MAGETWO-53795: [Github] Ups shipping method CNY vs RMB currencycode problem

Author: viktym

app/code/Magento/Directory/Model/Currency.php

@@ -410,22 +410,6 @@ public function saveRates($rates)
         return $this;
     }
 
-    /**
-     * Map currency alias to currency code
-     *
-     * @param string $code
-     * @return string
-     */
-    public function mapCurrencyCode($code)
-    {
-        $currencyMapping = [
-            'RMB' => 'CNY',
-            'CNH' => 'CNY'
-        ];
-
-        return isset($currencyMapping[$code]) ? $currencyMapping[$code] : $code;
-    }
-
     /**
      * This method removes LRM and RLM marks from string
      *

app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php

@@ -53,32 +53,6 @@ public function testGetCurrencySymbol()
         $this->assertEquals($currencySymbol, $this->currency->getCurrencySymbol());
     }
 
-    /**
-     * @dataProvider mapCurrencyCodeDataProvider
-     * @param string $currencyCode
-     * @param string $expected
-     */
-    public function testMapCurrencyCode($currencyCode, $expected)
-    {
-        static::assertEquals(
-            $expected,
-            $this->currency->mapCurrencyCode($currencyCode)
-        );
-    }
-
-    /**
-     * Return data sets for testMapCurrencyCode()
-     *
-     * @return array
-     */
-    public function mapCurrencyCodeDataProvider()
-    {
-        return [
-            ['RMB', 'CNY'],
-            ['CNH', 'CNY'],
-            ['USD', 'USD']
-        ];
-    }
     /**
      * @dataProvider getOutputFormatDataProvider
      * @param $withCurrency

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

@@ -771,6 +771,22 @@ protected function _getBaseCurrencyRate($code)
         return $this->_baseCurrencyRate;
     }
 
+    /**
+     * Map currency alias to currency code
+     *
+     * @param string $code
+     * @return string
+     */
+    private function mapCurrencyCode($code)
+    {
+        $currencyMapping = [
+            'RMB' => 'CNY',
+            'CNH' => 'CNY'
+        ];
+
+        return isset($currencyMapping[$code]) ? $currencyMapping[$code] : $code;
+    }
+
     /**
      * Prepare shipping rate result based on response
      *
@@ -799,10 +815,7 @@ protected function _parseXmlResponse($xmlResponse)
                         'shipper_number'
                     ) && !empty($negotiatedArr);
 
-                /** @var \Magento\Directory\Model\Currency $currency */
-                $currency = $this->_currencyFactory->create();
-                $allowedCurrencies = $currency->getConfigAllowCurrencies();
-
+                $allowedCurrencies = $this->_currencyFactory->create()->getConfigAllowCurrencies();
                 foreach ($arr as $shipElement) {
                     $code = (string)$shipElement->Service->Code;
                     if (in_array($code, $allowedMethods)) {
@@ -814,7 +827,7 @@ protected function _parseXmlResponse($xmlResponse)
 
                         //convert price with Origin country currency code to base currency code
                         $successConversion = true;
-                        $responseCurrencyCode = $currency->mapCurrencyCode(
+                        $responseCurrencyCode = $this->mapCurrencyCode(
                             (string)$shipElement->TotalCharges->CurrencyCode
                         );
                         if ($responseCurrencyCode) {