ENGCOM-620: #12889: Wrong shipping fee in backend with multiple store views #1132

Author: Stanislav Idolov

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

@@ -1008,6 +1008,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
+        $request->setQuoteStoreId($this->getQuote()->getStoreId());
         $request->setStoreId($this->storeManager->getStore()->getId());
         $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         $request->setFreeShipping($this->getFreeShipping());

app/code/Magento/Shipping/Model/Shipping.php

@@ -252,7 +252,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
     public function collectCarrierRates($carrierCode, $request)
     {
         /* @var $carrier \Magento\Shipping\Model\Carrier\AbstractCarrier */
-        $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getStoreId());
+        $carrier = $this->_carrierFactory->createIfActive($carrierCode, $request->getQuoteStoreId());
         if (!$carrier) {
             return $this;
         }

dev/tests/integration/testsuite/Magento/Quote/Model/Quote/AddressTest.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Quote\Model\Quote;
 
+use Magento\Store\Api\StoreRepositoryInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -25,6 +26,9 @@ class AddressTest extends \PHPUnit\Framework\TestCase
     /**@var \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository */
     protected $customerRepository;
 
+    /** @var  StoreRepositoryInterface */
+    private $storeRepository;
+
     /**
      * Initialize quote and customer fixtures
      */
@@ -48,6 +52,8 @@ public function setUp()
         $this->_address->setId(1);
         $this->_address->load($this->_address->getId());
         $this->_address->setQuote($this->_quote);
+        $this->storeRepository = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
+            ->create(StoreRepositoryInterface::class);
     }
 
     protected function tearDown()
@@ -309,4 +315,50 @@ public function dataProvider()
             [[123, true], [123, true]]
         ];
     }
+
+    /**
+     * Tests different shipping rates for different stores.
+     *
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDataFixture Magento/Sales/_files/quote_with_customer.php
+     * @magentoDataFixture Magento/Customer/_files/customer_two_addresses.php
+     * @magentoDataFixture Magento/Sales/_files/quote.php
+     * @magentoConfigFixture default_store carriers/flatrate/price 5
+     * @magentoConfigFixture fixture_second_store_store carriers/flatrate/price 10
+     * @magentoAppIsolation enabled
+     * @magentoDbIsolation enabled
+     * @dataProvider requestShippingRatesDataProvider
+     */
+    public function testRequestShippingRates($storeCode, $expectedRate)
+    {
+        $store = $this->storeRepository->get($storeCode);
+        $this->_quote->setStoreId($store->getId());
+        $this->_address->setItemQty(1);
+        $this->_address->requestShippingRates();
+        /**
+         * @var \Magento\Quote\Model\ResourceModel\Quote\Address\Rate\Collection $shippingRatesCollection
+         */
+        $shippingRatesCollection = $this->_address->getShippingRatesCollection();
+        /**
+         * @var \Magento\Quote\Model\Quote\Address\Rate[] $shippingRates
+         */
+        $shippingRates = $shippingRatesCollection->getItems();
+        self::assertEquals(
+            $expectedRate,
+            $shippingRates[0]->getPrice()
+        );
+    }
+
+    /**
+     * Data provider for testRequestShippingRates.
+     *
+     * @return array
+     */
+    public function requestShippingRatesDataProvider()
+    {
+        return [
+            ['default', 5],
+            ['fixture_second_store', 10],
+        ];
+    }
 }