Skip to content

Commit 79feac9

Browse files
author
Joan He
committed
Merge remote-tracking branch 'owls/MAGETWO-94433-ups-api-removal-dec-2018' into BugFixPR
2 parents 6ebce39 + 741df4f commit 79feac9

File tree

2 files changed

+28
-21
lines changed

2 files changed

+28
-21
lines changed

‎app/code/Magento/Ups/Model/Carrier.php

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,7 @@ protected function _getXmlQuotes()
630630
$serviceCode = null;
631631
} else {
632632
$params['10_action'] = 'Rate';
633-
$serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : '';
633+
$serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : null;
634634
}
635635
$serviceDescription = $serviceCode ? $this->getShipmentByCode($serviceCode) : '';
636636

@@ -664,8 +664,8 @@ protected function _getXmlQuotes()
664664
<Shipper>
665665
XMLRequest;
666666

667-
if ($this->getConfigFlag('negotiated_active') && ($shipper = $this->getConfigData('shipper_number'))) {
668-
$xmlParams .= "<ShipperNumber>{$shipper}</ShipperNumber>";
667+
if ($this->getConfigFlag('negotiated_active') && ($shipperNumber = $this->getConfigData('shipper_number'))) {
668+
$xmlParams .= "<ShipperNumber>{$shipperNumber}</ShipperNumber>";
669669
}
670670

671671
if ($rowRequest->getIsReturn()) {
@@ -688,6 +688,7 @@ protected function _getXmlQuotes()
688688
<StateProvinceCode>{$shipperStateProvince}</StateProvinceCode>
689689
</Address>
690690
</Shipper>
691+
691692
<ShipTo>
692693
<Address>
693694
<PostalCode>{$params['19_destPostal']}</PostalCode>
@@ -703,8 +704,7 @@ protected function _getXmlQuotes()
703704
$xmlParams .= <<<XMLRequest
704705
</Address>
705706
</ShipTo>
706-
707-
707+
708708
<ShipFrom>
709709
<Address>
710710
<PostalCode>{$params['15_origPostal']}</PostalCode>
@@ -714,9 +714,13 @@ protected function _getXmlQuotes()
714714
</ShipFrom>
715715
716716
<Package>
717-
<PackagingType><Code>{$params['48_container']}</Code></PackagingType>
717+
<PackagingType>
718+
<Code>{$params['48_container']}</Code>
719+
</PackagingType>
718720
<PackageWeight>
719-
<UnitOfMeasurement><Code>{$rowRequest->getUnitMeasure()}</Code></UnitOfMeasurement>
721+
<UnitOfMeasurement>
722+
<Code>{$rowRequest->getUnitMeasure()}</Code>
723+
</UnitOfMeasurement>
720724
<Weight>{$params['23_weight']}</Weight>
721725
</PackageWeight>
722726
</Package>
@@ -730,8 +734,8 @@ protected function _getXmlQuotes()
730734
}
731735

732736
$xmlParams .= <<<XMLRequest
733-
</Shipment>
734-
</RatingServiceSelectionRequest>
737+
</Shipment>
738+
</RatingServiceSelectionRequest>
735739
XMLRequest;
736740

737741
$xmlRequest .= $xmlParams;
@@ -907,10 +911,13 @@ protected function _parseXmlResponse($xmlResponse)
907911
$error = $this->_rateErrorFactory->create();
908912
$error->setCarrier('ups');
909913
$error->setCarrierTitle($this->getConfigData('title'));
914+
if ($this->getConfigData('specificerrmsg') !== '') {
915+
$errorTitle = $this->getConfigData('specificerrmsg');
916+
}
910917
if (!isset($errorTitle)) {
911918
$errorTitle = __('Cannot retrieve shipping rates');
912919
}
913-
$error->setErrorMessage($this->getConfigData('specificerrmsg'));
920+
$error->setErrorMessage($errorTitle);
914921
$result->append($error);
915922
} else {
916923
foreach ($priceArr as $method => $price) {
@@ -1014,14 +1021,14 @@ protected function _getXmlTracking($trackings)
10141021

10151022
foreach ($trackings as $tracking) {
10161023
/**
1017-
* RequestOption==>'activity' or '1' to request all activities
1024+
* RequestOption==>'1' to request all activities
10181025
*/
10191026
$xmlRequest = <<<XMLAuth
10201027
<?xml version="1.0" ?>
10211028
<TrackRequest xml:lang="en-US">
10221029
<Request>
10231030
<RequestAction>Track</RequestAction>
1024-
<RequestOption>activity</RequestOption>
1031+
<RequestOption>1</RequestOption>
10251032
</Request>
10261033
<TrackingNumber>$tracking</TrackingNumber>
10271034
<IncludeFreight>01</IncludeFreight>
@@ -1085,15 +1092,15 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
10851092
if ($activityTags) {
10861093
$index = 1;
10871094
foreach ($activityTags as $activityTag) {
1088-
$addArr = [];
1095+
$addressArr = [];
10891096
if (isset($activityTag->ActivityLocation->Address->City)) {
1090-
$addArr[] = (string)$activityTag->ActivityLocation->Address->City;
1097+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->City;
10911098
}
10921099
if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
1093-
$addArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
1100+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
10941101
}
10951102
if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
1096-
$addArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
1103+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
10971104
}
10981105
$dateArr = [];
10991106
$date = (string)$activityTag->Date;
@@ -1117,8 +1124,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
11171124
//HH:MM:SS
11181125
$resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
11191126
$resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
1120-
if ($addArr) {
1121-
$resultArr['deliveryto'] = implode(', ', $addArr);
1127+
if ($addressArr) {
1128+
$resultArr['deliveryto'] = implode(', ', $addressArr);
11221129
}
11231130
} else {
11241131
$tempArr = [];
@@ -1127,8 +1134,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
11271134
//YYYY-MM-DD
11281135
$tempArr['deliverytime'] = implode(':', $timeArr);
11291136
//HH:MM:SS
1130-
if ($addArr) {
1131-
$tempArr['deliverylocation'] = implode(', ', $addArr);
1137+
if ($addressArr) {
1138+
$tempArr['deliverylocation'] = implode(', ', $addressArr);
11321139
}
11331140
$packageProgress[] = $tempArr;
11341141
}

‎app/code/Magento/Ups/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<model>Magento\Ups\Model\Carrier</model>
2626
<pickup>CC</pickup>
2727
<title>United Parcel Service</title>
28-
<tracking_xml_url>https://www.ups.com/ups.app/xml/Track</tracking_xml_url>
28+
<tracking_xml_url>https://onlinetools.ups.com/ups.app/xml/Track</tracking_xml_url>
2929
<unit_of_measure>LBS</unit_of_measure>
3030
<username backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
3131
<password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />

0 commit comments

Comments
 (0)