Merge branch 'v3' into develop

# Conflicts: # CHANGELOG.md # composer.json # src/base/ShippingMethod.php
craftcms · Oct 19, 2023 · fc50df2 · fc50df2
2 parents 1c604c5 + bc11b8a
commit fc50df2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/adjusters/Shipping.php b/src/adjusters/Shipping.php
@@ -68,7 +68,7 @@ public function adjust(Order $order): array
 
         foreach ($lineItems as $item) {
             $purchasable = $item->getPurchasable();
-            if ($purchasable && !Plugin::getInstance()->getPurchasables()->isPurchasableShippable($purchasable)) {
+            if ($purchasable && !Plugin::getInstance()->getPurchasables()->isPurchasableShippable($purchasable, $order)) {
                 $nonShippableItems[$item->id] = $item->id;
             }
         }
@@ -129,7 +129,7 @@ public function adjust(Order $order): array
                     }
 
                     $freeShippingFlagOnProduct = $item->purchasable->hasFreeShipping();
-                    $shippable = Plugin::getInstance()->getPurchasables()->isPurchasableShippable($item->getPurchasable());
+                    $shippable = Plugin::getInstance()->getPurchasables()->isPurchasableShippable($item->getPurchasable(), $order);
                     if (!$freeShippingFlagOnProduct && !$hasFreeShippingFromDiscount && $shippable) {
                         $adjustment = $this->_createAdjustment($shippingMethod, $rule);
 

diff --git a/src/base/ShippingMethod.php b/src/base/ShippingMethod.php
@@ -163,7 +163,7 @@ public function getPriceForOrder(Order $order): float
 
         foreach ($lineItems as $item) {
             $purchasable = $item->getPurchasable();
-            if ($purchasable && !Plugin::getInstance()->getPurchasables()->isPurchasableShippable($purchasable)) {
+            if ($purchasable && !Plugin::getInstance()->getPurchasables()->isPurchasableShippable($purchasable, $order)) {
                 $nonShippableItems[$item->id] = $item->id;
             }
         }