Merge branch 'release/3.3.0.1' into main

Author: lukeholder

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release Notes for Craft Commerce
 
+### 3.3.0.1 - 2021-04-26
+
+### Fixed
+- Fixed a bug where an incorrect amount could be calculated when paying an outstanding balance in a non-primary currency.
+- Fixed a bug where shipping rules were enforcing the “Order Condition Formula” field as required. ([#2098](https://github.com/craftcms/commerce/issues/2098))
+- Fixed a bug where Base Discount and Per Item Discount fields could show negative values on the Edit Discount page. ([#2090](https://github.com/craftcms/commerce/issues/2090))
+
 ## 3.3.0 - 2021-04-20
 
 ### Added
@@ -148,10 +155,6 @@
 - Emails and PDFs now have Language settings that can be used to specify the language that should be used, instead of the order’s language. ([#1884](https://github.com/craftcms/commerce/issues/1884))
 - Added the `cp.commerce.order.content`, `cp.commerce.order.edit.order-actions`, and `cp.commerce.order.edit.order-secondary-actions` template hooks to the Edit Order page. ([#138](https://github.com/craftcms/commerce/issues/138), [#1269](https://github.com/craftcms/commerce/issues/1269))
 
-### Added
-- Partial payments on orders can now be made from the Edit Order page.
-- Added the `allowFrontEndPartialPayments` config setting.
-
 ### Changed
 - Improved the Edit Product page load time by lazy-loading variants’ related sales on scroll. ([#1883](https://github.com/craftcms/commerce/issues/1883))
 - The Edit Order page no longer requires orders to have at least one line item to be saved.

composer.json

@@ -2,7 +2,7 @@
   "name": "craftcms/commerce",
   "description": "Craft Commerce",
   "type": "craft-plugin",
-  "version": "3.3.0",
+  "version": "3.3.0.1",
   "keywords": [
     "cms",
     "craftcms",

src/controllers/DiscountsController.php

@@ -181,6 +181,10 @@ public function actionSave()
             $this->redirectToPostedUrl($discount);
         } else {
             $this->setFailFlash(Craft::t('commerce', 'Couldn’t save discount.'));
+            
+            // Set back to original input value of the text field to prevent negative value.
+            $discount->baseDiscount = $baseDiscount;
+            $discount->perItemDiscount = $perItemDiscount;
         }
 
         // Send the model back to the template

src/controllers/PaymentsController.php

@@ -421,7 +421,9 @@ public function actionPay()
             $order->setPaymentAmount($paymentAmount);
         }
 
-        if (!$partialAllowed && $order->getPaymentAmount() < $order->getOutstandingBalance()) {
+        $paymentAmountInPrimaryCurrency = Plugin::getInstance()->getPaymentCurrencies()->convertCurrency($order->getPaymentAmount(), $order->paymentCurrency, $order->currency);
+
+        if (!$partialAllowed && $paymentAmountInPrimaryCurrency < $order->getOutstandingBalance()) {
             $error = Craft::t('commerce', 'Partial payment not allowed.');
             $this->setFailFlash($error);
             Craft::$app->getUrlManager()->setRouteParams(['paymentForm' => $paymentForm, $this->_cartVariableName => $order]);

src/elements/Order.php

@@ -2244,11 +2244,13 @@ public function getIsUnpaid(): bool
      */
     public function getPaymentAmount(): float
     {
-        if ($this->_paymentAmount && $this->_paymentAmount >= 0 && $this->_paymentAmount <= $this->getOutstandingBalance()) {
+        $outstandingBalanceInPaymentCurrency = Plugin::getInstance()->getPaymentCurrencies()->convertCurrency($this->getOutstandingBalance(), $this->currency, $this->paymentCurrency);
+
+        if ($this->_paymentAmount && $this->_paymentAmount >= 0 && $this->_paymentAmount <= $outstandingBalanceInPaymentCurrency) {
             return $this->_paymentAmount;
         }
-        $amount = $this->getOutstandingBalance();
-        return $amount;
+
+        return $outstandingBalanceInPaymentCurrency;
     }
 
     /**

src/models/Discount.php

@@ -388,17 +388,20 @@ public function defineRules(): array
                 }
             }
         ];
+        $rules[] = [['orderConditionFormula'], 'string', 'length' => [1, 65000], 'skipOnEmpty' => true];
         $rules[] = [
             'orderConditionFormula', function($attribute, $params, $validator) {
-                $order = Order::find()->one();
-                if (!$order) {
-                    $order = new Order();
-                }
-                $orderDiscountConditionParams = [
-                    'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress'])
-                ];
-                if (!Plugin::getInstance()->getFormulas()->validateConditionSyntax($this->orderConditionFormula, $orderDiscountConditionParams)) {
-                    $this->addError($attribute, Craft::t('commerce', 'Invalid order condition syntax.'));
+                if ($this->orderConditionFormula) {
+                    $order = Order::find()->one();
+                    if (!$order) {
+                        $order = new Order();
+                    }
+                    $orderDiscountConditionParams = [
+                        'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress'])
+                    ];
+                    if (!Plugin::getInstance()->getFormulas()->validateConditionSyntax($this->orderConditionFormula, $orderDiscountConditionParams)) {
+                        $this->addError($attribute, Craft::t('commerce', 'Invalid order condition syntax.'));
+                    }
                 }
             }
         ];

src/models/ShippingAddressZone.php

@@ -224,7 +224,9 @@ public function defineRules(): array
         $rules = parent::defineRules();
 
         $rules[] = [['name'], 'required'];
+        $rules[] = [['zipCodeConditionFormula'], 'string', 'length' => [1, 65000], 'skipOnEmpty' => true];
         $rules[] = [['name'], UniqueValidator::class, 'targetClass' => ShippingZoneRecord::class, 'targetAttribute' => ['name']];
+
         $rules[] = [
             ['states'], 'required', 'when' => static function($model) {
                 return !$model->isCountryBased;

src/models/ShippingRule.php

@@ -194,7 +194,6 @@ public function defineRules(): array
                 'methodId',
                 'priority',
                 'enabled',
-                'orderConditionFormula',
                 'minQty',
                 'maxQty',
                 'minTotal',
@@ -221,17 +220,21 @@ public function defineRules(): array
 
         $rules[] = [['shippingRuleCategories'], 'validateShippingRuleCategories', 'skipOnEmpty' => true];
 
+        $rules[] = [['orderConditionFormula'], 'string', 'length' => [1, 65000], 'skipOnEmpty' => true];
         $rules[] = [
             'orderConditionFormula', function($attribute, $params, $validator) {
-                $order = Order::find()->one();
-                if (!$order) {
-                    $order = new Order();
-                }
-                $orderConditionParams = [
-                    'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress'])
-                ];
-                if (!Plugin::getInstance()->getFormulas()->validateConditionSyntax($this->orderConditionFormula, $orderConditionParams)) {
-                    $this->addError($attribute, Craft::t('commerce', 'Invalid order condition syntax.'));
+
+                if($this->orderConditionFormula) {
+                    $order = Order::find()->one();
+                    if (!$order) {
+                        $order = new Order();
+                    }
+                    $orderConditionParams = [
+                        'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress'])
+                    ];
+                    if (!Plugin::getInstance()->getFormulas()->validateConditionSyntax($this->orderConditionFormula, $orderConditionParams)) {
+                        $this->addError($attribute, Craft::t('commerce', 'Invalid order condition syntax.'));
+                    }
                 }
             }
         ];

src/models/TaxAddressZone.php

@@ -234,7 +234,9 @@ public function defineRules(): array
         $rules = parent::defineRules();
 
         $rules[] = [['name'], 'required'];
+        $rules[] = [['zipCodeConditionFormula'], 'string', 'length' => [1, 65000], 'skipOnEmpty' => true];
         $rules[] = [['name'], UniqueValidator::class, 'targetClass' => TaxZoneRecord::class, 'targetAttribute' => ['name']];
+
         $rules[] = [
             ['states'], 'required', 'when' => static function($model) {
                 return !$model->isCountryBased;

src/services/Discounts.php

@@ -514,6 +514,7 @@ public function matchLineItem(LineItem $lineItem, Discount $discount, bool $matc
      * @param Order $order
      * @param Discount $discount
      * @return bool
+     * @throws \Exception
      */
     public function matchOrder(Order $order, Discount $discount): bool
     {
@@ -549,14 +550,8 @@ public function matchOrder(Order $order, Discount $discount): bool
             return false;
         }
 
-        if ($discount->orderConditionFormula) {
-            $orderDiscountConditionParams = [
-                'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress'])
-            ];
-
-            if (!Plugin::getInstance()->getFormulas()->evaluateCondition($discount->orderConditionFormula, $orderDiscountConditionParams, 'Evaluate Order Discount Condition Formula')) {
-                return false;
-            }
+        if(!$this->_isDiscountConditionFormulaValid($order, $discount)){
+            return false;
         }
 
         if (($discount->allPurchasables && $discount->allCategories) && $discount->purchaseTotal > 0 && $order->getItemSubtotal() < $discount->purchaseTotal) {