From 6cf271b8bc3abbfb3a23bf86036729c8a990cb60 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 23 Aug 2024 14:54:22 +0530
Subject: [PATCH 01/10] Improved: support for adding tracking details while
 packing (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 233 +++++++++++++++++++
 src/views/OrderDetail.vue                    |  19 +-
 2 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100644 src/components/GenerateTrackingCodeModal.vue

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
new file mode 100644
index 00000000..963464c3
--- /dev/null
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -0,0 +1,233 @@
+<template>
+  <ion-header>
+    <ion-toolbar>
+      <ion-buttons slot="start">
+        <ion-button @click="closeModal"> 
+          <ion-icon slot="icon-only" :icon="closeOutline" />
+        </ion-button>
+      </ion-buttons>
+      <ion-title>{{ translate("Pack order") }}</ion-title>
+    </ion-toolbar>
+  </ion-header>
+
+  <ion-content>
+    <ion-list lines="none">
+      <ion-item>
+        <ion-label>
+          {{ translate(isTrackingRequired ? "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually." : "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.") }}
+        </ion-label>
+      </ion-item>
+      <ion-item>
+        <ion-select :disabled="!order.missingLabelImage" :label="translate('Carrier')" v-model="carrierPartyId" interface="popover" @ionChange="updateCarrier(carrierPartyId)">
+          <ion-select-option v-for="carrier in facilityCarriers" :key="carrier.partyId" :value="carrier.partyId">{{ translate(carrier.groupName) }}</ion-select-option>
+        </ion-select>
+      </ion-item>
+      <ion-item>
+        <ion-select :disabled="!order.missingLabelImage" :label="translate('Method')" v-model="shipmentMethodTypeId" interface="popover">
+          <ion-select-option v-for="method in carrierMethods" :key="method.productStoreShipMethId" :value="method.shipmentMethodTypeId">{{ translate(method.description) }}</ion-select-option>
+        </ion-select>
+      </ion-item>
+      <ion-item>
+        <ion-input :label="translate('Tracking code')" :placeholder="translate('enter code')" v-model="trackingCode" />
+      </ion-item>
+    </ion-list>
+  </ion-content>
+
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button :disabled="!isTrackingDetailUpdated()" @click="confirmSave()">
+      <ion-icon :icon="isForceScanEnabled ? barcodeOutline : saveOutline" />
+    </ion-fab-button>
+  </ion-fab>
+</template>
+
+<script lang="ts">
+import { 
+  IonContent,
+  IonFab,
+  IonFabButton,
+  IonHeader,
+  IonIcon,
+  IonInput,
+  IonLabel,
+  IonSelect,
+  IonSelectOption,
+  IonTitle,
+  IonToolbar,
+  modalController,
+  IonButton,
+  IonButtons,
+  IonItem,
+  IonList
+} from "@ionic/vue";
+import { defineComponent } from "vue";
+import { barcodeOutline, closeOutline, copyOutline, saveOutline } from "ionicons/icons";
+import { translate } from "@hotwax/dxp-components";
+import { mapGetters, useStore } from "vuex";
+import { OrderService } from '@/services/OrderService';
+import logger from "@/logger";
+import { showToast } from "@/utils";
+import { hasError } from "@/adapter";
+
+export default defineComponent({
+  name: "GenerateTrackingCodeModal",
+  components: { 
+    IonContent,
+    IonFab,
+    IonFabButton,
+    IonHeader,
+    IonIcon,
+    IonInput,
+    IonLabel,
+    IonSelect,
+    IonSelectOption,
+    IonTitle,
+    IonToolbar,
+    IonButton,
+    IonButtons,
+    IonItem,
+    IonList
+  },
+  computed: {
+    ...mapGetters({
+      facilityCarriers: 'carrier/getFacilityCarriers',
+      isForceScanEnabled: 'util/isForceScanEnabled',
+      productStoreShipmentMethods: 'carrier/getProductStoreShipmentMethods',
+      productStoreShipmentMethCount: 'util/getProductStoreShipmentMethCount',
+      order: "order/getCurrent",
+      completedOrders: 'order/getCompletedOrders',
+    })
+  },
+  data() {
+    return {
+      isTrackingRequired: false,
+      carrierMethods:[] as any,
+      carrierPartyId: "",
+      shipmentMethodTypeId: "",
+      trackingCode: "",
+      isGeneratingShippingLabel: false
+    }
+  },
+  async mounted() {
+    this.isTrackingRequired = this.isTrackingRequiredForAnyShipmentPackage()
+    if (this.facilityCarriers) {
+      const shipmentPackage = this.order.shipmentPackages?.[0];
+      this.carrierPartyId = shipmentPackage?.carrierPartyId ? shipmentPackage?.carrierPartyId : this.facilityCarriers[0].partyId;
+      this.carrierMethods = await this.getProductStoreShipmentMethods(this.carrierPartyId);
+      this.shipmentMethodTypeId = shipmentPackage?.shipmentMethodTypeId;
+    }
+  },
+  methods: {
+    closeModal() {
+      modalController.dismiss({ dismissed: true });
+    },
+    isTrackingRequiredForAnyShipmentPackage() {
+      return this.order.shipmentPackages?.some((shipmentPackage: any) => shipmentPackage.isTrackingRequired === 'Y')
+    },
+    async getProductStoreShipmentMethods(carrierPartyId: string) { 
+      return this.productStoreShipmentMethods?.filter((method: any) => method.partyId === carrierPartyId) || [];
+    },
+    isTrackingDetailUpdated() {
+      return (this.trackingCode.trim() || this.shipmentMethodTypeId)
+    },
+    async updateCarrier(carrierPartyId: string) {
+      this.carrierMethods = await this.getProductStoreShipmentMethods(carrierPartyId);
+      this.shipmentMethodTypeId = this.carrierMethods?.[0]?.shipmentMethodTypeId;
+    },
+    async confirmSave() {
+      let order = this.order
+      let isRegenerated = false as any;
+
+      // if the request to print shipping label is not yet completed, then clicking multiple times on the button
+      // should not do anything
+      if(this.isGeneratingShippingLabel) {
+        return;
+      }
+
+      this.isGeneratingShippingLabel = true;
+
+      if(this.trackingCode.trim()) {
+        isRegenerated = await this.addCustomTrackingCode(order);
+      } else {
+        isRegenerated = await this.regenerateShippingLabel(order)
+      }
+
+      if(isRegenerated) {
+        modalController.dismiss({ dismissed: true, isRegenerated });
+      }
+      this.isGeneratingShippingLabel = false;
+    },
+    async addCustomTrackingCode(order: any) {
+      try {
+        for (const shipmentPackage of order.shipmentPackages) {
+          await OrderService.addTrackingCode({
+            "shipmentId": shipmentPackage.shipmentId,
+            "shipmentRouteSegmentId": shipmentPackage.shipmentRouteSegmentId,
+            "shipmentPackageSeqId": shipmentPackage.shipmentPackageSeqId,
+            "trackingCode": this.trackingCode.trim()
+          });
+        }
+        //fetching updated shipment packages
+        await this.store.dispatch('order/updateShipmentPackageDetail', order)
+        return true;
+      } catch (error: any) {
+        logger.error('Failed to add tracking code', error);
+        showToast(translate("Failed to add tracking code."));
+      }
+      return false;
+    },
+    async regenerateShippingLabel(order: any) {
+      // If there are no product store shipment method configured, then not generating the label and displaying an error toast
+      if(this.productStoreShipmentMethCount <= 0) {
+        showToast(translate('Unable to generate shipping label due to missing product store shipping method configuration'))
+        return;
+      }
+
+      // Getting all the shipmentIds from shipmentPackages for which label is missing
+      const shipmentIds = order.shipmentPackages
+          ?.filter((shipmentPackage: any) => !shipmentPackage.trackingCode)
+          .map((shipmentPackage: any) => shipmentPackage.shipmentId);
+
+      if(!shipmentIds?.length) {
+        showToast(translate("Failed to generate shipping label"))
+        return;
+      }
+
+      try {
+        const resp = await OrderService.retryShippingLabel(shipmentIds)
+
+        if (!hasError(resp)) {
+          //Updated shipment package detail is needed if the label pdf url is generated on retrying shipping label generation
+          await this.store.dispatch('order/updateShipmentPackageDetail', order) 
+
+          // TODO fetch specific order
+          this.initialiseOrderQuery();
+          return true;
+        } else {
+          throw resp.data;
+        }
+      } catch(error: any) {
+        logger.error(error);
+        showToast(translate("Failed to generate shipping label"))
+      }
+      return false;
+    },
+    async initialiseOrderQuery() {
+      const completedOrdersQuery = JSON.parse(JSON.stringify(this.completedOrders.query))
+      completedOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
+      completedOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
+      await this.store.dispatch('order/updateCompletedQuery', { ...completedOrdersQuery })
+    },
+  },
+  setup() {
+    const store = useStore();
+    return {
+      barcodeOutline,
+      closeOutline,
+      copyOutline,
+      saveOutline,
+      store,
+      translate
+    };
+  },
+});
+</script>
\ No newline at end of file
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index bade5e39..74fac8f4 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -170,7 +170,7 @@
             <!-- positive -->
             <div>
               <template v-if="category === 'in-progress'">
-                <ion-button :disabled="order.hasRejectedItem || order.isModified || order.hasMissingInfo" @click="isForceScanEnabled ? scanOrder(order) : packOrder(order)">
+                <ion-button :disabled="order.hasRejectedItem || order.isModified || order.hasMissingInfo" @click="order.missingLabelImage ? generateTrackingCodeForPacking(order) : isForceScanEnabled ? scanOrder(order) : packOrder(order)">
                   <ion-icon slot="start" :icon="personAddOutline" />
                   {{ translate("Pack order") }}
                 </ion-button>
@@ -411,6 +411,7 @@ import ReportIssuePopover from '@/components/ReportIssuePopover.vue'
 import { isKit } from '@/utils/order'
 import ScanOrderItemModal from "@/components/ScanOrderItemModal.vue";
 import ShippingLabelActionPopover from '@/components/ShippingLabelActionPopover.vue';
+import GenerateTrackingCodeModal from '@/components/GenerateTrackingCodeModal.vue';
 
 export default defineComponent({
   name: "OrderDetail",
@@ -1448,6 +1449,22 @@ export default defineComponent({
         }
       })
 
+      modal.present();
+    },
+    async generateTrackingCodeForPacking(order: any) {
+      const modal = await modalController.create({
+        component: GenerateTrackingCodeModal,
+        componentProps: { order }
+      })
+
+      modal.onDidDismiss().then((result: any) => {
+        console.log(result);
+        if(result.data?.isRegenerated) {
+          if(this.isForceScanEnabled) this.scanOrder(order);
+          else this.packOrder(order);
+        }
+      })
+
       modal.present();
     }
   },

