Fixed #1366 a bug that cause old order status message to persist

craftcms · Apr 9, 2020 · 4c694e0 · 4c694e0
1 parent 6531483
commit 4c694e0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Fixed a bug that caused a redirect back to the Edit Customer page instead of the Edit User page editing an address from the Customer Info tab. ([#1368](https://github.com/craftcms/commerce/issues/1368)) 
 - Hard deleting a product now correctly hard deletes orphaned variants. ([#1186](https://github.com/craftcms/commerce/issues/1186))
 - Fixed a bug when that occurred when selecting all orders on the order index page. ([#1367](https://github.com/craftcms/commerce/issues/1367))
+- Fixed a bug that could occur when changing and order’s status on the Edit Order page. ([#1366](https://github.com/craftcms/commerce/issues/1366))
 
 ## 3.1.1 - 2020-04-03
 

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/OrderMeta.vue b/src/web/assets/commerceui/src/js/OrderMeta.vue
@@ -56,6 +56,7 @@
                     <div class="input ltr">
                         <order-status
                                 :originalOrderStatusId="originalDraft.order.orderStatusId"
+                                :original-message="originalDraft.order.message"
                                 :order="order"
                                 @updateOrder="updateOrder"></order-status>
                     </div>

diff --git a/src/web/assets/commerceui/src/js/components/meta/OrderStatus.vue b/src/web/assets/commerceui/src/js/components/meta/OrderStatus.vue
@@ -55,12 +55,16 @@
             originalOrderStatusId: {
                 type: Number,
             },
+            originalMessage: {
+                type: [String, null],
+            },
         },
 
         data() {
             return {
                 isRecalculating: false,
                 textareaHasFocus: false,
+                orderMessage: '',
             }
         },
 
@@ -97,10 +101,11 @@
 
             message: {
                 get() {
-                    return this.order.message
+                    return this.orderMessage
                 },
 
                 set(value) {
+                    this.orderMessage = value
                     this.$store.commit('updateDraftOrderMessage', value)
                 },
             },