5.5

CHANGELOG.md

@@ -1,7 +1,76 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+### Store Management
+- Added the ability to suppress order emails when marking an order as complete in the control panel. ([#4144](https://github.com/craftcms/commerce/issues/4144))
+- PDF download URLs are now generated with time-limited security tokens.
+- Anonymous users attempting to download a PDF with an expired or missing token are now shown an email verification form.
+- Added a new system message for customizing PDF download emails.
+- Added the ability to select multiple products in variant conditions. ([#4166](https://github.com/craftcms/commerce/pull/4166))
+- Added the ability to select multiple variants in pricing rules’ “Match Variant” conditions. ([#4167](https://github.com/craftcms/commerce/issues/4167))
+- Added the ability to select multiple users in pricing rules’ “Match Customer” conditions. ([#4167](https://github.com/craftcms/commerce/issues/4167))
+
+### Administration
+- Added billing and shipping address conditions to payment gateways. ([#4100](https://github.com/craftcms/commerce/pull/4100))
+- Added preview targets for products. ([#4128](https://github.com/craftcms/commerce/pull/4128))
+- Added slug translation options to product types. ([#4088](https://github.com/craftcms/commerce/pull/4088))
+- Gateway condition rules now allow multiple gateways to be selected. ([#4112](https://github.com/craftcms/commerce/issues/4112))
+- Product action menus now have a “Product type settings” action, for admin users on environments that allow admin changes. ([#4157](https://github.com/craftcms/commerce/issues/4157))
+- Added the “Link Duration” setting to PDF settings.
+
+### Development
+- Orders now have a `dateFirstPaid` property that records the date and time when the order was first paid in full.
+- Improved product and variant query performance.
+- Improved the performance of retrieving a line item’s catalog pricing rule ID.
+- Added the `children`, `parent`, `ancestors` and `descendants` fields to products’ GraphQL data. ([#4122](https://github.com/craftcms/commerce/issues/4122))
+- Added the `productStatus` variant query param. ([#4158](https://github.com/craftcms/commerce/issues/4158))
+- Added the `productStatus` GraphQL variant query argument. ([#4158](https://github.com/craftcms/commerce/issues/4158))
+- Added the `--force` option to the `commerce/reset-data` command. ([#4115](https://github.com/craftcms/commerce/discussions/4115))
+
+### Extensibility
+- Added `craft\commerce\controllers\BaseStoreManagementController::asStoreManagementCpScreen()`.
+- Added `craft\commerce\controllers\DownloadsController::actionEmailChallenge()`.
+- Added `craft\commerce\controllers\DownloadsController::actionPdfChallenge()`.
+- Added `craft\commerce\controllers\DownloadsController::actionPdfSent()`.
+- Added `craft\commerce\elements\Order::$dateFirstPaid`.
+- Added `craft\commerce\elements\Order::getMaskedEmail()`.
+- Added `craft\commerce\elements\conditions\customers\CatalogPricingRuleCustomerConditionRule`.
+- Added `craft\commerce\elements\conditions\variants\CatalogPricingRuleVariantConditionRule`.
+- Added `craft\commerce\elements\conditions\variants\VariantConditionRule`.
+- Added `craft\commerce\elements\db\OrderQuery::$dateFirstPaid`.
+- Added `craft\commerce\elements\db\OrderQuery::dateFirstPaid()`.
+- Added `craft\commerce\events\InventoryMovementEvent`. ([#4063](https://github.com/craftcms/commerce/pull/4063))
+- Added `craft\commerce\events\UpdateInventoryLevelEvent`. ([#4063](https://github.com/craftcms/commerce/pull/4063))
+- Added `craft\commerce\helpers\Cp::shippingCategoryFieldHtml()`.
+- Added `craft\commerce\helpers\Cp::shippingMethodFieldHtml()`.
+- Added `craft\commerce\helpers\Cp::shippingZoneFieldHtml()`.
+- Added `craft\commerce\helpers\Cp::taxCategoryFieldHtml()`.
+- Added `craft\commerce\helpers\Cp::taxZoneFieldHtml()`.
+- Added `craft\commerce\helpers\Gql::getSchemaContainedProductTypes()`.
+- Added `craft\commerce\helpers\ProductQuery`.
+- Added `craft\commerce\models\Email::$renderSiteId`.
+- Added `craft\commerce\models\Email::getRenderSite()`.
+- Added `craft\commerce\models\Pdf::$linkExpiry`.
+- Added `craft\commerce\queue\jobs\ResaveProductVariants`.
+- Added `craft\commerce\records\Email::$renderSiteId`.
+- Added `craft\commerce\records\Order::$dateFirstPaid`.
+- Added `craft\commerce\services\CatalogPricingRules::hasCatalogPricingRules()`.
+- Added `craft\commerce\services\Discounts::appendCouponCode()`. ([#4084](https://github.com/craftcms/commerce/pull/4084))
+- Added `craft\commerce\services\Inventory::EVENT_AFTER_EXECUTE_INVENTORY_MOVEMENT`. ([#3835](https://github.com/craftcms/commerce/discussions/3835))
+- Added `craft\commerce\services\Inventory::EVENT_AFTER_EXECUTE_UPDATE_INVENTORY_LEVEL`. ([#3835](https://github.com/craftcms/commerce/discussions/3835))
+- Added `craft\commerce\services\Pdfs::getPdfUrl()` now generates secure tokenized URLs with expiry timestamps.
+
+### System
+- Fixed a bug where purchasables could have a shipping category that was no longer available to their product type. ([#4018](https://github.com/craftcms/commerce/issues/4018))
+- Fixed a bug where order emails weren’t always getting rendered for the correct site.
+- Fixed a bug where variant titles were being incorrectly generated for draft products. ([#4173](https://github.com/craftcms/commerce/pull/4173), [#4126](https://github.com/craftcms/commerce/issues/4126))
+- Fixed a PHP error that occurred when retrieving an order that referenced an archived payment gateway. ([#4172](https://github.com/craftcms/commerce/issues/4172))
+- Fixed a bug where variants with inactive products were being returned in GraphQL variant queries. ([#4158](https://github.com/craftcms/commerce/issues/4158))
+
 ## 5.4.10 - 2025-11-12
 
+- Fixed a bug where variants were not getting the default shipping category set when the currently set category was no longer available. ([#4018](https://github.com/craftcms/commerce/issues/4018))
 - Fixed a SQL error that could occur when viewing unfulfilled orders on PostgreSQL. ([#4171](https://github.com/craftcms/commerce/issues/4171))
 - Fixed a bug where duplicate pricing catalog jobs could be queued. ([#4136](https://github.com/craftcms/commerce/issues/4136))
 - Fixed a bug where the `commerce_catalogpricing` table could be missing indexes. ([#4160](https://github.com/craftcms/commerce/issues/4160))
@@ -28,6 +97,7 @@
 - Fixed a bug where variants weren’t getting duplicated correctly. ([#4125](https://github.com/craftcms/commerce/issues/4125))
 - Fixed a SQL error that could occur when deleting a shipping method.
 
+
 ## 5.4.6 - 2025-09-04
 
 - Fixed a bug where the `commerce/cart/update-cart` action could return unnecessary validation errors. ([3873](https://github.com/craftcms/commerce/issues/3873))
@@ -121,6 +191,7 @@
 - Improved store query performance. ([#4029](https://github.com/craftcms/commerce/issues/4029))
 - Fixed a bug where the purchasable cache was not cleared when stock was updated.
 - Fixed a PHP error that could occur when sending emails. ([#4017](https://github.com/craftcms/commerce/issues/4017))
+- Fixed a bug where order emails weren’t always getting rendered for the correct site.
 - Fixed a SQL error that could occur when upgrading to Commerce 5. ([#4044](https://github.com/craftcms/commerce/issues/4044))
 - Fixed a bug where duplicate order references could be generated. ([#4050](https://github.com/craftcms/commerce/issues/4050))
 - Fixed a bug where purchasables’ `shippingCategoryId` and `taxCategoryId` properties couldn’t be set via `setAttributes()`. ([#4046](https://github.com/craftcms/commerce/issues/4046))

src/Plugin.php

@@ -136,6 +136,7 @@
 use craft\events\RegisterCacheOptionsEvent;
 use craft\events\RegisterComponentTypesEvent;
 use craft\events\RegisterElementExportersEvent;
+use craft\events\RegisterEmailMessagesEvent;
 use craft\events\RegisterGqlEagerLoadableFields;
 use craft\events\RegisterGqlQueriesEvent;
 use craft\events\RegisterGqlSchemaComponentsEvent;
@@ -160,6 +161,7 @@
 use craft\services\Gql;
 use craft\services\ProjectConfig;
 use craft\services\Sites;
+use craft\services\SystemMessages;
 use craft\services\UserPermissions;
 use craft\services\Users;
 use craft\utilities\ClearCaches;
@@ -257,7 +259,7 @@ public static function editions(): array
     /**
      * @inheritDoc
      */
-    public string $schemaVersion = '5.4.0.7';
+    public string $schemaVersion = '5.5.0.5';
 
     /**
      * @inheritdoc
@@ -848,6 +850,22 @@ function(DefineBehaviorsEvent $event) {
 
         Event::on(Purchasable::class, Elements::EVENT_BEFORE_RESTORE_ELEMENT, [$this->getPurchasables(), 'beforeRestorePurchasableHandler']);
 
+        // Register system message for PDF download emails
+        Event::on(
+            SystemMessages::class,
+            SystemMessages::EVENT_REGISTER_MESSAGES,
+            function(RegisterEmailMessagesEvent $event) {
+                $event->messages = array_merge($event->messages, [
+                    [
+                        'key' => 'commerce_pdf_download',
+                        'heading' => Craft::t('commerce', 'Order PDF Download Link'),
+                        'subject' => Craft::t('commerce', 'Your Order PDF Download Link'),
+                        'body' => $this->_getDefaultPdfDownloadMessage(),
+                    ],
+                ]);
+            }
+        );
+
         Event::on(Elements::class, Elements::EVENT_AUTHORIZE_VIEW, [$this->getStoreSettings(), 'authorizeStoreLocationView']);
         Event::on(Elements::class, Elements::EVENT_AUTHORIZE_SAVE, [$this->getStoreSettings(), 'authorizeStoreLocationEdit']);
         Event::on(Elements::class, Elements::EVENT_AUTHORIZE_CREATE_DRAFTS, [$this->getStoreSettings(), 'authorizeStoreLocationEdit']);
@@ -1276,4 +1294,18 @@ private function _defineResaveCommand(): void
             ];
         });
     }
+
+    /**
+     * Returns the default message body for the PDF download email.
+     *
+     * @return string
+     */
+    private function _getDefaultPdfDownloadMessage(): string
+    {
+        return "Hello,\n\n" .
+            "You requested a PDF download for your order. Click the link below to download your PDF:\n\n" .
+            "[Download PDF]({{ link }})\n\n" .
+            "**Please note:** This link will expire for security purposes.\n\n" .
+            "Thank you!";
+    }
 }

src/base/Gateway.php

@@ -9,6 +9,7 @@
 
 use Craft;
 use craft\base\SavableComponent;
+use craft\commerce\elements\conditions\addresses\GatewayAddressCondition;
 use craft\commerce\elements\conditions\orders\DiscountOrderCondition;
 use craft\commerce\elements\conditions\orders\GatewayOrderCondition;
 use craft\commerce\elements\Order;
@@ -42,6 +43,18 @@ abstract class Gateway extends SavableComponent implements GatewayInterface
      */
     private ?ElementConditionInterface $_orderCondition = null;
 
+    /**
+     * @var ElementConditionInterface|null
+     * @since 5.5
+     */
+    private ?ElementConditionInterface $_billingAddressCondition = null;
+
+    /**
+     * @var ElementConditionInterface|null
+     * @since 5.5
+     */
+    private ?ElementConditionInterface $_shippingAddressCondition = null;
+
     /**
      * Returns the name of this payment method.
      *
@@ -113,7 +126,7 @@ public function defineRules(): array
         $rules = parent::defineRules();
         $rules[] = [['paymentType', 'handle'], 'required'];
 
-        $rules[] = [['name', 'handle', 'paymentType', 'isFrontendEnabled', 'orderCondition', 'sortOrder'], 'safe'];
+        $rules[] = [['name', 'handle', 'paymentType', 'isFrontendEnabled', 'orderCondition', 'billingAddressCondition', 'shippingAddressCondition', 'sortOrder'], 'safe'];
 
         return $rules;
     }
@@ -138,6 +151,14 @@ public function availableForUseWithOrder(Order $order): bool
             return false;
         }
 
+        if ($this->hasBillingAddressCondition() && $order->billingAddress && !$this->getBillingAddressCondition()->matchElement($order->billingAddress)) {
+            return false;
+        }
+
+        if ($this->hasShippingAddressCondition() && $order->shippingAddress && !$this->getShippingAddressCondition()->matchElement($order->shippingAddress)) {
+            return false;
+        }
+
         return true;
     }
 
@@ -203,7 +224,7 @@ public function getOrderCondition(): ElementConditionInterface
      *
      * @since 5.4.0
      */
-    public function setOrderCondition(ElementConditionInterface|string|array $condition): void
+    public function setOrderCondition(ElementConditionInterface|string|array|null $condition): void
     {
         if (empty($condition)) {
             $this->_orderCondition = null;
@@ -224,6 +245,108 @@ public function setOrderCondition(ElementConditionInterface|string|array $condit
         $this->_orderCondition = $condition;
     }
 
+    /**
+     * Returns true if this gateway has a billing address condition
+     *
+     * @since 5.5
+     */
+    public function hasBillingAddressCondition(): bool
+    {
+        return $this->getBillingAddressCondition()->getConditionRules() !== [];
+    }
+
+    /**
+     * Gets the billing address condition for this gateway
+     *
+     * @since 5.5
+     */
+    public function getBillingAddressCondition(): ElementConditionInterface
+    {
+        /** @var GatewayAddressCondition $condition */
+        $condition = $this->_billingAddressCondition ?? new GatewayAddressCondition();
+        $condition->mainTag = 'div';
+        $condition->name = 'billingAddressCondition';
+
+        return $condition;
+    }
+
+    /**
+     * Sets the billing address condition for this gateway
+     *
+     * @since 5.5
+     */
+    public function setBillingAddressCondition(ElementConditionInterface|string|array $condition): void
+    {
+        if (empty($condition)) {
+            $this->_billingAddressCondition = null;
+            return;
+        }
+
+        if (is_string($condition)) {
+            $condition = Json::decodeIfJson($condition);
+        }
+
+        if (!$condition instanceof GatewayAddressCondition) {
+            $condition['class'] = GatewayAddressCondition::class;
+            $condition = \Craft::$app->getConditions()->createCondition($condition);
+            /** @var GatewayAddressCondition $condition */
+        }
+        $condition->forProjectConfig = true;
+
+        $this->_billingAddressCondition = $condition;
+    }
+
+    /**
+     * Returns true if this gateway has a shipping address condition
+     *
+     * @since 5.5
+     */
+    public function hasShippingAddressCondition(): bool
+    {
+        return $this->getShippingAddressCondition()->getConditionRules() !== [];
+    }
+
+    /**
+     * Gets the shipping address condition for this gateway
+     *
+     * @since 5.5
+     */
+    public function getShippingAddressCondition(): ElementConditionInterface
+    {
+        /** @var GatewayAddressCondition $condition */
+        $condition = $this->_shippingAddressCondition ?? new GatewayAddressCondition();
+        $condition->mainTag = 'div';
+        $condition->name = 'shippingAddressCondition';
+
+        return $condition;
+    }
+
+    /**
+     * Sets the shipping address condition for this gateway
+     *
+     * @since 5.5
+     */
+    public function setShippingAddressCondition(ElementConditionInterface|string|array $condition): void
+    {
+        if (empty($condition)) {
+            $this->_shippingAddressCondition = null;
+            return;
+        }
+
+        if (is_string($condition)) {
+            $condition = Json::decodeIfJson($condition);
+        }
+
+        if (!$condition instanceof GatewayAddressCondition) {
+            $condition['class'] = GatewayAddressCondition::class;
+            $condition = \Craft::$app->getConditions()->createCondition($condition);
+            /** @var GatewayAddressCondition $condition */
+        }
+        $condition->forProjectConfig = true;
+
+        $this->_shippingAddressCondition = $condition;
+    }
+
     /**
      * @return array
      * @since 5.4.0
@@ -239,6 +362,8 @@ public function getConfig(): array
             'paymentType' => $this->paymentType,
             'isFrontendEnabled' => $this->getIsFrontendEnabled(false),
             'orderCondition' => $this->getOrderCondition()->getConfig(),
+            'billingAddressCondition' => $this->getBillingAddressCondition()->getConfig(),
+            'shippingAddressCondition' => $this->getShippingAddressCondition()->getConfig(),
         ];
 
         return $configData;