Fixes #3279

craftcms · Oct 18, 2023 · 94dd13e · 94dd13e
1 parent 8b8920a
commit 94dd13e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Fixed an XSS vulnerability.
 - Fixed a bug where emails were not being ordered by name correctly. ([#3263](https://github.com/craftcms/commerce/issues/3263))
 - Fixed a bug where a gateway’s webhook URL was malformed. ([#3299](https://github.com/craftcms/commerce/issues/3299))
+- The order param is now included when triggering the `craft\commerce\services\Purchasables::EVENT_PURCHASABLE_SHIPPABLE` event. ([#3279](https://github.com/craftcms/commerce/pull/3279))
 
 ## 3.4.22.1 - 2023-06-03
 

diff --git a/src/adjusters/Shipping.php b/src/adjusters/Shipping.php
@@ -64,7 +64,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;
             }
         }
@@ -125,7 +125,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
@@ -162,7 +162,7 @@ public function getPriceForOrder(Order $order)
 
         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;
             }
         }
@@ -175,7 +175,7 @@ public function getPriceForOrder(Order $order)
         $amount = $shippingRule->getBaseRate();
 
         foreach ($order->lineItems as $item) {
-            if ($item->getPurchasable() && !$item->purchasable->hasFreeShipping() && Plugin::getInstance()->getPurchasables()->isPurchasableShippable($item->getPurchasable())) {
+            if ($item->getPurchasable() && !$item->purchasable->hasFreeShipping() && Plugin::getInstance()->getPurchasables()->isPurchasableShippable($item->getPurchasable(), $order)) {
                 $percentageRate = $shippingRule->getPercentageRate($item->shippingCategoryId);
                 $perItemRate = $shippingRule->getPerItemRate($item->shippingCategoryId);
                 $weightRate = $shippingRule->getWeightRate($item->shippingCategoryId);