Merge remote-tracking branch 'origin/MAGETWO-53795' into MPI-BUGFIXES

Author: viktym

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
      *
@@ -800,7 +816,6 @@ protected function _parseXmlResponse($xmlResponse)
                     ) && !empty($negotiatedArr);
 
                 $allowedCurrencies = $this->_currencyFactory->create()->getConfigAllowCurrencies();
-
                 foreach ($arr as $shipElement) {
                     $code = (string)$shipElement->Service->Code;
                     if (in_array($code, $allowedMethods)) {
@@ -812,7 +827,9 @@ protected function _parseXmlResponse($xmlResponse)
 
                         //convert price with Origin country currency code to base currency code
                         $successConversion = true;
-                        $responseCurrencyCode = (string)$shipElement->TotalCharges->CurrencyCode;
+                        $responseCurrencyCode = $this->mapCurrencyCode(
+                            (string)$shipElement->TotalCharges->CurrencyCode
+                        );
                         if ($responseCurrencyCode) {
                             if (in_array($responseCurrencyCode, $allowedCurrencies)) {
                                 $cost = (double)$cost * $this->_getBaseCurrencyRate($responseCurrencyCode);