Merge pull request #6019 from magento-mpi/MC-36547

[mpi] MC-36547: Unexpected behavior of "FedEx" shipping method in the case of multiple currencies
magento · Aug 13, 2020 · 632267c · 632267c
2 parents 334ce01 + f1d4254
commit 632267c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
@@ -161,6 +161,29 @@ class Carrier extends AbstractCarrierOnline implements \Magento\Shipping\Model\C
      */
     private $_rawTrackingRequest;
 
+    /**
+     * ISO 4217 to Fedex currency codes matching
+     *
+     * @var string[]
+     */
+    private $codes = [
+        'DOP' => 'RDD',
+        'XCD' => 'ECD',
+        'ARS' => 'ARN',
+        'SGD' => 'SID',
+        'KRW' => 'WON',
+        'JMD' => 'JAD',
+        'CHF' => 'SFR',
+        'JPY' => 'JYE',
+        'KWD' => 'KUD',
+        'GBP' => 'UKL',
+        'AED' => 'DHS',
+        'MXN' => 'NMP',
+        'UYU' => 'UYP',
+        'CLP' => 'CHP',
+        'TWD' => 'NTD',
+    ];
+
     /**
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Quote\Model\Quote\Address\RateResult\ErrorFactory $rateErrorFactory
@@ -678,6 +701,7 @@ protected function _getRateAmountOriginBased($rate)
      */
     private function getBaseCurrencyRate(string $currencyCode): float
     {
+        $currencyCode = array_search($currencyCode, $this->codes) ?: $currencyCode;
         if (!isset($this->baseCurrencyRate[$currencyCode])) {
             $baseCurrencyCode = $this->_request->getBaseCurrency()->getCode();
             $rate = $this->_currencyFactory->create()
@@ -1033,26 +1057,9 @@ public function getCode($type, $code = '')
      */
     public function getCurrencyCode()
     {
-        $codes = [
-            'DOP' => 'RDD',
-            'XCD' => 'ECD',
-            'ARS' => 'ARN',
-            'SGD' => 'SID',
-            'KRW' => 'WON',
-            'JMD' => 'JAD',
-            'CHF' => 'SFR',
-            'JPY' => 'JYE',
-            'KWD' => 'KUD',
-            'GBP' => 'UKL',
-            'AED' => 'DHS',
-            'MXN' => 'NMP',
-            'UYU' => 'UYP',
-            'CLP' => 'CHP',
-            'TWD' => 'NTD',
-        ];
         $currencyCode = $this->_storeManager->getStore()->getBaseCurrencyCode();
 
-        return $codes[$currencyCode] ?? $currencyCode;
+        return $this->codes[$currencyCode] ?? $currencyCode;
     }
 
     /**

diff --git a/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Fedex/Test/Unit/Model/CarrierTest.php
@@ -358,6 +358,7 @@ public function collectRatesDataProvider()
             [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],
+            [10.0, 'SID', 'USD', 'PAYOR_LIST_SHIPMENT', 10.0, 0],
         ];
     }