Skip to content

Commit cc00197

Browse files
committed
MAGETWO-91702: Shipping method Table Rates settings gets from wrong store
- Fix website id for shipping
1 parent b35b681 commit cc00197

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,14 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
10031003
/**
10041004
* Store and website identifiers specified from StoreManager
10051005
*/
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+
}
10081014
$request->setFreeShipping($this->getFreeShipping());
10091015
/**
10101016
* Currencies need to convert in free shipping

0 commit comments

Comments
 (0)