MAGETWO-91702: Shipping method Table Rates settings gets from wrong store

- Get store id from quote for shipping rates

Author: stkorf

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

@@ -965,6 +965,7 @@ public function collectShippingRates()
 
     /**
      * Request shipping rates for entire address or specified address item
+     *
      * Returns true if current selected shipping method code corresponds to one of the found rates
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
@@ -1002,7 +1003,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
-        $request->setStoreId($this->storeManager->getStore()->getId());
+        $request->setStoreId($this->getQuote()->getStoreId() ?? $this->storeManager->getStore()->getId());
         $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         $request->setFreeShipping($this->getFreeShipping());
         /**
@@ -1348,31 +1349,31 @@ public function getAllBaseTotalAmounts()
     /******************************* End Total Collector Interface *******************************************/
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
         return $this->validator;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCountryId()
     {
         return $this->getData(self::KEY_COUNTRY_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($countryId)
     {
         return $this->setData(self::KEY_COUNTRY_ID, $countryId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStreet()
     {
@@ -1381,207 +1382,207 @@ public function getStreet()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
         return $this->setData(self::KEY_STREET, $street);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompany()
     {
         return $this->getData(self::KEY_COMPANY);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
         return $this->setData(self::KEY_COMPANY, $company);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTelephone()
     {
         return $this->getData(self::KEY_TELEPHONE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
         return $this->setData(self::KEY_TELEPHONE, $telephone);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFax()
     {
         return $this->getData(self::KEY_FAX);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
         return $this->setData(self::KEY_FAX, $fax);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPostcode()
     {
         return $this->getData(self::KEY_POSTCODE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
         return $this->setData(self::KEY_POSTCODE, $postcode);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCity()
     {
         return $this->getData(self::KEY_CITY);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
         return $this->setData(self::KEY_CITY, $city);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstname()
     {
         return $this->getData(self::KEY_FIRSTNAME);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
         return $this->setData(self::KEY_FIRSTNAME, $firstname);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLastname()
     {
         return $this->getData(self::KEY_LASTNAME);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
         return $this->setData(self::KEY_LASTNAME, $lastname);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMiddlename()
     {
         return $this->getData(self::KEY_MIDDLENAME);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
         return $this->setData(self::KEY_MIDDLENAME, $middlename);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrefix()
     {
         return $this->getData(self::KEY_PREFIX);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
         return $this->setData(self::KEY_PREFIX, $prefix);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSuffix()
     {
         return $this->getData(self::KEY_SUFFIX);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
         return $this->setData(self::KEY_SUFFIX, $suffix);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getVatId()
     {
         return $this->getData(self::KEY_VAT_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($vatId)
     {
         return $this->setData(self::KEY_VAT_ID, $vatId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerId()
     {
         return $this->getData(self::KEY_CUSTOMER_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($customerId)
     {
         return $this->setData(self::KEY_CUSTOMER_ID, $customerId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getEmail()
     {
@@ -1594,63 +1595,63 @@ public function getEmail()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
         return $this->setData(self::KEY_EMAIL, $email);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
         return $this->setData(self::KEY_REGION, $region);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($regionId)
     {
         return $this->setData(self::KEY_REGION_ID, $regionId);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
         return $this->setData(self::KEY_REGION_CODE, $regionCode);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSameAsBilling()
     {
         return $this->getData(self::SAME_AS_BILLING);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSameAsBilling($sameAsBilling)
     {
         return $this->setData(self::SAME_AS_BILLING, $sameAsBilling);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerAddressId()
     {
         return $this->getData(self::CUSTOMER_ADDRESS_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($customerAddressId)
     {
@@ -1681,20 +1682,15 @@ public function setSaveInAddressBook($saveInAddressBook)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
         return $this->_getExtensionAttributes();
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
-     * @return $this
+     * @inheritdoc
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes)
     {
@@ -1712,7 +1708,7 @@ public function getShippingMethod()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {