File tree 1 file changed +8
-2
lines changed
app/code/Magento/Quote/Model/Quote 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -1003,8 +1003,14 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
1003
1003
/**
1004
1004
* Store and website identifiers specified from StoreManager
1005
1005
*/
1006
- $ request ->setStoreId ($ this ->getQuote ()->getStoreId () ?? $ this ->storeManager ->getStore ()->getId ());
1007
- $ request ->setWebsiteId ($ this ->storeManager ->getWebsite ()->getId ());
1006
+ if ($ this ->getQuote ()->getStoreId ()) {
1007
+ $ storeId = $ this ->getQuote ()->getStoreId ();
1008
+ $ request ->setStoreId ($ storeId );
1009
+ $ request ->setWebsiteId ($ this ->storeManager ->getStore ($ storeId )->getWebsiteId ());
1010
+ } else {
1011
+ $ request ->setStoreId ($ this ->storeManager ->getStore ()->getId ());
1012
+ $ request ->setWebsiteId ($ this ->storeManager ->getWebsite ()->getId ());
1013
+ }
1008
1014
$ request ->setFreeShipping ($ this ->getFreeShipping ());
1009
1015
/**
1010
1016
* Currencies need to convert in free shipping
You can’t perform that action at this time.
0 commit comments