From c94c501625a70e490619f3c4f348c57c164e7a60 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 6 Feb 2025 11:00:31 +0530
Subject: [PATCH 01/15] Implented: Step1- fetching current facility lat-lon
 from facilityId.

---
 src/services/UtilService.ts              | 11 +++++++++-
 src/store/modules/util/UtilState.ts      |  1 +
 src/store/modules/util/actions.ts        | 27 +++++++++++++++++++++++-
 src/store/modules/util/getters.ts        |  3 +++
 src/store/modules/util/index.ts          |  3 ++-
 src/store/modules/util/mutation-types.ts |  1 +
 src/store/modules/util/mutations.ts      |  3 +++
 src/views/OtherStoresInventoryModal.vue  | 15 ++++++++++---
 src/views/ProductDetail.vue              |  4 ++--
 9 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 7cbff83d9..0dd991109 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -147,6 +147,14 @@ const fetchEnumerations = async (payload: any): Promise<any> => {
   });
 }
 
+const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "post",
+    data: payload
+  });
+}
+
 export const UtilService = {
   createEnumeration,
   createProductStoreSetting,
@@ -163,5 +171,6 @@ export const UtilService = {
   isEnumExists,
   resetPicker,
   updateProductStoreSetting,
-  fetchReservedQuantity
+  fetchReservedQuantity,
+  fetchCurrentFacilityLatLon
 }
\ No newline at end of file
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index ed52feb8e..84f0f5494 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,4 +7,5 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   facilities: any;
   enumerations: any;
+  currentFacilityLatLon: any; 
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index e4123c751..356fcea50 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -378,7 +378,32 @@ const actions: ActionTree<UtilState, RootState> = {
 
   async clearEnumerations({ commit }) {
     commit(types.UTIL_ENUMERATIONS_UPDATED, {})
-  }
+  },
+
+  async fetchCurrentFacilityLatLon({ commit }, facilityId) {
+    const payload = {
+      inputFields: {
+        facilityId: facilityId
+      },
+      entityName: "FacilityContactDetailByPurpose",
+      orderBy: "fromDate DESC",
+      filterByDate: "Y",
+      fieldList: ["latitude", "longitude"],
+      viewSize: 5
+    }
+
+    try {
+      const resp = await UtilService.fetchCurrentFacilityLatLon(payload)
+      
+      if (!hasError(resp) && resp.data?.docs.length > 0) {
+        commit(types.UTIL_CURRENT_FACILITY_LATLON_UPDATED, resp.data.docs[0])
+      } else {
+        throw resp.data
+      }
+    } catch (err) {
+      console.error("Failed to fetch facility lat/long information", err)
+    }
+  },  
 }
 
 export default actions;
