Merge pull request #335 from amansinghbais/bopis/rejectorderbehaviour

Improved: removing all items from order details on reject all event
hotwax · Nov 3, 2023 · 22482fd · 22482fd
2 parents d5015f3 + 19bbd19
commit 22482fd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/src/components/RejectOrderModal.vue b/src/components/RejectOrderModal.vue
@@ -105,7 +105,9 @@ export default defineComponent({
               this.store.dispatch('order/setUnfillableOrderOrItem', { orderId: this.order.orderId, part }).then((resp) => {
                 if (resp) {
                   // Mark current order as rejected
-                  this.store.dispatch('order/updateCurrent', { order: { ...this.order, rejected: true } })
+                  const order = { ...this.order, part: { ...this.order.part, items: [] }, rejected: true };
+
+                  this.store.dispatch('order/updateCurrent', { order })
                 }
                 this.closeModal();
               })

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -1,6 +1,7 @@
 { 
   "App": "App",
   "All items were rejected from the order": "All items were rejected from the order",
+  "All order items are rejected": "All order items are rejected",
   "Allow partial rejection": "Allow partial rejection",
   "An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "An email notification will be sent to { customerName } that their order is ready for pickup.{ space } This order will also be moved to the packed orders tab.",
   "An email notification will be sent to that their order is ready for pickup.": "An email notification will be sent to { customerName } that their order is ready for pickup.",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -1,6 +1,7 @@
 {
   "App": "Aplicación",
   "All items were rejected from the order": "All items were rejected from the order",
+  "All order items are rejected": "All order items are rejected",
   "Allow partial rejection": "Allow partial rejection",
   "An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "Se enviará una notificación por correo electrónico a {customerName} de que su pedido está listo para recoger.{ space } Este pedido también se moverá a la pestaña de pedidos empacados.",
   "An email notification will be sent to that their order is ready for pickup.": "Se enviará una notificación por correo electrónico a {customerName} de que su pedido está listo para recoger.",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -1,6 +1,7 @@
 {
   "App": "App",
   "All items were rejected from the order": "All items were rejected from the order",
+  "All order items are rejected": "All order items are rejected",
   "Allow partial rejection": "Allow partial rejection",
   "An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "{ customerName }様宛に注文の受け取り準備が完了したことをお知らするメールが送信されます。{ space } この注文は「梱包済み注文」タブに移動されます.",
   "An email notification will be sent to that their order is ready for pickup.": "{ customerName }様宛に注文の受け取り準備が完了したことをお知らするメールが送信されます。",

diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
@@ -100,7 +100,7 @@
               </ion-button>
             </div>
           </ion-card>
-          <p v-if="!order.part?.items?.length" class="empty-state">{{ translate('No items found') }}</p>
+          <p v-if="!order.part?.items?.length" class="empty-state">{{ translate('All order items are rejected') }}</p>
         </section>
       </main>