Merge branch '5.5' into feature/variant-title-format-regen-conditional

Author: lukeholder

CHANGELOG-WIP.md

@@ -7,6 +7,7 @@
 - PDF link expiry duration can now be configured per PDF in Settings → PDFs.
 - Logged-in users who own the order or have appropriate permissions bypass the email verification flow and can download PDFs directly.
 - Added a new system email message for sending PDF download links to customers.
+- It is now possible to select multiple products in variant conditions. 
 
 ### Administration
 - Added billing and shipping address conditions to gateways. ([#4100](https://github.com/craftcms/commerce/pull/4100))

src/controllers/PlansController.php

@@ -144,7 +144,7 @@ public function actionEditPlan(int $planId = null, Plan $plan = null): Response
             ->title($variables['title'])
             ->selectedSubnavItem('subscription-plans')
             ->addCrumb(Craft::t('commerce', 'Commerce'), 'commerce')
-            ->addCrumb(Craft::t('commerce', 'Plans'), 'commerce/subscription-plans')
+            ->addCrumb(Craft::t('commerce', 'Subscription Plans'), 'commerce/subscription-plans')
             ->contentTemplate('commerce/subscriptions/plans/_edit.twig', $variables)
             ->action('commerce/plans/save-plan')
             ->redirectUrl('commerce/subscription-plans')

src/elements/conditions/variants/ProductConditionRule.php

@@ -54,7 +54,7 @@ public function getExclusiveQueryParams(): array
     public function modifyQuery(ElementQueryInterface $query): void
     {
         /** @var VariantQuery $query */
-        $query->ownerId($this->getElementId());
+        $query->ownerId($this->getElementIds());
     }
 
     /**
@@ -63,7 +63,15 @@ public function modifyQuery(ElementQueryInterface $query): void
     public function matchElement(ElementInterface $element): bool
     {
         /** @var Variant $element */
-        return $element->getOwnerId() == $this->getElementId();
+        return $this->matchValue($element->getOwnerId());
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function allowMultiple(): bool
+    {
+        return true;
     }
 
     /**

src/models/ProductType.php

@@ -252,7 +252,7 @@ public function init(): void
         if (!isset($this->previewTargets)) {
             $this->previewTargets = [
                 [
-                    'label' => Craft::t('commerce', 'Primary {type} page', [
+                    'label' => Craft::t('app', 'Primary {type} page', [
                         'type' => Product::lowerDisplayName(),
                     ]),
                     'urlFormat' => '{url}',
@@ -566,7 +566,7 @@ public function validatePreviewTargets(): void
         unset($target);
 
         if ($hasErrors) {
-            $this->addError('previewTargets', Craft::t('commerce', 'All targets must have a label.'));
+            $this->addError('previewTargets', Craft::t('app', 'All targets must have a label.'));
         }
     }
 

src/templates/settings/emails/_edit.twig

@@ -182,7 +182,7 @@
 
     {{ forms.selectField({
         label: 'Language'|t('commerce'),
-        instructions: "The language to be used when email is rendered."|t('commerce'),
+        instructions: "The language to be used when this email is rendered."|t('commerce'),
         id: 'language',
         name: 'language',
         options : emailLanguageOptions,
@@ -194,7 +194,7 @@
 
     {{ forms.selectField({
         label: 'Site'|t('app'),
-        instructions: "The site to be used when email is rendered."|t('commerce'),
+        instructions: "The site to be used when this email is rendered."|t('commerce'),
         id: 'renderSiteId',
         name: 'renderSiteId',
         options : emailRenderSiteOptions,

src/templates/settings/pdfs/_edit.twig

@@ -123,7 +123,7 @@
     }) }}
 
     {{ forms.textField({
-        label: "Link Expiry"|t('commerce'),
+        label: 'Link Duration'|t('commerce'),
         instructions: "How long (in seconds) a PDF download link should remain valid before expiring. Default is 86400 (24 hours)."|t('commerce'),
         id: 'linkExpiry',
         name: 'linkExpiry',

src/translations/en/commerce.php

@@ -10,9 +10,9 @@
     '(of original price)' => '(of original price)',
     '(off original price)' => '(off original price)',
     'A cart number must be specified.' => 'A cart number must be specified.',
+    'A friendly reference number will be generated based on this format when a cart is completed and becomes an order. For example {ex1}, or<br> {ex2}. The result of this format must be unique.' => 'A friendly reference number will be generated based on this format when a cart is completed and becomes an order. For example {ex1}, or<br> {ex2}. The result of this format must be unique.',
     'A new download link has been sent to {email}' => 'A new download link has been sent to {email}',
     'A new download link will be sent to {email}' => 'A new download link will be sent to {email}',
-    'A friendly reference number will be generated based on this format when a cart is completed and becomes an order. For example {ex1}, or<br> {ex2}. The result of this format must be unique.' => 'A friendly reference number will be generated based on this format when a cart is completed and becomes an order. For example {ex1}, or<br> {ex2}. The result of this format must be unique.',
     'A valid email is required to create a customer.' => 'A valid email is required to create a customer.',
     'Accept' => 'Accept',
     'Accepted' => 'Accepted',
@@ -276,7 +276,6 @@
     'Coupons' => 'Coupons',
     'Craft Commerce' => 'Craft Commerce',
     'Create a Discount' => 'Create a Discount',
-    'Create a Product Type' => 'Create a Product Type',
     'Create a Subscription Plan' => 'Create a Subscription Plan',
     'Create a new PDF' => 'Create a new PDF',
     'Create a new catalog pricing rule' => 'Create a new catalog pricing rule',
@@ -470,14 +469,14 @@
     'Example' => 'Example',
     'Exclude this discount for products that are already on promotion' => 'Exclude this discount for products that are already on promotion',
     'Expand' => 'Expand',
-    'Expired' => 'Expired',
     'Expired Link' => 'Expired Link',
+    'Expired' => 'Expired',
     'Expiry Date' => 'Expiry Date',
     'Expiry date' => 'Expiry date',
     'Expiry' => 'Expiry',
     'Failed to receive transfer: {error}' => 'Failed to receive transfer: {error}',
-    'Failed to start' => 'Failed to start',
     'Failed to send email. Please try again.' => 'Failed to send email. Please try again.',
+    'Failed to start' => 'Failed to start',
     'Failed to update {num, plural, =1{order status} other{order statuses}}.' => 'Failed to update {num, plural, =1{order status} other{order statuses}}.',
     'Failed updating order status on {num, plural, =1{order} other{orders}}.' => 'Failed updating order status on {num, plural, =1{order} other{orders}}.',
     'Feet (ft)' => 'Feet (ft)',
@@ -623,11 +622,11 @@
     'Line item price (minus discounts)' => 'Line item price (minus discounts)',
     'Line item shipping cost' => 'Line item shipping cost',
     'Line item statuses reordered.' => 'Line item statuses reordered.',
+    'Link Duration' => 'Link Duration',
+    'Link Sent' => 'Link Sent',
     'Link to a product' => 'Link to a product',
     'Link to a variant' => 'Link to a variant',
     'Link' => 'Link',
-    'Link Expiry' => 'Link Expiry',
-    'Link Sent' => 'Link Sent',
     'Live' => 'Live',
     'Location' => 'Location',
     'MM' => 'MM',
@@ -787,6 +786,7 @@
     'Order Description Format' => 'Order Description Format',
     'Order Details' => 'Order Details',
     'Order Fields' => 'Order Fields',
+    'Order PDF Download Link' => 'Order PDF Download Link',
     'Order PDF Filename Format' => 'Order PDF Filename Format',
     'Order Reference Number Format' => 'Order Reference Number Format',
     'Order Settings' => 'Order Settings',
@@ -799,7 +799,6 @@
     'Order deleted.' => 'Order deleted.',
     'Order fields saved.' => 'Order fields saved.',
     'Order not found.' => 'Order not found.',
-    'Order PDF Download Link' => 'Order PDF Download Link',
     'Order payment balance is {outstandingBalanceAsCurrency}. This is the maximum value that will be charged.' => 'Order payment balance is {outstandingBalanceAsCurrency}. This is the maximum value that will be charged.',
     'Order recalculated.' => 'Order recalculated.',
     'Order status saved.' => 'Order status saved.',
@@ -864,7 +863,6 @@
     'Plain Text Email Template Path' => 'Plain Text Email Template Path',
     'Plan' => 'Plan',
     'Plans reordered.' => 'Plans reordered.',
-    'Plans' => 'Plans',
     'Portrait' => 'Portrait',
     'Post Date' => 'Post Date',
     'Postal Code Formula' => 'Postal Code Formula',
@@ -1124,10 +1122,10 @@
     'The address provided is outside the store’s market.' => 'The address provided is outside the store’s market.',
     'The amount of discount that is applied to the whole order. This amount is spread across line items in order of highest price to lowest price, until the discount is used up.' => 'The amount of discount that is applied to the whole order. This amount is spread across line items in order of highest price to lowest price, until the discount is used up.',
     'The base discount can only discount items in the cart to down to zero until it is used up, it can not make the order negative.' => 'The base discount can only discount items in the cart to down to zero until it is used up, it can not make the order negative.',
-    'The download link is invalid. Please request a new one.' => 'The download link is invalid. Please request a new one.',
     'The conversion rate that will be used when converting an amount to this currency. For example, if an item costs {amount1}, a conversion rate of {rate} would result in {amount2} in the alternate currency.' => 'The conversion rate that will be used when converting an amount to this currency. For example, if an item costs {amount1}, a conversion rate of {rate} would result in {amount2} in the alternate currency.',
     'The countries that orders are allowed to be placed from.' => 'The countries that orders are allowed to be placed from.',
     'The default shipping category is automatically available to all product types.' => 'The default shipping category is automatically available to all product types.',
+    'The download link is invalid. Please request a new one.' => 'The download link is invalid. Please request a new one.',
     'The email address that order status emails are sent from. Leave blank to use the System Email Address defined in Craft’s General Settings.' => 'The email address that order status emails are sent from. Leave blank to use the System Email Address defined in Craft’s General Settings.',
     'The entry that contains the description for this subscription’s plan.' => 'The entry that contains the description for this subscription’s plan.',
     'The flat value which should discount each item. i.e “3” for $3 off each item.' => 'The flat value which should discount each item. i.e “3” for $3 off each item.',
@@ -1136,6 +1134,7 @@
     'The inventory locations this store uses.' => 'The inventory locations this store uses.',
     'The item is not enabled for sale.' => 'The item is not enabled for sale.',
     'The language the order was made in.' => 'The language the order was made in.',
+    'The language to be used when this email is rendered.' => 'The language to be used when this email is rendered.',
     'The maximum number of levels this product type can have. Leave blank if you don’t care.' => 'The maximum number of levels this product type can have. Leave blank if you don’t care.',
     'The maximum the customer should spend on shipping. Set to zero to disable.' => 'The maximum the customer should spend on shipping. Set to zero to disable.',
     'The minimum the customer should spend on shipping. Set to zero to disable.' => 'The minimum the customer should spend on shipping. Set to zero to disable.',
@@ -1151,7 +1150,7 @@
     'The recipient of the email. Twig code can be used here.' => 'The recipient of the email. Twig code can be used here.',
     'The reply to email address. Leave blank for normal reply to of email sender. Twig code can be used here.' => 'The reply to email address. Leave blank for normal reply to of email sender. Twig code can be used here.',
     'The site the order was made in.' => 'The site the order was made in.',
-    'The site to be used when email is rendered.' => 'The site to be used when email is rendered.',
+    'The site to be used when this email is rendered.' => 'The site to be used when this email is rendered.',
     'The subject line of the email. Twig code can be used here.' => 'The subject line of the email. Twig code can be used here.',
     'The template that the PDF should be generated from.' => 'The template that the PDF should be generated from.',
     'The template to be used for HTML emails.' => 'The template to be used for HTML emails.',