AC-15664::shipping method issue fix for inncorrect price

Author: del77428

app/code/Magento/Multishipping/Block/Checkout/Overview.php

@@ -234,9 +234,11 @@ public function getShippingAddressRate($address)
     public function getShippingPriceInclTax($address)
     {
         $rate = $address->getShippingRateByCode($address->getShippingMethod());
-        $exclTax = $rate->getPrice();
-        $taxAmount = $address->getShippingTaxAmount();
-        return $this->formatPrice($exclTax + $taxAmount);
+        $baseAmount = (float)$rate->getPrice();
+        $baseTaxAmount = (float)$address->getBaseShippingTaxAmount();
+        $store = $this->getQuote()->getStore();
+        $converted = $store->getBaseCurrency()->convert($baseAmount + $baseTaxAmount, $store->getCurrentCurrencyCode());
+        return $this->formatPrice($converted);
     }
 
     /**
@@ -248,8 +250,10 @@ public function getShippingPriceInclTax($address)
     public function getShippingPriceExclTax($address)
     {
         $rate = $address->getShippingRateByCode($address->getShippingMethod());
-        $shippingAmount = $rate->getPrice();
-        return $this->formatPrice($shippingAmount);
+        $baseAmount = (float)$rate->getPrice();
+        $store = $this->getQuote()->getStore();
+        $converted = $store->getBaseCurrency()->convert($baseAmount, $store->getCurrentCurrencyCode());
+        return $this->formatPrice($converted);
     }
 
     /**