Skip to content

Commit c40fd81

Browse files
StasKozarStasKozar
committed
MAGETWO-94435: UPS API removal - Dec 2018 [2.1.x]
1 parent 27088fd commit c40fd81

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
@@ -623,7 +623,7 @@ protected function _getXmlQuotes()
623623
$serviceCode = null;
624624
} else {
625625
$params['10_action'] = 'Rate';
626-
$serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : '';
626+
$serviceCode = $rowRequest->getProduct() ? $rowRequest->getProduct() : null;
627627
}
628628
$serviceDescription = $serviceCode ? $this->getShipmentByCode($serviceCode) : '';
629629

@@ -657,8 +657,8 @@ protected function _getXmlQuotes()
657657
<Shipper>
658658
XMLRequest;
659659

660-
if ($this->getConfigFlag('negotiated_active') && ($shipper = $this->getConfigData('shipper_number'))) {
661-
$xmlParams .= "<ShipperNumber>{$shipper}</ShipperNumber>";
660+
if ($this->getConfigFlag('negotiated_active') && ($shipperNumber = $this->getConfigData('shipper_number'))) {
661+
$xmlParams .= "<ShipperNumber>{$shipperNumber}</ShipperNumber>";
662662
}
663663

664664
if ($rowRequest->getIsReturn()) {
@@ -681,6 +681,7 @@ protected function _getXmlQuotes()
681681
<StateProvinceCode>{$shipperStateProvince}</StateProvinceCode>
682682
</Address>
683683
</Shipper>
684+
684685
<ShipTo>
685686
<Address>
686687
<PostalCode>{$params['19_destPostal']}</PostalCode>
@@ -696,8 +697,7 @@ protected function _getXmlQuotes()
696697
$xmlParams .= <<<XMLRequest
697698
</Address>
698699
</ShipTo>
699-
700-
700+
701701
<ShipFrom>
702702
<Address>
703703
<PostalCode>{$params['15_origPostal']}</PostalCode>
@@ -707,9 +707,13 @@ protected function _getXmlQuotes()
707707
</ShipFrom>
708708
709709
<Package>
710-
<PackagingType><Code>{$params['48_container']}</Code></PackagingType>
710+
<PackagingType>
711+
<Code>{$params['48_container']}</Code>
712+
</PackagingType>
711713
<PackageWeight>
712-
<UnitOfMeasurement><Code>{$rowRequest->getUnitMeasure()}</Code></UnitOfMeasurement>
714+
<UnitOfMeasurement>
715+
<Code>{$rowRequest->getUnitMeasure()}</Code>
716+
</UnitOfMeasurement>
713717
<Weight>{$params['23_weight']}</Weight>
714718
</PackageWeight>
715719
</Package>
@@ -720,8 +724,8 @@ protected function _getXmlQuotes()
720724
}
721725

722726
$xmlParams .= <<<XMLRequest
723-
</Shipment>
724-
</RatingServiceSelectionRequest>
727+
</Shipment>
728+
</RatingServiceSelectionRequest>
725729
XMLRequest;
726730

727731
$xmlRequest .= $xmlParams;
@@ -873,10 +877,13 @@ protected function _parseXmlResponse($xmlResponse)
873877
$error = $this->_rateErrorFactory->create();
874878
$error->setCarrier('ups');
875879
$error->setCarrierTitle($this->getConfigData('title'));
880+
if ($this->getConfigData('specificerrmsg') !== '') {
881+
$errorTitle = $this->getConfigData('specificerrmsg');
882+
}
876883
if (!isset($errorTitle)) {
877884
$errorTitle = __('Cannot retrieve shipping rates');
878885
}
879-
$error->setErrorMessage($this->getConfigData('specificerrmsg'));
886+
$error->setErrorMessage($errorTitle);
880887
$result->append($error);
881888
} else {
882889
foreach ($priceArr as $method => $price) {
@@ -982,14 +989,14 @@ protected function _getXmlTracking($trackings)
982989
$xmlRequest = $this->_xmlAccessRequest;
983990

984991
/**
985-
* RequestOption==>'activity' or '1' to request all activities
992+
* RequestOption==>'1' to request all activities
986993
*/
987994
$xmlRequest .= <<<XMLAuth
988995
<?xml version="1.0" ?>
989996
<TrackRequest xml:lang="en-US">
990997
<Request>
991998
<RequestAction>Track</RequestAction>
992-
<RequestOption>activity</RequestOption>
999+
<RequestOption>1</RequestOption>
9931000
</Request>
9941001
<TrackingNumber>$tracking</TrackingNumber>
9951002
<IncludeFreight>01</IncludeFreight>
@@ -1064,15 +1071,15 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
10641071
if ($activityTags) {
10651072
$index = 1;
10661073
foreach ($activityTags as $activityTag) {
1067-
$addArr = [];
1074+
$addressArr = [];
10681075
if (isset($activityTag->ActivityLocation->Address->City)) {
1069-
$addArr[] = (string)$activityTag->ActivityLocation->Address->City;
1076+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->City;
10701077
}
10711078
if (isset($activityTag->ActivityLocation->Address->StateProvinceCode)) {
1072-
$addArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
1079+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->StateProvinceCode;
10731080
}
10741081
if (isset($activityTag->ActivityLocation->Address->CountryCode)) {
1075-
$addArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
1082+
$addressArr[] = (string)$activityTag->ActivityLocation->Address->CountryCode;
10761083
}
10771084
$dateArr = [];
10781085
$date = (string)$activityTag->Date;
@@ -1096,8 +1103,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
10961103
//HH:MM:SS
10971104
$resultArr['deliverylocation'] = (string)$activityTag->ActivityLocation->Description;
10981105
$resultArr['signedby'] = (string)$activityTag->ActivityLocation->SignedForByName;
1099-
if ($addArr) {
1100-
$resultArr['deliveryto'] = implode(', ', $addArr);
1106+
if ($addressArr) {
1107+
$resultArr['deliveryto'] = implode(', ', $addressArr);
11011108
}
11021109
} else {
11031110
$tempArr = [];
@@ -1106,8 +1113,8 @@ protected function _parseXmlTrackingResponse($trackingValue, $xmlResponse)
11061113
//YYYY-MM-DD
11071114
$tempArr['deliverytime'] = implode(':', $timeArr);
11081115
//HH:MM:SS
1109-
if ($addArr) {
1110-
$tempArr['deliverylocation'] = implode(', ', $addArr);
1116+
if ($addressArr) {
1117+
$tempArr['deliverylocation'] = implode(', ', $addressArr);
11111118
}
11121119
$packageProgress[] = $tempArr;
11131120
}

‎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)