From d42474d7c7470fce30afdc5bd2db59b5459a92bd Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 23 Aug 2024 18:48:35 +0530
Subject: [PATCH 02/10] Improved: UI of the generate tracking modal while
 packing (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 16 +++++++++++++---
 src/locales/en.json                          |  1 +
 src/locales/es.json                          |  1 +
 src/locales/ja.json                          |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index 963464c3..858c6abc 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -11,8 +11,8 @@
   </ion-header>
 
   <ion-content>
-    <ion-list lines="none">
-      <ion-item>
+    <ion-list>
+      <ion-item lines="none">
         <ion-label>
           {{ translate(isTrackingRequired ? "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually." : "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.") }}
         </ion-label>
@@ -30,6 +30,15 @@
       <ion-item>
         <ion-input :label="translate('Tracking code')" :placeholder="translate('enter code')" v-model="trackingCode" />
       </ion-item>
+      <ion-item>
+        <ion-label>
+          {{ translate("Tracking URL:", { trackingUrl: "http" }) }}
+        </ion-label>
+        <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim()">
+          {{ translate("Test") }}
+          <ion-icon :icon="openOutline" slot="end" />
+        </ion-button>
+      </ion-item>
     </ion-list>
   </ion-content>
 
@@ -60,7 +69,7 @@ import {
   IonList
 } from "@ionic/vue";
 import { defineComponent } from "vue";
-import { barcodeOutline, closeOutline, copyOutline, saveOutline } from "ionicons/icons";
+import { barcodeOutline, closeOutline, copyOutline, openOutline, saveOutline } from "ionicons/icons";
 import { translate } from "@hotwax/dxp-components";
 import { mapGetters, useStore } from "vuex";
 import { OrderService } from '@/services/OrderService';
@@ -224,6 +233,7 @@ export default defineComponent({
       barcodeOutline,
       closeOutline,
       copyOutline,
+      openOutline,
       saveOutline,
       store,
       translate
diff --git a/src/locales/en.json b/src/locales/en.json
index 9163c5f9..3a671ded 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -539,6 +539,7 @@
   "Tracking Code": "Tracking Code",
   "Tracking code settings updated successfully.": "Tracking code settings updated successfully.",
   "Tracking ID": "Tracking ID",
+  "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Transfer Orders": "Transfer Orders",
   "Transfer Order Details": "Transfer Order Details",
   "Turn off eCom inventory": "Turn off eCom inventory",
diff --git a/src/locales/es.json b/src/locales/es.json
index adbb13ce..737379e2 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -536,6 +536,7 @@
   "Tracking Code": "Código de Seguimiento",
   "Tracking code settings updated successfully.": "Tracking code settings updated successfully.",
   "Tracking ID": "ID de Seguimiento",
+  "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Transfer Orders": "Transferir Ordenes",
   "Transfer Order Details": "Transferir los Detalles del Pedido",
   "Turn off eCom inventory": "Desactivar el inventario de eCom",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index b331c55c..d5c45afb 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -537,6 +537,7 @@
   "Tracking Code": "追跡コード",
   "Tracking code settings updated successfully.": "追跡コード設定が正常に更新されました。",
   "Tracking ID": "追跡ID",
+  "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Transfer Orders": "転送注文",
   "Transfer Order Details": "転送注文の詳細",
   "Turn off eCom inventory": "EC在庫をオフにする",

From eec460c31df1c2bf6a801fc325df4fba3c60fa27 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 23 Aug 2024 19:14:36 +0530
Subject: [PATCH 03/10] Implemented: logic to fetch tracking url for all the
 facility carriers (#704)

---
 src/services/CarrierService.ts       |  9 ++++++++
 src/store/modules/carrier/actions.ts | 33 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/src/services/CarrierService.ts b/src/services/CarrierService.ts
index 31f2884a..8b666c41 100644
--- a/src/services/CarrierService.ts
+++ b/src/services/CarrierService.ts
@@ -167,6 +167,14 @@ const ensurePartyRole = async (payload: any): Promise <any> => {
   });
 }
 
+const fetchCarrierTrackingUrls = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "POST",
+    data: payload,
+  })
+}
+
 export const CarrierService = {
   addCarrierShipmentMethod,
   addCarrierToFacility,
@@ -177,6 +185,7 @@ export const CarrierService = {
   fetchCarriers,
   fetchCarrierFacilities,
   fetchCarrierShipmentMethods,
+  fetchCarrierTrackingUrls,
   fetchProductStoreShipmentMethods,
   fetchShipmentMethodTypes,
   removeCarrierFromFacility,
diff --git a/src/store/modules/carrier/actions.ts b/src/store/modules/carrier/actions.ts
index 6bba23e2..83efc5ab 100644
--- a/src/store/modules/carrier/actions.ts
+++ b/src/store/modules/carrier/actions.ts
@@ -391,6 +391,39 @@ const actions: ActionTree<CarrierState, RootState> = {
       facilityCarriers = [...facilityCarriers, {"partyId": "_NA_", "groupName": "Default", "roleTypeId": "CARRIER"}]
     }
 
+    const carrierIds = facilityCarriers.map((carrier: any) => carrier.partyId)
+    const systemProperties = {} as any;
+
+    try {
+      resp = await CarrierService.fetchCarrierTrackingUrls({
+        "entityName": "SystemProperty",
+        "inputFields": {
+          "systemResourceId": carrierIds,
+          "systemResourceId_op": "in",
+          "systemResourceId_ic": "Y",
+          "systemPropertyId": "%trackingUrl%",
+          "systemPropertyId_op": "like"
+        },
+        "fieldList": ["systemResourceId", "systemPropertyValue"]
+      })
+
+      if(!hasError(resp)) {
+        resp.data.docs.map((doc: any) => {
+          systemProperties[doc.systemResourceId.toUpperCase()] = doc.systemPropertyValue
+        })
+      } else {
+        throw resp.data;
+      }
+    } catch(error: any) {
+      logger.error(error);
+    }
+
+    if(Object.keys(systemProperties).length) {
+      facilityCarriers.map((carrier: any) => {
+        carrier.trackingUrl = systemProperties[carrier.partyId.toUpperCase()]
+      })
+    }
+
     commit(types.CARRIER_FACILITY_CARRIERS_UPDATED, facilityCarriers)
   },
   async fetchProductStoreShipmentMeths({ state, commit }) {

From 2a364233e83b56d3791add177668b46d5acda970 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Fri, 23 Aug 2024 19:59:38 +0530
Subject: [PATCH 04/10] Improved: added logic for testing tracking url on
 tracking modal (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index 858c6abc..afca1a4c 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -34,7 +34,7 @@
         <ion-label>
           {{ translate("Tracking URL:", { trackingUrl: "http" }) }}
         </ion-label>
-        <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim()">
+        <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim()" @click="redirectToTrackingUrl()">
           {{ translate("Test") }}
           <ion-icon :icon="openOutline" slot="end" />
         </ion-button>
@@ -226,6 +226,17 @@ export default defineComponent({
       completedOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
       await this.store.dispatch('order/updateCompletedQuery', { ...completedOrdersQuery })
     },
+    getCarrierTrackingUrl() {
+      return this.facilityCarriers.find((carrier: any) => carrier.partyId === this.carrierPartyId)?.trackingUrl
+    },
+    redirectToTrackingUrl() {
+      const trackingUrl = this.getCarrierTrackingUrl()
+      if(!trackingUrl) {
+        showToast(translate("Tracking url is not configured for following carrier."));
+        return;
+      }
+      window.open(trackingUrl.replace("${trackingNumber}", this.trackingCode), "_blank");
+    }
   },
   setup() {
     const store = useStore();

From 9a1417439cbce1314ce212541f7a240e4a6db4e0 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 26 Aug 2024 11:27:51 +0530
Subject: [PATCH 05/10] Improved: logic for tracking URl generation and label
 display (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 59 +++++++++++++++++++-
 src/locales/en.json                          |  1 +
 src/locales/es.json                          |  1 +
 src/locales/ja.json                          |  1 +
 src/views/OrderDetail.vue                    |  1 -
 5 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index afca1a4c..866de34f 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -32,9 +32,9 @@
       </ion-item>
       <ion-item>
         <ion-label>
-          {{ translate("Tracking URL:", { trackingUrl: "http" }) }}
+          {{ translate("Tracking URL:", { trackingUrl: generateTrackingUrl() }) }}
         </ion-label>
-        <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim()" @click="redirectToTrackingUrl()">
+        <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim() || !getCarrierTrackingUrl()" @click="redirectToTrackingUrl()">
           {{ translate("Test") }}
           <ion-icon :icon="openOutline" slot="end" />
         </ion-button>
@@ -136,7 +136,7 @@ export default defineComponent({
       return this.productStoreShipmentMethods?.filter((method: any) => method.partyId === carrierPartyId) || [];
     },
     isTrackingDetailUpdated() {
-      return (this.trackingCode.trim() || this.shipmentMethodTypeId)
+      return (this.trackingCode.trim() && this.shipmentMethodTypeId)
     },
     async updateCarrier(carrierPartyId: string) {
       this.carrierMethods = await this.getProductStoreShipmentMethods(carrierPartyId);
@@ -154,6 +154,12 @@ export default defineComponent({
 
       this.isGeneratingShippingLabel = true;
 
+      const isUpdated = await this.updateCarrierAndShippingMethod(this.carrierPartyId, this.shipmentMethodTypeId)
+      if(!isUpdated) {
+        showToast(translate("Failed to update shipment method detail."));
+        return;
+      }
+
       if(this.trackingCode.trim()) {
         isRegenerated = await this.addCustomTrackingCode(order);
       } else {
@@ -229,6 +235,53 @@ export default defineComponent({
     getCarrierTrackingUrl() {
       return this.facilityCarriers.find((carrier: any) => carrier.partyId === this.carrierPartyId)?.trackingUrl
     },
+    generateTrackingUrl() {
+      if(this.getCarrierTrackingUrl()) {
+        return this.getCarrierTrackingUrl()?.replace("${trackingNumber}", this.trackingCode)
+      }
+      return translate("A tracking URL not configured for", { carrierName: this.getCarrierName() })
+    },
+    getCarrierName() {
+      return this.facilityCarriers.find((carrier: any) => carrier.partyId === this.carrierPartyId)?.groupName
+    },
+    async updateCarrierAndShippingMethod(carrierPartyId: string, shipmentMethodTypeId: string) {
+      let resp;
+      try {
+        const params = {
+          orderId: this.order.orderId,
+          shipGroupSeqId: this.order.shipGroupSeqId,
+          shipmentMethodTypeId,
+          carrierPartyId
+        }
+        resp = await OrderService.updateOrderItemShipGroup(params)
+        if (!hasError(resp)) {
+          for (const shipmentPackage of this.order.shipmentPackages) {
+            resp = await OrderService.updateShipmentRouteSegment({
+              "shipmentId": shipmentPackage.shipmentId,
+              "shipmentRouteSegmentId": shipmentPackage.shipmentRouteSegmentId,
+              "carrierPartyId": carrierPartyId,
+              "shipmentMethodTypeId": shipmentMethodTypeId
+            }) as any;
+            if (!hasError(resp)) {
+              this.shipmentMethodTypeId = shipmentMethodTypeId
+              showToast(translate("Shipment method detail updated successfully."))
+              //fetching updated shipment packages
+              await this.store.dispatch('order/updateShipmentPackageDetail', this.order)
+              return true;
+            } else {
+              throw resp.data;
+            }
+          }
+        } else {
+          throw resp.data;
+        }
+      } catch (err) {
+        this.carrierPartyId = this.order.shipmentPackages?.[0].carrierPartyId;
+        this.shipmentMethodTypeId = this.order.shipmentPackages?.[0].shipmentMethodTypeId;
+        logger.error('Failed to update carrier and method', err);
+        return false;
+      }
+    },
     redirectToTrackingUrl() {
       const trackingUrl = this.getCarrierTrackingUrl()
       if(!trackingUrl) {
diff --git a/src/locales/en.json b/src/locales/en.json
index 3a671ded..26a167ef 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -33,6 +33,7 @@
   "Are you sure you want to reject in progress order(s)?": "Are you sure you want to reject { ordersCount } in progress order(s)?",
   "Are you sure you want to update box selection?": "Are you sure you want to update box selection?",
   "Assign Pickers": "Assign Pickers",
+  "A tracking URL not configured for": "A tracking URL not configured for {carrierName}",
   "Auto reject related items": "Auto reject related items",
   "Back to Launchpad": "Back to Launchpad",
   "Billing Address 1": "Billing Address 1",
diff --git a/src/locales/es.json b/src/locales/es.json
index 737379e2..d87d0a62 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -33,6 +33,7 @@
   "Are you sure you want to reject in progress order(s)?": "¿Estás seguro/a de que quieres rechazar { ordersCount } pedido(s) en curso?",
   "Are you sure you want to update box selection?": "¿Está seguro de que desea actualizar la selección del cuadro?",
   "Assign Pickers": "Asignar Recolectores",
+  "A tracking URL not configured for": "A tracking URL not configured for {carrierName}",
   "Auto reject related items": "Auto reject related items",
   "Back to Launchpad": "Volver a Launchpad",
   "Billing Address 1": "Dirección de Facturación 1",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index d5c45afb..c6d3ff9d 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -33,6 +33,7 @@
   "Are you sure you want to reject in progress order(s)?": "{ ordersCount }件の進行中の注文を拒否してもよろしいですか？",
   "Are you sure you want to update box selection?": "ボックスの選択を更新してもよろしいですか？",
   "Assign Pickers": "ピッカーを割り当てる",
+  "A tracking URL not configured for": "A tracking URL not configured for {carrierName}",
   "Auto reject related items": "Auto reject related items",
   "Back to Launchpad": "ランチパッドに戻る",
   "Billing Address 1": "請求先住所 1",
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index 74fac8f4..51eddb76 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -1458,7 +1458,6 @@ export default defineComponent({
       })
 
       modal.onDidDismiss().then((result: any) => {
-        console.log(result);
         if(result.data?.isRegenerated) {
           if(this.isForceScanEnabled) this.scanOrder(order);
           else this.packOrder(order);

From d67d90f761818164a07242af267c37650c7a72ad Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 26 Aug 2024 12:48:26 +0530
Subject: [PATCH 06/10] Improved: logic for the updation of the carrier and
 shipment method from the modal (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 26 ++++++--------------
 src/views/OrderDetail.vue                    |  6 ++++-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index 866de34f..e4e5a0b7 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -43,7 +43,7 @@
   </ion-content>
 
   <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-    <ion-fab-button :disabled="!isTrackingDetailUpdated()" @click="confirmSave()">
+    <ion-fab-button :disabled="!shipmentMethodTypeId" @click="confirmSave()">
       <ion-icon :icon="isForceScanEnabled ? barcodeOutline : saveOutline" />
     </ion-fab-button>
   </ion-fab>
@@ -116,6 +116,7 @@ export default defineComponent({
       isGeneratingShippingLabel: false
     }
   },
+  props: ["updateCarrierShipmentDetails"],
   async mounted() {
     this.isTrackingRequired = this.isTrackingRequiredForAnyShipmentPackage()
     if (this.facilityCarriers) {
@@ -135,9 +136,6 @@ export default defineComponent({
     async getProductStoreShipmentMethods(carrierPartyId: string) { 
       return this.productStoreShipmentMethods?.filter((method: any) => method.partyId === carrierPartyId) || [];
     },
-    isTrackingDetailUpdated() {
-      return (this.trackingCode.trim() && this.shipmentMethodTypeId)
-    },
     async updateCarrier(carrierPartyId: string) {
       this.carrierMethods = await this.getProductStoreShipmentMethods(carrierPartyId);
       this.shipmentMethodTypeId = this.carrierMethods?.[0]?.shipmentMethodTypeId;
@@ -160,6 +158,8 @@ export default defineComponent({
         return;
       }
 
+      this.updateCarrierShipmentDetails(this.carrierPartyId, this.shipmentMethodTypeId);
+
       if(this.trackingCode.trim()) {
         isRegenerated = await this.addCustomTrackingCode(order);
       } else {
@@ -262,13 +262,7 @@ export default defineComponent({
               "carrierPartyId": carrierPartyId,
               "shipmentMethodTypeId": shipmentMethodTypeId
             }) as any;
-            if (!hasError(resp)) {
-              this.shipmentMethodTypeId = shipmentMethodTypeId
-              showToast(translate("Shipment method detail updated successfully."))
-              //fetching updated shipment packages
-              await this.store.dispatch('order/updateShipmentPackageDetail', this.order)
-              return true;
-            } else {
+            if(hasError(resp)) {
               throw resp.data;
             }
           }
@@ -276,19 +270,13 @@ export default defineComponent({
           throw resp.data;
         }
       } catch (err) {
-        this.carrierPartyId = this.order.shipmentPackages?.[0].carrierPartyId;
-        this.shipmentMethodTypeId = this.order.shipmentPackages?.[0].shipmentMethodTypeId;
         logger.error('Failed to update carrier and method', err);
         return false;
       }
+      return true;
     },
     redirectToTrackingUrl() {
-      const trackingUrl = this.getCarrierTrackingUrl()
-      if(!trackingUrl) {
-        showToast(translate("Tracking url is not configured for following carrier."));
-        return;
-      }
-      window.open(trackingUrl.replace("${trackingNumber}", this.trackingCode), "_blank");
+      window.open(this.getCarrierTrackingUrl().replace("${trackingNumber}", this.trackingCode), "_blank");
     }
   },
   setup() {
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index 51eddb76..c218878e 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -572,6 +572,10 @@ export default defineComponent({
         showToast(translate("Failed to update shipment method detail."));
       }
     },
+    updateCarrierShipmentDetails(carrierPartyId: string, shipmentMethodTypeId: string) {
+      this.carrierPartyId = carrierPartyId
+      this.shipmentMethodTypeId = shipmentMethodTypeId
+    },
     async fetchKitComponent(orderItem: any, isOtherShipment = false ) {
       await this.store.dispatch('product/fetchProductComponents', { productId: orderItem.productId })
       
@@ -1454,7 +1458,7 @@ export default defineComponent({
     async generateTrackingCodeForPacking(order: any) {
       const modal = await modalController.create({
         component: GenerateTrackingCodeModal,
-        componentProps: { order }
+        componentProps: { updateCarrierShipmentDetails: this.updateCarrierShipmentDetails }
       })
 
       modal.onDidDismiss().then((result: any) => {

From c695ba9d80209c3a45dbe5432901d00c6363694c Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 26 Aug 2024 15:32:53 +0530
Subject: [PATCH 07/10] Improved: logic for handling both trackingRequired and
 trackingNotRequired cases (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 75 ++++++++++----------
 src/views/OrderDetail.vue                    |  2 +-
 2 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index e4e5a0b7..a9eccbcf 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -43,30 +43,30 @@
   </ion-content>
 
   <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-    <ion-fab-button :disabled="!shipmentMethodTypeId" @click="confirmSave()">
+    <ion-fab-button :disabled="isTrackingRequired ? !shipmentMethodTypeId: ''" @click="confirmSave()">
       <ion-icon :icon="isForceScanEnabled ? barcodeOutline : saveOutline" />
     </ion-fab-button>
   </ion-fab>
 </template>
 
 <script lang="ts">
-import { 
+import {
+  IonButton,
+  IonButtons,
   IonContent,
   IonFab,
   IonFabButton,
   IonHeader,
   IonIcon,
   IonInput,
+  IonItem,
   IonLabel,
+  IonList,
   IonSelect,
   IonSelectOption,
   IonTitle,
   IonToolbar,
   modalController,
-  IonButton,
-  IonButtons,
-  IonItem,
-  IonList
 } from "@ionic/vue";
 import { defineComponent } from "vue";
 import { barcodeOutline, closeOutline, copyOutline, openOutline, saveOutline } from "ionicons/icons";
@@ -80,21 +80,21 @@ import { hasError } from "@/adapter";
 export default defineComponent({
   name: "GenerateTrackingCodeModal",
   components: { 
+    IonButton,
+    IonButtons,
     IonContent,
     IonFab,
     IonFabButton,
     IonHeader,
     IonIcon,
     IonInput,
+    IonItem,
     IonLabel,
+    IonList,
     IonSelect,
     IonSelectOption,
     IonTitle,
     IonToolbar,
-    IonButton,
-    IonButtons,
-    IonItem,
-    IonList
   },
   computed: {
     ...mapGetters({
@@ -119,7 +119,7 @@ export default defineComponent({
   props: ["updateCarrierShipmentDetails"],
   async mounted() {
     this.isTrackingRequired = this.isTrackingRequiredForAnyShipmentPackage()
-    if (this.facilityCarriers) {
+    if(this.facilityCarriers) {
       const shipmentPackage = this.order.shipmentPackages?.[0];
       this.carrierPartyId = shipmentPackage?.carrierPartyId ? shipmentPackage?.carrierPartyId : this.facilityCarriers[0].partyId;
       this.carrierMethods = await this.getProductStoreShipmentMethods(this.carrierPartyId);
@@ -127,8 +127,8 @@ export default defineComponent({
     }
   },
   methods: {
-    closeModal() {
-      modalController.dismiss({ dismissed: true });
+    closeModal(payload = {}) {
+      modalController.dismiss({ dismissed: true, ...payload });
     },
     isTrackingRequiredForAnyShipmentPackage() {
       return this.order.shipmentPackages?.some((shipmentPackage: any) => shipmentPackage.isTrackingRequired === 'Y')
@@ -152,23 +152,29 @@ export default defineComponent({
 
       this.isGeneratingShippingLabel = true;
 
-      const isUpdated = await this.updateCarrierAndShippingMethod(this.carrierPartyId, this.shipmentMethodTypeId)
-      if(!isUpdated) {
-        showToast(translate("Failed to update shipment method detail."));
-        return;
-      }
+      if(this.shipmentMethodTypeId) {
+        const isUpdated = await this.updateCarrierAndShippingMethod(this.carrierPartyId, this.shipmentMethodTypeId)
+        if(!isUpdated) {
+          showToast(translate("Failed to update shipment method detail."));
+          return;
+        }
 
-      this.updateCarrierShipmentDetails(this.carrierPartyId, this.shipmentMethodTypeId);
+        this.updateCarrierShipmentDetails && this.updateCarrierShipmentDetails(this.carrierPartyId, this.shipmentMethodTypeId);
+      }
 
       if(this.trackingCode.trim()) {
         isRegenerated = await this.addCustomTrackingCode(order);
-      } else {
+      } else if(this.shipmentMethodTypeId) {
         isRegenerated = await this.regenerateShippingLabel(order)
       }
 
-      if(isRegenerated) {
-        modalController.dismiss({ dismissed: true, isRegenerated });
+      //fetching updated shipment packages
+      await this.store.dispatch('order/updateShipmentPackageDetail', order)
+
+      if(isRegenerated || !this.isTrackingRequired) {
+        this.closeModal({ moveToNext: true });
       }
+
       this.isGeneratingShippingLabel = false;
     },
     async addCustomTrackingCode(order: any) {
@@ -181,8 +187,6 @@ export default defineComponent({
             "trackingCode": this.trackingCode.trim()
           });
         }
-        //fetching updated shipment packages
-        await this.store.dispatch('order/updateShipmentPackageDetail', order)
         return true;
       } catch (error: any) {
         logger.error('Failed to add tracking code', error);
@@ -194,26 +198,22 @@ export default defineComponent({
       // If there are no product store shipment method configured, then not generating the label and displaying an error toast
       if(this.productStoreShipmentMethCount <= 0) {
         showToast(translate('Unable to generate shipping label due to missing product store shipping method configuration'))
-        return;
+        return false;
       }
 
       // Getting all the shipmentIds from shipmentPackages for which label is missing
       const shipmentIds = order.shipmentPackages
-          ?.filter((shipmentPackage: any) => !shipmentPackage.trackingCode)
-          .map((shipmentPackage: any) => shipmentPackage.shipmentId);
+        ?.filter((shipmentPackage: any) => !shipmentPackage.trackingCode)
+        .map((shipmentPackage: any) => shipmentPackage.shipmentId);
 
       if(!shipmentIds?.length) {
         showToast(translate("Failed to generate shipping label"))
-        return;
+        return false;
       }
 
       try {
         const resp = await OrderService.retryShippingLabel(shipmentIds)
-
-        if (!hasError(resp)) {
-          //Updated shipment package detail is needed if the label pdf url is generated on retrying shipping label generation
-          await this.store.dispatch('order/updateShipmentPackageDetail', order) 
-
+        if(!hasError(resp)) {
           // TODO fetch specific order
           this.initialiseOrderQuery();
           return true;
@@ -246,15 +246,16 @@ export default defineComponent({
     },
     async updateCarrierAndShippingMethod(carrierPartyId: string, shipmentMethodTypeId: string) {
       let resp;
-      try {
+      try{
         const params = {
           orderId: this.order.orderId,
           shipGroupSeqId: this.order.shipGroupSeqId,
           shipmentMethodTypeId,
           carrierPartyId
         }
+
         resp = await OrderService.updateOrderItemShipGroup(params)
-        if (!hasError(resp)) {
+        if(!hasError(resp)) {
           for (const shipmentPackage of this.order.shipmentPackages) {
             resp = await OrderService.updateShipmentRouteSegment({
               "shipmentId": shipmentPackage.shipmentId,
@@ -269,8 +270,8 @@ export default defineComponent({
         } else {
           throw resp.data;
         }
-      } catch (err) {
-        logger.error('Failed to update carrier and method', err);
+      } catch(error: any) {
+        logger.error("Failed to update carrier and method", error);
         return false;
       }
       return true;
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index 5753f04b..23b298a5 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -1466,7 +1466,7 @@ export default defineComponent({
       })
 
       modal.onDidDismiss().then((result: any) => {
-        if(result.data?.isRegenerated) {
+        if(result.data?.moveToNext) {
           if(this.isForceScanEnabled) this.scanOrder(order);
           else this.packOrder(order);
         }

From f64aabe065db05323a8b959689cfd6b5d1d37499 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 26 Aug 2024 18:01:56 +0530
Subject: [PATCH 08/10] Implemented: logic to open generate tracking code modal
 from the pack button in InProgress page and order details page (#704)

---
 src/components/GenerateTrackingCodeModal.vue |  3 +--
 src/views/InProgress.vue                     | 23 +++++++++++++++++---
 src/views/OrderDetail.vue                    |  4 ++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index a9eccbcf..b0963e15 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -102,7 +102,6 @@ export default defineComponent({
       isForceScanEnabled: 'util/isForceScanEnabled',
       productStoreShipmentMethods: 'carrier/getProductStoreShipmentMethods',
       productStoreShipmentMethCount: 'util/getProductStoreShipmentMethCount',
-      order: "order/getCurrent",
       completedOrders: 'order/getCompletedOrders',
     })
   },
@@ -116,7 +115,7 @@ export default defineComponent({
       isGeneratingShippingLabel: false
     }
   },
-  props: ["updateCarrierShipmentDetails"],
+  props: ["order", "updateCarrierShipmentDetails"],
   async mounted() {
     this.isTrackingRequired = this.isTrackingRequiredForAnyShipmentPackage()
     if(this.facilityCarriers) {
diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue
index 6db11bc3..6b4b331f 100644
--- a/src/views/InProgress.vue
+++ b/src/views/InProgress.vue
@@ -175,7 +175,7 @@
 
             <div class="mobile-only">
               <ion-item>
-                <ion-button fill="clear"  :disabled="order.isModified || order.hasMissingInfo" @click.stop="isForceScanEnabled ? scanOrder(order) : packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
+                <ion-button fill="clear"  :disabled="order.isModified || order.hasMissingInfo" @click.stop="order.missingLabelImage ? generateTrackingCodeForPacking(order) : isForceScanEnabled ? scanOrder(order) : packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
                 <ion-button slot="end" fill="clear" color="medium" @click.stop="packagingPopover">
                   <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
                 </ion-button>
@@ -184,7 +184,7 @@
 
             <div class="actions">
               <div>
-                <ion-button :disabled="order.hasRejectedItem || order.isModified || order.hasMissingInfo" @click.stop="isForceScanEnabled ? scanOrder(order) : packOrder(order)">{{ translate("Pack") }}</ion-button>
+                <ion-button :disabled="order.hasRejectedItem || order.isModified || order.hasMissingInfo" @click.stop="order.missingLabelImage ? generateTrackingCodeForPacking(order) : isForceScanEnabled ? scanOrder(order) : packOrder(order)">{{ translate("Pack") }}</ion-button>
                 <ion-button :disabled="order.hasMissingInfo" fill="outline" @click.stop="save(order)">{{ translate("Save") }}</ion-button>
               </div>
 
@@ -310,6 +310,7 @@ import ShipmentBoxPopover from '@/components/ShipmentBoxPopover.vue'
 import QRCodeModal from '@/components/QRCodeModal.vue'
 import { useAuthStore } from '@hotwax/dxp-components'
 import ScanOrderItemModal from "@/components/ScanOrderItemModal.vue";
+import GenerateTrackingCodeModal from '@/components/GenerateTrackingCodeModal.vue';
 
 
 export default defineComponent({
@@ -375,6 +376,7 @@ export default defineComponent({
   },
   async ionViewWillEnter() {
     this.isScrollingEnabled = false;
+    await Promise.all([this.store.dispatch('carrier/fetchFacilityCarriers'), this.store.dispatch('carrier/fetchProductStoreShipmentMeths')]);
   },
   methods: {
     getRejectionReasonDescription (rejectionReasonId: string) {
@@ -1235,7 +1237,22 @@ export default defineComponent({
       })
 
       modal.present();
-    }
+    },
+    async generateTrackingCodeForPacking(order: any) {
+      const modal = await modalController.create({
+        component: GenerateTrackingCodeModal,
+        componentProps: { order }
+      })
+
+      modal.onDidDismiss().then((result: any) => {
+        if(result.data?.moveToNext) {
+          if(this.isForceScanEnabled) this.scanOrder(order);
+          else this.packOrder(order);
+        }
+      })
+
+      modal.present();
+    },
   },
   async mounted () {
     this.store.dispatch('util/fetchRejectReasons')
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index 23b298a5..03b735ea 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -150,7 +150,7 @@
           
           <div v-if="category === 'in-progress'" class="mobile-only">
             <ion-item>
-              <ion-button fill="clear" :disabled="order.hasMissingInfo" @click="isForceScanEnabled ? scanOrder(order) :packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
+              <ion-button fill="clear" :disabled="order.hasMissingInfo" @click="order.missingLabelImage ? generateTrackingCodeForPacking(order) : isForceScanEnabled ? scanOrder(order) :packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
               <ion-button slot="end" fill="clear" color="medium" @click="packagingPopover">
                 <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
               </ion-button>
@@ -1462,7 +1462,7 @@ export default defineComponent({
     async generateTrackingCodeForPacking(order: any) {
       const modal = await modalController.create({
         component: GenerateTrackingCodeModal,
-        componentProps: { updateCarrierShipmentDetails: this.updateCarrierShipmentDetails }
+        componentProps: { order, updateCarrierShipmentDetails: this.updateCarrierShipmentDetails }
       })
 
       modal.onDidDismiss().then((result: any) => {

From b2912c248d4ac2a18ace0e27abd6046ae0d50945 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 26 Aug 2024 18:47:46 +0530
Subject: [PATCH 09/10] Improved: optimized logic, added entry in locale for
 missing static text (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 51 ++++++++------------
 src/locales/en.json                          |  5 ++
 src/locales/es.json                          |  5 ++
 src/locales/ja.json                          |  5 ++
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index b0963e15..0184d4ae 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -13,10 +13,9 @@
   <ion-content>
     <ion-list>
       <ion-item lines="none">
-        <ion-label>
-          {{ translate(isTrackingRequired ? "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually." : "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.") }}
-        </ion-label>
+        <ion-label>{{ translate(isTrackingRequired ? "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually." : "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.") }}</ion-label>
       </ion-item>
+
       <ion-item>
         <ion-select :disabled="!order.missingLabelImage" :label="translate('Carrier')" v-model="carrierPartyId" interface="popover" @ionChange="updateCarrier(carrierPartyId)">
           <ion-select-option v-for="carrier in facilityCarriers" :key="carrier.partyId" :value="carrier.partyId">{{ translate(carrier.groupName) }}</ion-select-option>
@@ -31,9 +30,7 @@
         <ion-input :label="translate('Tracking code')" :placeholder="translate('enter code')" v-model="trackingCode" />
       </ion-item>
       <ion-item>
-        <ion-label>
-          {{ translate("Tracking URL:", { trackingUrl: generateTrackingUrl() }) }}
-        </ion-label>
+        <ion-label>{{ translate("Tracking URL:", { trackingUrl: generateTrackingUrl() }) }}</ion-label>
         <ion-button slot="end" fill="clear" size="default" :disabled="!trackingCode.trim() || !getCarrierTrackingUrl()" @click="redirectToTrackingUrl()">
           {{ translate("Test") }}
           <ion-icon :icon="openOutline" slot="end" />
@@ -151,14 +148,10 @@ export default defineComponent({
 
       this.isGeneratingShippingLabel = true;
 
-      if(this.shipmentMethodTypeId) {
-        const isUpdated = await this.updateCarrierAndShippingMethod(this.carrierPartyId, this.shipmentMethodTypeId)
-        if(!isUpdated) {
-          showToast(translate("Failed to update shipment method detail."));
-          return;
-        }
-
-        this.updateCarrierShipmentDetails && this.updateCarrierShipmentDetails(this.carrierPartyId, this.shipmentMethodTypeId);
+      const isUpdated = await this.updateCarrierAndShippingMethod(this.carrierPartyId, this.shipmentMethodTypeId)
+      if(!isUpdated) {
+        showToast(translate("Failed to update shipment method detail."));
+        return;
       }
 
       if(this.trackingCode.trim()) {
@@ -186,17 +179,17 @@ export default defineComponent({
             "trackingCode": this.trackingCode.trim()
           });
         }
-        return true;
       } catch (error: any) {
         logger.error('Failed to add tracking code', error);
         showToast(translate("Failed to add tracking code."));
+        return false;
       }
-      return false;
+      return true;
     },
     async regenerateShippingLabel(order: any) {
       // If there are no product store shipment method configured, then not generating the label and displaying an error toast
       if(this.productStoreShipmentMethCount <= 0) {
-        showToast(translate('Unable to generate shipping label due to missing product store shipping method configuration'))
+        showToast(translate("Unable to generate shipping label due to missing product store shipping method configuration"))
         return false;
       }
 
@@ -212,24 +205,15 @@ export default defineComponent({
 
       try {
         const resp = await OrderService.retryShippingLabel(shipmentIds)
-        if(!hasError(resp)) {
-          // TODO fetch specific order
-          this.initialiseOrderQuery();
-          return true;
-        } else {
+        if(hasError(resp)) {
           throw resp.data;
         }
       } catch(error: any) {
         logger.error(error);
         showToast(translate("Failed to generate shipping label"))
+        return false;
       }
-      return false;
-    },
-    async initialiseOrderQuery() {
-      const completedOrdersQuery = JSON.parse(JSON.stringify(this.completedOrders.query))
-      completedOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
-      completedOrdersQuery.viewSize = process.env.VUE_APP_VIEW_SIZE
-      await this.store.dispatch('order/updateCompletedQuery', { ...completedOrdersQuery })
+      return true;
     },
     getCarrierTrackingUrl() {
       return this.facilityCarriers.find((carrier: any) => carrier.partyId === this.carrierPartyId)?.trackingUrl
@@ -246,10 +230,13 @@ export default defineComponent({
     async updateCarrierAndShippingMethod(carrierPartyId: string, shipmentMethodTypeId: string) {
       let resp;
       try{
+        const carrierShipmentMethods = await this.getProductStoreShipmentMethods(carrierPartyId);
+        shipmentMethodTypeId = shipmentMethodTypeId ? shipmentMethodTypeId : carrierShipmentMethods?.[0]?.shipmentMethodTypeId;
+
         const params = {
           orderId: this.order.orderId,
           shipGroupSeqId: this.order.shipGroupSeqId,
-          shipmentMethodTypeId,
+          shipmentMethodTypeId : shipmentMethodTypeId ? shipmentMethodTypeId : "",
           carrierPartyId
         }
 
@@ -260,7 +247,7 @@ export default defineComponent({
               "shipmentId": shipmentPackage.shipmentId,
               "shipmentRouteSegmentId": shipmentPackage.shipmentRouteSegmentId,
               "carrierPartyId": carrierPartyId,
-              "shipmentMethodTypeId": shipmentMethodTypeId
+              "shipmentMethodTypeId" : shipmentMethodTypeId ? shipmentMethodTypeId : "",
             }) as any;
             if(hasError(resp)) {
               throw resp.data;
@@ -273,6 +260,8 @@ export default defineComponent({
         logger.error("Failed to update carrier and method", error);
         return false;
       }
+
+      this.updateCarrierShipmentDetails && this.updateCarrierShipmentDetails(carrierPartyId, shipmentMethodTypeId);
       return true;
     },
     redirectToTrackingUrl() {
diff --git a/src/locales/en.json b/src/locales/en.json
index 2e607580..69bbac74 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -140,6 +140,7 @@
   "Edit Pickers": "Edit Pickers",
   "Edit sequence": "Edit sequence",
   "Email": "Email",
+  "enter code": "enter code",
   "Enter key": "Enter key",
   "Enter mapping name": "Enter mapping name",
   "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.": "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.",
@@ -167,6 +168,7 @@
   "Facility updated successfully": "Facility updated successfully",
   "Facilities": "Facilities",
   "Failed to add box": "Failed to add box",
+  "Failed to add tracking code.": "Failed to add tracking code.",
   "Failed to create picklist for orders": "Failed to create picklist for orders",
   "Failed to create rejection reason.": "Failed to create rejection reason.",
   "Failed to delete CSV mapping.": "Failed to delete CSV mapping.",
@@ -526,6 +528,7 @@
   "Store pickup": "Store pickup",
   "Store Pickup": "Store Pickup",
   "STAY": "STAY",
+  "Test": "Test",
   "Test tracking url": "Test tracking url",
   "The import orders has been uploaded successfully": "The import orders has been uploaded successfully",
   "The picked quantity cannot exceed the ordered quantity.": "The picked quantity cannot exceed the ordered quantity.",
@@ -546,6 +549,8 @@
   "Tracking code added successfully.": "Tracking code added successfully.",
   "Tracking Code": "Tracking Code",
   "Tracking code settings updated successfully.": "Tracking code settings updated successfully.",
+  "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
+  "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
   "Tracking ID": "Tracking ID",
   "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Tracking url is not configured for following carrier.": "Tracking url is not configured for following carrier.",
diff --git a/src/locales/es.json b/src/locales/es.json
index 580b859a..0a73b339 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -138,6 +138,7 @@
   "Edit Pickers": "Editar recolectores",
   "Edit sequence": "Edit sequence",
   "Email": "Correo Electrónico",
+  "enter code": "enter code",
   "Enter key": "Ingresar clave",
   "Enter mapping name": "Insertar nombre de mapeo",
   "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.": "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.",
@@ -165,6 +166,7 @@
   "Facility updated successfully": "Instalación actualizada exitosamente",
   "Facilities": "Facilities",
   "Failed to add box": "Error al agregar la caja",
+  "Failed to add tracking code.": "Failed to add tracking code.",
   "Failed to create picklist for orders": "Error al crear la lista de selección para los pedidos",
   "Failed to create rejection reason.": "Failed to create rejection reason.",
   "Failed to delete CSV mapping.": "Intento fallido de envio de mapeo de CSV",
@@ -523,6 +525,7 @@
   "Store": "Tienda",
   "Store pickup": "Recoger en tienda",
   "Store Pickup": "Recoger en tienda",
+  "Test": "Test",
   "Test tracking url": "Test tracking url",
   "The import orders has been uploaded successfully": "Los pedidos de importación se han cargado exitosamente",
   "The picked quantity cannot exceed the ordered quantity.": "La cantidad seleccionada no puede exceder la cantidad pedida.",
@@ -543,6 +546,8 @@
   "Tracking code added successfully.": "Tracking code added successfully.",
   "Tracking Code": "Código de Seguimiento",
   "Tracking code settings updated successfully.": "Tracking code settings updated successfully.",
+  "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
+  "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
   "Tracking ID": "ID de Seguimiento",
   "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Tracking url is not configured for following carrier.": "Tracking url is not configured for following carrier.",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 569aa2d7..3af109b8 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -140,6 +140,7 @@
   "Edit Pickers": "ピッカーを編集",
   "Edit sequence": "順序を編集",
   "Email": "メール",
+  "enter code": "enter code",
   "Enter key": "キーを入力",
   "Enter mapping name": "マッピング名を入力",
   "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.": "Enter tracking details for shipping labels generated outside of the fulfillment app. This tracking code will be shared with customers when you complete the fulfillment of the order.",
@@ -167,6 +168,7 @@
   "Facility updated successfully": "施設が正常に更新されました",
   "Facilities": "施設",
   "Failed to add box": "ボックスの追加に失敗しました",
+  "Failed to add tracking code.": "Failed to add tracking code.",
   "Failed to create picklist for orders": "注文のピックリスト作成に失敗しました",
   "Failed to create rejection reason.": "拒否理由の作成に失敗しました。",
   "Failed to delete CSV mapping.": "CSVマッピングの削除に失敗しました。",
@@ -524,6 +526,7 @@
   "Store pickup": "ストア受け取り",
   "Store Pickup": "店頭受け取り",
   "STAY": "滞在",
+  "Test": "Test",
   "Test tracking url": "Test tracking url",
   "The import orders has been uploaded successfully": "インポート注文が正常にアップロードされました",
   "The picked quantity cannot exceed the ordered quantity.": "選ばれた数量は注文された数量を超えることはできません。",
@@ -544,6 +547,8 @@
   "Tracking code added successfully.": "Tracking code added successfully.",
   "Tracking Code": "追跡コード",
   "Tracking code settings updated successfully.": "追跡コード設定が正常に更新されました。",
+  "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are missing in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
+  "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.": "Tracking details are required in order to pack this shipment. Try generating a label from the selected carrier or enter a tracking code manually.",
   "Tracking ID": "追跡ID",
   "Tracking URL:": "Tracking URL: {trackingUrl}",
   "Tracking url is not configured for following carrier.": "Tracking url is not configured for following carrier.",

From dbc8cd722eb8c7af0bb236c39a9ee6834517dbec Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 2 Sep 2024 19:02:07 +0530
Subject: [PATCH 10/10] Improved: method name for adding tracking code,
 reverted unwanted getter (#704)

---
 src/components/GenerateTrackingCodeModal.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index 0184d4ae..445e35bf 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -99,7 +99,6 @@ export default defineComponent({
       isForceScanEnabled: 'util/isForceScanEnabled',
       productStoreShipmentMethods: 'carrier/getProductStoreShipmentMethods',
       productStoreShipmentMethCount: 'util/getProductStoreShipmentMethCount',
-      completedOrders: 'order/getCompletedOrders',
     })
   },
   data() {
@@ -155,7 +154,7 @@ export default defineComponent({
       }
 
       if(this.trackingCode.trim()) {
-        isRegenerated = await this.addCustomTrackingCode(order);
+        isRegenerated = await this.addTrackingCode(order);
       } else if(this.shipmentMethodTypeId) {
         isRegenerated = await this.regenerateShippingLabel(order)
       }
@@ -169,7 +168,7 @@ export default defineComponent({
 
       this.isGeneratingShippingLabel = false;
     },
-    async addCustomTrackingCode(order: any) {
+    async addTrackingCode(order: any) {
       try {
         for (const shipmentPackage of order.shipmentPackages) {
           await OrderService.addTrackingCode({