MC-33737: Fedex response shows wrong "IntoCurrency"

nikita-shcherbatykh · nikita-shcherbatykh · commit 39ce0e1b5250 · 2020-04-29T14:46:26.000+03:00
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
@@ -8,6 +8,7 @@
 
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Module\Dir;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Webapi\Soap\ClientFactory;
@@ -21,6 +22,7 @@
  *
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\Carrier\CarrierInterface
 {
@@ -149,6 +151,16 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     private $soapClientFactory;
 
+    /**
+     * @var array
+     */
+    private $baseCurrencyRate;
+
+    /**
+     * @var DataObject
+     */
+    private $_rawTrackingRequest;
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -629,12 +641,13 @@ protected function _prepareRateResponse($response)
     protected function _getRateAmountOriginBased($rate)
     {
         $amount = null;
+        $currencyCode = '';
         $rateTypeAmounts = [];
-
         if (is_object($rate)) {
             // The "RATED..." rates are expressed in the currency of the origin country
             foreach ($rate->RatedShipmentDetails as $ratedShipmentDetail) {
                 $netAmount = (string)$ratedShipmentDetail->ShipmentRateDetail->TotalNetCharge->Amount;
+                $currencyCode = (string)$ratedShipmentDetail->ShipmentRateDetail->TotalNetCharge->Currency;
                 $rateType = (string)$ratedShipmentDetail->ShipmentRateDetail->RateType;
                 $rateTypeAmounts[$rateType] = $netAmount;
             }
@@ -649,11 +662,42 @@ protected function _getRateAmountOriginBased($rate)
             if ($amount === null) {
                 $amount = (string)$rate->RatedShipmentDetails[0]->ShipmentRateDetail->TotalNetCharge->Amount;
             }
+
+            $amount = (float)$amount * $this->getBaseCurrencyRate($currencyCode);
         }
 
         return $amount;
     }
 
+    /**
+     * Returns base currency rate.
+     *
+     * @param string $currencyCode
+     * @return float
+     * @throws LocalizedException
+     */
+    private function getBaseCurrencyRate(string $currencyCode): float
+    {
+        if (!isset($this->baseCurrencyRate[$currencyCode])) {
+            $baseCurrencyCode = $this->_request->getBaseCurrency()->getCode();
+            $rate = $this->_currencyFactory->create()
+                ->load($currencyCode)
+                ->getAnyRate($baseCurrencyCode);
+            if ($rate === false) {
+                $errorMessage = __(
+                    'Can\'t convert a shipping cost from "%1-%2" for FedEx carrier.',
+                    $currencyCode,
+                    $baseCurrencyCode
+                );
+                $this->_logger->critical($errorMessage);
+                throw new LocalizedException($errorMessage);
+            }
+            $this->baseCurrencyRate[$currencyCode] = (float)$rate;
+        }
+
+        return $this->baseCurrencyRate[$currencyCode];
+    }
+
     /**
      * Set free method request
      *
@@ -726,9 +770,8 @@ protected function _getXmlQuotes()
             $debugData = ['request' => $this->filterDebugData($request)];
             try {
                 $url = $this->getConfigData('gateway_url');
-                if (!$url) {
-                    $url = $this->_defaultGatewayUrl;
-                }
+
+                // phpcs:disable Magento2.Functions.DiscouragedFunction
                 $ch = curl_init();
                 curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
                 curl_setopt($ch, CURLOPT_URL, $url);
@@ -737,6 +780,7 @@ protected function _getXmlQuotes()
                 curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
                 $responseBody = curl_exec($ch);
                 curl_close($ch);
+                // phpcs:enable
 
                 $debugData['result'] = $this->filterDebugData($responseBody);
                 $this->_setCachedQuotes($request, $responseBody);
diff --git a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
@@ -10,10 +10,12 @@
 use Magento\Directory\Helper\Data;
 use Magento\Directory\Model\Country;
 use Magento\Directory\Model\CountryFactory;
+use Magento\Directory\Model\Currency;
 use Magento\Directory\Model\CurrencyFactory;
 use Magento\Directory\Model\RegionFactory;
 use Magento\Fedex\Model\Carrier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Module\Dir\Reader;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
 use Magento\Framework\Serialize\Serializer\Json;
@@ -100,6 +102,11 @@ class CarrierTest extends \PHPUnit\Framework\TestCase
      */
     private $logger;
 
+    /**
+     * @var CurrencyFactory|MockObject
+     */
+    private $currencyFactory;
+
     protected function setUp()
     {
         $this->helper = new ObjectManager($this);
@@ -141,7 +148,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
+        $this->currencyFactory = $this->getMockBuilder(CurrencyFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -179,7 +186,7 @@ protected function setUp()
                     'trackStatusFactory' => $this->statusFactory,
                     'regionFactory' => $regionFactory,
                     'countryFactory' => $countryFactory,
-                    'currencyFactory' => $currencyFactory,
+                    'currencyFactory' => $this->currencyFactory,
                     'directoryData' => $data,
                     'stockRegistry' => $stockRegistry,
                     'storeManager' => $storeManager,
@@ -240,20 +247,29 @@ public function scopeConfigGetValue(string $path)
 
     /**
      * @param float $amount
+     * @param string $currencyCode
+     * @param string $baseCurrencyCode
      * @param string $rateType
      * @param float $expected
      * @param int $callNum
      * @dataProvider collectRatesDataProvider
      */
-    public function testCollectRatesRateAmountOriginBased($amount, $rateType, $expected, $callNum = 1)
-    {
+    public function testCollectRatesRateAmountOriginBased(
+        $amount,
+        $currencyCode,
+        $baseCurrencyCode,
+        $rateType,
+        $expected,
+        $callNum = 1
+    ) {
         $this->scope->expects($this->any())
             ->method('isSetFlag')
             ->willReturn(true);
 
         // @codingStandardsIgnoreStart
         $netAmount = new \stdClass();
         $netAmount->Amount = $amount;
+        $netAmount->Currency = $currencyCode;
 
         $totalNetCharge = new \stdClass();
         $totalNetCharge->TotalNetCharge = $netAmount;
@@ -274,9 +290,39 @@ public function testCollectRatesRateAmountOriginBased($amount, $rateType, $expec
         $this->serializer->method('serialize')
             ->willReturn('CollectRateString' . $amount);
 
+        $rateCurrency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $rateCurrency->method('load')
+            ->willReturnSelf();
+        $rateCurrency->method('getAnyRate')
+            ->willReturnMap(
+                [
+                    ['USD', 1],
+                    ['EUR', 0.75],
+                    ['UNKNOWN', false]
+                ]
+            );
+
+        if ($baseCurrencyCode === 'UNKNOWN') {
+            $this->expectException(LocalizedException::class);
+        }
+
+        $this->currencyFactory->method('create')
+            ->willReturn($rateCurrency);
+
+        $baseCurrency = $this->getMockBuilder(Currency::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $baseCurrency->method('getCode')
+            ->willReturn($baseCurrencyCode);
+
         $request = $this->getMockBuilder(RateRequest::class)
+            ->setMethods(['getBaseCurrency'])
             ->disableOriginalConstructor()
             ->getMock();
+        $request->method('getBaseCurrency')
+            ->willReturn($baseCurrency);
 
         $this->soapClient->expects($this->exactly($callNum))
             ->method('getRates')
@@ -295,22 +341,23 @@ public function testCollectRatesRateAmountOriginBased($amount, $rateType, $expec
     public function collectRatesDataProvider()
     {
         return [
-            [10.0, 'RATED_ACCOUNT_PACKAGE', 10],
-            [10.0, 'RATED_ACCOUNT_PACKAGE', 10, 0],
-            [11.50, 'PAYOR_ACCOUNT_PACKAGE', 11.5],
-            [11.50, 'PAYOR_ACCOUNT_PACKAGE', 11.5, 0],
-            [100.01, 'RATED_ACCOUNT_SHIPMENT', 100.01],
-            [100.01, 'RATED_ACCOUNT_SHIPMENT', 100.01, 0],
-            [32.2, 'PAYOR_ACCOUNT_SHIPMENT', 32.2],
-            [32.2, 'PAYOR_ACCOUNT_SHIPMENT', 32.2, 0],
-            [15.0, 'RATED_LIST_PACKAGE', 15],
-            [15.0, 'RATED_LIST_PACKAGE', 15, 0],
-            [123.25, 'PAYOR_LIST_PACKAGE', 123.25],
-            [123.25, 'PAYOR_LIST_PACKAGE', 123.25, 0],
-            [12.12, 'RATED_LIST_SHIPMENT', 12.12],
-            [12.12, 'RATED_LIST_SHIPMENT', 12.12, 0],
-            [38.9, 'PAYOR_LIST_SHIPMENT', 38.9],
-            [38.9, 'PAYOR_LIST_SHIPMENT', 38.9, 0],
+            [10.0, 'USD', 'EUR', 'RATED_ACCOUNT_PACKAGE', 7.5],
+            [10.0, 'USD', 'UNKNOWN', 'RATED_ACCOUNT_PACKAGE', null, 0],
+            [10.0, 'USD', 'USD', 'RATED_ACCOUNT_PACKAGE', 10, 0],
+            [11.50, 'USD', 'USD', 'PAYOR_ACCOUNT_PACKAGE', 11.5],
+            [11.50, 'USD', 'USD', 'PAYOR_ACCOUNT_PACKAGE', 11.5, 0],
+            [100.01, 'USD', 'USD', 'RATED_ACCOUNT_SHIPMENT', 100.01],
+            [100.01, 'USD', 'USD', 'RATED_ACCOUNT_SHIPMENT', 100.01, 0],
+            [32.2, 'USD', 'USD', 'PAYOR_ACCOUNT_SHIPMENT', 32.2],
+            [32.2, 'USD', 'USD', 'PAYOR_ACCOUNT_SHIPMENT', 32.2, 0],
+            [15.0, 'USD', 'USD', 'RATED_LIST_PACKAGE', 15],
+            [15.0, 'USD', 'USD', 'RATED_LIST_PACKAGE', 15, 0],
+            [123.25, 'USD', 'USD', 'PAYOR_LIST_PACKAGE', 123.25],
+            [123.25, 'USD', 'USD', 'PAYOR_LIST_PACKAGE', 123.25, 0],
+            [12.12, 'USD', 'USD', 'RATED_LIST_SHIPMENT', 12.12],
+            [12.12, 'USD', 'USD', 'RATED_LIST_SHIPMENT', 12.12, 0],
+            [38.9, 'USD', 'USD', 'PAYOR_LIST_SHIPMENT', 38.9],
+            [38.9, 'USD', 'USD', 'PAYOR_LIST_SHIPMENT', 38.9, 0],
         ];
     }
 
diff --git a/app/code/Magento/Fedex/i18n/en_US.csv b/app/code/Magento/Fedex/i18n/en_US.csv
@@ -77,3 +77,4 @@ Dropoff,Dropoff
 Debug,Debug
 "Show Method if Not Applicable","Show Method if Not Applicable"
 "Sort Order","Sort Order"
+"Can't convert a shipping cost from ""%1-%2"" for FedEx carrier.","Can't convert a shipping cost from ""%1-%2"" for FedEx carrier."
