Subversion Repositories munaweb

Rev

Rev 158 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 158 Rev 198
Line 891... Line 891...
891
            emailAddress = transactions[i].Buyer.Email;
891
            emailAddress = transactions[i].Buyer.Email;
892
        }
892
        }
893
 
893
 
894
        html.push(tableCell(firstName.toProperCase()));
894
        html.push(tableCell(firstName.toProperCase()));
895
        html.push(tableCell(lastName.toProperCase()));
895
        html.push(tableCell(lastName.toProperCase()));
896
        html.push(tableCell(emailAddress != 'Invalid Request' ? emailAddress : ""));
896
        html.push(tableCell(emailAddress != 'Invalid Request' && emailAddress !== undefined ? emailAddress : ""));
897
        html.push(tableCell(''));
897
        html.push(tableCell(''));
898
        html.push(tableCell(order.ShippingAddress.Street1.toProperCase()));
898
        html.push(tableCell(order.ShippingAddress.Street1.toProperCase()));
899
        html.push(tableCell(order.ShippingAddress.Street2.toProperCase()));
899
        html.push(tableCell(order.ShippingAddress.Street2.toProperCase()));
900
        html.push(tableCell(orders[entry].ShippingAddress.CityName.toProperCase()));
900
        html.push(tableCell(orders[entry].ShippingAddress.CityName.toProperCase()));
901
        html.push(tableCell(''));
901
        html.push(tableCell(''));
Line 1249... Line 1249...
1249
    xw.writeElementString('AccountHistorySelection', 'BetweenSpecifiedDates');
1249
    xw.writeElementString('AccountHistorySelection', 'BetweenSpecifiedDates');
1250
    xw.writeElementString('BeginDate', valueStartDate);
1250
    xw.writeElementString('BeginDate', valueStartDate);
1251
    xw.writeElementString('EndDate', valueEndDate);
1251
    xw.writeElementString('EndDate', valueEndDate);
1252
    xw.writeElementString('ExcludeBalance', 'true');
1252
    xw.writeElementString('ExcludeBalance', 'true');
1253
    xw.writeElementString('ExcludeSummary', 'true');
1253
    xw.writeElementString('ExcludeSummary', 'true');
-
 
1254
    xw.writeElementString('IncludeNettedEntries', 'true');
1254
 
1255
 
1255
    xw.writeStartElement('Pagination');
1256
    xw.writeStartElement('Pagination');
1256
    xw.writeElementString('EntriesPerPage', configXmlRequestEntriesPerPage);
1257
    xw.writeElementString('EntriesPerPage', configXmlRequestEntriesPerPage);
1257
    xw.writeElementString('PageNumber', pageNumber.toString());
1258
    xw.writeElementString('PageNumber', pageNumber.toString());
1258
    xw.writeEndElement(); /* Pagination */
1259
    xw.writeEndElement(); /* Pagination */
Line 1400... Line 1401...
1400
        html.push('<tbody>');
1401
        html.push('<tbody>');
1401
    }
1402
    }
1402
 
1403
 
1403
    for (i = 0; i < obj.AccountEntries.AccountEntry.length; i++) {
1404
    for (i = 0; i < obj.AccountEntries.AccountEntry.length; i++) {
1404
        var AccountEntry = obj.AccountEntries.AccountEntry[i];
1405
        var AccountEntry = obj.AccountEntries.AccountEntry[i];
1405
        if ((!AccountEntry.Description.includes('Payment') && !AccountEntry.Description.includes('Final Value Fee') && AccountEntry.GrossDetailAmount.text != '0.0' && AccountEntry.NetDetailAmount.text != '0.0') ||
1406
/*        if ((!AccountEntry.Description.includes('Payment') && !AccountEntry.Description.includes('Final Value Fee') && AccountEntry.GrossDetailAmount.text != '0.0' && AccountEntry.NetDetailAmount.text != '0.0') ||
1406
            (AccountEntry.Description.includes('Final Value Fee') && AccountEntry.NetDetailAmount.text.substr(0, 1) == '-')) {
1407
            (AccountEntry.Description.includes('Final Value Fee') && AccountEntry.NetDetailAmount.text.substr(0, 1) == '-')) {
-
 
1408
*/
-
 
1409
            if (!(AccountEntry.Description == 'Payment' && AccountEntry.RefNumber == 0)) {
1407
            html.push('<tr>');
1410
            html.push('<tr>');
1408
 
1411
 
1409
            html.push(tableCellDate(AccountEntry.Date));
1412
            html.push(tableCellDate(AccountEntry.Date));
1410
            html.push(tableCell(AccountEntry.RefNumber));
1413
            html.push(tableCell(AccountEntry.RefNumber));
1411
            html.push(tableCell(AccountEntry.Title));
1414
            html.push(tableCell(AccountEntry.Title));