Implemented: logic to search product based on identifier selected in …

…barcode identifier preference (hotwax#325)

src/locales/en.json

@@ -71,6 +71,7 @@
   "Pending: items": "Pending: {itemsCount} items",
   "Please provide a valid SKU.": "Please provide a valid SKU.",
   "primary identifier": "primary identifier",
+  "Primary identifier": "Primary identifier",
   "Primary Product Identifier": "Primary Product Identifier",
   "Proceed": "Proceed",
   "Product Identifier": "Product Identifier",
@@ -104,6 +105,7 @@
   "Scanned item is not present within the shipment:": "Scanned item is not present within the shipment: {itemName}",
   "Scanned successfully.": "Scanned {itemName} successfully.",
   "secondary identifier": "secondary identifier",
+  "Secondary identifier": "Secondary identifier",
   "Search": "Search",
   "Search purchase orders": "Search purchase orders",
   "Search returns": "Search returns",

src/store/modules/order/actions.ts

@@ -4,8 +4,9 @@ import RootState from '@/store/RootState'
 import OrderState from './OrderState'
 import * as types from './mutation-types'
 import { hasError, showToast } from '@/utils'
-import { translate } from '@hotwax/dxp-components'
+import { getProductIdentificationValue, translate } from '@hotwax/dxp-components'
 import emitter from "@/event-bus";
+import store from "@/store";
 
 
 const actions: ActionTree<OrderState, RootState> = {
@@ -41,7 +42,13 @@ const actions: ActionTree<OrderState, RootState> = {
     return resp;
   },
   async updateProductCount({ commit, state }, payload ) {
-    const item = state.current.items.find((item: any) => item.internalName === payload);
+    const barcodeIdentifier = store.getters['util/getBarcodeIdentificationValue'];
+    const getProduct = store.getters['product/getProduct'];
+
+    const item = state.current.items.find((item: any) => {
+      const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, getProduct(item.productId)) : item.internalName;
+      return itemVal === payload;
+    });
 
     if (item) {
       if(item.orderItemStatusId === 'ITEM_COMPLETED') return { isCompleted: true }

src/store/modules/return/actions.ts

@@ -4,8 +4,9 @@ import RootState from '@/store/RootState'
 import ReturnState from './ReturnState'
 import * as types from './mutation-types'
 import { hasError, showToast } from '@/utils'
-import { translate } from '@hotwax/dxp-components'
+import { getProductIdentificationValue, translate } from '@hotwax/dxp-components'
 import emitter from '@/event-bus'
+import store from "@/store";
 
 const actions: ActionTree<ReturnState, RootState> = {
   async findReturn ({ commit, state }, payload) {
@@ -33,7 +34,13 @@ const actions: ActionTree<ReturnState, RootState> = {
     return resp;
   },
   async updateReturnProductCount ({ commit, state }, payload) {
-    const item = state.current.items.find((item: any) => item.sku === payload);
+    const barcodeIdentifier = store.getters['util/getBarcodeIdentificationValue'];
+    const getProduct = store.getters['product/getProduct'];
+
+    const item = state.current.items.find((item: any) => {
+      const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, getProduct(item.productId)) : item.internalName;
+      return itemVal === payload;
+    });
 
     if (item) {
       item.quantityAccepted = item.quantityAccepted ? parseInt(item.quantityAccepted) + 1 : 1;

src/store/modules/shipment/actions.ts

@@ -4,8 +4,9 @@ import RootState from '@/store/RootState'
 import ShipmentState from './ShipmentState'
 import * as types from './mutation-types'
 import { hasError, showToast } from '@/utils'
-import { translate } from '@hotwax/dxp-components'
+import { getProductIdentificationValue, translate } from '@hotwax/dxp-components'
 import emitter from '@/event-bus'
+import store from "@/store";
 
 const actions: ActionTree<ShipmentState, RootState> = {
   async findShipment ({ commit, state }, payload) {
@@ -43,7 +44,13 @@ const actions: ActionTree<ShipmentState, RootState> = {
   },
 
   async updateShipmentProductCount ({ commit, state }, payload) {
-    const item = state.current.items.find((item: any) => item.sku === payload);
+    const barcodeIdentifier = store.getters['util/getBarcodeIdentificationValue'];
+    const getProduct = store.getters['product/getProduct'];
+
+    const item = state.current.items.find((item: any) => {
+      const itemVal = barcodeIdentifier ? getProductIdentificationValue(barcodeIdentifier, getProduct(item.productId)) : item.internalName;
+      return itemVal === payload;
+    });
 
     if (item) {
       item.quantityAccepted = item.quantityAccepted ? parseInt(item.quantityAccepted) + 1 : 1;

src/store/modules/util/actions.ts

@@ -206,7 +206,7 @@ const actions: ActionTree<UtilState, RootState> = {
         fromDate,
         "productStoreId": ecomStore.productStoreId,
         "settingTypeEnumId": "BARCODE_IDEN_PREF",
-        "settingValue": "productId"
+        "settingValue": "primaryId"
       }  
 
       await UtilService.createBarcodeIdentificationPref(params) as any
@@ -216,7 +216,7 @@ const actions: ActionTree<UtilState, RootState> = {
 
     // not checking for resp success and fail case as every time we need to update the state with the
     // default value when creating a scan setting
-    commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, "productId")
+    commit(types.UTIL_BARCODE_IDENTIFICATION_PREF_UPDATED, "primaryId")
     return fromDate;
   },
 

src/store/modules/util/getters.ts

@@ -1,5 +1,5 @@
 import { GetterTree } from 'vuex'
-import RootState from '@/store/RootState'
+import RootState from '../../RootState'
 import UtilState from './UtilState';
 
 const getters: GetterTree <UtilState, RootState> = {
@@ -14,6 +14,9 @@ const getters: GetterTree <UtilState, RootState> = {
   },
   getBarcodeIdentificationPref(state) {
     return state.barcodeIdentificationPref
+  },
+  getBarcodeIdentificationValue(state, getters, rootState, rootGetters) {
+    return rootGetters['user/getProductIdentificationPref'][state.barcodeIdentificationPref]
   }
 }
 export default getters;

src/views/Settings.vue

@@ -98,7 +98,8 @@
           </ion-item>
           <ion-item lines="none">
             <ion-select :label="translate('Barcode Identifier')" interface="popover" :placeholder="translate('Select')" :value="barcodeIdentificationPref" @ionChange="setBarcodeIdentificationPref($event.detail.value)">
-              <ion-select-option v-for="identification in productIdentifications" :key="identification">{{ identification }}</ion-select-option>
+              <ion-select-option value="primaryId">{{ translate("Primary identifier") }}</ion-select-option>
+              <ion-select-option value="secondaryId">{{ translate("Secondary identifier") }}</ion-select-option>
             </ion-select>
           </ion-item>
         </ion-card>