diff --git a/src/services/UtilService.ts b/src/services/UtilService.ts
index 7cbff83d9..5c76e1d4e 100644
--- a/src/services/UtilService.ts
+++ b/src/services/UtilService.ts
@@ -147,6 +147,22 @@ const fetchEnumerations = async (payload: any): Promise<any> => {
   });
 }
 
+const fetchCurrentFacilityLatLon = async (payload: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "post",
+    data: payload
+  });
+}
+
+const fetchStoreLookupByLatLon = async (payload: any): Promise<any> => {
+  return api({
+    url: "storeLookup",
+    method: "post",
+    data: payload
+  });
+}
+
 export const UtilService = {
   createEnumeration,
   createProductStoreSetting,
@@ -163,5 +179,7 @@ export const UtilService = {
   isEnumExists,
   resetPicker,
   updateProductStoreSetting,
-  fetchReservedQuantity
+  fetchReservedQuantity,
+  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 ed52feb8e..f7ff1c368 100644
--- a/src/store/modules/util/UtilState.ts
+++ b/src/store/modules/util/UtilState.ts
@@ -7,4 +7,6 @@ export default interface UtilState {
   cancelReasons: Array<any>;
   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 e4123c751..07d854805 100644
--- a/src/store/modules/util/actions.ts
+++ b/src/store/modules/util/actions.ts
@@ -378,7 +378,58 @@ 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) {
+        // 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)
+    }
+  },
+
+  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 db6a9e91a..71c7513c9 100644
--- a/src/store/modules/util/getters.ts
+++ b/src/store/modules/util/getters.ts
@@ -27,5 +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 : {}
+  },
+  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 3d91b0aeb..862a40e26 100644
--- a/src/store/modules/util/index.ts
+++ b/src/store/modules/util/index.ts
@@ -15,7 +15,9 @@ const utilModule: Module<UtilState, RootState> = {
     partyNames: {},
     cancelReasons: [],
     facilities: {},
-    enumerations: {}
+    enumerations: {},
+    currentFacilityLatLon: {},
+    storeLookupByLatLon: {}
   },
   getters,
   actions,
diff --git a/src/store/modules/util/mutation-types.ts b/src/store/modules/util/mutation-types.ts
index 4ec560a08..94207ec6c 100644
--- a/src/store/modules/util/mutation-types.ts
+++ b/src/store/modules/util/mutation-types.ts
@@ -7,3 +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'
diff --git a/src/store/modules/util/mutations.ts b/src/store/modules/util/mutations.ts
index 31f36a0b3..c6308eaf5 100644
--- a/src/store/modules/util/mutations.ts
+++ b/src/store/modules/util/mutations.ts
@@ -27,5 +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_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 3cc393db3..02710aae1 100644
--- a/src/views/OtherStoresInventoryModal.vue
+++ b/src/views/OtherStoresInventoryModal.vue
@@ -6,25 +6,74 @@
           <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" :debounce="500"
+      @ionInput="queryString = $event.target.value; searchFacilities()"
+      @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-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-content>
+    <ion-list>
+      <ion-item>
+        <ion-label>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"
+        :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 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 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">
-      <p>{{ translate("No inventory details found")}}</p>
+      <ion-spinner v-if="isRefreshing" name="crescent" />
+      <p v-else>{{ translate("No inventory details found") }}</p>
     </div>
   </ion-content>
 </template>
 
 <script lang="ts">
-import { 
+import {
+  IonAccordionGroup,
+  IonAccordion,
   IonButtons,
   IonButton,
   IonContent,
@@ -32,21 +81,25 @@ import {
   IonItem,
   IonIcon,
   IonLabel,
-  IonList,
   IonNote,
   IonSearchbar,
   IonTitle,
   IonToolbar,
-  modalController
+  modalController,
+  IonSpinner
 } from "@ionic/vue";
 import { 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";
+import { DateTime } from "luxon";
 
 export default defineComponent({
   name: "OtherStoresInventoryModal",
-  components: { 
+  components: {
+    IonAccordionGroup,
+    IonAccordion,
     IonButtons,
     IonButton,
     IonContent,
@@ -54,40 +107,184 @@ export default defineComponent({
     IonIcon,
     IonItem,
     IonLabel,
-    IonList,
     IonNote,
     IonSearchbar,
     IonTitle,
-    IonToolbar 
+    IonToolbar,
+    IonSpinner
   },
-  props: ["otherStoresInventory"],
+  props: ["otherStoresInventory", "currentFacilityId"],
   data() {
-    return{
+    return {
       queryString: "",
-      storesInventory: [] as any
+      isRefreshing: false,
+      storesInventory: [] as any, // will be used when fallback
+      atpMappedStoresInventory: [] as any, // will be used primarily.
+      hideEmptyStores: false,
+      activeSortType: "name", // 'name' or 'distance'
+      weekArray: ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
     }
   },
-  mounted() {
+  computed: {
+    ...mapGetters({
+      FacilityLatLon: 'util/getCurrentFacilityLatLon',
+      storeLookupByLatLon: 'util/getStoreLookupByLatLon'
+    }),
+    currentFacilityCoords() {
+      return this.FacilityLatLon;
+    },
+    nearbyStores() {
+      return this.storeLookupByLatLon || [];
+    },
+  },
+  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/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);
+      }
+    } catch (error) {
+      // 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(){
+    searchFacilities() {
+      this.isRefreshing = true;
+      let filteredInventory = this.mapStock(this.storesInventory, this.storeLookupByLatLon);
       if (this.queryString.trim() !== "") {
-        this.storesInventory = this.otherStoresInventory.filter((facility: any) => facility.facilityName.toLowerCase().includes(this.queryString.toLowerCase()));
+        filteredInventory = filteredInventory.filter((store: any) =>
+          store.storeName.toLowerCase().includes(this.queryString.toLowerCase())
+        );
+      }
+      if (this.hideEmptyStores) {
+        filteredInventory = filteredInventory.filter((store: any) => store.stock > 0);
+      }
+      this.atpMappedStoresInventory = filteredInventory;
+      this.isRefreshing = false;
+    },
+    // method to map the facilitty 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);
+        const storeHoursInfo = this.getStoreHoursStatus(store);
+        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 storesInventory when query is empty
-        this.storesInventory = this.otherStoresInventory.slice(); 
+        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();
     return {
       close,
+      locationOutline,
+      textOutline,
       store,
       translate
     };
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();
     }