\ No newline at end of file
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index db6a9e91a..edbc17975 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,5 +27,8 @@ const getters: GetterTree <UtilState, RootState> = {
   getEnumDescription: (state) => (enumId: string) => {
     return state.enumerations[enumId] ? state.enumerations[enumId] : enumId
   },
+  getCurrentFacilityLatLong: (state) => (facilityId: string) => {
+    return state.currentFacilityLatLon[facilityId] ? state.currentFacilityLatLon[facilityId] : {}
+  }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 3d91b0aeb..2fad5e0f5 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -15,7 +15,8 @@ const utilModule: Module<UtilState, RootState> = {
     partyNames: {},
     cancelReasons: [],
     facilities: {},
-    enumerations: {}
+    enumerations: {},
+    currentFacilityLatLon: {},
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 4ec560a08..c8c956284 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,3 +7,4 @@ export const UTIL_PARTY_NAMES_UPDATED = SN_UTIL + '/PARTY_NAMES_UPDATED'
 export const UTIL_CANCEL_REASONS_UPDATED = SN_UTIL + '/CANCEL_REASONS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_ENUMERATIONS_UPDATED = SN_UTIL + '/ENUMERATIONS_UPDATED'
+export const UTIL_CURRENT_FACILITY_LATLON_UPDATED = SN_UTIL + '/CURRENT_FACILITY_LATLON_UPDATED'
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 31f36a0b3..618401d32 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -27,5 +27,8 @@ const mutations: MutationTree <UtilState> = {
   [types.UTIL_ENUMERATIONS_UPDATED] (state, payload) {
     state.enumerations = payload
   },
+  [types.UTIL_CURRENT_FACILITY_LATLON_UPDATED] (state, payload) {
+    state.currentFacilityLatLon = payload
+  }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 3cc393db3..3c610f04d 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -39,8 +39,9 @@ import {
   IonToolbar,
   modalController
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { computed, defineComponent } from "vue";
 import { close } from "ionicons/icons";
+import { mapGetters } from "vuex";
 import { useStore } from "@/store";
 import { translate } from "@hotwax/dxp-components";
 
@@ -60,16 +61,24 @@ export default defineComponent({
     IonTitle,
     IonToolbar 
   },
-  props: ["otherStoresInventory"],
+  props: ["otherStoresInventory","currentFacilityId"],
   data() {
     return{
       queryString: "",
       storesInventory: [] as any
     }
   },
-  mounted() {
+  computed: {
+    ...mapGetters({
+      FacilityLatLong: 'util/getCurrentFacilityLatLon',
+    }),
+  },
+  async mounted() {
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
+    
+    // fetch latitude and longitude of the facility by dispaching an action
+    await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
   },
   methods: {
     closeModal() {
diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue
index dab076234..94330d807 100644
--- a/src/views/ProductDetail.vue
+++ b/src/views/ProductDetail.vue
@@ -300,7 +300,7 @@ export default defineComponent({
                 this.warehouseInventory += storeInventory.atp
               } else if (!isCurrentStore) {
                 // Only add to list if it is not a current store
-                this.otherStoresInventoryDetails.push({ facilityName: storeInventory.facilityName, stock: storeInventory.atp })
+                this.otherStoresInventoryDetails.push({ facilityName: storeInventory.facilityName, stock: storeInventory.atp, facilityId: storeInventory.facilityId })
                 this.otherStoresInventory += storeInventory.atp
               }
             }
@@ -314,7 +314,7 @@ export default defineComponent({
     async getOtherStoresInventoryDetails() {
       const otherStoresInventoryModal = await modalController.create({
         component: OtherStoresInventoryModal,
-        componentProps: { otherStoresInventory: this.otherStoresInventoryDetails }
+        componentProps: { otherStoresInventory: this.otherStoresInventoryDetails, currentFacilityId: this.currentFacility?.facilityId }
       });
       return otherStoresInventoryModal.present();
     }

From a285f0a1ffaa3705621e50c81f5191fc237cecd2 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 6 Feb 2025 11:47:55 +0530
Subject: [PATCH 02/15] Fixed: step1 showing lat-long in card, bugfixes.

---
 src/store/modules/util/actions.ts       | 11 +++++++++--
 src/store/modules/util/getters.ts       |  4 ++--
 src/views/OtherStoresInventoryModal.vue | 12 +++++++++++-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index 356fcea50..dbd939ecd 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -396,14 +396,21 @@ const actions: ActionTree<UtilState, RootState> = {
       const resp = await UtilService.fetchCurrentFacilityLatLon(payload)
       
       if (!hasError(resp) && resp.data?.docs.length > 0) {
-        commit(types.UTIL_CURRENT_FACILITY_LATLON_UPDATED, resp.data.docs[0])
+        // Find first doc with non-null coordinates
+        const validCoords = resp.data.docs.find((doc: any) => 
+          doc.latitude !== null && doc.longitude !== null
+        )
+        
+        if (validCoords) {
+          commit(types.UTIL_CURRENT_FACILITY_LATLON_UPDATED, validCoords)
+        }
       } else {
         throw resp.data
       }
     } catch (err) {
       console.error("Failed to fetch facility lat/long information", err)
     }
-  },  
+  },
 }
 
 export default actions;
\ No newline at end of file
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index edbc17975..0de0fe35c 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,8 +27,8 @@ const getters: GetterTree <UtilState, RootState> = {
   getEnumDescription: (state) => (enumId: string) => {
     return state.enumerations[enumId] ? state.enumerations[enumId] : enumId
   },
-  getCurrentFacilityLatLong: (state) => (facilityId: string) => {
-    return state.currentFacilityLatLon[facilityId] ? state.currentFacilityLatLon[facilityId] : {}
+  getCurrentFacilityLatLon: (state) => {
+    return state.currentFacilityLatLon ? state.currentFacilityLatLon : {}
   }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 3c610f04d..fe16bcc27 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -12,6 +12,13 @@
   <ion-content class="ion-padding">
     <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; searchFacilities()"/>
     <ion-list v-if="storesInventory.length">
+      <ion-item>
+  <ion-label>Current Facility Coordinates:</ion-label>
+  <ion-note slot="end">
+    Lat: {{ currentFacilityCoords.latitude }}, 
+    Long: {{ currentFacilityCoords.longitude }}
+  </ion-note>
+</ion-item>
       <ion-item v-for="storeInventory in storesInventory" :key="storeInventory.facilityName">
         <ion-label class="ion-text-wrap">{{ storeInventory.facilityName }}</ion-label>
         <ion-note slot="end">{{ translate('ATP', { count: storeInventory.stock}) }}</ion-note>
@@ -70,8 +77,11 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      FacilityLatLong: 'util/getCurrentFacilityLatLon',
+      FacilityLatLon: 'util/getCurrentFacilityLatLon'
     }),
+    currentFacilityCoords() {
+      return this.FacilityLatLon;
+    }
   },
   async mounted() {
     // Create a copy of otherStoresInventory on mount

From 8e6428933caffa2f7795d300a8cbd35d117dc565 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 6 Feb 2025 12:58:44 +0530
Subject: [PATCH 03/15] Implemented : Step 2- fetching stores using lat-lon to
 obtain distance and operational hours.

---
 src/services/UtilService.ts              | 11 +++++++++-
 src/store/modules/util/UtilState.ts      |  1 +
 src/store/modules/util/actions.ts        | 19 +++++++++++++++++
 src/store/modules/util/getters.ts        |  3 +++
 src/store/modules/util/index.ts          |  1 +
 src/store/modules/util/mutation-types.ts |  1 +
 src/store/modules/util/mutations.ts      |  3 +++
 src/views/OtherStoresInventoryModal.vue  | 26 ++++++++++++++++++++++--
 8 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 0dd991109..5c76e1d4e 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -155,6 +155,14 @@ const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
   });
 }
 
+const fetchStoreLookupByLatLon = async (payload: any): Promise<any> => {
+  return api({
+    url: "storeLookup",
+    method: "post",
+    data: payload
+  });
+}
+
 export const UtilService = {
   createEnumeration,
   createProductStoreSetting,
@@ -172,5 +180,6 @@ export const UtilService = {
   resetPicker,
   updateProductStoreSetting,
   fetchReservedQuantity,
-  fetchCurrentFacilityLatLon
+  fetchCurrentFacilityLatLon,
+  fetchStoreLookupByLatLon
 }
\ No newline at end of file
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 84f0f5494..f7ff1c368 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -8,4 +8,5 @@ export default interface UtilState {
   facilities: any;
   enumerations: any;
   currentFacilityLatLon: any; 
+  storeLookupByLatLon: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index dbd939ecd..07d854805 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -411,6 +411,25 @@ const actions: ActionTree<UtilState, RootState> = {
       console.error("Failed to fetch facility lat/long information", err)
     }
   },
+
+  async fetchStoreLookupByLatLon({ commit }, point) {
+    const payload = {
+      viewSize: 250,
+      filters: ["storeType: RETAIL_STORE"],
+      point: `${point.latitude},${point.longitude}`    }
+      
+    try {
+      const resp = await UtilService.fetchStoreLookupByLatLon(payload)
+
+      if (!hasError(resp) && resp.data?.response?.docs?.length > 0) {
+        commit(types.UTIL_STORE_LOOKUP_BY_LATLON_UPDATED, resp.data.response.docs)
+      } else {
+        throw resp.data
+      }
+    } catch (err) {
+      console.error("Failed to fetch stores by lat/lon information", err)
+    }
+  },
 }
 
 export default actions;
\ No newline at end of file
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 0de0fe35c..71c7513c9 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -29,6 +29,9 @@ const getters: GetterTree <UtilState, RootState> = {
   },
   getCurrentFacilityLatLon: (state) => {
     return state.currentFacilityLatLon ? state.currentFacilityLatLon : {}
+  },
+  getStoreLookupByLatLon: (state) => {
+    return state.storeLookupByLatLon ? state.storeLookupByLatLon : {}
   }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 2fad5e0f5..862a40e26 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -17,6 +17,7 @@ const utilModule: Module<UtilState, RootState> = {
     facilities: {},
     enumerations: {},
     currentFacilityLatLon: {},
+    storeLookupByLatLon: {}
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index c8c956284..94207ec6c 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -8,3 +8,4 @@ export const UTIL_CANCEL_REASONS_UPDATED = SN_UTIL + '/CANCEL_REASONS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_ENUMERATIONS_UPDATED = SN_UTIL + '/ENUMERATIONS_UPDATED'
 export const UTIL_CURRENT_FACILITY_LATLON_UPDATED = SN_UTIL + '/CURRENT_FACILITY_LATLON_UPDATED'
+export const UTIL_STORE_LOOKUP_BY_LATLON_UPDATED = SN_UTIL + '/STORE_LOOKUP_BY_LATLON_UPDATED'
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 618401d32..c6308eaf5 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -29,6 +29,9 @@ const mutations: MutationTree <UtilState> = {
   },
   [types.UTIL_CURRENT_FACILITY_LATLON_UPDATED] (state, payload) {
     state.currentFacilityLatLon = payload
+  },
+  [types.UTIL_STORE_LOOKUP_BY_LATLON_UPDATED] (state, payload) {
+    state.storeLookupByLatLon = payload
   }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index fe16bcc27..c844fced3 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -18,6 +18,11 @@
     Lat: {{ currentFacilityCoords.latitude }}, 
     Long: {{ currentFacilityCoords.longitude }}
   </ion-note>
+  <div v-if="nearbyStores.length">
+  <div v-for="store in nearbyStores" :key="store.identifier">
+    {{ store.storeCode }} - {{ store.dist }} km
+  </div>
+</div>
 </ion-item>
       <ion-item v-for="storeInventory in storesInventory" :key="storeInventory.facilityName">
         <ion-label class="ion-text-wrap">{{ storeInventory.facilityName }}</ion-label>
@@ -77,18 +82,35 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      FacilityLatLon: 'util/getCurrentFacilityLatLon'
+      FacilityLatLon: 'util/getCurrentFacilityLatLon',
+      storeLookupByLatLon: 'util/getStoreLookupByLatLon'
     }),
     currentFacilityCoords() {
       return this.FacilityLatLon;
+    },
+    nearbyStores() {
+      return this.storeLookupByLatLon || [];
     }
   },
   async mounted() {
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
     
-    // fetch latitude and longitude of the facility by dispaching an action
+    // fetch latitude and longitude of the facility by dispatching an action
+    try {
     await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
+
+    if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
+      await this.store.dispatch("util/fetchStoreLookupByLatLon", {
+        latitude: this.currentFacilityCoords.latitude,
+        longitude: this.currentFacilityCoords.longitude
+      });
+    } else {
+      throw new Error('Invalid facility coordinates');
+    }
+  } catch (error) {
+    throw new Error('Error fetching facility coordinates');
+  }
   },
   methods: {
     closeModal() {

From b0d620e0aa8e7b7900c8afc02ec2362c0928534d Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 6 Feb 2025 16:36:24 +0530
Subject: [PATCH 04/15] Implemented: Step 3- atp + storeLookup data in new
 array, alphabetical sorting, distance based sorting, atp based toggle,
 improved search function.

---
 src/views/OtherStoresInventoryModal.vue | 157 ++++++++++++++++--------
 1 file changed, 109 insertions(+), 48 deletions(-)

diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index c844fced3..aa8efd517 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -6,37 +6,49 @@
           <ion-icon :icon="close" />
         </ion-button>
       </ion-buttons>
-      <ion-title>{{ translate("Other stores inventory") }}</ion-title>
+      <ion-title>{{ translate("Other stores") }}</ion-title>
+      <ion-buttons slot="end">
+        <ion-button @click="sortByDistance">
+          <ion-icon slot="icon-only" :icon="locationOutline"
+            :color="activeSortType === 'distance' ? 'primary' : 'medium'"></ion-icon>
+        </ion-button>
+        <ion-button @click="sortByName">
+          <ion-icon slot="icon-only" :icon="textOutline"
+            :color="activeSortType === 'name' ? 'primary' : 'medium'"></ion-icon>
+        </ion-button>
+      </ion-buttons>
     </ion-toolbar>
+    <ion-searchbar v-model="queryString" placeholder="Search store name"
+      @keyup.enter="queryString = $event.target.value; searchFacilities()" />
   </ion-header>
-  <ion-content class="ion-padding">
-    <ion-searchbar v-model="queryString" @keyup.enter="queryString = $event.target.value; searchFacilities()"/>
-    <ion-list v-if="storesInventory.length">
+  <ion-content>
+    <ion-list lines="full">
       <ion-item>
-  <ion-label>Current Facility Coordinates:</ion-label>
-  <ion-note slot="end">
-    Lat: {{ currentFacilityCoords.latitude }}, 
-    Long: {{ currentFacilityCoords.longitude }}
-  </ion-note>
-  <div v-if="nearbyStores.length">
-  <div v-for="store in nearbyStores" :key="store.identifier">
-    {{ store.storeCode }} - {{ store.dist }} km
-  </div>
-</div>
-</ion-item>
-      <ion-item v-for="storeInventory in storesInventory" :key="storeInventory.facilityName">
-        <ion-label class="ion-text-wrap">{{ storeInventory.facilityName }}</ion-label>
-        <ion-note slot="end">{{ translate('ATP', { count: storeInventory.stock}) }}</ion-note>
+        <ion-label>Hide facilities without stock</ion-label>
+        <ion-toggle @click="toggleHideEmptyStock" />
       </ion-item>
+      <div v-if="ATPMappedStoresInventory.length">
+        <ion-item v-for="inventory in ATPMappedStoresInventory" :key="inventory.storeCode">
+          <ion-label class="ion-text-wrap">
+            <p class="overline">{{ inventory.storeCode }}</p>
+            <h2>{{ inventory.storeName }}</h2>
+            <ion-note>open</ion-note>
+            <p v-if="typeof inventory.dist === 'number'">{{ inventory.dist }} miles</p>
+          </ion-label>
+          <ion-button fill="clear" slot="end">
+            <ion-note slot="end">{{ translate('ATP', { count: inventory.stock }) }}</ion-note>
+          </ion-button>
+        </ion-item>
+      </div>
+      <div v-else class="ion-text-center">
+        <p>{{ translate("No inventory details found")}}</p>
+      </div>
     </ion-list>
-    <div v-else class="ion-text-center">
-      <p>{{ translate("No inventory details found")}}</p>
-    </div>
   </ion-content>
 </template>
 
 <script lang="ts">
-import { 
+import {
   IonButtons,
   IonButton,
   IonContent,
@@ -52,14 +64,14 @@ import {
   modalController
 } from "@ionic/vue";
 import { computed, defineComponent } from "vue";
-import { close } from "ionicons/icons";
+import { close, locationOutline, textOutline } from "ionicons/icons";
 import { mapGetters } from "vuex";
 import { useStore } from "@/store";
 import { translate } from "@hotwax/dxp-components";
 
 export default defineComponent({
   name: "OtherStoresInventoryModal",
-  components: { 
+  components: {
     IonButtons,
     IonButton,
     IonContent,
@@ -71,13 +83,16 @@ export default defineComponent({
     IonNote,
     IonSearchbar,
     IonTitle,
-    IonToolbar 
+    IonToolbar
   },
-  props: ["otherStoresInventory","currentFacilityId"],
+  props: ["otherStoresInventory", "currentFacilityId"],
   data() {
-    return{
+    return {
       queryString: "",
-      storesInventory: [] as any
+      storesInventory: [] as any, // will be replaced
+      ATPMappedStoresInventory: [] as any, // will be used.
+      hideEmptyStores: false,
+      activeSortType: "name",
     }
   },
   computed: {
@@ -95,40 +110,86 @@ export default defineComponent({
   async mounted() {
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
-    
+
     // fetch latitude and longitude of the facility by dispatching an action
     try {
-    await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
+      await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
 
-    if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
-      await this.store.dispatch("util/fetchStoreLookupByLatLon", {
-        latitude: this.currentFacilityCoords.latitude,
-        longitude: this.currentFacilityCoords.longitude
-      });
-    } else {
-      throw new Error('Invalid facility coordinates');
+      if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
+        await this.store.dispatch("util/fetchStoreLookupByLatLon", {
+          latitude: this.currentFacilityCoords.latitude,
+          longitude: this.currentFacilityCoords.longitude
+        });
+        this.ATPMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+        // Sort by name by default
+        this.sortByName();
+      } else {
+        throw new Error('Invalid facility coordinates');
+      }
+    } catch (error) {
+      throw new Error('Error fetching facility coordinates');
     }
-  } catch (error) {
-    throw new Error('Error fetching facility coordinates');
-  }
   },
   methods: {
     closeModal() {
       modalController.dismiss({ dismissed: true });
     },
-    searchFacilities(){
-      if (this.queryString.trim() !== "") {
-        this.storesInventory = this.otherStoresInventory.filter((facility: any) => facility.facilityName.toLowerCase().includes(this.queryString.toLowerCase()));
-      } else {
-        // Reset storesInventory when query is empty
-        this.storesInventory = this.otherStoresInventory.slice(); 
-      }
-    }
+    searchFacilities() {
+      // First get the full mapped inventory
+      let filteredInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+  
+  // Apply search filter if query exists
+  if (this.queryString.trim() !== "") {
+    filteredInventory = filteredInventory.filter((store: any) =>
+      store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
+    );
+  }
+  
+  // Apply hide empty stores filter if active
+  if (this.hideEmptyStores) {
+    filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
+  }
+  
+  this.ATPMappedStoresInventory = filteredInventory;
+}
+,
+mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
+  // Skip first item (current facility) using slice(1)
+  return storeLookupByLatLon.slice(1).map((store, index) => {
+    const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
+    return {
+      ...store,
+      index: index + 1,
+      stock: matchingFacility ? matchingFacility.stock : 0
+    };
+  });
+},
+sortByDistance() {
+  this.activeSortType = 'distance';
+  this.ATPMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
+},
+
+sortByName() {
+  this.activeSortType = 'name';
+  this.ATPMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
+},
+toggleHideEmptyStock() {
+  this.hideEmptyStores = !this.hideEmptyStores;
+  if (this.hideEmptyStores) {
+    this.ATPMappedStoresInventory = this.ATPMappedStoresInventory.filter((store: any) => store.stock > 0);
+  } else {
+    // Reset to full list
+    this.ATPMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+  }
+}
+
   },
   setup() {
     const store = useStore();
     return {
       close,
+      locationOutline,
+      textOutline,
       store,
       translate
     };

From 155f26caf36834642d640267093e26ab6769a41c Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Fri, 7 Feb 2025 16:45:43 +0530
Subject: [PATCH 05/15] Implemented: Step 4 : all features implemented.

---
 src/views/OtherStoresInventoryModal.vue | 250 +++++++++++++++++-------
 1 file changed, 177 insertions(+), 73 deletions(-)

diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index aa8efd517..d09f82d26 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -18,37 +18,62 @@
         </ion-button>
       </ion-buttons>
     </ion-toolbar>
-    <ion-searchbar v-model="queryString" placeholder="Search store name"
+    <ion-searchbar v-model="queryString" placeholder="Search store name" :debounce="500"
+      @ionInput="queryString = $event.target.value; searchFacilities()"
       @keyup.enter="queryString = $event.target.value; searchFacilities()" />
   </ion-header>
   <ion-content>
-    <ion-list lines="full">
+    <ion-list>
       <ion-item>
         <ion-label>Hide facilities without stock</ion-label>
         <ion-toggle @click="toggleHideEmptyStock" />
       </ion-item>
-      <div v-if="ATPMappedStoresInventory.length">
-        <ion-item v-for="inventory in ATPMappedStoresInventory" :key="inventory.storeCode">
+    </ion-list>
+    <ion-accordion-group v-if="atpMappedStoresInventory.length">
+      <ion-accordion v-for="inventory in atpMappedStoresInventory" :key="inventory.storeCode"
+        :value="String(inventory.storeCode)" :toggle-icon="hasWeekCalendar(inventory) ? caretDownCircle : false"
+        :readonly="!hasWeekCalendar(inventory)">
+        <ion-item slot="header" lines="inset">
           <ion-label class="ion-text-wrap">
             <p class="overline">{{ inventory.storeCode }}</p>
             <h2>{{ inventory.storeName }}</h2>
-            <ion-note>open</ion-note>
-            <p v-if="typeof inventory.dist === 'number'">{{ inventory.dist }} miles</p>
+            <ion-note v-if="hasWeekCalendar(inventory)" :color="inventory.isOpen ? '' : 'danger'">
+              {{ inventory.hoursDisplay }}
+            </ion-note>
+            <p v-if="typeof inventory.dist === 'number'">{{ Math.round(inventory.dist) }} miles</p>
           </ion-label>
           <ion-button fill="clear" slot="end">
             <ion-note slot="end">{{ translate('ATP', { count: inventory.stock }) }}</ion-note>
           </ion-button>
         </ion-item>
-      </div>
-      <div v-else class="ion-text-center">
-        <p>{{ translate("No inventory details found")}}</p>
-      </div>
-    </ion-list>
+        <div class="ion-padding" slot="content" v-if="hasWeekCalendar(inventory)">
+          <ion-list lines="none">
+            <ion-item v-for="day in weekArray" :key="day">
+              <ion-label>
+                <p>{{ capitalizeFirst(day) }}</p>
+              </ion-label>
+              <ion-label slot="end">
+                <p v-if="inventory[`${day}_open`] && inventory[`${day}_close`]">
+                  {{ formatTime(inventory[`${day}_open`]) }} - {{ formatTime(inventory[`${day}_close`]) }}
+                </p>
+                <p v-else>Closed</p>
+              </ion-label>
+            </ion-item>
+          </ion-list>
+        </div>
+      </ion-accordion>
+    </ion-accordion-group>
+    <div v-else class="ion-text-center">
+      <ion-spinner v-if="isRefreshing" name="crescent" />
+      <p v-else>{{ translate("No inventory details found") }}</p>
+    </div>
   </ion-content>
 </template>
 
 <script lang="ts">
 import {
+  IonAccordionGroup,
+  IonAccordion,
   IonButtons,
   IonButton,
   IonContent,
@@ -56,22 +81,25 @@ import {
   IonItem,
   IonIcon,
   IonLabel,
-  IonList,
   IonNote,
   IonSearchbar,
   IonTitle,
   IonToolbar,
-  modalController
+  modalController,
+  IonSpinner
 } from "@ionic/vue";
-import { computed, defineComponent } from "vue";
+import { defineComponent } from "vue";
 import { close, locationOutline, textOutline } from "ionicons/icons";
 import { mapGetters } from "vuex";
 import { useStore } from "@/store";
 import { translate } from "@hotwax/dxp-components";
+import { DateTime } from "luxon";
 
 export default defineComponent({
   name: "OtherStoresInventoryModal",
   components: {
+    IonAccordionGroup,
+    IonAccordion,
     IonButtons,
     IonButton,
     IonContent,
@@ -79,20 +107,22 @@ export default defineComponent({
     IonIcon,
     IonItem,
     IonLabel,
-    IonList,
     IonNote,
     IonSearchbar,
     IonTitle,
-    IonToolbar
+    IonToolbar,
+    IonSpinner
   },
   props: ["otherStoresInventory", "currentFacilityId"],
   data() {
     return {
       queryString: "",
-      storesInventory: [] as any, // will be replaced
-      ATPMappedStoresInventory: [] as any, // will be used.
+      isRefreshing: false,
+      storesInventory: [] as any, // will be used when fallback
+      atpMappedStoresInventory: [] as any, // will be used primarily.
       hideEmptyStores: false,
-      activeSortType: "name",
+      activeSortType: "name", // 'name' or 'distance'
+      weekArray: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
     }
   },
   computed: {
@@ -105,84 +135,158 @@ export default defineComponent({
     },
     nearbyStores() {
       return this.storeLookupByLatLon || [];
-    }
+    },
   },
   async mounted() {
+    this.isRefreshing = true;
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
-
-    // fetch latitude and longitude of the facility by dispatching an action
+    // Fetching Lat Lon for current facility and then fetching store lookup
     try {
       await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
-
       if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
         await this.store.dispatch("util/fetchStoreLookupByLatLon", {
           latitude: this.currentFacilityCoords.latitude,
           longitude: this.currentFacilityCoords.longitude
         });
-        this.ATPMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
-        // Sort by name by default
-        this.sortByName();
-      } else {
-        throw new Error('Invalid facility coordinates');
+        this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
       }
     } catch (error) {
-      throw new Error('Error fetching facility coordinates');
+      // Fallback mapping when APIs fail
+      this.atpMappedStoresInventory = this.storesInventory.map((facility: any) => ({
+        storeCode: facility.facilityId,
+        storeName: facility.facilityName,
+        stock: facility.stock
+      }));
+    } finally {
+      this.isRefreshing = false;
     }
+    // Sort by name by default in all cases
+    this.sortByName();
   },
   methods: {
     closeModal() {
       modalController.dismiss({ dismissed: true });
     },
     searchFacilities() {
+      this.isRefreshing = true;
       // First get the full mapped inventory
       let filteredInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
-  
-  // Apply search filter if query exists
-  if (this.queryString.trim() !== "") {
-    filteredInventory = filteredInventory.filter((store: any) =>
-      store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
-    );
-  }
-  
-  // Apply hide empty stores filter if active
-  if (this.hideEmptyStores) {
-    filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
-  }
-  
-  this.ATPMappedStoresInventory = filteredInventory;
-}
-,
-mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
-  // Skip first item (current facility) using slice(1)
-  return storeLookupByLatLon.slice(1).map((store, index) => {
-    const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
-    return {
-      ...store,
-      index: index + 1,
-      stock: matchingFacility ? matchingFacility.stock : 0
-    };
-  });
-},
-sortByDistance() {
-  this.activeSortType = 'distance';
-  this.ATPMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
-},
+      if (this.queryString.trim() !== "") {
+        filteredInventory = filteredInventory.filter((store: any) =>
+          store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
+        );
+      }
 
-sortByName() {
-  this.activeSortType = 'name';
-  this.ATPMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
-},
-toggleHideEmptyStock() {
-  this.hideEmptyStores = !this.hideEmptyStores;
-  if (this.hideEmptyStores) {
-    this.ATPMappedStoresInventory = this.ATPMappedStoresInventory.filter((store: any) => store.stock > 0);
-  } else {
-    // Reset to full list
-    this.ATPMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
-  }
-}
+      // Apply hide empty stores filter if active
+      if (this.hideEmptyStores) {
+        filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
+      }
 
+      this.atpMappedStoresInventory = filteredInventory;
+      this.isRefreshing = false;
+    },
+    // method to map the facilitty inventory to the store lookup data
+    mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
+      // skip first item (current facility) using slice(1)
+      return storeLookupByLatLon.slice(1).map((store, index) => {
+        // Find the matching facility in the storesInventory array based on facilityId
+        const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
+        // Get the store hours status
+        const storeHoursInfo = this.getStoreHoursStatus(store);
+        // Return the modified object
+        return {
+          ...store,
+          index: index + 1,
+          stock: matchingFacility ? matchingFacility.stock : 0,
+          hoursDisplay: storeHoursInfo.display,
+          isOpen: storeHoursInfo.isOpen
+        };
+      });
+    },
+    // method to sort the stores by distance 
+    sortByDistance() {
+      this.activeSortType = 'distance';
+      this.atpMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
+    },
+    // method to sort the stores by name
+    sortByName() {
+      this.activeSortType = 'name';
+      this.atpMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
+    },
+    // method to run the current filter to maintain the current sort type when toggling empty stock toggle
+    runCurrentFilter() {
+      if (this.activeSortType === 'distance') {
+        this.atpMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
+      } else if (this.activeSortType === 'name') {
+        this.atpMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
+      }
+    },
+    // method to handle empty stock toggle
+    toggleHideEmptyStock() {
+      this.hideEmptyStores = !this.hideEmptyStores;
+      if (this.hideEmptyStores) {
+        this.atpMappedStoresInventory = this.atpMappedStoresInventory.filter((store: any) => store.stock > 0);
+      } else {
+        // Reset to full list
+        this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+      }
+      // Run the current filter to maintain the current sort type
+      this.runCurrentFilter();
+    },
+    getCurrentWeekday() {
+      const today = DateTime.now()
+      // Get weekday index (1-7, Monday is 1, Sunday is 7)
+      const weekdayIndex = today.weekday
+      // Convert to 0-6 index (Sunday is 0, Monday is 1)
+      const momentWeekday = weekdayIndex === 7 ? 0 : weekdayIndex
+      return momentWeekday
+    },
+    // method to get the store hours status
+    getStoreHoursStatus(store: any) {
+      const currentDay = this.weekArray[this.getCurrentWeekday()];
+      const hasCalendar = Object.keys(store).some(key => /_open$|_close$/.test(key));
+
+      // Case 1: No calendar at all - return empty
+      if (!hasCalendar) {
+        return { display: '', isOpen: false };
+      }
+
+      const openKey = `${currentDay}_open`;
+      const closeKey = `${currentDay}_close`;
+
+      // Case 2: Has calendar and today's hours
+      if (store[openKey] && store[closeKey]) {
+        const now = DateTime.now();
+        const openTime = DateTime.fromFormat(store[openKey], 'HH:mm:ss');
+        const closeTime = DateTime.fromFormat(store[closeKey], 'HH:mm:ss');
+
+        const openDisplay = openTime.toFormat('ha').toLowerCase();
+        const closeDisplay = closeTime.toFormat('ha').toLowerCase();
+
+        const isOpen = now >= openTime && now <= closeTime;
+
+        return {
+          display: isOpen ? `Open: ${openDisplay} - ${closeDisplay}` : 'Closed',
+          isOpen
+        };
+      }
+
+      // Case 3: Has calendar but no hours for today
+      else return {
+        display: 'Closed',
+        isOpen: false
+      };
+    },
+    hasWeekCalendar(store: any): boolean {
+      return Object.keys(store).some(key => /_open$|_close$/.test(key));
+    },
+    capitalizeFirst(string: string): string {
+      return string.charAt(0).toUpperCase() + string.slice(1);
+    },
+    formatTime(time: string): string {
+      return DateTime.fromFormat(time, 'HH:mm:ss').toFormat('h:mm a');
+    },
   },
   setup() {
     const store = useStore();

From 1b817902771f33af4735f242edb7cc1844507c60 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Fri, 7 Feb 2025 16:52:36 +0530
Subject: [PATCH 06/15] Implemented: Clean up UI for BOPIS inventory lookup
 (#470)

---
 src/views/OtherStoresInventoryModal.vue | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index d09f82d26..02710aae1 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -170,31 +170,23 @@ export default defineComponent({
     },
     searchFacilities() {
       this.isRefreshing = true;
-      // First get the full mapped inventory
       let filteredInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
       if (this.queryString.trim() !== "") {
         filteredInventory = filteredInventory.filter((store: any) =>
           store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
         );
       }
-
-      // Apply hide empty stores filter if active
       if (this.hideEmptyStores) {
         filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
       }
-
       this.atpMappedStoresInventory = filteredInventory;
       this.isRefreshing = false;
     },
-    // method to map the facilitty inventory to the store lookup data
+    // method to map the facilitty inventory from props to the store lookup data from api call
     mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
-      // skip first item (current facility) using slice(1)
-      return storeLookupByLatLon.slice(1).map((store, index) => {
-        // Find the matching facility in the storesInventory array based on facilityId
+      return storeLookupByLatLon.slice(1).map((store, index) => {  // skips first item (current facility)
         const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
-        // Get the store hours status
         const storeHoursInfo = this.getStoreHoursStatus(store);
-        // Return the modified object
         return {
           ...store,
           index: index + 1,
@@ -228,7 +220,6 @@ export default defineComponent({
       if (this.hideEmptyStores) {
         this.atpMappedStoresInventory = this.atpMappedStoresInventory.filter((store: any) => store.stock > 0);
       } else {
-        // Reset to full list
         this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
       }
       // Run the current filter to maintain the current sort type

From f43466e913f1e292cedca45ad1b31dd37e9c8f85 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Mon, 10 Feb 2025 10:41:02 +0530
Subject: [PATCH 07/15] Improved: created a new branch with issue-number, added
 internalization texts in locales/ files and code improvements.

---
 src/locales/en.json                     |  2 ++
 src/locales/es.json                     |  2 ++
 src/locales/ja.json                     |  2 ++
 src/views/OtherStoresInventoryModal.vue | 32 +++++++++++++------------
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index d70406faf..9f65304fe 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -72,6 +72,7 @@
   "Go to Launchpad": "Go to Launchpad",
   "Handover": "Handover",
   "Handling Instructions": "Handling Instructions",
+  "Hide facilities without stock": "Hide facilities without stock",
   "If you cannot fulfill this order, will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.": "If you cannot fulfill this order, {customerName} will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.",
   "Imported from Shopify": "Imported from Shopify",
   "Inactive store": "Inactive store",
@@ -192,6 +193,7 @@
   "Safety stock": "Safety stock",
   "Search": "Search",
   "Search Orders": "Search Orders",
+  "Search store name": "Search store name",
   "Search time zones": "Search time zones",
   "Secondary": "Secondary",
   "Select facility": "Select facility",
diff --git a/src/locales/es.json b/src/locales/es.json
index f0dac653c..765e784d1 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -71,6 +71,7 @@
   "Go to Launchpad": "Ir a la plataforma de lanzamiento",
   "Handover": "Entregar",
   "Handling Instructions": "Instrucciones de manejo",
+  "Hide facilities without stock": "Hide facilities without stock",
   "Imported from Shopify": "Imported from Shopify",
   "Inactive store": "Tienda inactiva",
   "in stock": "en stock",
@@ -189,6 +190,7 @@
   "Safety stock": "Safety stock",
   "Search": "Buscar",
   "Search Orders": "Buscar pedidos",
+  "Search store name": "Search store name",
   "Search time zones": "Buscar zonas horarias",
   "Secondary": "Secondary",
   "Select facility": "Seleccionar instalación",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index c6a607a9c..f4cc3d7dd 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -69,6 +69,7 @@
   "Go to Launchpad": "Launchpadへ移動",
   "Handover": "引き継ぐ",
   "Handling Instructions": "取扱説明",
+  "Hide facilities without stock": "Hide facilities without stock",
   "Imported from Shopify": "Imported from Shopify",
   "Inactive store": "休止店舗",
   "in stock": "在庫あり",
@@ -185,6 +186,7 @@
   "Safety stock": "安全在庫",
   "Search": "検索",
   "Search Orders": "注文の検索",
+  "Search store name": "Search store name",
   "Search time zones": "タイムゾーンの検索",
   "Secondary": "Secondary",
   "Select Facility": "Select Facility",
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 02710aae1..a311e717e 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -18,20 +18,20 @@
         </ion-button>
       </ion-buttons>
     </ion-toolbar>
-    <ion-searchbar v-model="queryString" placeholder="Search store name" :debounce="500"
+    <ion-searchbar v-model="queryString" :placeholder="translate('Search store name')" :debounce="500"
       @ionInput="queryString = $event.target.value; searchFacilities()"
       @keyup.enter="queryString = $event.target.value; searchFacilities()" />
   </ion-header>
   <ion-content>
     <ion-list>
       <ion-item>
-        <ion-label>Hide facilities without stock</ion-label>
+        <ion-label>{{ translate("Hide facilities without stock") }}</ion-label>
         <ion-toggle @click="toggleHideEmptyStock" />
       </ion-item>
     </ion-list>
     <ion-accordion-group v-if="atpMappedStoresInventory.length">
       <ion-accordion v-for="inventory in atpMappedStoresInventory" :key="inventory.storeCode"
-        :value="String(inventory.storeCode)" :toggle-icon="hasWeekCalendar(inventory) ? caretDownCircle : false"
+        :value="String(inventory.storeCode)" :toggle-icon="hasWeekCalendar(inventory) ? chevronDownOutline : false"
         :readonly="!hasWeekCalendar(inventory)">
         <ion-item slot="header" lines="inset">
           <ion-label class="ion-text-wrap">
@@ -81,15 +81,17 @@ import {
   IonItem,
   IonIcon,
   IonLabel,
+  IonList,
   IonNote,
   IonSearchbar,
   IonTitle,
+  IonToggle,
   IonToolbar,
   modalController,
   IonSpinner
 } from "@ionic/vue";
 import { defineComponent } from "vue";
-import { close, locationOutline, textOutline } from "ionicons/icons";
+import { close, locationOutline, textOutline, chevronDownOutline } from "ionicons/icons";
 import { mapGetters } from "vuex";
 import { useStore } from "@/store";
 import { translate } from "@hotwax/dxp-components";
@@ -107,9 +109,11 @@ export default defineComponent({
     IonIcon,
     IonItem,
     IonLabel,
+    IonList,
     IonNote,
     IonSearchbar,
     IonTitle,
+    IonToggle,
     IonToolbar,
     IonSpinner
   },
@@ -161,7 +165,7 @@ export default defineComponent({
     } finally {
       this.isRefreshing = false;
     }
-    // Sort by name by default in all cases
+    // Sort by name by default
     this.sortByName();
   },
   methods: {
@@ -182,7 +186,7 @@ export default defineComponent({
       this.atpMappedStoresInventory = filteredInventory;
       this.isRefreshing = false;
     },
-    // method to map the facilitty inventory from props to the store lookup data from api call
+    // method to map the facility inventory from props to the store lookup data from api call
     mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
       return storeLookupByLatLon.slice(1).map((store, index) => {  // skips first item (current facility)
         const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
@@ -209,9 +213,9 @@ export default defineComponent({
     // method to run the current filter to maintain the current sort type when toggling empty stock toggle
     runCurrentFilter() {
       if (this.activeSortType === 'distance') {
-        this.atpMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
+        this.sortByDistance();
       } else if (this.activeSortType === 'name') {
-        this.atpMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
+        this.sortByName();
       }
     },
     // method to handle empty stock toggle
@@ -222,14 +226,11 @@ export default defineComponent({
       } else {
         this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
       }
-      // Run the current filter to maintain the current sort type
-      this.runCurrentFilter();
+      this.runCurrentFilter();   // Run the current filter to maintain the current sort type
     },
     getCurrentWeekday() {
-      const today = DateTime.now()
-      // Get weekday index (1-7, Monday is 1, Sunday is 7)
-      const weekdayIndex = today.weekday
-      // Convert to 0-6 index (Sunday is 0, Monday is 1)
+      const today = DateTime.now() // Get weekday index (1-7, Monday is 1, Sunday is 7)
+      const weekdayIndex = today.weekday // Convert to 0-6 index (Sunday is 0, Monday is 1)
       const momentWeekday = weekdayIndex === 7 ? 0 : weekdayIndex
       return momentWeekday
     },
@@ -286,7 +287,8 @@ export default defineComponent({
       locationOutline,
       textOutline,
       store,
-      translate
+      translate,
+      chevronDownOutline
     };
   }
 });

From bd015e17f33d77090df139192210271053d04cca Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Tue, 11 Feb 2025 11:39:51 +0530
Subject: [PATCH 08/15] Improved: code improvements after review, including
 stores with infinite distances.

---
 src/services/UtilService.ts              |  8 +--
 src/store/modules/util/UtilState.ts      |  4 +-
 src/store/modules/util/actions.ts        | 18 +++---
 src/store/modules/util/getters.ts        |  8 +--
 src/store/modules/util/index.ts          |  4 +-
 src/store/modules/util/mutation-types.ts |  4 +-
 src/store/modules/util/mutations.ts      |  8 +--
 src/views/OtherStoresInventoryModal.vue  | 73 +++++++++++++-----------
 8 files changed, 68 insertions(+), 59 deletions(-)

diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 5c76e1d4e..dae7b250d 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -147,7 +147,7 @@ const fetchEnumerations = async (payload: any): Promise<any> => {
   });
 }
 
-const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
+const fetchCurrentFacilityInformation = async (payload: any): Promise<any> => {
   return api({
     url: "performFind",
     method: "post",
@@ -155,7 +155,7 @@ const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
   });
 }
 
-const fetchStoreLookupByLatLon = async (payload: any): Promise<any> => {
+const fetchStoresInformation = async (payload: any): Promise<any> => {
   return api({
     url: "storeLookup",
     method: "post",
@@ -180,6 +180,6 @@ export const UtilService = {
   resetPicker,
   updateProductStoreSetting,
   fetchReservedQuantity,
-  fetchCurrentFacilityLatLon,
-  fetchStoreLookupByLatLon
+  fetchCurrentFacilityInformation,
+  fetchStoresInformation
 }
\ No newline at end of file
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index f7ff1c368..8f807ae69 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,6 +7,6 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   facilities: any;
   enumerations: any;
-  currentFacilityLatLon: any; 
-  storeLookupByLatLon: any;
+  currentFacilityInformation: any; 
+  storesInformation: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index 07d854805..c1a1bede9 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -380,10 +380,10 @@ const actions: ActionTree<UtilState, RootState> = {
     commit(types.UTIL_ENUMERATIONS_UPDATED, {})
   },
 
-  async fetchCurrentFacilityLatLon({ commit }, facilityId) {
+  async fetchCurrentFacilityInformation({ commit }, facilityId) {
     const payload = {
       inputFields: {
-        facilityId: facilityId
+        facilityId
       },
       entityName: "FacilityContactDetailByPurpose",
       orderBy: "fromDate DESC",
@@ -393,7 +393,7 @@ const actions: ActionTree<UtilState, RootState> = {
     }
 
     try {
-      const resp = await UtilService.fetchCurrentFacilityLatLon(payload)
+      const resp = await UtilService.fetchCurrentFacilityInformation(payload)
       
       if (!hasError(resp) && resp.data?.docs.length > 0) {
         // Find first doc with non-null coordinates
@@ -402,32 +402,32 @@ const actions: ActionTree<UtilState, RootState> = {
         )
         
         if (validCoords) {
-          commit(types.UTIL_CURRENT_FACILITY_LATLON_UPDATED, validCoords)
+          commit(types.UTIL_CURRENT_FACILITY_INFORMATION_UPDATED, validCoords)
         }
       } else {
         throw resp.data
       }
     } catch (err) {
-      console.error("Failed to fetch facility lat/long information", err)
+      logger.error("Failed to fetch facility lat/long information", err)
     }
   },
 
-  async fetchStoreLookupByLatLon({ commit }, point) {
+  async fetchStoresInformation({ commit }, point) {
     const payload = {
       viewSize: 250,
       filters: ["storeType: RETAIL_STORE"],
       point: `${point.latitude},${point.longitude}`    }
       
     try {
-      const resp = await UtilService.fetchStoreLookupByLatLon(payload)
+      const resp = await UtilService.fetchStoresInformation(payload)
 
       if (!hasError(resp) && resp.data?.response?.docs?.length > 0) {
-        commit(types.UTIL_STORE_LOOKUP_BY_LATLON_UPDATED, resp.data.response.docs)
+        commit(types.UTIL_STORES_INFORMATION_UPDATED, resp.data.response.docs)
       } else {
         throw resp.data
       }
     } catch (err) {
-      console.error("Failed to fetch stores by lat/lon information", err)
+      logger.error("Failed to fetch stores information by lat/lon", err)
     }
   },
 }
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index 71c7513c9..d45fb1c4b 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,11 +27,11 @@ const getters: GetterTree <UtilState, RootState> = {
   getEnumDescription: (state) => (enumId: string) => {
     return state.enumerations[enumId] ? state.enumerations[enumId] : enumId
   },
-  getCurrentFacilityLatLon: (state) => {
-    return state.currentFacilityLatLon ? state.currentFacilityLatLon : {}
+  getCurrentFacilityInformation: (state) => {
+    return state.currentFacilityInformation ? state.currentFacilityInformation : {}
   },
-  getStoreLookupByLatLon: (state) => {
-    return state.storeLookupByLatLon ? state.storeLookupByLatLon : {}
+  getStoresInformation: (state) => {
+    return state.storesInformation ? state.storesInformation : {}
   }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 862a40e26..5aa3bee15 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -16,8 +16,8 @@ const utilModule: Module<UtilState, RootState> = {
     cancelReasons: [],
     facilities: {},
     enumerations: {},
-    currentFacilityLatLon: {},
-    storeLookupByLatLon: {}
+    currentFacilityInformation: {},
+    storesInformation: {}
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 94207ec6c..32aa0bdf6 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,5 +7,5 @@ export const UTIL_PARTY_NAMES_UPDATED = SN_UTIL + '/PARTY_NAMES_UPDATED'
 export const UTIL_CANCEL_REASONS_UPDATED = SN_UTIL + '/CANCEL_REASONS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_ENUMERATIONS_UPDATED = SN_UTIL + '/ENUMERATIONS_UPDATED'
-export const UTIL_CURRENT_FACILITY_LATLON_UPDATED = SN_UTIL + '/CURRENT_FACILITY_LATLON_UPDATED'
-export const UTIL_STORE_LOOKUP_BY_LATLON_UPDATED = SN_UTIL + '/STORE_LOOKUP_BY_LATLON_UPDATED'
+export const UTIL_CURRENT_FACILITY_INFORMATION_UPDATED = SN_UTIL + '/CURRENT_FACILITY_INFORMATION_UPDATED'
+export const UTIL_STORES_INFORMATION_UPDATED = SN_UTIL + '/STORES_INFORMATION_UPDATED'
\ No newline at end of file
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index c6308eaf5..fd875c66a 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -27,11 +27,11 @@ const mutations: MutationTree <UtilState> = {
   [types.UTIL_ENUMERATIONS_UPDATED] (state, payload) {
     state.enumerations = payload
   },
-  [types.UTIL_CURRENT_FACILITY_LATLON_UPDATED] (state, payload) {
-    state.currentFacilityLatLon = payload
+  [types.UTIL_CURRENT_FACILITY_INFORMATION_UPDATED] (state, payload) {
+    state.currentFacilityInformation = payload
   },
-  [types.UTIL_STORE_LOOKUP_BY_LATLON_UPDATED] (state, payload) {
-    state.storeLookupByLatLon = payload
+  [types.UTIL_STORES_INFORMATION_UPDATED] (state, payload) {
+    state.storesInformation = payload
   }
 }
 export default mutations;
\ No newline at end of file
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index a311e717e..c3b26603a 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -29,32 +29,31 @@
         <ion-toggle @click="toggleHideEmptyStock" />
       </ion-item>
     </ion-list>
-    <ion-accordion-group v-if="atpMappedStoresInventory.length">
-      <ion-accordion v-for="inventory in atpMappedStoresInventory" :key="inventory.storeCode"
-        :value="String(inventory.storeCode)" :toggle-icon="hasWeekCalendar(inventory) ? chevronDownOutline : false"
-        :readonly="!hasWeekCalendar(inventory)">
+    <ion-accordion-group v-if="storesWithInventory.length">
+      <ion-accordion v-for="store in storesWithInventory" :key="store.storeCode" :value="store.storeCode"
+        :toggle-icon="hasWeekCalendar(store) ? chevronDownOutline : false" :readonly="!hasWeekCalendar(store)">
         <ion-item slot="header" lines="inset">
           <ion-label class="ion-text-wrap">
-            <p class="overline">{{ inventory.storeCode }}</p>
-            <h2>{{ inventory.storeName }}</h2>
-            <ion-note v-if="hasWeekCalendar(inventory)" :color="inventory.isOpen ? '' : 'danger'">
-              {{ inventory.hoursDisplay }}
+            <p class="overline">{{ store.storeCode }}</p>
+            <h2>{{ store.storeName }}</h2>
+            <ion-note v-if="hasWeekCalendar(store)" :color="store.isOpen ? '' : 'danger'">
+              {{ store.hoursDisplay }}
             </ion-note>
-            <p v-if="typeof inventory.dist === 'number'">{{ Math.round(inventory.dist) }} miles</p>
+            <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} miles</p>
           </ion-label>
-          <ion-button fill="clear" slot="end">
-            <ion-note slot="end">{{ translate('ATP', { count: inventory.stock }) }}</ion-note>
-          </ion-button>
+          <div slot="end">
+            <ion-note slot="end">{{ translate('ATP', { count: store.stock }) }}</ion-note>
+          </div>
         </ion-item>
-        <div class="ion-padding" slot="content" v-if="hasWeekCalendar(inventory)">
+        <div class="ion-padding" slot="content" v-if="hasWeekCalendar(store)">
           <ion-list lines="none">
             <ion-item v-for="day in weekArray" :key="day">
               <ion-label>
                 <p>{{ capitalizeFirst(day) }}</p>
               </ion-label>
               <ion-label slot="end">
-                <p v-if="inventory[`${day}_open`] && inventory[`${day}_close`]">
-                  {{ formatTime(inventory[`${day}_open`]) }} - {{ formatTime(inventory[`${day}_close`]) }}
+                <p v-if="store[`${day}_open`] && store[`${day}_close`]">
+                  {{ formatTime(store[`${day}_open`]) }} - {{ formatTime(store[`${day}_close`]) }}
                 </p>
                 <p v-else>Closed</p>
               </ion-label>
@@ -123,7 +122,7 @@ export default defineComponent({
       queryString: "",
       isRefreshing: false,
       storesInventory: [] as any, // will be used when fallback
-      atpMappedStoresInventory: [] as any, // will be used primarily.
+      storesWithInventory: [] as any, // will be used primarily.
       hideEmptyStores: false,
       activeSortType: "name", // 'name' or 'distance'
       weekArray: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
@@ -131,14 +130,14 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      FacilityLatLon: 'util/getCurrentFacilityLatLon',
-      storeLookupByLatLon: 'util/getStoreLookupByLatLon'
+      FacilityInformation: 'util/getCurrentFacilityInformation',
+      storesInformation: 'util/getStoresInformation'
     }),
     currentFacilityCoords() {
-      return this.FacilityLatLon;
+      return this.FacilityInformation;
     },
     nearbyStores() {
-      return this.storeLookupByLatLon || [];
+      return this.storesInformation || [];
     },
   },
   async mounted() {
@@ -147,17 +146,17 @@ export default defineComponent({
     this.storesInventory = this.otherStoresInventory.slice();
     // Fetching Lat Lon for current facility and then fetching store lookup
     try {
-      await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
+      await this.store.dispatch("util/fetchCurrentFacilityInformation", this.currentFacilityId);
       if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
-        await this.store.dispatch("util/fetchStoreLookupByLatLon", {
+        await this.store.dispatch("util/fetchStoresInformation", {
           latitude: this.currentFacilityCoords.latitude,
           longitude: this.currentFacilityCoords.longitude
         });
-        this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+        this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
       }
     } catch (error) {
       // Fallback mapping when APIs fail
-      this.atpMappedStoresInventory = this.storesInventory.map((facility: any) => ({
+      this.storesWithInventory = this.storesInventory.map((facility: any) => ({
         storeCode: facility.facilityId,
         storeName: facility.facilityName,
         stock: facility.stock
@@ -174,7 +173,7 @@ export default defineComponent({
     },
     searchFacilities() {
       this.isRefreshing = true;
-      let filteredInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+      let filteredInventory = this.mapStock(this.storesInventory, this.storesInformation);
       if (this.queryString.trim() !== "") {
         filteredInventory = filteredInventory.filter((store: any) =>
           store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
@@ -183,12 +182,12 @@ export default defineComponent({
       if (this.hideEmptyStores) {
         filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
       }
-      this.atpMappedStoresInventory = filteredInventory;
+      this.storesWithInventory = filteredInventory;
       this.isRefreshing = false;
     },
     // method to map the facility inventory from props to the store lookup data from api call
-    mapStock(storesInventory: any[], storeLookupByLatLon: any[]): any[] {
-      return storeLookupByLatLon.slice(1).map((store, index) => {  // skips first item (current facility)
+    mapStock(storesInventory: any[], storesInformation: any[]): any[] {
+      return storesInformation.slice(1).map((store, index) => {  // skips first item (current facility)
         const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
         const storeHoursInfo = this.getStoreHoursStatus(store);
         return {
@@ -200,15 +199,25 @@ export default defineComponent({
         };
       });
     },
+    // logic for sorting stores by names
+    sortByNameLogic(a: any, b: any): number {
+      return a.storeName.localeCompare(b.storeName);
+    },
     // method to sort the stores by distance 
     sortByDistance() {
       this.activeSortType = 'distance';
-      this.atpMappedStoresInventory.sort((a: any, b: any) => a.dist - b.dist);
+      // if store has Infinity distance, move it to the end
+      this.storesWithInventory.sort((a: any, b: any) => {
+        if (a.dist === "Infinity" && b.dist === "Infinity") return this.sortByNameLogic(a, b);  //If both stores have "Infinity" distance, sorts them alphabetically by store name
+        if (a.dist === "Infinity") return 1;  //If only store 'a' has "Infinity" distance, moves it to the end.
+        if (b.dist === "Infinity") return -1;  //If only store 'b' has "Infinity" distance, moves it to the end.
+        return a.dist - b.dist;  //For stores with numeric distances, sorts them in ascending order.
+      });
     },
     // method to sort the stores by name
     sortByName() {
       this.activeSortType = 'name';
-      this.atpMappedStoresInventory.sort((a: any, b: any) => a.storeName.localeCompare(b.storeName));
+      this.storesWithInventory.sort((a: any, b: any) => this.sortByNameLogic(a, b));
     },
     // method to run the current filter to maintain the current sort type when toggling empty stock toggle
     runCurrentFilter() {
@@ -222,9 +231,9 @@ export default defineComponent({
     toggleHideEmptyStock() {
       this.hideEmptyStores = !this.hideEmptyStores;
       if (this.hideEmptyStores) {
-        this.atpMappedStoresInventory = this.atpMappedStoresInventory.filter((store: any) => store.stock > 0);
+        this.storesWithInventory = this.storesWithInventory.filter((store: any) => store.stock > 0);
       } else {
-        this.atpMappedStoresInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
+        this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
       }
       this.runCurrentFilter();   // Run the current filter to maintain the current sort type
     },

From feda4730b86e229993084785ff8a12b10a0885b2 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Wed, 12 Feb 2025 17:05:54 +0530
Subject: [PATCH 09/15] Improved: variable meaningful names, searchbar
 debounced search, ion-toggle label warning fix, internationalization of
 static texts and calendar and store open time minutes display added.

---
 src/locales/en.json                     |  9 ++++++
 src/locales/es.json                     |  9 ++++++
 src/locales/ja.json                     |  9 ++++++
 src/views/OtherStoresInventoryModal.vue | 38 +++++++++++--------------
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 9f65304fe..30a638975 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -36,6 +36,7 @@
   "Choose language": "Choose language",
   "City": "City",
   "Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
+  "Closed": "Closed",
   "Color:": "Color: {color}",
   "Colors": "Colors",
   "Confirm Cancelation": "Confirm Cancelation",
@@ -66,6 +67,7 @@
   "Fetching pickers": "Fetching pickers",
   "Fetching facilities": "Fetching facilities",
   "First name": "First name",
+  "friday": "Friday",
   "Generate packing slips": "Generate packing slips",
   "Generate shipping documents": "Generate shipping documents",
   "Go to OMS": "Go to OMS",
@@ -95,8 +97,10 @@
   "Logging out": "Logging out",
   "Logout": "Logout",
   "Method": "Method",
+  "miles": "miles",
   "Mismatch": "Mismatch",
   "Mis-Ordered Item": "Mis-Ordered Item",
+  "monday": "Monday",
   "More": "More",
   "New notification received.": "New notification received.",
   "No facilities found": "No facilities found",
@@ -191,6 +195,7 @@
   "Resend email": "Resend email",
   "Reserved": "Reserved",
   "Safety stock": "Safety stock",
+  "saturday": "Saturday",
   "Search": "Search",
   "Search Orders": "Search Orders",
   "Search store name": "Search store name",
@@ -237,6 +242,7 @@
   "Street": "Street",
   "Store": "Store",
   "Summary": "Summary",
+  "sunday": "Sunday",
   "Timezone": "Timezone",
   "Timeline": "Timeline",
   "Time zone updated successfully": "Time zone updated successfully",
@@ -245,14 +251,17 @@
   "Selected variant not available": "Selected variant not available",
   "This order cannot be split. If you cannot fulfill any item, will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.": "This order cannot be split. If you cannot fulfill any item, { customerName } will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.",
   "This order will be rejected from this store with the selected reason and shipped to the address that has been inputed.Please make sure the address you have entered is correct.": "This order will be rejected from this store with the selected reason and shipped to the address that has been inputed. { space } Please make sure the address you have entered is correct.",
+  "thursday": "Thursday",
   "Total": "Total",
   "Track Pickers": "Track Pickers",
   "Track who picked orders by entering picker IDs when packing an order.": "Track who picked orders by entering picker IDs when packing an order.",
+  "tuesday": "Tuesday",
   "Unable to open as browser is blocking pop-ups.": "Unable to open { documentName } as browser is blocking pop-ups.",
   "Unfillable Items": "Unfillable Items",
   "Update time zone": "Update time zone",
   "Username": "Username",
   "Warehouse": "Warehouse",
+  "wednesday": "Wednesday",
   "will be removed from your dashboard. This action cannot be undone.": "{ productName } will be removed from your dashboard.{ space } This action cannot be undone.",
   "Worn Display": "Worn Display",
   "This order will be removed from your dashboard. This action cannot be undone.": "This order will be removed from your dashboard.{ space } This action cannot be undone.",
diff --git a/src/locales/es.json b/src/locales/es.json
index 765e784d1..aa3390d4d 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -36,6 +36,7 @@
   "Choose language": "Elegir idioma",
   "City": "Ciudad",
   "Click the backdrop to dismiss.": "Haz clic en el fondo para cerrar.",
+  "Closed": "Closed",
   "Colors": "Colores",
   "Confirm Cancelation": "Confirm Cancelation",
   "Complete": "Completar",
@@ -65,6 +66,7 @@
   "Fetching pickers": "Fetching pickers",
   "Fetching facilities": "Fetching facilities",
   "First name": "Nombre",
+   "friday": "Friday",
   "Generate packing slips": "Generar documentos de embalaje",
   "Generate shipping documents": "Generar documentos de envío",
   "Go to OMS": "Ir a OMS",
@@ -93,8 +95,10 @@
   "Logging out": "Cerrando sesión",
   "Logout": "Cerrar sesión",
   "Method": "Method",
+  "miles": "miles",
   "Mismatch": "Desajuste",
   "Mis-Ordered Item": "Mis-Ordered Item",
+  "monday": "Monday",
   "More": "Más",
   "New notification received.": "Nueva notificación recibida.",
   "No facilities found": "No facilities found",
@@ -188,6 +192,7 @@
   "Resend email": "Reenviar correo electrónico",
   "Reserved": "Reserved",
   "Safety stock": "Safety stock",
+  "saturday": "Saturday",
   "Search": "Buscar",
   "Search Orders": "Buscar pedidos",
   "Search store name": "Search store name",
@@ -234,6 +239,7 @@
   "Street": "Calle",
   "Store": "Tienda",
   "Summary": "Summary",
+  "sunday": "Sunday",
   "Timeline": "Timeline",
   "Timezone": "Zona horaria",
   "Time zone updated successfully": "Zona horaria actualizada exitosamente",
@@ -242,14 +248,17 @@
   "Selected variant not available": "Variante seleccionada no disponible",
   "This order cannot be split. If you cannot fulfill any item, an email will be sent with alternate fulfillment options, and this order will be removed from your dashboard.": "Este pedido no se puede dividir. Si no puedes cumplir con algún artículo, { customerName } se enviará un correo electrónico con opciones de cumplimiento alternativas y este pedido se eliminará de tu panel de control.",
   "This order will be rejected from this store with the selected reason and shipped to the address that has been inputted. Please make sure the address you have entered is correct.": "Este pedido será rechazado en esta tienda con la razón seleccionada y se enviará a la dirección que se ha ingresado.{ space } Por favor, asegúrate de que la dirección que has ingresado sea correcta.",
+  "thursday": "Thursday",
   "Total": "Total",
   "Track Pickers": "Seguimiento de recolectores",
   "Track who picked orders by entering picker IDs when packing an order.": "Realiza un seguimiento de quién recogió los pedidos ingresando los ID de los recolectores al empacar un pedido.",
+  "tuesday": "Tuesday",
   "Unable to open as browser is blocking pop-ups.": "No se puede abrir {documentName} porque el navegador bloquea las ventanas emergentes.",
   "Unfillable Items": "Artículos no disponibles",
   "Update time zone": "Actualizar zona horaria",
   "Username": "Nombre de usuario",
   "Warehouse": "Almacén",
+  "wednesday": "Wednesday",
   "will be removed from your dashboard. This action cannot be undone.": "{ productName } se eliminará de su panel de control.{ space } Esta acción no se puede deshacer.",
   "Worn Display": "Pantalla desgastada",
   "This order will be removed from your dashboard. This action cannot be undone.": "Este pedido será eliminado de tu panel de control.{ space } Esta acción no se puede deshacer.",
diff --git a/src/locales/ja.json b/src/locales/ja.json
index f4cc3d7dd..f07f2df66 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -35,6 +35,7 @@
   "Choose language": "言語を選択",
   "City": "街",
   "Click the backdrop to dismiss.": "背景をクリックして閉じます。",
+  "Closed": "Closed",
   "Colors": "色",
   "Confirm Cancelation": "Confirm Cancelation",
   "Complete": "完了",
@@ -63,6 +64,7 @@
   "Fetching pickers": "Fetching pickers",
   "Fetching facilities": "Fetching facilities",
   "First name": "名",
+   "friday": "Friday",
   "Generate packing slips": "内容明細票の作成",
   "Generate shipping documents": "出荷書類を生成する",
   "Go to OMS": "OMSへ",
@@ -90,8 +92,10 @@
   "Logging in": "ログイン中",
   "Logging out": "ログアウト中",
   "Logout": "ログアウト",
+  "miles": "miles",
   "Mismatch": "不一致",
   "Mis-Ordered Item": "Mis-Ordered Item",
+  "monday": "Monday",
   "More": "もっと見る",
   "New notification received.": "新しい通知を受信しました。",
   "No facilities found": "No facilities found",
@@ -184,6 +188,7 @@
   "Resend email": "メールを再送する",
   "Reserved": "Reserved",
   "Safety stock": "安全在庫",
+  "saturday": "Saturday",
   "Search": "検索",
   "Search Orders": "注文の検索",
   "Search store name": "Search store name",
@@ -227,6 +232,7 @@
   "Street": "市区町村",
   "Store": "ストア",
   "Summary": "Summary",
+  "sunday": "Sunday",
   "Timeline": "Timeline",
   "Timezone": "タイムゾーン",
   "Time zone updated successfully": "タイムゾーンの更新成功",
@@ -235,15 +241,18 @@
   "Selected variant not available": "選択したバリアントは利用できません",
   "This order cannot be split. If you cannot fulfill any item, will be sent an email with alternate fulfillment options and this order will be removed from your dashboard.": "この注文は分割できません。どのアイテムもフィフィルできない場合、{ customerName } に別の発送オプションを記載したメールが送信され、ダッシュボードから注文が削除されます。",
   "This order will be rejected from this store with the selected reason and shipped to the address that has been inputed.Please make sure the address you have entered is correct.": "この注文は、選択された理由によりこのストアから拒否され、入力された住所に発送されます。{ space } 入力したアドレスが正しいことを確認してください。",
+  "thursday": "Thursday",
   "Total": "Total",
   "Track Pickers": "受取人の追跡",
   "Track who picked orders by entering picker IDs when packing an order.": "注文を梱包する際に受取人IDを入力することで、誰が注文を受け取ったかを追跡できます。",
+  "tuesday": "Tuesday",
   "Unable to login. User is not associated with any facility": "Unable to login. User is not associated with any facility",
   "Unable to open as browser is blocking pop-ups.": "ブラウザーがポップアップをブロックしているため、{documentName} を開くことができません。",
   "Unfillable Items": "記入不可の項目",
   "Update time zone": "タイムゾーンを更新する",
   "Username": "ユーザーネーム",
   "Warehouse": "倉庫",
+  "wednesday": "Wednesday",
   "will be removed from your dashboard. This action cannot be undone.": "{productName} はダッシュボードから削除されます。{space} この操作は元に戻せません。",
   "Worn Display": "すり切れたディスプレイ",
   "This order will be removed from your dashboard. This action cannot be undone.": "この注文はダッシュボードから削除されます。{ space } この操作は元に戻せません。",
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index c3b26603a..390f0205c 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -10,23 +10,20 @@
       <ion-buttons slot="end">
         <ion-button @click="sortByDistance">
           <ion-icon slot="icon-only" :icon="locationOutline"
-            :color="activeSortType === 'distance' ? 'primary' : 'medium'"></ion-icon>
+            :color="sortBy === 'distance' ? 'primary' : 'medium'"></ion-icon>
         </ion-button>
         <ion-button @click="sortByName">
           <ion-icon slot="icon-only" :icon="textOutline"
-            :color="activeSortType === 'name' ? 'primary' : 'medium'"></ion-icon>
+            :color="sortBy === 'name' ? 'primary' : 'medium'"></ion-icon>
         </ion-button>
       </ion-buttons>
     </ion-toolbar>
-    <ion-searchbar v-model="queryString" :placeholder="translate('Search store name')" :debounce="500"
-      @ionInput="queryString = $event.target.value; searchFacilities()"
-      @keyup.enter="queryString = $event.target.value; searchFacilities()" />
+    <ion-searchbar v-model="queryString" :placeholder="translate('Search store name')" @keyup.enter="queryString = $event.target.value; searchFacilities()" />
   </ion-header>
   <ion-content>
     <ion-list>
       <ion-item>
-        <ion-label>{{ translate("Hide facilities without stock") }}</ion-label>
-        <ion-toggle @click="toggleHideEmptyStock" />
+       <ion-toggle @click="toggleHideEmptyStock" label-placement="start">{{ translate("Hide facilities without stock")}}</ion-toggle>
       </ion-item>
     </ion-list>
     <ion-accordion-group v-if="storesWithInventory.length">
@@ -39,7 +36,7 @@
             <ion-note v-if="hasWeekCalendar(store)" :color="store.isOpen ? '' : 'danger'">
               {{ store.hoursDisplay }}
             </ion-note>
-            <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} miles</p>
+            <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} {{translate("miles")}}</p>
           </ion-label>
           <div slot="end">
             <ion-note slot="end">{{ translate('ATP', { count: store.stock }) }}</ion-note>
@@ -49,13 +46,13 @@
           <ion-list lines="none">
             <ion-item v-for="day in weekArray" :key="day">
               <ion-label>
-                <p>{{ capitalizeFirst(day) }}</p>
+                <p>{{ translate(day) }}</p>
               </ion-label>
               <ion-label slot="end">
                 <p v-if="store[`${day}_open`] && store[`${day}_close`]">
                   {{ formatTime(store[`${day}_open`]) }} - {{ formatTime(store[`${day}_close`]) }}
                 </p>
-                <p v-else>Closed</p>
+                <p v-else>{{ translate("Closed") }}</p>
               </ion-label>
             </ion-item>
           </ion-list>
@@ -124,7 +121,7 @@ export default defineComponent({
       storesInventory: [] as any, // will be used when fallback
       storesWithInventory: [] as any, // will be used primarily.
       hideEmptyStores: false,
-      activeSortType: "name", // 'name' or 'distance'
+      sortBy: "name", // 'name' or 'distance'
       weekArray: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
     }
   },
@@ -205,7 +202,7 @@ export default defineComponent({
     },
     // method to sort the stores by distance 
     sortByDistance() {
-      this.activeSortType = 'distance';
+      this.sortBy = 'distance';
       // if store has Infinity distance, move it to the end
       this.storesWithInventory.sort((a: any, b: any) => {
         if (a.dist === "Infinity" && b.dist === "Infinity") return this.sortByNameLogic(a, b);  //If both stores have "Infinity" distance, sorts them alphabetically by store name
@@ -216,14 +213,14 @@ export default defineComponent({
     },
     // method to sort the stores by name
     sortByName() {
-      this.activeSortType = 'name';
+      this.sortBy = 'name';
       this.storesWithInventory.sort((a: any, b: any) => this.sortByNameLogic(a, b));
     },
     // method to run the current filter to maintain the current sort type when toggling empty stock toggle
     runCurrentFilter() {
-      if (this.activeSortType === 'distance') {
+      if (this.sortBy === 'distance') {
         this.sortByDistance();
-      } else if (this.activeSortType === 'name') {
+      } else if (this.sortBy === 'name') {
         this.sortByName();
       }
     },
@@ -262,29 +259,26 @@ export default defineComponent({
         const openTime = DateTime.fromFormat(store[openKey], 'HH:mm:ss');
         const closeTime = DateTime.fromFormat(store[closeKey], 'HH:mm:ss');
 
-        const openDisplay = openTime.toFormat('ha').toLowerCase();
-        const closeDisplay = closeTime.toFormat('ha').toLowerCase();
+        const openDisplay = openTime.toFormat('hh:mm a').toLowerCase();
+        const closeDisplay = closeTime.toFormat('hh:mm a').toLowerCase();
 
         const isOpen = now >= openTime && now <= closeTime;
 
         return {
-          display: isOpen ? `Open: ${openDisplay} - ${closeDisplay}` : 'Closed',
+          display: isOpen ? `${translate("Open")} ${openDisplay} - ${closeDisplay}` : translate("Closed"),
           isOpen
         };
       }
 
       // Case 3: Has calendar but no hours for today
       else return {
-        display: 'Closed',
+        display: translate("Closed"),
         isOpen: false
       };
     },
     hasWeekCalendar(store: any): boolean {
       return Object.keys(store).some(key => /_open$|_close$/.test(key));
     },
-    capitalizeFirst(string: string): string {
-      return string.charAt(0).toUpperCase() + string.slice(1);
-    },
     formatTime(time: string): string {
       return DateTime.fromFormat(time, 'HH:mm:ss').toFormat('h:mm a');
     },

From 8111c6815db3cd72d7a8265dc6b399a96547157a Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 13 Feb 2025 12:10:49 +0530
Subject: [PATCH 10/15] Improved: updated state name
 fetchCurrentFacilityInformation to fetchCurrentFacilityLatLon and related
 state changes, cleared state on logout and facility change.

---
 src/services/UtilService.ts              |   4 +-
 src/store/modules/user/actions.ts        |   3 +-
 src/store/modules/util/UtilState.ts      |   2 +-
 src/store/modules/util/actions.ts        |  14 ++-
 src/store/modules/util/getters.ts        |   6 +-
 src/store/modules/util/index.ts          |   4 +-
 src/store/modules/util/mutation-types.ts |   2 +-
 src/store/modules/util/mutations.ts      |   4 +-
 src/views/OtherStoresInventoryModal.vue  | 103 ++++++++++++++---------
 src/views/Settings.vue                   |   3 +
 10 files changed, 90 insertions(+), 55 deletions(-)

diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index dae7b250d..0b6418301 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -147,7 +147,7 @@ const fetchEnumerations = async (payload: any): Promise<any> => {
   });
 }
 
-const fetchCurrentFacilityInformation = async (payload: any): Promise<any> => {
+const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
   return api({
     url: "performFind",
     method: "post",
@@ -180,6 +180,6 @@ export const UtilService = {
   resetPicker,
   updateProductStoreSetting,
   fetchReservedQuantity,
-  fetchCurrentFacilityInformation,
+  fetchCurrentFacilityLatLon,
   fetchStoresInformation
 }
\ No newline at end of file
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index c4a88e27f..230f66a97 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -156,7 +156,8 @@ const actions: ActionTree<UserState, RootState> = {
     this.dispatch('util/updateCancelReasons', [])
     this.dispatch("util/clearFacilities", {})
     this.dispatch("util/clearEnumerations", {})
-    this.dispatch('order/clearOrders')
+    this.dispatch("util/clearCurrentFacilityLatLon", {})
+    this.dispatch("util/clearStoresInformation", {})
     commit(types.USER_END_SESSION)
     resetPermissions();
     resetConfig();
diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 8f807ae69..78832bfbc 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,6 +7,6 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   facilities: any;
   enumerations: any;
-  currentFacilityInformation: any; 
+  facilitiesLatLng: any; 
   storesInformation: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index c1a1bede9..3001782ac 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -380,7 +380,7 @@ const actions: ActionTree<UtilState, RootState> = {
     commit(types.UTIL_ENUMERATIONS_UPDATED, {})
   },
 
-  async fetchCurrentFacilityInformation({ commit }, facilityId) {
+  async fetchCurrentFacilityLatLon({ commit }, facilityId) {
     const payload = {
       inputFields: {
         facilityId
@@ -393,7 +393,7 @@ const actions: ActionTree<UtilState, RootState> = {
     }
 
     try {
-      const resp = await UtilService.fetchCurrentFacilityInformation(payload)
+      const resp = await UtilService.fetchCurrentFacilityLatLon(payload)
       
       if (!hasError(resp) && resp.data?.docs.length > 0) {
         // Find first doc with non-null coordinates
@@ -402,7 +402,7 @@ const actions: ActionTree<UtilState, RootState> = {
         )
         
         if (validCoords) {
-          commit(types.UTIL_CURRENT_FACILITY_INFORMATION_UPDATED, validCoords)
+          commit(types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED, validCoords)
         }
       } else {
         throw resp.data
@@ -412,6 +412,10 @@ const actions: ActionTree<UtilState, RootState> = {
     }
   },
 
+    async clearCurrentFacilityLatLon({ commit }) {
+    commit(types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED, {})
+  },
+
   async fetchStoresInformation({ commit }, point) {
     const payload = {
       viewSize: 250,
@@ -430,6 +434,10 @@ const actions: ActionTree<UtilState, RootState> = {
       logger.error("Failed to fetch stores information by lat/lon", err)
     }
   },
+
+  async clearStoresInformation({ commit }) {
+    commit(types.UTIL_STORES_INFORMATION_UPDATED, [])
+  }
 }
 
 export default actions;
\ No newline at end of file
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index d45fb1c4b..d6000c335 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,11 +27,11 @@ const getters: GetterTree <UtilState, RootState> = {
   getEnumDescription: (state) => (enumId: string) => {
     return state.enumerations[enumId] ? state.enumerations[enumId] : enumId
   },
-  getCurrentFacilityInformation: (state) => {
-    return state.currentFacilityInformation ? state.currentFacilityInformation : {}
+  getCurrentFacilityLatLon: (state) => {
+    return state.facilitiesLatLng ? state.facilitiesLatLng : {}
   },
   getStoresInformation: (state) => {
-    return state.storesInformation ? state.storesInformation : {}
+    return state.storesInformation ? state.storesInformation : []
   }
 }
 export default getters;
\ No newline at end of file
diff --git a/src/store/modules/util/index.ts b/src/store/modules/util/index.ts
index 5aa3bee15..002329a65 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -16,8 +16,8 @@ const utilModule: Module<UtilState, RootState> = {
     cancelReasons: [],
     facilities: {},
     enumerations: {},
-    currentFacilityInformation: {},
-    storesInformation: {}
+    facilitiesLatLng: {},
+    storesInformation: []
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 32aa0bdf6..9dbf81f2b 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,5 +7,5 @@ export const UTIL_PARTY_NAMES_UPDATED = SN_UTIL + '/PARTY_NAMES_UPDATED'
 export const UTIL_CANCEL_REASONS_UPDATED = SN_UTIL + '/CANCEL_REASONS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_ENUMERATIONS_UPDATED = SN_UTIL + '/ENUMERATIONS_UPDATED'
-export const UTIL_CURRENT_FACILITY_INFORMATION_UPDATED = SN_UTIL + '/CURRENT_FACILITY_INFORMATION_UPDATED'
+export const UTIL_CURRENT_FACILITY_LAT_LON_UPDATED = SN_UTIL + '/CURRENT_FACILITY_LAT_LON_UPDATED'
 export const UTIL_STORES_INFORMATION_UPDATED = SN_UTIL + '/STORES_INFORMATION_UPDATED'
\ No newline at end of file
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index fd875c66a..3b6c20ba9 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -27,8 +27,8 @@ const mutations: MutationTree <UtilState> = {
   [types.UTIL_ENUMERATIONS_UPDATED] (state, payload) {
     state.enumerations = payload
   },
-  [types.UTIL_CURRENT_FACILITY_INFORMATION_UPDATED] (state, payload) {
-    state.currentFacilityInformation = payload
+  [types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED] (state, payload) {
+    state.facilitiesLatLng = payload
   },
   [types.UTIL_STORES_INFORMATION_UPDATED] (state, payload) {
     state.storesInformation = payload
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 390f0205c..200789d9d 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -13,51 +13,64 @@
             :color="sortBy === 'distance' ? 'primary' : 'medium'"></ion-icon>
         </ion-button>
         <ion-button @click="sortByName">
-          <ion-icon slot="icon-only" :icon="textOutline"
-            :color="sortBy === 'name' ? 'primary' : 'medium'"></ion-icon>
+          <ion-icon slot="icon-only" :icon="textOutline" :color="sortBy === 'name' ? 'primary' : 'medium'"></ion-icon>
         </ion-button>
       </ion-buttons>
     </ion-toolbar>
-    <ion-searchbar v-model="queryString" :placeholder="translate('Search store name')" @keyup.enter="queryString = $event.target.value; searchFacilities()" />
+    <ion-searchbar v-model="queryString" :placeholder="translate('Search store name')"
+      @keyup.enter="queryString = $event.target.value; searchFacilities()" />
   </ion-header>
   <ion-content>
     <ion-list>
       <ion-item>
-       <ion-toggle @click="toggleHideEmptyStock" label-placement="start">{{ translate("Hide facilities without stock")}}</ion-toggle>
+        <ion-toggle @click="toggleHideEmptyStock" label-placement="start">{{ translate("Hide facilities without stock")}}</ion-toggle>
       </ion-item>
     </ion-list>
     <ion-accordion-group v-if="storesWithInventory.length">
-      <ion-accordion v-for="store in storesWithInventory" :key="store.storeCode" :value="store.storeCode"
-        :toggle-icon="hasWeekCalendar(store) ? chevronDownOutline : false" :readonly="!hasWeekCalendar(store)">
-        <ion-item slot="header" lines="inset">
+      <template v-for="store in storesWithInventory" :key="store.storeCode">
+        <!-- render accordion for items with calendar -->
+        <ion-accordion v-if="hasWeekCalendar(store)" :value="store.storeCode">
+          <ion-item slot="header" lines="inset">
+            <ion-label class="ion-text-wrap">
+              <p class="overline">{{ store.storeCode }}</p>
+              <h2>{{ store.storeName }}</h2>
+              <ion-note v-if="hasWeekCalendar(store)" :color="store.isOpen ? '' : 'danger'">
+                {{ store.hoursDisplay }}
+              </ion-note>
+              <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} {{ translate("miles") }}</p>
+            </ion-label>
+            <div slot="end">
+              <ion-note slot="end">{{ translate('ATP', { count: store.stock }) }}</ion-note>
+            </div>
+          </ion-item>
+          <div class="ion-padding" slot="content">
+            <ion-list lines="none">
+              <ion-item v-for="day in weekArray" :key="day">
+                <ion-label>
+                  <p>{{ translate(day) }}</p>
+                </ion-label>
+                <ion-label slot="end">
+                  <p v-if="store[`${day}_open`] && store[`${day}_close`]">
+                    {{ formatTime(store[`${day}_open`]) }} - {{ formatTime(store[`${day}_close`]) }}
+                  </p>
+                  <p v-else>{{ translate("Closed") }}</p>
+                </ion-label>
+              </ion-item>
+            </ion-list>
+          </div>
+        </ion-accordion>
+        <!-- render list for items without calendar -->
+        <ion-item v-else>
           <ion-label class="ion-text-wrap">
             <p class="overline">{{ store.storeCode }}</p>
             <h2>{{ store.storeName }}</h2>
-            <ion-note v-if="hasWeekCalendar(store)" :color="store.isOpen ? '' : 'danger'">
-              {{ store.hoursDisplay }}
-            </ion-note>
-            <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} {{translate("miles")}}</p>
+            <p v-if="typeof store.dist === 'number'">{{ Math.round(store.dist) }} {{ translate("miles") }}</p>
           </ion-label>
           <div slot="end">
             <ion-note slot="end">{{ translate('ATP', { count: store.stock }) }}</ion-note>
           </div>
         </ion-item>
-        <div class="ion-padding" slot="content" v-if="hasWeekCalendar(store)">
-          <ion-list lines="none">
-            <ion-item v-for="day in weekArray" :key="day">
-              <ion-label>
-                <p>{{ translate(day) }}</p>
-              </ion-label>
-              <ion-label slot="end">
-                <p v-if="store[`${day}_open`] && store[`${day}_close`]">
-                  {{ formatTime(store[`${day}_open`]) }} - {{ formatTime(store[`${day}_close`]) }}
-                </p>
-                <p v-else>{{ translate("Closed") }}</p>
-              </ion-label>
-            </ion-item>
-          </ion-list>
-        </div>
-      </ion-accordion>
+      </template>
     </ion-accordion-group>
     <div v-else class="ion-text-center">
       <ion-spinner v-if="isRefreshing" name="crescent" />
@@ -127,31 +140,40 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      FacilityInformation: 'util/getCurrentFacilityInformation',
+      FacilityInformation: 'util/getCurrentFacilityLatLon',
       storesInformation: 'util/getStoresInformation'
     }),
-    currentFacilityCoords() {
-      return this.FacilityInformation;
-    },
     nearbyStores() {
       return this.storesInformation || [];
     },
   },
-  async mounted() {
+ async mounted() {
     this.isRefreshing = true;
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
-    // Fetching Lat Lon for current facility and then fetching store lookup
+
     try {
-      await this.store.dispatch("util/fetchCurrentFacilityInformation", this.currentFacilityId);
-      if (this.currentFacilityCoords?.latitude && this.currentFacilityCoords?.longitude) {
-        await this.store.dispatch("util/fetchStoresInformation", {
-          latitude: this.currentFacilityCoords.latitude,
-          longitude: this.currentFacilityCoords.longitude
-        });
-        this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
+      console.log(this.storesInventory);
+      // Check if the state already has the required data
+      if (!this.FacilityInformation || !this.FacilityInformation.latitude || !this.FacilityInformation.longitude) {
+        // Fetching Lat Lon for current facility
+        await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
       }
+
+      if (!this.storesInformation || this.storesInformation.length === 0) {
+        // Fetching store lookup
+        if (this.FacilityInformation?.latitude && this.FacilityInformation?.longitude) {
+          await this.store.dispatch("util/fetchStoresInformation", {
+            latitude: this.FacilityInformation.latitude,
+            longitude: this.FacilityInformation.longitude
+          });
+        }
+      }
+
+      // Map the stock information
+      this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
     } catch (error) {
+      console.error('Error fetching data:', error);
       // Fallback mapping when APIs fail
       this.storesWithInventory = this.storesInventory.map((facility: any) => ({
         storeCode: facility.facilityId,
@@ -161,6 +183,7 @@ export default defineComponent({
     } finally {
       this.isRefreshing = false;
     }
+
     // Sort by name by default
     this.sortByName();
   },
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index fe5d3b4e6..0e54e0946 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -296,6 +296,9 @@ export default defineComponent({
         this.getAvailableShipmentMethods();
         this.getRerouteFulfillmentConfiguration();
       }
+      // clear facility lat lon and stores information state when facility changes
+      this.store.dispatch("util/clearCurrentFacilityLatLon", {})
+      this.store.dispatch("util/clearStoresInformation", {})
     },
     async timeZoneUpdated(tzId: string) {
       await this.store.dispatch("user/setUserTimeZone", tzId)

From f7910b40b1895c6c94d078a998cf8b9e37ea7987 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 13 Feb 2025 15:25:10 +0530
Subject: [PATCH 11/15] Improved: code formatting.

---
 src/store/modules/util/actions.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index 3001782ac..b31cfa214 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -420,7 +420,8 @@ const actions: ActionTree<UtilState, RootState> = {
     const payload = {
       viewSize: 250,
       filters: ["storeType: RETAIL_STORE"],
-      point: `${point.latitude},${point.longitude}`    }
+      point: `${point.latitude},${point.longitude}`
+    }
       
     try {
       const resp = await UtilService.fetchStoresInformation(payload)

From bb2e574b48a4a338b26260dd9b73c90ba7759592 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Thu, 13 Feb 2025 16:49:29 +0530
Subject: [PATCH 12/15] Improved: Instead of passing facilityId from props,
 directly fetching the facilityId in component itself.

---
 src/views/OtherStoresInventoryModal.vue | 15 ++++++++-------
 src/views/ProductDetail.vue             |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 200789d9d..54a33293d 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -99,11 +99,11 @@ import {
   modalController,
   IonSpinner
 } from "@ionic/vue";
-import { defineComponent } from "vue";
+import { computed, defineComponent } from "vue";
 import { close, locationOutline, textOutline, chevronDownOutline } from "ionicons/icons";
 import { mapGetters } from "vuex";
 import { useStore } from "@/store";
-import { translate } from "@hotwax/dxp-components";
+import { translate, useUserStore  } from "@hotwax/dxp-components";
 import { DateTime } from "luxon";
 
 export default defineComponent({
@@ -126,7 +126,7 @@ export default defineComponent({
     IonToolbar,
     IonSpinner
   },
-  props: ["otherStoresInventory", "currentFacilityId"],
+  props: ["otherStoresInventory"],
   data() {
     return {
       queryString: "",
@@ -153,11 +153,10 @@ export default defineComponent({
     this.storesInventory = this.otherStoresInventory.slice();
 
     try {
-      console.log(this.storesInventory);
       // Check if the state already has the required data
       if (!this.FacilityInformation || !this.FacilityInformation.latitude || !this.FacilityInformation.longitude) {
         // Fetching Lat Lon for current facility
-        await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacilityId);
+        await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacility?.facilityId);
       }
 
       if (!this.storesInformation || this.storesInformation.length === 0) {
@@ -173,7 +172,6 @@ export default defineComponent({
       // Map the stock information
       this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
     } catch (error) {
-      console.error('Error fetching data:', error);
       // Fallback mapping when APIs fail
       this.storesWithInventory = this.storesInventory.map((facility: any) => ({
         storeCode: facility.facilityId,
@@ -308,13 +306,16 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const userStore = useUserStore();
+    let currentFacility: any = computed(() => userStore.getCurrentFacility);
     return {
       close,
       locationOutline,
       textOutline,
       store,
       translate,
-      chevronDownOutline
+      chevronDownOutline,
+      currentFacility
     };
   }
 });
diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue
index 94330d807..bcb02d771 100644
--- a/src/views/ProductDetail.vue
+++ b/src/views/ProductDetail.vue
@@ -314,7 +314,7 @@ export default defineComponent({
     async getOtherStoresInventoryDetails() {
       const otherStoresInventoryModal = await modalController.create({
         component: OtherStoresInventoryModal,
-        componentProps: { otherStoresInventory: this.otherStoresInventoryDetails, currentFacilityId: this.currentFacility?.facilityId }
+        componentProps: { otherStoresInventory: this.otherStoresInventoryDetails }
       });
       return otherStoresInventoryModal.present();
     }

From dad0c7c21ede647447db99d6d0c25cebcf8aa6b4 Mon Sep 17 00:00:00 2001
From: Aashutosh soni <ashutoshsoni130@gmail.com>
Date: Fri, 14 Feb 2025 12:21:36 +0530
Subject: [PATCH 13/15] Improved: facilityLatLon state updates. (#470)

---
 src/store/modules/util/UtilState.ts      |  4 +++-
 src/store/modules/util/actions.ts        |  4 ++--
 src/store/modules/util/getters.ts        |  4 ++--
 src/store/modules/util/mutation-types.ts |  2 +-
 src/store/modules/util/mutations.ts      |  4 ++--
 src/views/OtherStoresInventoryModal.vue  | 13 +++++++------
 6 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 78832bfbc..029cf9165 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,6 +7,8 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   facilities: any;
   enumerations: any;
-  facilitiesLatLng: any; 
+ facilitiesLatLng: {
+  [facilityId :string]: { latitude: any , longitude: any }
+},
   storesInformation: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index b31cfa214..bb8000cd9 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -402,7 +402,7 @@ const actions: ActionTree<UtilState, RootState> = {
         )
         
         if (validCoords) {
-          commit(types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED, validCoords)
+          commit(types.UTIL_FACILITY_LAT_LON_UPDATED, { facilityId, validCoords })
         }
       } else {
         throw resp.data
@@ -413,7 +413,7 @@ const actions: ActionTree<UtilState, RootState> = {
   },
 
     async clearCurrentFacilityLatLon({ commit }) {
-    commit(types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED, {})
+    commit(types.UTIL_FACILITY_LAT_LON_UPDATED, {})
   },
 
   async fetchStoresInformation({ commit }, point) {
diff --git a/src/store/modules/util/getters.ts b/src/store/modules/util/getters.ts
index d6000c335..d8dd5feca 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,8 +27,8 @@ const getters: GetterTree <UtilState, RootState> = {
   getEnumDescription: (state) => (enumId: string) => {
     return state.enumerations[enumId] ? state.enumerations[enumId] : enumId
   },
-  getCurrentFacilityLatLon: (state) => {
-    return state.facilitiesLatLng ? state.facilitiesLatLng : {}
+   getFacilityLatLon: (state) => (facilityId: string) => {
+    return state.facilitiesLatLng[facilityId] ? state.facilitiesLatLng[facilityId] : {}
   },
   getStoresInformation: (state) => {
     return state.storesInformation ? state.storesInformation : []
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 9dbf81f2b..f53b0decd 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,5 +7,5 @@ export const UTIL_PARTY_NAMES_UPDATED = SN_UTIL + '/PARTY_NAMES_UPDATED'
 export const UTIL_CANCEL_REASONS_UPDATED = SN_UTIL + '/CANCEL_REASONS_UPDATED'
 export const UTIL_FACILITIES_UPDATED = SN_UTIL + '/FACILITIES_UPDATED'
 export const UTIL_ENUMERATIONS_UPDATED = SN_UTIL + '/ENUMERATIONS_UPDATED'
-export const UTIL_CURRENT_FACILITY_LAT_LON_UPDATED = SN_UTIL + '/CURRENT_FACILITY_LAT_LON_UPDATED'
+export const UTIL_FACILITY_LAT_LON_UPDATED = SN_UTIL + '/FACILITY_LAT_LON_UPDATED'
 export const UTIL_STORES_INFORMATION_UPDATED = SN_UTIL + '/STORES_INFORMATION_UPDATED'
\ No newline at end of file
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 3b6c20ba9..7bdad3f69 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -27,8 +27,8 @@ const mutations: MutationTree <UtilState> = {
   [types.UTIL_ENUMERATIONS_UPDATED] (state, payload) {
     state.enumerations = payload
   },
-  [types.UTIL_CURRENT_FACILITY_LAT_LON_UPDATED] (state, payload) {
-    state.facilitiesLatLng = payload
+  [types.UTIL_FACILITY_LAT_LON_UPDATED] (state, payload) {
+    state.facilitiesLatLng[payload.facilityId] = payload.validCoords
   },
   [types.UTIL_STORES_INFORMATION_UPDATED] (state, payload) {
     state.storesInformation = payload
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index 54a33293d..e1856f389 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -140,7 +140,7 @@ export default defineComponent({
   },
   computed: {
     ...mapGetters({
-      FacilityInformation: 'util/getCurrentFacilityLatLon',
+      facilityLatLon: 'util/getFacilityLatLon',
       storesInformation: 'util/getStoresInformation'
     }),
     nearbyStores() {
@@ -151,20 +151,21 @@ export default defineComponent({
     this.isRefreshing = true;
     // Create a copy of otherStoresInventory on mount
     this.storesInventory = this.otherStoresInventory.slice();
+    const currentFacilityId = this.currentFacility?.facilityId;
 
     try {
       // Check if the state already has the required data
-      if (!this.FacilityInformation || !this.FacilityInformation.latitude || !this.FacilityInformation.longitude) {
+      if (!this.facilityLatLon(currentFacilityId).latitude || !this.facilityLatLon(currentFacilityId).longitude) {
         // Fetching Lat Lon for current facility
-        await this.store.dispatch("util/fetchCurrentFacilityLatLon", this.currentFacility?.facilityId);
+        await this.store.dispatch("util/fetchCurrentFacilityLatLon", currentFacilityId);
       }
 
       if (!this.storesInformation || this.storesInformation.length === 0) {
         // Fetching store lookup
-        if (this.FacilityInformation?.latitude && this.FacilityInformation?.longitude) {
+        if (this.facilityLatLon(currentFacilityId)?.latitude && this.facilityLatLon(currentFacilityId)?.longitude) {
           await this.store.dispatch("util/fetchStoresInformation", {
-            latitude: this.FacilityInformation.latitude,
-            longitude: this.FacilityInformation.longitude
+            latitude: this.facilityLatLon(currentFacilityId).latitude,
+            longitude: this.facilityLatLon(currentFacilityId).longitude
           });
         }
       }

From 9f7f27d869b48ae38899ebada7c5dad1e35bda80 Mon Sep 17 00:00:00 2001
From: Aashutosh Soni <aashutosh.soni@hotwaxsystems.com>
Date: Tue, 4 Mar 2025 15:28:49 +0530
Subject: [PATCH 14/15] Fixed: renamed variables for clarity and consistency in
 OtherStoresInventoryModal.vue (#470)

---
 src/store/modules/util/UtilState.ts     |  2 +-
 src/views/OtherStoresInventoryModal.vue | 29 +++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 029cf9165..9983ce0b7 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,7 +7,7 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   facilities: any;
   enumerations: any;
- facilitiesLatLng: {
+  facilitiesLatLng: {
   [facilityId :string]: { latitude: any , longitude: any }
 },
   storesInformation: any;
diff --git a/src/views/OtherStoresInventoryModal.vue b/src/views/OtherStoresInventoryModal.vue
index e1856f389..9217b0132 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -133,7 +133,7 @@ export default defineComponent({
       isRefreshing: false,
       storesInventory: [] as any, // will be used when fallback
       storesWithInventory: [] as any, // will be used primarily.
-      hideEmptyStores: false,
+      hideStoresWithoutInventory: false,
       sortBy: "name", // 'name' or 'distance'
       weekArray: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
     }
@@ -142,10 +142,7 @@ export default defineComponent({
     ...mapGetters({
       facilityLatLon: 'util/getFacilityLatLon',
       storesInformation: 'util/getStoresInformation'
-    }),
-    nearbyStores() {
-      return this.storesInformation || [];
-    },
+    })
   },
  async mounted() {
     this.isRefreshing = true;
@@ -198,7 +195,7 @@ export default defineComponent({
           store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
         );
       }
-      if (this.hideEmptyStores) {
+      if (this.hideStoresWithoutInventory) {
         filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
       }
       this.storesWithInventory = filteredInventory;
@@ -208,7 +205,7 @@ export default defineComponent({
     mapStock(storesInventory: any[], storesInformation: any[]): any[] {
       return storesInformation.slice(1).map((store, index) => {  // skips first item (current facility)
         const matchingFacility = storesInventory.find(facility => facility.facilityId === store.storeCode);
-        const storeHoursInfo = this.getStoreHoursStatus(store);
+        const storeHoursInfo = this.getStoreHoursInfo(store);
         return {
           ...store,
           index: index + 1,
@@ -219,7 +216,7 @@ export default defineComponent({
       });
     },
     // logic for sorting stores by names
-    sortByNameLogic(a: any, b: any): number {
+    sortStoresAlphabetically(a: any, b: any): number {
       return a.storeName.localeCompare(b.storeName);
     },
     // method to sort the stores by distance 
@@ -227,7 +224,7 @@ export default defineComponent({
       this.sortBy = 'distance';
       // if store has Infinity distance, move it to the end
       this.storesWithInventory.sort((a: any, b: any) => {
-        if (a.dist === "Infinity" && b.dist === "Infinity") return this.sortByNameLogic(a, b);  //If both stores have "Infinity" distance, sorts them alphabetically by store name
+        if (a.dist === "Infinity" && b.dist === "Infinity") return this.sortStoresAlphabetically(a, b);  //If both stores have "Infinity" distance, sorts them alphabetically by store name
         if (a.dist === "Infinity") return 1;  //If only store 'a' has "Infinity" distance, moves it to the end.
         if (b.dist === "Infinity") return -1;  //If only store 'b' has "Infinity" distance, moves it to the end.
         return a.dist - b.dist;  //For stores with numeric distances, sorts them in ascending order.
@@ -236,25 +233,25 @@ export default defineComponent({
     // method to sort the stores by name
     sortByName() {
       this.sortBy = 'name';
-      this.storesWithInventory.sort((a: any, b: any) => this.sortByNameLogic(a, b));
+      this.storesWithInventory.sort((a: any, b: any) => this.sortStoresAlphabetically(a, b));
     },
     // method to run the current filter to maintain the current sort type when toggling empty stock toggle
-    runCurrentFilter() {
+    updateSort() {
       if (this.sortBy === 'distance') {
         this.sortByDistance();
-      } else if (this.sortBy === 'name') {
+      } else {
         this.sortByName();
       }
     },
     // method to handle empty stock toggle
     toggleHideEmptyStock() {
-      this.hideEmptyStores = !this.hideEmptyStores;
-      if (this.hideEmptyStores) {
+      this.hideStoresWithoutInventory = !this.hideStoresWithoutInventory;
+      if (this.hideStoresWithoutInventory) {
         this.storesWithInventory = this.storesWithInventory.filter((store: any) => store.stock > 0);
       } else {
         this.storesWithInventory = this.mapStock(this.storesInventory, this.storesInformation);
       }
-      this.runCurrentFilter();   // Run the current filter to maintain the current sort type
+      this.updateSort();   // Run the current filter to maintain the current sort type
     },
     getCurrentWeekday() {
       const today = DateTime.now() // Get weekday index (1-7, Monday is 1, Sunday is 7)
@@ -263,7 +260,7 @@ export default defineComponent({
       return momentWeekday
     },
     // method to get the store hours status
-    getStoreHoursStatus(store: any) {
+    getStoreHoursInfo(store: any) {
       const currentDay = this.weekArray[this.getCurrentWeekday()];
       const hasCalendar = Object.keys(store).some(key => /_open$|_close$/.test(key));
 

From 332de784f007ae768c145db9fd248edbf591e02d Mon Sep 17 00:00:00 2001
From: Aashutosh Soni <aashutosh.soni@hotwaxsystems.com>
Date: Thu, 6 Mar 2025 16:09:55 +0530
Subject: [PATCH 15/15] Improved: formatting and indentation in UtilState and
 actions; clearing state on logout instead of facility change. (#470)

---
 src/store/modules/util/UtilState.ts | 4 ++--
 src/store/modules/util/actions.ts   | 2 +-
 src/views/Settings.vue              | 7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/util/UtilState.ts b/src/store/modules/util/UtilState.ts
index 9983ce0b7..396f75611 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -8,7 +8,7 @@ export default interface UtilState {
   facilities: any;
   enumerations: any;
   facilitiesLatLng: {
-  [facilityId :string]: { latitude: any , longitude: any }
-},
+    [facilityId :string]: { latitude: any , longitude: any }
+  },
   storesInformation: any;
 }
\ No newline at end of file
diff --git a/src/store/modules/util/actions.ts b/src/store/modules/util/actions.ts
index bb8000cd9..6743f6e11 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -412,7 +412,7 @@ const actions: ActionTree<UtilState, RootState> = {
     }
   },
 
-    async clearCurrentFacilityLatLon({ commit }) {
+  async clearCurrentFacilityLatLon({ commit }) {
     commit(types.UTIL_FACILITY_LAT_LON_UPDATED, {})
   },
 
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 0e54e0946..5f2003ca4 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -296,9 +296,6 @@ export default defineComponent({
         this.getAvailableShipmentMethods();
         this.getRerouteFulfillmentConfiguration();
       }
-      // clear facility lat lon and stores information state when facility changes
-      this.store.dispatch("util/clearCurrentFacilityLatLon", {})
-      this.store.dispatch("util/clearStoresInformation", {})
     },
     async timeZoneUpdated(tzId: string) {
       await this.store.dispatch("user/setUserTimeZone", tzId)
@@ -312,6 +309,10 @@ export default defineComponent({
         logger.error(error)
       }
 
+      // clear facility lat lon and stores information state when facility changes
+      this.store.dispatch("util/clearCurrentFacilityLatLon", {})
+      this.store.dispatch("util/clearStoresInformation", {})
+
       this.store.dispatch('user/logout', { isUserUnauthorised: false }).then((redirectionUrl) => {
         // if not having redirection url then redirect the user to launchpad
         if(!redirectionUrl) {