Merge branch 'release/4.2.11'

Author: lukeholder

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce
 
+## 4.2.11 - 2023-06-05
+
+- Fixed a bug where “Send Email” option text wasn’t getting translated. ([#3172](https://github.com/craftcms/commerce/issues/3172)) 
+- Fixed a bug where discounts’ user condition values weren’t getting migrated properly when upgrading to Commerce 4. ([#3176](https://github.com/craftcms/commerce/issues/3176))
+
 ## 4.2.10 - 2023-05-31
 
 - An error notification is now displayed when attempting to delete a user with existing orders or subscriptions. ([#3071](https://github.com/craftcms/commerce/pull/3071), [#3070](https://github.com/craftcms/commerce/pull/3070))

src/elements/conditions/customers/DiscountCustomerCondition.php

@@ -2,6 +2,7 @@
 
 namespace craft\commerce\elements\conditions\customers;
 
+use craft\commerce\elements\conditions\users\DiscountGroupConditionRule;
 use craft\elements\conditions\users\UserCondition as UserElementCondition;
 
 /**
@@ -20,6 +21,7 @@ protected function conditionRuleTypes(): array
         return array_merge(parent::conditionRuleTypes(), [
             HasOrdersConditionRule::class,
             SignedInConditionRule::class,
+            DiscountGroupConditionRule::class,
         ]);
     }
 }

src/elements/conditions/users/DiscountGroupConditionRule.php

@@ -4,18 +4,48 @@
 
 use craft\elements\conditions\users\GroupConditionRule;
 use craft\elements\db\ElementQueryInterface;
+use yii\base\InvalidConfigException;
 use yii\base\NotSupportedException;
 
 /**
  * Discount user group condition rule.
  *
  * @author Pixel & Tonic, Inc. <support@pixelandtonic.com>
  * @since 4.0.0
- *
- * @property-read float|int $orderAttributeValue
  */
 class DiscountGroupConditionRule extends GroupConditionRule
 {
+    protected const OPERATOR_IN_ALL = 'inAll';
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel(): string
+    {
+        return \Craft::t('app', 'User Groups');
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function operators(): array
+    {
+        return array_merge(parent::operators(), [
+            self::OPERATOR_IN_ALL,
+        ]);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    protected function operatorLabel(string $operator): string
+    {
+        return match ($operator) {
+            self::OPERATOR_IN_ALL => 'is in all of',
+            default => parent::operatorLabel($operator)
+        };
+    }
+
     /**
      * @inheritdoc
      */
@@ -28,4 +58,30 @@ public function getExclusiveQueryParams(): array
     {
         return [];
     }
+
+    /**
+     * Returns whether the condition rule matches the given value.
+     *
+     * @param string|string[]|null $value
+     * @return bool
+     */
+    protected function matchValue(array|string|null $value): bool
+    {
+        if (!$this->getValues()) {
+            return true;
+        }
+
+        if ($value === '' || $value === null) {
+            $value = [];
+        } else {
+            $value = (array)$value;
+        }
+
+        return match ($this->operator) {
+            self::OPERATOR_IN => !empty(array_intersect($value, $this->getValues())),
+            self::OPERATOR_NOT_IN => empty(array_intersect($value, $this->getValues())),
+            self::OPERATOR_IN_ALL => empty(array_diff($this->getValues(), $value)),
+            default => throw new InvalidConfigException("Invalid operator: $this->operator"),
+        };
+    }
 }

src/migrations/m220304_094835_discount_conditions.php

@@ -8,6 +8,7 @@
 use craft\commerce\elements\conditions\users\DiscountGroupConditionRule;
 use craft\db\Migration;
 use craft\db\Query;
+use craft\helpers\Db;
 use craft\helpers\Json;
 
 /**
@@ -21,9 +22,7 @@ class m220304_094835_discount_conditions extends Migration
     public function safeUp(): bool
     {
         $orderCondition = new DiscountOrderCondition();
-        // TODO migrate some discount conditions to the builder
         $customerCondition = new DiscountCustomerCondition();
-        // TODO migrate the user groups condition to the builder
         $shippingAddressCondition = new DiscountAddressCondition();
         $billingAddressCondition = new DiscountAddressCondition();
 
@@ -42,41 +41,38 @@ public function safeUp(): bool
                 'orderCondition' => Json::encode($orderCondition->getConfig()),
             ], ['id' => $id]);
 
-
             /**
-             * User condition
+             * User/Customer condition
              */
             $discountsUserGroupIds = (new Query())->select(['dug.userGroupId'])
                 ->from('{{%commerce_discounts}} discounts')
                 ->leftJoin('{{%commerce_discount_usergroups}} dug', '[[dug.discountId]] = [[discounts.id]]')
                 ->where(['discounts.id' => $id])
                 ->column();
 
-            $userGroupUids = $this->_getGroupUids($discountsUserGroupIds);
+            $userGroupUids = Db::uidsByIds('{{%usergroups}}', $discountsUserGroupIds, $this->db);
 
-            $userRules = [];
-            if ($discount['userGroupsCondition'] == 'userGroupsAnyOrNone') {
-                // do nothing
-            } elseif ($discount['userGroupsCondition'] == 'userGroupsIncludeAll') {
-                foreach ($discountsUserGroupIds as $userGroupId) {
+            if ($discountsUserGroupIds && $userGroupUids && ($discount['userGroupsCondition'] != 'userGroupsAnyOrNone')) {
+                $userRules = [];
+                if ($discount['userGroupsCondition'] == 'userGroupsIncludeAll') {
+                    $conditionRule = new DiscountGroupConditionRule();
+                    $conditionRule->setValues($userGroupUids);
+                    $conditionRule->operator = 'inAll';
+                    $userRules[] = $conditionRule;
+                } elseif ($discount['userGroupsCondition'] == 'userGroupsIncludeAny') {
                     $conditionRule = new DiscountGroupConditionRule();
-                    $userGroup = \Craft::$app->getUserGroups()->getGroupById($userGroupId);
-                    $conditionRule->setValues($userGroup->uid);
+                    $conditionRule->setValues($userGroupUids);
                     $conditionRule->operator = 'in';
                     $userRules[] = $conditionRule;
+                } elseif ($discount['userGroupsCondition'] == 'userGroupsExcludeAny') {
+                    $conditionRule = new DiscountGroupConditionRule();
+                    $conditionRule->setValues($userGroupUids);
+                    $conditionRule->operator = 'ni';
+                    $userRules[] = $conditionRule;
                 }
-            } elseif ($discount['userGroupsCondition'] == 'userGroupsIncludeAny') {
-                $conditionRule = new DiscountGroupConditionRule();
-                $conditionRule->setValues($userGroupUids);
-                $conditionRule->operator = 'in';
-                $userRules[] = $conditionRule;
-            } elseif ($discount['userGroupsCondition'] == 'userGroupsExcludeAny') {
-                $conditionRule = new DiscountGroupConditionRule();
-                $conditionRule->setValues($userGroupUids);
-                $conditionRule->operator = 'ni';
-                $userRules[] = $conditionRule;
+                $customerCondition->setConditionRules($userRules);
             }
-            $customerCondition->setConditionRules($userRules);
+
             $this->update('{{%commerce_discounts}}', [
                 'customerCondition' => Json::encode($customerCondition->getConfig()),
             ], ['id' => $id]);
@@ -96,9 +92,10 @@ public function safeUp(): bool
             ], ['id' => $id]);
         }
 
+        // No longer needed now that we have the condition builder
         $this->dropTableIfExists('{{%commerce_discount_usergroups}}');
         $this->dropColumn('{{%commerce_discounts}}', 'userGroupsCondition');
-        
+
         return true;
     }
 
@@ -110,17 +107,4 @@ public function safeDown(): bool
         echo "m220304_094835_discount_conditions cannot be reverted.\n";
         return false;
     }
-
-    /**
-     * @param array $ids
-     * @return array
-     */
-    private function _getGroupUids(array $ids): array
-    {
-        return array_map(function($value) {
-            $userGroup = \Craft::$app->getUserGroups()->getGroupById($value);
-
-            return $userGroup->uid;
-        }, $ids);
-    }
 }

src/web/assets/commerceui/dist/js/app.js

@@ -39,8 +39,7 @@
                                 <a
                                     :href="emailTemplate.id"
                                     @click.prevent="sendEmail(emailTemplate.id)"
-                                    >Send the “{{ emailTemplate.name }}”
-                                    email</a
+                                    >{{ emailTemplate.name }}</a
                                 >
                             </li>
                         </ul>