[*] MO : Use UPS Negotiated Rates in upscarrier module if available

PrestaShopCorp · Jul 15, 2015 · 46af8ba · 46af8ba
1 parent c474aa7
commit 46af8ba
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/upscarrier.php b/upscarrier.php
@@ -1735,7 +1735,12 @@ public function getUpsShippingCost($wsParams)
 
 		// Return results
 		if (isset ($resultTab['RATINGSERVICESELECTIONRESPONSE']['RESPONSE']['RESPONSESTATUSDESCRIPTION']) && $resultTab['RATINGSERVICESELECTIONRESPONSE']['RESPONSE']['RESPONSESTATUSDESCRIPTION'] == 'Success')
-			return array('connect' => true, 'cost' => $resultTab['RATINGSERVICESELECTIONRESPONSE']['RATEDSHIPMENT']['TOTALCHARGES']['MONETARYVALUE'] * $conversionRate);
+		{
+			if (isset($resultTab['RATINGSERVICESELECTIONRESPONSE']['RATEDSHIPMENT']['NEGOTIATEDRATES']))
+				return array('connect' => true, 'cost' => $resultTab['RATINGSERVICESELECTIONRESPONSE']['RATEDSHIPMENT']['NEGOTIATEDRATES']['NETSUMMARYCHARGES']['GRANDTOTAL']['MONETARYVALUE'] * $conversionRate);
+			else
+				return array('connect' => true, 'cost' => $resultTab['RATINGSERVICESELECTIONRESPONSE']['RATEDSHIPMENT']['TOTALCHARGES']['MONETARYVALUE'] * $conversionRate);
+		}
 
 		if (isset($resultTab['RATINGSERVICESELECTIONRESPONSE']['RESPONSE']['ERROR']['ERRORDESCRIPTION']))
 			$this->_webserviceError = $resultTab['RATINGSERVICESELECTIONRESPONSE']['RESPONSE']['ERROR']['ERRORDESCRIPTION'];
@@ -1758,7 +1763,7 @@ public function sendRequest($wsParams)
 				'content' => $xml,
 				'header'  => 'Content-type: application/x-www-form-urlencoded',
 				'timeout' => 5,
- 			)
+			)
 		);
 		$context = stream_context_create($opts);
 		$result = @file_get_contents('https://onlinetools.ups.com/ups.app/xml/Rate', false, $context);

diff --git a/xml.tpl b/xml.tpl
@@ -18,6 +18,9 @@
 	</PickupType>
 	<Shipment>
 		<Description>Rate Shopping - Domestic</Description>
+		<RateInformation>
+			<NegotiatedRatesIndicator />
+		</RateInformation>
 		<Shipper>
 			<ShipperNumber>[[ShipperNumber]]</ShipperNumber>
 			<Address>