From 1307a19743d33d721da413276ea0a6e82b3cd28f Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Thu, 22 Aug 2024 18:55:40 +0530
Subject: [PATCH 1/6] Implemented: Added a button to the empty state. On click,
 it shows completed TOs (#673)

---
 src/locales/en.json          |  1 +
 src/locales/es.json          |  1 +
 src/locales/ja.json          |  1 +
 src/views/TransferOrders.vue | 15 ++++++++++++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index e2a205aa..6bce3acb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -285,6 +285,7 @@
   "No orders are currently able to be shipped due to missing tracking codes.": "No orders are currently able to be shipped due to missing tracking codes.",
   "No payments found": "No payments found",
   "No reason": "No reason",
+  "No results found for .": "No results found for { searchedQuery }.",
   "No results found for . Try searching Open or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No results found for { searchedQuery }. Try searching Open or Completed tab instead.{ lineBreak } If you still can't find what you're looking for, try switching stores.",
   "No results found for . Try searching In Progress or Open tab instead. If you still can't find what you're looking for, try switching stores.": "No results found for { searchedQuery }. Try searching In Progress or Open tab instead.{ lineBreak } If you still can't find what you're looking for, try switching stores.",
   "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No results found for { searchedQuery }. Try searching In Progress or Completed tab instead.{ lineBreak } If you still can't find what you're looking for, try switching stores.",
diff --git a/src/locales/es.json b/src/locales/es.json
index 35190eef..d8b7024a 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -280,6 +280,7 @@
   "No orders found.": "No se encontraron pedidos.",
   "No payments found": "No se encontraron pagos",
   "No reason": "Sin motivo",
+  "No results found for .": "No results found for { searchedQuery }.",
   "No results found for . Try searching Open or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No se encontraron resultados para { searchedQuery }. Intenta buscar en la pestaña 'Abierto' o 'Completado' en su lugar.{ lineBreak } Si aún no puedes encontrar lo que buscas, prueba cambiando de tiendas.",
   "No results found for . Try searching In Progress or Open tab instead. If you still can't find what you're looking for, try switching stores.": "No se encontraron resultados para { searchedQuery }. Intenta buscar en la pestaña 'En Curso' o 'Abierto' en su lugar.{ lineBreak } Si aún no puedes encontrar lo que buscas, prueba cambiando de tiendas.",
   "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "No se encontraron resultados para { searchedQuery }. Intenta buscar en la pestaña 'En Curso' o 'Completado' en su lugar.{ lineBreak } Si aún no puedes encontrar lo que buscas, prueba cambiando de tiendas.",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 0ce4872a..18fddc82 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -284,6 +284,7 @@
   "No orders are currently able to be shipped due to missing tracking codes.": "追跡コードがないため、現在出荷可能な注文はありません。",
   "No payments found": "支払いが見つかりません",
   "No reason": "理由なし",
+  "No results found for .": "No results found for { searchedQuery }.",
   "No results found for . Try searching Open or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "{ searchedQuery }の結果は見つかりませんでした。代わりに「オープン」または「完了」タブで検索してみてください。 { lineBreak } それでも見つからない場合は、ストアを切り替えてみてください。",
   "No results found for . Try searching In Progress or Open tab instead. If you still can't find what you're looking for, try switching stores.": "{ searchedQuery }の結果は見つかりませんでした。代わりに「進行中」または「オープン」タブで検索してみてください。 { lineBreak } それでも見つからない場合は、ストアを切り替えてみてください。",
   "No results found for . Try searching In Progress or Completed tab instead. If you still can't find what you're looking for, try switching stores.": "{ searchedQuery }の結果は見つかりませんでした。代わりに「進行中」または「完了」タブで検索してみてください。 { lineBreak } それでも見つからない場合は、ストアを切り替えてみてください。",
diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 6ad5df1f..ed043567 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -45,6 +45,9 @@
       </div>
       <div v-else class="empty-state">
         <p v-html="getErrorMessage()"></p>
+        <ion-button v-if="!transferOrders.query.queryString" size="small" fill="outline" color="medium" @click="showCompletedTransferOrders">
+          <ion-icon slot="end" :icon="checkmarkDone"/>{{ translate("Show completed transfer orders") }}
+        </ion-button>
       </div>
     </ion-content>
   </ion-page>
@@ -53,6 +56,7 @@
 <script lang="ts">
 import { 
   IonBadge,
+  IonButton,
   IonButtons,
   IonIcon,
   IonContent, 
@@ -69,7 +73,7 @@ import {
   IonToolbar, 
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
-import { caretDownOutline, cubeOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
+import { caretDownOutline, checkmarkDone, cubeOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { translate } from '@hotwax/dxp-components';
@@ -80,6 +84,7 @@ export default defineComponent({
   name: 'TransferOrders',
   components: {
     IonBadge,
+    IonButton,
     IonButtons,
     IonIcon,  
     IonContent,
@@ -143,6 +148,13 @@ export default defineComponent({
     isTransferOrdersScrollable() {
       return this.transferOrders.list?.length > 0 && this.transferOrders.list?.length < this.transferOrders.total
     },
+    async showCompletedTransferOrders() {
+      const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))
+      transferOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
+      transferOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
+      transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED"]
+      await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
+    },
     async updateQueryString(queryString: string) {
       const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))
 
@@ -177,6 +189,7 @@ export default defineComponent({
     return{
       Actions,
       caretDownOutline,
+      checkmarkDone,
       cubeOutline,
       optionsOutline,
       pricetagOutline,

From 02e9f3fa00e04d26ef10db2dbd6189f0956b0ca0 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Thu, 7 Nov 2024 19:15:20 +0530
Subject: [PATCH 2/6] Improved: disabled filter option when no TOs & changed
 the ion-icon to  checkmarkDoneOutline(#673)

---
 src/views/TransferOrders.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index ed043567..c5c7e9ed 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -8,7 +8,7 @@
         <ion-title v-if="!transferOrders.total">{{ transferOrders.total }} {{ translate('orders') }}</ion-title>
         <ion-title v-else>{{ transferOrders.list.length }} {{ translate('of') }} {{ transferOrders.total }} {{ translate('orders') }}</ion-title>
         <ion-buttons slot="end">
-          <ion-menu-button menu="transfer-order-filters">
+          <ion-menu-button menu="transfer-order-filters" :disabled="!transferOrders.total">
             <ion-icon :icon="optionsOutline" />
           </ion-menu-button>
         </ion-buttons>
@@ -46,7 +46,7 @@
       <div v-else class="empty-state">
         <p v-html="getErrorMessage()"></p>
         <ion-button v-if="!transferOrders.query.queryString" size="small" fill="outline" color="medium" @click="showCompletedTransferOrders">
-          <ion-icon slot="end" :icon="checkmarkDone"/>{{ translate("Show completed transfer orders") }}
+          <ion-icon slot="end" :icon="checkmarkDoneOutline"/>{{ translate("Show completed transfer orders") }}
         </ion-button>
       </div>
     </ion-content>
@@ -73,7 +73,7 @@ import {
   IonToolbar, 
 } from '@ionic/vue';
 import { defineComponent } from 'vue';
-import { caretDownOutline, checkmarkDone, cubeOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
+import { caretDownOutline, checkmarkDoneOutline, cubeOutline, optionsOutline, pricetagOutline, printOutline,} from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { translate } from '@hotwax/dxp-components';
@@ -189,7 +189,7 @@ export default defineComponent({
     return{
       Actions,
       caretDownOutline,
-      checkmarkDone,
+      checkmarkDoneOutline,
       cubeOutline,
       optionsOutline,
       pricetagOutline,

From 052d898fe3fc1ff563eebbc3eb791ea203785bf6 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Fri, 8 Nov 2024 12:37:01 +0530
Subject: [PATCH 3/6] Improved: In no completed transfer order case changed the
 empty state text and removed the 'show completedTO' button.(#673)

---
 src/locales/en.json          |  1 +
 src/views/TransferOrders.vue | 12 +++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index c3280c00..e67bde5f 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -13,6 +13,7 @@
   "doesn't have any orders in progress right now.": "{facilityName} doesn't have any orders in progress right now.",
   "doesn't have any outstanding orders right now.": "{facilityName} doesn't have any outstanding orders right now.",
   "doesn't have any transfer orders right now.": "{facilityName} doesn't have any transfer orders right now.",
+  "doesn't have any open transfer orders right now.": "{facilityName} doesn't have any open transfer orders right now.",
   "Add Box": "Add Box",
   "Add custom field": "Add custom field",
   "Add tracking code manually": "Add tracking code manually",
diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index c5c7e9ed..6457f8e1 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -45,7 +45,7 @@
       </div>
       <div v-else class="empty-state">
         <p v-html="getErrorMessage()"></p>
-        <ion-button v-if="!transferOrders.query.queryString" size="small" fill="outline" color="medium" @click="showCompletedTransferOrders">
+        <ion-button v-if="!transferOrders.query.queryString && hasCompletedTransferOrders" size="small" fill="outline" color="medium" @click="showCompletedTransferOrders">
           <ion-icon slot="end" :icon="checkmarkDoneOutline"/>{{ translate("Show completed transfer orders") }}
         </ion-button>
       </div>
@@ -113,7 +113,8 @@ export default defineComponent({
     return {
       shipmentMethods: [] as Array<any>,
       searchedQuery: '',
-      isScrollingEnabled: false
+      isScrollingEnabled: false,
+      hasCompletedTransferOrders: true
     }
   },
   async ionViewWillEnter() {
@@ -122,7 +123,11 @@ export default defineComponent({
   },
   methods: {
     getErrorMessage() {
-      return this.searchedQuery === '' ? translate("doesn't have any transfer orders right now.", { facilityName: this.currentFacility.facilityName }) : translate( "No results found for .", { searchedQuery: this.searchedQuery })
+      if (this.searchedQuery === '') {
+        return this.hasCompletedTransferOrders ? translate("doesn't have any open transfer orders right now.", { facilityName: this.currentFacility.facilityName }) : translate("doesn't have any transfer orders right now.", { facilityName: this.currentFacility.facilityName });
+      } else {
+        return translate("No results found for .", { searchedQuery: this.searchedQuery });
+      }
     },
     enableScrolling() {
       const parentElement = (this as any).$refs.contentRef.$el
@@ -154,6 +159,7 @@ export default defineComponent({
       transferOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
       transferOrdersQuery.selectedStatuses = ["ORDER_COMPLETED"]
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
+      this.hasCompletedTransferOrders = this.transferOrders.list.some((order: any) => order.orderStatusId === "ORDER_COMPLETED");
     },
     async updateQueryString(queryString: string) {
       const transferOrdersQuery = JSON.parse(JSON.stringify(this.transferOrders.query))

From 64d32e52c84ed14efbc03fadc16e726575e632af Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Wed, 20 Nov 2024 11:09:08 +0530
Subject: [PATCH 4/6] Improved: added the missing locale text in es.json and
 ja.json file(#673)

---
 src/locales/es.json | 1 +
 src/locales/ja.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/locales/es.json b/src/locales/es.json
index c9be08f1..208fbd9c 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -12,6 +12,7 @@
   "doesn't have any orders in progress right now.": "{facilityName} no tiene ningún pedido en curso en este momento.",
   "doesn't have any outstanding orders right now.": "{facilityName} no tiene ningún pedido pendiente en este momento.",
   "doesn't have any transfer orders right now.": "{facilityName} no tiene ninguna orden de transferencia en este momento.",
+  "doesn't have any open transfer orders right now.": "{facilityName} doesn't have any open transfer orders right now.",
   "Add Box": "Agregar Caja",
   "Add custom field": "Agregar campo personalizado",
   "Add tracking code manually": "agregar el cosdigo de seguimiento manualmente", 
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 2a823171..e96da8e1 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -13,6 +13,7 @@
   "doesn't have any orders in progress right now.": "{facilityName}には現在進行中の注文はありません。",
   "doesn't have any transfer orders right now.": "{facilityName}には現在転送注文はありません。",
   "doesn't have any outstanding orders right now.": "{facilityName}には現在未処理の注文はありません。",
+  "doesn't have any open transfer orders right now.": "{facilityName} doesn't have any open transfer orders right now.",
   "Add Box": "ボックスを追加",
   "Add custom field": "カスタムフィールドを追加",
   "Add tracking code manually": "Add tracking code manually",

From 4e213ec9e0f5b40d2979135b6ee7e0759b66e571 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Wed, 20 Nov 2024 15:10:46 +0530
Subject: [PATCH 5/6] Improved:  added a trim check before saving the query
 string in the state & updated the locale file(#673)

---
 src/locales/en.json          | 1 +
 src/locales/es.json          | 1 +
 src/locales/ja.json          | 1 +
 src/views/TransferOrders.vue | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 8d58e521..efbd16c3 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -557,6 +557,7 @@
   "Shopify ID": "Shopify ID",
   "Show label error": "Show label error",
   "Show order items": "Show order items",
+  "Show completed transfer orders": "Show completed transfer orders",
   "Single variance": "Single variance",
   "Some of the mapping fields are missing in the CSV: ": "Some of the mapping fields are missing in the CSV: {missingFields}",
   "Something went wrong while fetching order details, please check the orderId and try again.": "Something went wrong while fetching order details, please check the orderId and try again.",
diff --git a/src/locales/es.json b/src/locales/es.json
index 208fbd9c..5f56d382 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -554,6 +554,7 @@
   "Shopify ID": "ID de Shopify",
   "Show label error": "Show label error",
   "Show order items": "Mostrar artículos del pedido",
+  "Show completed transfer orders": "Show completed transfer orders",
   "Single variance": "Variante unica",
   "Some of the mapping fields are missing in the CSV: ": "Algunos de los campos de mapeo faltan en el CSV: {missingFields}",
   "Something went wrong": "Algo salió mal",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index e96da8e1..b52ee582 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -554,6 +554,7 @@
   "Shopify ID": "Shopify ID",
   "Show label error": "ラベルエラーを表示",
   "Show order items": "注文アイテムを表示",
+  "Show completed transfer orders": "Show completed transfer orders",
   "Single variance": "単一変動",
   "Some of the mapping fields are missing in the CSV: ": "CSV内のいくつかのマッピングフィールドが欠落しています: {missingFields}",
   "Something went wrong while fetching order details, please check the orderId and try again.": "注文詳細の取得中にエラーが発生しました。注文IDを確認して再試行してください。",
diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index e3d63465..6f677bd1 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -165,7 +165,7 @@ export default defineComponent({
 
       transferOrdersQuery.viewIndex = 0
       transferOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
-      transferOrdersQuery.queryString = queryString
+      transferOrdersQuery.queryString = queryString.trim()
       await this.store.dispatch('transferorder/updateTransferOrderQuery', { ...transferOrdersQuery })
       this.searchedQuery = queryString;
     },

From 883e71fdf0d9f02d9def3b33e2f447680c1cdf89 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Wed, 20 Nov 2024 16:26:44 +0530
Subject: [PATCH 6/6] Improved: Changed check condition for searchedQuery in
 the error message generation function to handle different cases(#673)

---
 src/views/TransferOrders.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/TransferOrders.vue b/src/views/TransferOrders.vue
index 6f677bd1..1b77234a 100644
--- a/src/views/TransferOrders.vue
+++ b/src/views/TransferOrders.vue
@@ -122,7 +122,7 @@ export default defineComponent({
   },
   methods: {
     getErrorMessage() {
-      if(this.searchedQuery === '') {
+      if(!this.searchedQuery) {
         return this.hasCompletedTransferOrders ? translate("doesn't have any open transfer orders right now.", { facilityName: this.currentFacility.facilityName }) : translate("doesn't have any transfer orders right now.", { facilityName: this.currentFacility.facilityName });
       } else {
         return translate("No results found for .", { searchedQuery: this.searchedQuery });