From fd092fbd9c0b4698781fe3c01cbc433b627de973 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 5 Dec 2024 11:00:35 +0530
Subject: [PATCH 1/6] Implemneted: product identifier component and product
 store selector from the dxp-components (#220)

---
 package-lock.json                      | 16 ++++++++--------
 package.json                           |  4 ++--
 src/App.vue                            |  9 ++++++++-
 src/adapter/index.ts                   | 16 ++++++++++++++--
 src/authorization/Actions.ts           |  3 ++-
 src/authorization/Rules.ts             |  3 ++-
 src/components/PurchaseOrderDetail.vue | 12 +++++++++---
 src/main.ts                            |  9 +++++++--
 src/store/modules/user/actions.ts      |  9 ++++++++-
 src/views/InventoryReview.vue          | 14 +++++++++-----
 src/views/Settings.vue                 | 11 +++++++++--
 11 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2b05827d..218d2925 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,8 +13,8 @@
         "@casl/ability": "^6.0.0",
         "@hotwax/app-version-info": "^1.0.0",
         "@hotwax/apps-theme": "^1.2.6",
-        "@hotwax/dxp-components": "^1.15.4",
-        "@hotwax/oms-api": "^1.15.1",
+        "@hotwax/dxp-components": "^1.16.0",
+        "@hotwax/oms-api": "^1.16.0",
         "@ionic/core": "^7.6.0",
         "@ionic/vue": "^7.6.0",
         "@ionic/vue-router": "~7.6.0",
@@ -2795,9 +2795,9 @@
       "integrity": "sha512-zpUjGoY7LBlKeiP0V7tonrmoey8HQ5THQmyixQ+IDtrjmEJNBjynW/Ef3gC0FUNNPuVqxWPZdT5CVgaETLGTwg=="
     },
     "node_modules/@hotwax/dxp-components": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.15.5.tgz",
-      "integrity": "sha512-aOzipZwVk/fL6K7/BShsvE3eYqH8LagEQQpaNCPFtSs18KHgolGQxcKT3dQ1KRLTCmoKJugc7ut9uyxZVL5krg==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/dxp-components/-/dxp-components-1.16.0.tgz",
+      "integrity": "sha512-9HUrR58Sk9H3wryYGWfGfctcM9hRqq9pnLbaShnNf0mZeK/vTAIqqTPHcObfeKXkSaPtrqS6E/1Y/+Ysmv6v5A==",
       "dependencies": {
         "@hotwax/oms-api": "^1.8.1",
         "@ionic/core": "^7.6.0",
@@ -2931,9 +2931,9 @@
       }
     },
     "node_modules/@hotwax/oms-api": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.15.1.tgz",
