Merge branch 'release/4.5.1.1'

craftcms · Mar 1, 2024 · 504896a · 504896a
2 parents e34e36a + 7f59776
commit 504896a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes for Craft Commerce
 
+## 4.5.1.1 - 2024-03-01
+
+- Fixed a bug where the “Share cart” order index action wasn’t working.
+- Fixed a bug where editing an adjustment’s amount could cause the adjustment to lose data on the Edit Order page. ([#3392](https://github.com/craftcms/commerce/issues/3392))
+
 ## 4.5.1 - 2024-02-29
 
 - Fixed a SQL error that could occur when updating to Commerce 4 on MySQL. ([#3388](https://github.com/craftcms/commerce/pull/3388))

diff --git a/src/elements/traits/OrderElementTrait.php b/src/elements/traits/OrderElementTrait.php
@@ -57,7 +57,7 @@ public function getFieldLayout(): FieldLayout
     protected function htmlAttributes(string $context): array
     {
         $attributes = parent::htmlAttributes($context);
-        $attributes['data-number'] = $this->number;
+        $attributes['data'] = ['number' => $this->number];
         return $attributes;
     }
 

diff --git a/src/web/assets/commerceui/dist/js/app.js b/src/web/assets/commerceui/dist/js/app.js
diff --git a/src/web/assets/commerceui/dist/js/app.js.map b/src/web/assets/commerceui/dist/js/app.js.map
diff --git a/src/web/assets/commerceui/src/js/order/components/details/Adjustment.vue b/src/web/assets/commerceui/src/js/order/components/details/Adjustment.vue
@@ -226,7 +226,7 @@
                     },
                 ],
                 allowedAdjustmentTypes: ['tax', 'discount', 'shipping'],
-                localAdjustment: this.adjustment,
+                localAdjustmentAmount: this.adjustment.amount,
                 amountNaN: false,
             };
         },
@@ -272,14 +272,13 @@
 
             amount: {
                 get() {
-                    return this.localAdjustment.amount;
+                    return this.localAdjustmentAmount;
                 },
 
                 set: debounce(function (value) {
-                    this.localAdjustment.amount = value;
+                    this.localAdjustmentAmount = value;
 
                     if (value === '' || isNaN(value)) {
-                        console.log("isn't a number", value);
                         if (value === '') {
                             this.amountNaN = false;
                         } else {
@@ -289,7 +288,9 @@
                     }
 
                     this.amountNaN = false;
-                    this.$emit('update', this.localAdjustment);
+                    let adjustment = this.adjustment;
+                    adjustment.amount = this.localAdjustmentAmount;
+                    this.$emit('update', adjustment);
                 }, 1000),
             },