Merge branch '2.4-develop' of github.com:vo1/magento2 into 2.4-develop-prs

Author: ishakhsuvarov

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

@@ -273,7 +273,7 @@ public function collectRates(\Magento\Quote\Model\Quote\Address\RateRequest $req
      */
     private function prepareCarrier(string $carrierCode, RateRequest $request): AbstractCarrier
     {
-        $carrier = $this->isShippingCarrierAvailable($carrierCode)
+        $carrier = $this->isShippingCarrierAvailable($carrierCode, $request->getStoreId())
             ? $this->_carrierFactory->create($carrierCode, $request->getStoreId())
             : null;
         if (!$carrier) {
@@ -541,13 +541,15 @@ public function setCarrierAvailabilityConfigField($code = 'active')
      * Checks availability of carrier.
      *
      * @param string $carrierCode
+     * @param null|int $storeId
      * @return bool
      */
-    private function isShippingCarrierAvailable(string $carrierCode): bool
+    private function isShippingCarrierAvailable(string $carrierCode, ?int $storeId = null): bool
     {
         return $this->_scopeConfig->isSetFlag(
             'carriers/' . $carrierCode . '/' . $this->_availabilityConfigField,
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
         );
     }
 }