-      "integrity": "sha512-Zc/GcoPoBX/bbY1n2EtNpPaR7PAMGTfEt8lDQZEnX55h85RY00H4uLDslD2OGWbGBjJO0MZrRmGv7PObuFxfWQ==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/@hotwax/oms-api/-/oms-api-1.16.0.tgz",
+      "integrity": "sha512-WZ3v0TxcHz5UZEBDX+GvZd/cqD08Kws42kGcseN2tfNf5kKWbfaDgWm6KEaBxLFuVBPBdRelRZhGj/nRIxBgGw==",
       "dependencies": {
         "@types/node-json-transform": "^1.0.0",
         "axios": "^0.21.1",
diff --git a/package.json b/package.json
index 1394cd26..e1a7ec27 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
     "@casl/ability": "^6.0.0",
     "@hotwax/app-version-info": "^1.0.0",
     "@hotwax/apps-theme": "^1.2.6",
-    "@hotwax/dxp-components": "^1.15.4",
-    "@hotwax/oms-api": "^1.15.1",
+    "@hotwax/dxp-components": "^1.16.0",
+    "@hotwax/oms-api": "^1.16.0",
     "@ionic/core": "^7.6.0",
     "@ionic/vue": "^7.6.0",
     "@ionic/vue-router": "~7.6.0",
diff --git a/src/App.vue b/src/App.vue
index 9014ac24..9178695b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,9 @@ import emitter from "@/event-bus"
 import { mapGetters, useStore } from 'vuex';
 import { initialise, resetConfig } from '@/adapter'
 import { showToast } from "@/utils";
-import { translate } from "@hotwax/dxp-components";
+import { translate, useProductIdentificationStore, useUserStore } from "@hotwax/dxp-components";
 import { useRouter } from 'vue-router';
+import logger from '@/logger';
 
 export default defineComponent({
   name: 'App',
@@ -100,6 +101,12 @@ export default defineComponent({
     emitter.on('presentLoader', this.presentLoader);
     emitter.on('dismissLoader', this.dismissLoader);
     emitter.on('playAnimation', this.playAnimation);
+    
+    if(this.userToken) {
+      const currentEComStore : any = useUserStore().getCurrentEComStore;
+      await useProductIdentificationStore().getIdentificationPref(currentEComStore.productStoreId)
+        .catch((error) => logger.error(error));
+    }
   },
   created() {
     initialise({
diff --git a/src/adapter/index.ts b/src/adapter/index.ts
index 803ace03..63c0f2fb 100644
--- a/src/adapter/index.ts
+++ b/src/adapter/index.ts
@@ -2,7 +2,11 @@ import {
   api,
   client,
   getConfig,
+  getEComStoresByFacility,
+  getProductIdentificationPref,
+  getUserPreference,
   hasError,
+  fetchGoodIdentificationTypes,
   fetchProducts,
   initialise,
   logout,
@@ -12,14 +16,20 @@ import {
   updateToken,
   updateInstanceUrl,
   setUserTimeZone,
-  getAvailableTimeZones
+  getAvailableTimeZones,
+  setProductIdentificationPref,
+  setUserPreference
 } from '@hotwax/oms-api'
 
 export {
   api,
   client,
   getConfig,
+  getEComStoresByFacility,
+  getProductIdentificationPref,
+  getUserPreference,
   hasError,
+  fetchGoodIdentificationTypes,
   fetchProducts,
   initialise,
   logout,
@@ -29,5 +39,7 @@ export {
   updateToken,
   updateInstanceUrl,
   setUserTimeZone,
-  getAvailableTimeZones
+  getAvailableTimeZones,
+  setProductIdentificationPref,
+  setUserPreference
 }
\ No newline at end of file
diff --git a/src/authorization/Actions.ts b/src/authorization/Actions.ts
index 08ab787f..b808ff20 100644
--- a/src/authorization/Actions.ts
+++ b/src/authorization/Actions.ts
@@ -1,3 +1,4 @@
 export default {
-  'APP_COMMERCE_VIEW': 'APP_COMMERCE_VIEW'
+  'APP_COMMERCE_VIEW': 'APP_COMMERCE_VIEW',
+  'APP_PRODUCT_IDENTIFIER_UPDATE': 'APP_PRODUCT_IDENTIFIER_UPDATE',
 }
\ No newline at end of file
diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts
index 78b83d35..9e248e00 100644
--- a/src/authorization/Rules.ts
+++ b/src/authorization/Rules.ts
@@ -1,5 +1,6 @@
 export default {
   "APP_INVENTORY_VIEW": "MDM_IMP_INVENTORY_VIEW", 
   "IMPORT_APP_VIEW": "IMPORT_APP_VIEW",
-  "APP_COMMERCE_VIEW": "COMMERCEUSER_VIEW"
+  "APP_COMMERCE_VIEW": "COMMERCEUSER_VIEW",
+  "APP_PRODUCT_IDENTIFIER_UPDATE":"COMMON_ADMIN",
 } as any 
\ No newline at end of file
diff --git a/src/components/PurchaseOrderDetail.vue b/src/components/PurchaseOrderDetail.vue
index 8c838cf3..0e1a379a 100644
--- a/src/components/PurchaseOrderDetail.vue
+++ b/src/components/PurchaseOrderDetail.vue
@@ -27,8 +27,8 @@
               <DxpShopifyImg :src="item.imageUrl" size="small" />
             </ion-thumbnail>
             <ion-label class="ion-text-wrap">
-              <h3>{{ item.pseudoId }}</h3>
-              <p v-if="item.initialSKU">{{ item.initialSKU }}</p>
+              <h3>{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) : item.pseudoId }}</h3>
+              <p>{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.pseudoId)) }}</p>
             </ion-label>
           </ion-item>
           <ion-chip outline class="tablet">
@@ -69,7 +69,8 @@ import { defineComponent } from "@vue/runtime-core";
 import { mapGetters, useStore } from "vuex";
 import ProductPopover from '@/components/ProductPopover.vue'
 import { DateTime } from 'luxon';
-import { translate } from "@hotwax/dxp-components";
+import { getProductIdentificationValue, translate, useProductIdentificationStore } from "@hotwax/dxp-components";
+import { computed } from "vue";
 
 export default defineComponent({
   name: "PurchaseOrderDetails",
@@ -158,10 +159,15 @@ export default defineComponent({
   },
   setup() {
     const store = useStore();
+    const productIdentificationStore = useProductIdentificationStore();
+    let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref);
+
     return {
+      getProductIdentificationValue,
       sendOutline,
       store,
       ellipsisVerticalOutline,
+      productIdentificationPref,
       translate
     }
   }
diff --git a/src/main.ts b/src/main.ts
index 4a9ce9c5..f29d0ad4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -32,9 +32,8 @@ import permissionActions from '@/authorization/Actions';
 import logger from './logger';
 import { dxpComponents } from '@hotwax/dxp-components'
 import { login, logout, loader } from './user-utils';
-import { getConfig, initialise } from '@hotwax/oms-api';
 import localeMessages from './locales';
-import { setUserTimeZone, getAvailableTimeZones} from '@/adapter'
+import { fetchGoodIdentificationTypes, getAvailableTimeZones, getConfig, getEComStoresByFacility, getProductIdentificationPref, getUserPreference, initialise, setProductIdentificationPref, setUserPreference, setUserTimeZone } from '@/adapter'
 
 const app = createApp(App)
   .use(IonicVue, {
@@ -57,11 +56,17 @@ const app = createApp(App)
     logout,
     loader,
     appLoginUrl: process.env.VUE_APP_LOGIN_URL as string,
+    fetchGoodIdentificationTypes,
     getConfig,
+    getEComStoresByFacility,
+    getProductIdentificationPref,
+    getUserPreference,
     initialise,
     localeMessages,
     setUserTimeZone,
     getAvailableTimeZones,
+    setProductIdentificationPref,
+    setUserPreference,
     hasPermission
   });
 
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index d5764287..58f53289 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -6,7 +6,7 @@ import * as types from './mutation-types'
 import { hasError, showToast } from '@/utils'
 import { logout, updateInstanceUrl, updateToken, resetConfig } from '@/adapter'
 import logger from "@/logger";
-import { useAuthStore, translate } from '@hotwax/dxp-components';
+import { useAuthStore, translate, useUserStore, useProductIdentificationStore } from '@hotwax/dxp-components';
 import emitter from '@/event-bus'
 import {
   getServerPermissionsFromRules,
@@ -62,6 +62,13 @@ const actions: ActionTree<UserState, RootState> = {
   
         await dispatch('getProfile')
         dispatch('setPreferredDateTimeFormat', process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy');
+
+        await useUserStore().getEComStoresByFacility("")
+        await useUserStore().getEComStorePreference("SELECTED_BRAND")
+        const preferredStore: any = useUserStore().getCurrentEComStore
+
+        await useProductIdentificationStore().getIdentificationPref(preferredStore.productStoreId)
+          .catch((error) => logger.error(error));
       }
     } catch (err: any) {
       showToast(translate('Something went wrong'));
diff --git a/src/views/InventoryReview.vue b/src/views/InventoryReview.vue
index 5861c97c..068f52a7 100644
--- a/src/views/InventoryReview.vue
+++ b/src/views/InventoryReview.vue
@@ -61,8 +61,8 @@
                 <DxpShopifyImg :src="item.imageUrl" size="small" />
               </ion-thumbnail>
               <ion-label class="ion-text-wrap">
-                <h3>{{ item.pseudoId }}</h3>
-                <p v-if="item.initialSKU">{{ item.initialSKU }}</p>
+                <h3>{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) : item.pseudoId }}</h3>
+                <p>{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.pseudoId)) }}</p>
               </ion-label>
             </ion-item>
 
@@ -95,10 +95,10 @@
 </template>   
 <script lang="ts">
 import { UploadService } from "@/services/UploadService";
-import { DxpShopifyImg, translate } from "@hotwax/dxp-components";
+import { DxpShopifyImg, getProductIdentificationValue, translate, useProductIdentificationStore } from "@hotwax/dxp-components";
 import ProductPopover from '@/components/ProductPopover.vue'
 import MissingFacilitiesModal from '@/components/MissingFacilitiesModal.vue'
-import { defineComponent } from 'vue';
+import { computed, defineComponent } from 'vue';
 import { mapGetters, useStore } from "vuex";
 import { useRouter } from 'vue-router';
 import { jsonToCsv, showToast } from '@/utils';
@@ -323,6 +323,8 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const store = useStore();
+    const productIdentificationStore = useProductIdentificationStore();
+    let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref);
     
     return {
       businessOutline,
@@ -330,14 +332,16 @@ export default defineComponent({
       chevronForwardOutline,
       checkboxOutline,
       ellipsisVerticalOutline,
+      getProductIdentificationValue,
       locationOutline,
       arrowUndoOutline,
       shirtOutline,
       cloudUploadOutline,
       warningOutline,
+      productIdentificationPref,
       router,
       store,
-      translate
+      translate 
     }
   }
 });
diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 92173ab3..87407357 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -38,6 +38,7 @@
 
       <section>
         <DxpOmsInstanceNavigator />
+        <DxpProductStoreSelector @updateEComStore="handleEComStoreUpdate" />
       </section>
 
       <hr />
@@ -45,6 +46,7 @@
       <DxpAppVersionInfo />
       
       <section>
+        <DxpProductIdentifier />
         <DxpTimeZoneSwitcher @timeZoneUpdated="timeZoneUpdated" />
         <ion-card>
           <ion-card-header>
@@ -87,7 +89,8 @@ import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import { DateTime } from 'luxon';
 import Image from '@/components/Image.vue';
-import { translate } from '@hotwax/dxp-components';
+import { translate, useProductIdentificationStore } from '@hotwax/dxp-components';
+import logger from '@/logger';
 
 export default defineComponent({
   name: 'Settings',
@@ -154,7 +157,11 @@ export default defineComponent({
     },
     goToLaunchpad() {
       window.location.href = `${process.env.VUE_APP_LOGIN_URL}`
-    }
+    },
+    async handleEComStoreUpdate(selectedProductStore: any) {
+      await useProductIdentificationStore().getIdentificationPref(selectedProductStore.productStoreId)
+        .catch((error) => logger.error(error));
+    },
   },
   setup(){
     const store = useStore();

From c54056cdafc7d27d66980344b63741612c764382 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 5 Dec 2024 12:18:53 +0530
Subject: [PATCH 2/6] Improved: fetching ecomStores using local service and
 added entry in locale for dxp component text (#220)

---
 src/locales/en.json               |  8 +++++++
 src/services/UserService.ts       | 36 +++++++++++++++++++++++++++++++
 src/store/modules/user/actions.ts |  3 ++-
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 9909b699..c323152b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.": "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.",
   "All": "All",
   "App": "App",
   "Apply": "Apply",
@@ -25,6 +26,7 @@
   "Changes to the date time format will cause edits done to your PO to be reverted.": "Changes to the date time format will cause edits done to your PO to be reverted.",
   "Configure date time format": "Configure date time format",
   "Check sample": "Check sample",
+  "Choosing a product identifier allows you to view products with your preferred identifiers.": "Choosing a product identifier allows you to view products with your preferred identifiers.",
   "Click the backdrop to dismiss.": "Click the backdrop to dismiss.",
   "Completed": "Completed",
   "Confirm": "Confirm",
@@ -123,9 +125,12 @@
   "Please upload a valid reset inventory csv to continue": "Please upload a valid reset inventory csv to continue",
   "PO External Order ID": "PO External Order ID",
   "Preorder": "Preorder",
+  "Primary": "Primary",
   "Product Identification": "Product Identification",
+  "Product Identifier": "Product Identifier",
   "Product SKU": "Product SKU",
   "Product store": "Product store",
+  "Product Store": "Product Store",
   "Product not found": "Product not found",
   "Purchase order": "Purchase order",
   "Purchase orders": "Purchase orders",
@@ -154,12 +159,14 @@
   "Search": "Search",
   "Search products": "Search products",
   "Search time zones": "Search time zones",
+  "Secondary": "Secondary",
   "Seems like uploaded file has missing products, checked with initial records.": "Seems like uploaded file has missing products, checked with initial {initialCount} records.",
   "Schedule": "Schedule",
   "Select": "Select",
   "Select mapping": "Select mapping",
   "Select SKU": "Select SKU",
   "Select all the fields to continue": "Select all the fields to continue",
+  "Select store": "Select store",
   "Select time zone": "Select time zone",
   "Select time": "Select time",
   "Select the column index for the following information in the uploaded CSV.": "Select the column index for the following information in the uploaded CSV.",
@@ -180,6 +187,7 @@
   "Shopify product UPC": "Shopify product UPC",
   "Start with Ionic": "Start with Ionic",
   "STAY": "STAY",
+  "Store": "Store",
   "store name": "store name",
   "The inventory has been updated successfully": "The inventory has been updated successfully",
   "The PO has been uploaded successfully": "The PO has been uploaded successfully",
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index 5c847ebe..4d4873cb 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -1,6 +1,7 @@
 import { api, client } from '@/adapter'
 import store from '@/store';
 import { hasError } from '@/adapter';
+import logger from '@/logger';
 
 const login = async (username: string, password: string): Promise <any> => {
   return api({
@@ -141,10 +142,45 @@ const getUserPermissions = async (payload: any, token: any): Promise<any> => {
   }
 }
 
+async function getEComStores(token: any): Promise<any> {
+  const baseURL = store.getters['user/getBaseUrl'];
+
+  const params = {
+    "viewSize": 200,
+    "fieldList": ["productStoreId", "storeName"],
+    "entityName": "ProductStoreFacilityDetail",
+    "distinct": "Y",
+    "noConditionFind": "Y",
+    "filterByDate": 'Y',
+  };
+
+  try {
+    const resp = await client({
+      url: "performFind",
+      method: "get",
+      baseURL,
+      params,
+      headers: {
+        Authorization: 'Bearer ' + token,
+        'Content-Type': 'application/json'
+      }
+    });
+    if(resp.status === 200 && !hasError(resp)) {
+      return Promise.resolve(resp.data.docs?.length ? resp.data.docs : []);
+    } else {
+      throw resp.data
+    }
+  } catch(error) {
+    logger.error(error)
+    return Promise.resolve({})
+  }
+}
+
 export const UserService = {
     createFieldMapping,
     deleteFieldMapping,
     login,
+    getEComStores,
     getFieldMappings,
     getProfile,
     getUserPermissions,
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 58f53289..2fb1fd65 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -63,7 +63,8 @@ const actions: ActionTree<UserState, RootState> = {
         await dispatch('getProfile')
         dispatch('setPreferredDateTimeFormat', process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy');
 
-        await useUserStore().getEComStoresByFacility("")
+        const ecomStores = await UserService.getEComStores(token)
+        useUserStore().$state.eComStores = ecomStores
         await useUserStore().getEComStorePreference("SELECTED_BRAND")
         const preferredStore: any = useUserStore().getCurrentEComStore
 

From 7a38081de0d6d38ce6e188af47b932f641e27dea Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 5 Dec 2024 12:20:36 +0530
Subject: [PATCH 3/6] Improved: emitter name for store selection (#220)

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

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
index 87407357..858b7263 100644
--- a/src/views/Settings.vue
+++ b/src/views/Settings.vue
@@ -38,7 +38,7 @@
 
       <section>
         <DxpOmsInstanceNavigator />
-        <DxpProductStoreSelector @updateEComStore="handleEComStoreUpdate" />
+        <DxpProductStoreSelector @updateEComStore="updateEComStore" />
       </section>
 
       <hr />
@@ -158,7 +158,7 @@ export default defineComponent({
     goToLaunchpad() {
       window.location.href = `${process.env.VUE_APP_LOGIN_URL}`
     },
-    async handleEComStoreUpdate(selectedProductStore: any) {
+    async updateEComStore(selectedProductStore: any) {
       await useProductIdentificationStore().getIdentificationPref(selectedProductStore.productStoreId)
         .catch((error) => logger.error(error));
     },

From daf05da4bb39f92b88cf9e358a2ff882588801b2 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 5 Dec 2024 15:32:32 +0530
Subject: [PATCH 4/6] Improved: used api method for fetching the ecomStores
 (#220)

---
 src/services/UserService.ts       | 17 +++++------------
 src/store/modules/user/actions.ts |  2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index 4d4873cb..1868a94b 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -142,9 +142,7 @@ const getUserPermissions = async (payload: any, token: any): Promise<any> => {
   }
 }
 
-async function getEComStores(token: any): Promise<any> {
-  const baseURL = store.getters['user/getBaseUrl'];
-
+async function getEComStores(): Promise<any> {
   const params = {
     "viewSize": 200,
     "fieldList": ["productStoreId", "storeName"],
@@ -155,17 +153,12 @@ async function getEComStores(token: any): Promise<any> {
   };
 
   try {
-    const resp = await client({
+    const resp = await api({
       url: "performFind",
       method: "get",
-      baseURL,
-      params,
-      headers: {
-        Authorization: 'Bearer ' + token,
-        'Content-Type': 'application/json'
-      }
-    });
-    if(resp.status === 200 && !hasError(resp)) {
+      params
+    }) as any;
+    if(!hasError(resp)) {
       return Promise.resolve(resp.data.docs?.length ? resp.data.docs : []);
     } else {
       throw resp.data
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 2fb1fd65..86a8306a 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -63,7 +63,7 @@ const actions: ActionTree<UserState, RootState> = {
         await dispatch('getProfile')
         dispatch('setPreferredDateTimeFormat', process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy');
 
-        const ecomStores = await UserService.getEComStores(token)
+        const ecomStores = await UserService.getEComStores()
         useUserStore().$state.eComStores = ecomStores
         await useUserStore().getEComStorePreference("SELECTED_BRAND")
         const preferredStore: any = useUserStore().getCurrentEComStore

From 05be4271803200d132add2233b7312822f5e4b68 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Mon, 9 Dec 2024 16:37:13 +0530
Subject: [PATCH 5/6] Improved: added product identifier support in
 scheduledRestockReview page and entity to fetch product stores (#220)

---
 src/services/UserService.ts          |  5 ++---
 src/store/modules/user/actions.ts    |  2 +-
 src/views/ScheduledRestockReview.vue | 16 +++++++++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index 1868a94b..ea9135a5 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -146,10 +146,9 @@ async function getEComStores(): Promise<any> {
   const params = {
     "viewSize": 200,
     "fieldList": ["productStoreId", "storeName"],
-    "entityName": "ProductStoreFacilityDetail",
+    "entityName": "ProductStore",
     "distinct": "Y",
-    "noConditionFind": "Y",
-    "filterByDate": 'Y',
+    "noConditionFind": "Y"
   };
 
   try {
diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
index 86a8306a..65e1b4c9 100644
--- a/src/store/modules/user/actions.ts
+++ b/src/store/modules/user/actions.ts
@@ -64,7 +64,7 @@ const actions: ActionTree<UserState, RootState> = {
         dispatch('setPreferredDateTimeFormat', process.env.VUE_APP_DATE_FORMAT ? process.env.VUE_APP_DATE_FORMAT : 'MM/dd/yyyy');
 
         const ecomStores = await UserService.getEComStores()
-        useUserStore().$state.eComStores = ecomStores
+        useUserStore().eComStores = ecomStores
         await useUserStore().getEComStorePreference("SELECTED_BRAND")
         const preferredStore: any = useUserStore().getCurrentEComStore
 
diff --git a/src/views/ScheduledRestockReview.vue b/src/views/ScheduledRestockReview.vue
index e5798f77..0b1f4ebf 100644
--- a/src/views/ScheduledRestockReview.vue
+++ b/src/views/ScheduledRestockReview.vue
@@ -77,8 +77,8 @@
               <DxpShopifyImg :src="item.imageUrl" size="small" />
             </ion-thumbnail>
             <ion-label>
-              <h2>{{ item.parentProductName }}</h2>
-              <p>{{ item.identification }}</p>
+              <h2>{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.pseudoId)) : item.parentProductName }}</h2>
+              <p>{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.pseudoId)) }}</p>
             </ion-label>
           </ion-item>
           <ion-chip outline class="tablet">
@@ -97,9 +97,9 @@
 </template>
   
 <script>
-import { defineComponent } from "vue";
+import { computed, defineComponent } from "vue";
 import { IonBackButton, IonButton, IonButtons, IonCheckbox, IonChip, IonContent, IonDatetime, IonFab, IonFabButton, IonHeader, IonIcon, IonInput, IonItem, IonLabel, IonList, IonModal, IonPage, IonSearchbar, IonSelect, IonSelectOption, IonThumbnail, IonTitle, IonToolbar, alertController} from "@ionic/vue";
-import { DxpShopifyImg, translate } from "@hotwax/dxp-components";
+import { DxpShopifyImg, getProductIdentificationValue, translate, useProductIdentificationStore } from "@hotwax/dxp-components";
 import { arrowUndoOutline, checkboxOutline, timerOutline, businessOutline, cloudUploadOutline, globeOutline} from "ionicons/icons"
 import { mapGetters, useStore } from "vuex";
 import { DateTime } from 'luxon';
@@ -147,7 +147,9 @@ export default defineComponent({
       userProfile: 'user/getUserProfile',
       fileName: 'order/getFileName',
       schedule: 'stock/getScheduledInformation',
-      productStores: 'util/getProductStores'
+      productStores: 'util/getProductStores',
+      getProduct: 'product/getProduct',
+
     })
   },
   data() {
@@ -352,6 +354,8 @@ export default defineComponent({
   setup() {
     const store = useStore();
     const router = useRouter();
+    const productIdentificationStore = useProductIdentificationStore();
+    let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref);
 
     return {
       translate,
@@ -362,7 +366,9 @@ export default defineComponent({
       store,
       cloudUploadOutline,
       DateTime,
+      getProductIdentificationValue,
       globeOutline,
+      productIdentificationPref,
       router
     }
   }

From 56185a392394cd42a83d904336fd29b4a935faf6 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 17 Dec 2024 18:34:41 +0530
Subject: [PATCH 6/6] Improved: returning array as promise when error in
 getEcomStore api (#220)

---
 src/services/UserService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index ea9135a5..45ce81dd 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -164,7 +164,7 @@ async function getEComStores(): Promise<any> {
     }
   } catch(error) {
     logger.error(error)
-    return Promise.resolve({})
+    return Promise.resolve([])
   }
 }