5.2

CHANGELOG-WIP.md

@@ -0,0 +1,33 @@
+# Release Notes for Craft Commerce 5.2 (WIP)
+
+### Store Management
+- Products can now be structured, per product type.
+- It’s now possible for discounts to explicitly require a coupon code. ([#3132](https://github.com/craftcms/commerce/issues/3132))
+- New order addresses now default to the store’s country on Order Edit screens. ([#3306](https://github.com/craftcms/commerce/issues/3306))
+- Product conditions can now have a “Variant Search” rule. ([#3689](https://github.com/craftcms/commerce/issues/3689))
+
+### Development
+- Added the `onPromotion` purchasable query param.
+- Added the `onPromotion` GraphQL variant query argument.
+
+### Extensibility
+- Added `craft\commerce\console\controllers\UpgradeController::$v3droppableColumns`
+- Added `craft\commerce\console\controllers\UpgradeController::EVENT_BEFORE_DROP_V3_DATABASE_ENTITIES`.
+- Added `craft\commerce\elements\Product::EVENT_DEFINE_PARENT_SELECTION_CRITERIA`.
+- Added `craft\commerce\elements\conditions\products\ProductVariantSearchConditionRule`.
+- Added `craft\commerce\elements\db\Purchasable::$onPromotion`.
+- Added `craft\commerce\elements\db\Purchasable::onPromotion()`.
+- Added `craft\commerce\events\UpgradeEvent`.
+- Added `craft\commerce\models\Discount::$requireCouponCode`.
+- Added `craft\commerce\models\ProductType::$isStructure`
+- Added `craft\commerce\models\ProductType::$maxLevels`
+- Added `craft\commerce\models\ProductType::$structureId`
+- Added `craft\commerce\models\ProductType::DEFAULT_PLACEMENT_BEGINNING`
+- Added `craft\commerce\models\ProductType::DEFAULT_PLACEMENT_END`
+- Added `craft\commerce\models\ProductType::getConfig()`
+
+### System
+- Improved the performance of adding items to the cart.
+- Improved the performance of shipping rule matching when an order condition formula is used. ([3653](https://github.com/craftcms/commerce/pull/3653))
+- Craft Commerce now requires Money PHP 4.2 or later.
+- Fixed a bug where outstanding order balances could be calculated incorrectly. ([#3403](https://github.com/craftcms/commerce/issues/3403))

composer.json

@@ -25,7 +25,8 @@
     "craftcms/cms": "^5.2.0",
     "dompdf/dompdf": "^2.0.2",
     "ibericode/vat": "^1.2.2",
-    "iio/libmergepdf": "^4.0"
+    "iio/libmergepdf": "^4.0",
+    "moneyphp/money": "^4.2.0"
   },
   "require-dev": {
     "codeception/codeception": "^5.0.11",

src/Plugin.php

@@ -254,7 +254,7 @@ public static function editions(): array
     /**
      * @inheritDoc
      */
-    public string $schemaVersion = '5.1.0.3';
+    public string $schemaVersion = '5.2.0.3';
 
     /**
      * @inheritdoc

src/controllers/CartController.php

@@ -136,7 +136,7 @@ public function actionUpdateCart(): ?Response
 
         // Get the cart from the request or from the session.
         // When we are about to update the cart, we consider it a real cart at this point, and want to actually create it in the DB.
-        $this->_cart = $this->_getCart(true);
+        $this->_cart = $this->_getCart();
 
         // Can clear line items when updating the cart
         $clearLineItems = $this->request->getParam('clearLineItems');
@@ -584,7 +584,7 @@ private function _getCart(bool $forceSave = false): Order
             // Get the cart from the order number
             $cart = Order::find()->number($orderNumber)->isCompleted(false)->one();
 
-            if (!$cart) {
+            if ($cart === null) {
                 throw new NotFoundHttpException('Cart not found');
             }
 
@@ -594,7 +594,9 @@ private function _getCart(bool $forceSave = false): Order
         $requestForceSave = (bool)$this->request->getBodyParam('forceSave');
         $doForceSave = ($requestForceSave || $forceSave);
 
-        return Plugin::getInstance()->getCarts()->getCart($doForceSave);
+        $this->_cart = Plugin::getInstance()->getCarts()->getCart($doForceSave);
+
+        return $this->_cart;
     }
 
     /**
@@ -699,6 +701,7 @@ private function _setAddresses(): void
                             'owner' => $this->_cart,
                         ]
                     );
+
                     $this->_cart->setBillingAddress($cartBillingAddress);
 
                     if ($shippingIsBilling) {

src/controllers/DiscountsController.php

@@ -113,13 +113,11 @@ public function actionTableData(): Response
                 'discounts.dateTo',
                 'discounts.totalDiscountUses',
                 'discounts.ignorePromotions',
+                'discounts.requireCouponCode',
                 'discounts.stopProcessing',
                 'discounts.sortOrder',
-                'coupons.discountId',
             ])
-            ->distinct()
             ->where(['discounts.storeId' => $storeId])
-            ->leftJoin(Table::COUPONS . ' coupons', '[[coupons.discountId]] = [[discounts.id]]')
             ->orderBy(['sortOrder' => SORT_ASC]);
 
 
@@ -164,8 +162,7 @@ public function actionTableData(): Response
                 'status' => (bool)$item['enabled'],
                 'duration' => $dateRange,
                 'timesUsed' => $item['totalDiscountUses'],
-                // If there is joined data then there are coupons
-                'hasCoupons' => (bool)$item['discountId'],
+                'requireCouponCode' => (bool)$item['requireCouponCode'],
                 'ignore' => (bool)$item['ignorePromotions'],
                 'stop' => (bool)$item['stopProcessing'],
             ];
@@ -259,6 +256,7 @@ public function actionSave(): ?Response
         $discount->setCustomerCondition($this->request->getBodyParam('customerCondition'));
         $discount->setShippingAddressCondition($this->request->getBodyParam('shippingAddressCondition'));
         $discount->setBillingAddressCondition($this->request->getBodyParam('billingAddressCondition'));
+        $discount->requireCouponCode = (bool)$this->request->getBodyParam('requireCouponCode');
         $discount->stopProcessing = (bool)$this->request->getBodyParam('stopProcessing');
         $discount->purchaseQty = $this->request->getBodyParam('purchaseQty');
         $discount->maxPurchaseQty = $this->request->getBodyParam('maxPurchaseQty');
@@ -385,6 +383,7 @@ public function actionSave(): ?Response
     private function _setCouponsOnDiscount(array $coupons, Discount $discount): void
     {
         if (empty($coupons)) {
+            $discount->setCoupons([]);
             return;
         }
 

src/controllers/OrdersController.php

@@ -1438,6 +1438,9 @@ private function _registerJavascript(array $variables): void
         $forceEdit = ($order->hasErrors() || !$order->isCompleted);
 
         Craft::$app->getView()->registerJs('window.orderEdit.forceEdit = ' . Json::encode($forceEdit) . ';', View::POS_BEGIN);
+
+        $store = $order->getStore();
+        Craft::$app->getView()->registerJs('window.orderEdit.store = ' . Json::encode($store->toArray([], ['settings.locationAddress'])) . ';', View::POS_BEGIN);
     }
 
     /**

src/controllers/ProductTypesController.php

@@ -110,8 +110,17 @@ public function actionSaveProductType(): void
         }
 
         $this->requirePostRequest();
+        $productTypeId = $this->request->getBodyParam('productTypeId');
 
-        $productType = new ProductType();
+        if ($productTypeId) {
+            $productType = Plugin::getInstance()->getProductTypes()->getProductTypeById($productTypeId);
+
+            if (!$productType) {
+                throw new BadRequestHttpException("Invalid section ID: $productTypeId");
+            }
+        } else {
+            $productType = new ProductType();
+        }
 
         // Shared attributes
         $productType->id = $this->request->getBodyParam('productTypeId');
@@ -130,8 +139,11 @@ public function actionSaveProductType(): void
         $productType->variantTitleTranslationKeyFormat = $this->request->getBodyParam('variantTitleTranslationKeyFormat', $productType->variantTitleTranslationKeyFormat);
         $productType->skuFormat = $this->request->getBodyParam('skuFormat');
         $productType->descriptionFormat = $this->request->getBodyParam('descriptionFormat');
-        $productType->propagationMethod = PropagationMethod::tryFrom($this->request->getBodyParam('propagationMethod') ?? '')
-            ?? PropagationMethod::All;
+        $productType->propagationMethod = PropagationMethod::tryFrom($this->request->getBodyParam('propagationMethod') ?? '') ?? PropagationMethod::All;
+        $productType->isStructure = $this->request->getBodyParam('isStructure');
+        $maxLevels = (int)$this->request->getBodyParam('maxLevels');
+        $productType->maxLevels = $maxLevels ?: null; // zero should be null
+        $productType->defaultPlacement = $this->request->getBodyParam('defaultPlacement');
 
         // Site-specific settings
         $allSiteSettings = [];

src/controllers/ProductsController.php

@@ -82,6 +82,15 @@ public function actionCreate(?string $productType = null)
         $product->typeId = $productType->id;
         $product->enabled = true;
 
+        // Structure parent
+        if (
+            $productType->isStructure &&
+            (int)$productType->maxLevels !== 1
+        ) {
+            // Set the initially selected parent
+            $product->setParentId($this->request->getParam('parentId'));
+        }
+
         // Make sure the user is allowed to create this entry
         if (!Craft::$app->getElements()->canSave($product, $user)) {
             throw new ForbiddenHttpException('User not authorized to create this product.');
@@ -131,6 +140,21 @@ public function actionCreate(?string $productType = null)
             ]), 'product');
         }
 
+        // Set its position in the structure if a before/after param was passed
+        if ($productType->isStructure) {
+            if ($nextId = $this->request->getParam('before')) {
+                $nextEntry = Plugin::getInstance()->getProducts()->getProductById($nextId, $site->id, [
+                    'structureId' => $productType->structureId,
+                ]);
+                Craft::$app->getStructures()->moveBefore($productType->structureId, $product, $nextEntry);
+            } elseif ($prevId = $this->request->getParam('after')) {
+                $prevEntry = Plugin::getInstance()->getProducts()->getProductById($prevId, $site->id, [
+                    'structureId' => $productType->structureId,
+                ]);
+                Craft::$app->getStructures()->moveAfter($productType->structureId, $product, $prevEntry);
+            }
+        }
+
         $editUrl = $product->getCpEditUrl();
 
         $response = $this->asModelSuccess($product, Craft::t('app', '{type} created.', [

src/controllers/ShippingCategoriesController.php

@@ -183,12 +183,12 @@ public function actionDelete(): ?Response
         }
 
         if (!empty($failedIds)) {
-            // @TODO: re-word this message at next translations update
-            return $this->asFailure(Craft::t('commerce', 'Could not delete shipping category'));
+            return $this->asFailure(Craft::t('commerce', 'Could not delete {count, number} shipping {count, plural, one{category} other{categories}}.', [
+                'count' => count($failedIds),
+            ]));
         }
 
-        // @TODO: re-word add better message in next translation update
-        return $this->asSuccess();
+        return $this->asSuccess(Craft::t('commerce', 'Shipping categories deleted.'));
     }
 
     /**

src/controllers/ShippingMethodsController.php

@@ -140,12 +140,12 @@ public function actionDelete(): ?Response
         }
 
         if (!empty($failedIds)) {
-            // @TODO: re-word this message at next translations update
-            return $this->asFailure(Craft::t('commerce', 'Could not delete shipping method and its rules.'));
+            return $this->asFailure(Craft::t('commerce', 'Could not delete {count, number} shipping {count, plural, one{method} other{methods}} and rules.', [
+                'count' => count($failedIds),
+            ]));
         }
 
-        // @TODO: re-word add better message in next translation update
-        return $this->asSuccess();
+        return $this->asSuccess(Craft::t('commerce', 'Shipping methods and rules deleted.'));
     }
 
     /**

src/controllers/TaxCategoriesController.php

@@ -146,7 +146,7 @@ public function actionSave(): ?Response
     /**
      * @throws HttpException
      */
-    public function actionDelete(): Response
+    public function actionDelete(): ?Response
     {
         $this->requirePostRequest();
 
@@ -171,12 +171,12 @@ public function actionDelete(): Response
         }
 
         if (!empty($failedIds)) {
-            // @TODO: re-word this message at next translations update
-            return $this->asFailure(Craft::t('commerce', 'Could not delete tax category'));
+            return $this->asFailure(Craft::t('commerce', 'Could not delete {count, number} tax {count, plural, one{category} other{categories}}.', [
+                'count' => count($failedIds),
+            ]));
         }
 
-        // @TODO: re-word add better message in next translation update
-        return $this->asSuccess();
+        return $this->asSuccess(Craft::t('commerce', 'Tax categories deleted.'));
     }
 
     /**

src/elements/Order.php

@@ -2592,11 +2592,9 @@ public function isPaymentAmountPartial(): bool
      */
     public function getPaidStatus(): string
     {
-        $teller = $this->_getTeller();
-
         if ($this->getIsPaid() &&
-            $teller->greaterThan($this->getTotalPrice(), 0) &&
-            $teller->greaterThan($this->getTotalPaid(), $this->getTotalPrice())
+            $this->_getTeller()->greaterThan($this->getTotalPrice(), 0) &&
+            $this->_getTeller()->greaterThan($this->getTotalPaid(), $this->getTotalPrice())
         ) {
             return self::PAID_STATUS_OVERPAID;
         }
@@ -2605,7 +2603,7 @@ public function getPaidStatus(): string
             return self::PAID_STATUS_PAID;
         }
 
-        if ($this->getTotalPaid() > 0) {
+        if ($this->_getTeller()->greaterThan($this->getTotalPaid(), 0)) {
             return self::PAID_STATUS_PARTIAL;
         }
 
@@ -2726,7 +2724,7 @@ public function getOutstandingBalance(): float
      */
     public function hasOutstandingBalance(): bool
     {
-        return $this->getOutstandingBalance() > 0;
+        return $this->_getTeller()->greaterThan($this->getOutstandingBalance(), 0);
     }
 
     /**