Subversion Repositories munaweb

Rev

Rev 83 | Rev 134 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 83 Rev 97
Line 1166... Line 1166...
1166
            return ("Regional Box A");
1166
            return ("Regional Box A");
1167
        } else if (trackingNumber.startsWith("82")) {
1167
        } else if (trackingNumber.startsWith("82")) {
1168
            return ("Global Express");
1168
            return ("Global Express");
1169
        } else if (trackingNumber.startsWith("EC")) {
1169
        } else if (trackingNumber.startsWith("EC")) {
1170
            return ("Priority Mail Express International");
1170
            return ("Priority Mail Express International");
1171
        } else if (trackingNumber.startsWith("92701") || trackingNumber.startsWith("EA")) {
1171
        } else if (trackingNumber.startsWith("92701") || trackingNumber.startsWith("9481") || trackingNumber.startsWith("EA")) {
1172
            return ("Priority Mail Express");
1172
            return ("Priority Mail Express");
1173
        } else if (trackingNumber.startsWith("CP")) {
1173
        } else if (trackingNumber.startsWith("CP")) {
1174
            return ("Priority Mail  International");
1174
            return ("Priority Mail International");
1175
        } else if (trackingNumber.startsWith("92088")) {
1175
        } else if (trackingNumber.startsWith("92088")) {
1176
            return ("Registered Mail");
1176
            return ("Registered Mail");
1177
        } else if (trackingNumber.startsWith("92021")) {
-
 
1178
            return ("Signature Confirmation");
-
 
1179
        } else if (trackingNumber.startsWith("9461") || trackingNumber.startsWith("9462")) {
1177
        } else if (trackingNumber.startsWith("9461") || trackingNumber.startsWith("9462")) {
1180
            return ("Parcel Select Ground");
1178
            return ("Parcel Select Ground");
1181
        } else if (trackingNumber.startsWith("92021")) {
1179
        } else if (trackingNumber.startsWith("92021")) {
1182
            return ("Signature Confirmation");
1180
            return ("Signature Confirmation");
1183
        }
1181
        }
Line 1994... Line 1992...
1994
            }
1992
            }
1995
 
1993
 
1996
            if (getRadioValue('rptType') != 'trackingList') {
1994
            if (getRadioValue('rptType') != 'trackingList') {
1997
                var soldTransactions = getJsonArray(obj.SellingManagerSoldOrder.SellingManagerSoldTransaction);
1995
                var soldTransactions = getJsonArray(obj.SellingManagerSoldOrder.SellingManagerSoldTransaction);
1998
                for (i = 0; i < soldTransactions.length; i++) {
1996
                for (i = 0; i < soldTransactions.length; i++) {
1999
                    if (soldTransactions[i].Shipment.DeliveryStatus !== undefined) {
1997
                    if (soldTransactions[i].Shipment !== undefined && soldTransactions[i].Shipment.DeliveryStatus !== undefined) {
2000
                        deliveryStatus += (i > 0 ? '<br/>' : '') + soldTransactions[i].Shipment.DeliveryStatus;
1998
                        deliveryStatus += (i > 0 ? '<br/>' : '') + soldTransactions[i].Shipment.DeliveryStatus;
2001
                    }
1999
                    }
2002
                }
2000
                }
2003
                document.getElementById('Delivery' + correlationId).innerHTML = deliveryStatus;
2001
                document.getElementById('Delivery' + correlationId).innerHTML = deliveryStatus;
2004
            }
2002
            }
Line 2387... Line 2385...
2387
        updateProgressBar(maxTrackingNumbersToProcess, trackingNumbersProcessed);
2385
        updateProgressBar(maxTrackingNumbersToProcess, trackingNumbersProcessed);
2388
    };
2386
    };
2389
 
2387
 
2390
    xhr.open('POST', configProxyUrl, true);
2388
    xhr.open('POST', configProxyUrl, true);
2391
    xhr.setRequestHeader('Content-Type', 'text/xml');
2389
    xhr.setRequestHeader('Content-Type', 'text/xml');
-
 
2390
    xhr.setRequestHeader('Accept-Charset', 'UTF-8,*;q=0.5');
2392
    xhr.setRequestHeader('X-Proxy-URL', configUPSUrl);
2391
    xhr.setRequestHeader('X-Proxy-URL', configUPSUrl);
2393
    xhr.send(xml);
2392
    xhr.send(xml);
2394
}
2393
}
2395
 
2394
 
2396
function formatUPSTrackingLine(t) {
2395
function formatUPSTrackingLine(t) {