Merge pull request #1315 from magento-mpi/MAGETWO-61067

Bug
- MAGETWO-61067 Shipping title and method name does not translated in shopping cart

Author: VladimirZaets

app/code/Magento/Quote/Model/Quote/Address.php

@@ -10,6 +10,7 @@
 use Magento\Customer\Api\Data\RegionInterfaceFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Sales Quote address model
@@ -202,6 +203,11 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      */
     protected $_addressTotalFactory;
 
+    /**
+     * @var \Magento\Quote\Model\Quote\Address\RateFactory
+     */
+    protected $_addressRateFactory;
+
     /**
      * @var \Magento\Customer\Api\Data\AddressInterfaceFactory
      */
@@ -242,6 +248,11 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      */
     private $serializer;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -259,7 +270,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param Address\ItemFactory $addressItemFactory
      * @param \Magento\Quote\Model\ResourceModel\Quote\Address\Item\CollectionFactory $itemCollectionFactory
-     * @param Address\RateFactory $addressRateFactory
+     * @param \Magento\Quote\Model\Quote\Address\RateFactory $addressRateFactory
      * @param Address\RateCollectorInterfaceFactory $rateCollector
      * @param \Magento\Quote\Model\ResourceModel\Quote\Address\Rate\CollectionFactory $rateCollectionFactory
      * @param Address\RateRequestFactory $rateRequestFactory
@@ -276,6 +287,7 @@ class Address extends \Magento\Customer\Model\Address\AbstractAddress implements
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
      * @param Json $serializer
+     * @param StoreManagerInterface $storeManager
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -312,7 +324,8 @@ public function __construct(
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = [],
-        Json $serializer = null
+        Json $serializer = null,
+        StoreManagerInterface $storeManager = null
     ) {
         $this->_scopeConfig = $scopeConfig;
         $this->_addressItemFactory = $addressItemFactory;
@@ -332,6 +345,7 @@ public function __construct(
         $this->totalsCollector = $totalsCollector;
         $this->totalsReader = $totalsReader;
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
         parent::__construct(
             $context,
             $registry,
@@ -990,16 +1004,16 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         $request->setFreeMethodWeight($item ? 0 : $this->getFreeMethodWeight());
 
         /**
-         * Store and website identifiers need specify from quote
+         * Store and website identifiers specified from StoreManager
          */
-        $request->setStoreId($this->getQuote()->getStore()->getId());
-        $request->setWebsiteId($this->getQuote()->getStore()->getWebsiteId());
+        $request->setStoreId($this->storeManager->getStore()->getId());
+        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         $request->setFreeShipping($this->getFreeShipping());
         /**
          * Currencies need to convert in free shipping
          */
-        $request->setBaseCurrency($this->getQuote()->getStore()->getBaseCurrency());
-        $request->setPackageCurrency($this->getQuote()->getStore()->getCurrentCurrency());
+        $request->setBaseCurrency($this->storeManager->getStore()->getBaseCurrency());
+        $request->setPackageCurrency($this->storeManager->getStore()->getCurrentCurrency());
         $request->setLimitCarrier($this->getLimitCarrier());
         $baseSubtotalInclTax = $this->getBaseSubtotalTotalInclTax();
         $request->setBaseSubtotalInclTax($baseSubtotalInclTax);
@@ -1021,11 +1035,10 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
                         $item->setBaseShippingAmount($rate->getPrice());
                     } else {
 
-                        /** @var \Magento\Quote\Model\Quote $quote */
-                        $quote = $this->getQuote();
-                        $amountPrice = $quote->getStore()
-                            ->getBaseCurrency()
-                            ->convert($rate->getPrice(), $quote->getQuoteCurrencyCode());
+                        /** @var \Magento\Store\Api\Data\StoreInterface */
+                        $store = $this->storeManager->getStore();
+                        $amountPrice = $store->getBaseCurrency()
+                            ->convert($rate->getPrice(), $store->getCurrentCurrencyCode());
                         $this->setBaseShippingAmount($rate->getPrice());
                         $this->setShippingAmount($amountPrice);
                     }