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

- Add currency code mapping

Author: viktym

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

@@ -410,6 +410,22 @@ 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,6 +53,32 @@ 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

@@ -799,7 +799,9 @@ protected function _parseXmlResponse($xmlResponse)
                         'shipper_number'
                     ) && !empty($negotiatedArr);
 
-                $allowedCurrencies = $this->_currencyFactory->create()->getConfigAllowCurrencies();
+                /** @var \Magento\Directory\Model\Currency $currency */
+                $currency = $this->_currencyFactory->create();
+                $allowedCurrencies = $currency->getConfigAllowCurrencies();
 
                 foreach ($arr as $shipElement) {
                     $code = (string)$shipElement->Service->Code;
@@ -812,7 +814,9 @@ protected function _parseXmlResponse($xmlResponse)
 
                         //convert price with Origin country currency code to base currency code
                         $successConversion = true;
-                        $responseCurrencyCode = (string)$shipElement->TotalCharges->CurrencyCode;
+                        $responseCurrencyCode = $currency->mapCurrencyCode(
+                            (string)$shipElement->TotalCharges->CurrencyCode
+                        );
                         if ($responseCurrencyCode) {
                             if (in_array($responseCurrencyCode, $allowedCurrencies)) {
                                 $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);