From a4ae986cb1e68b37ddcbaadbb6bb5360312b6e16 Mon Sep 17 00:00:00 2001
From: R-Sourabh <rsourabh002@gmail.com>
Date: Tue, 30 Apr 2024 11:25:58 +0530
Subject: [PATCH] Fixed: Product identifiers is visible for  selected
 product(#373)

---
 src/views/AddProductModal.vue     | 10 ++++++----
 src/views/AddProductToPOModal.vue | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/AddProductModal.vue b/src/views/AddProductModal.vue
index 06046d90..beed23d4 100644
--- a/src/views/AddProductModal.vue
+++ b/src/views/AddProductModal.vue
@@ -20,8 +20,8 @@
           </ion-thumbnail>
           <ion-label>
             <!-- Honouring the identifications set by the user on the settings page -->
-            <h2>{{ product[productIdentificationPref.primaryId] }}</h2>
-            <p>{{ product[productIdentificationPref.secondaryId] }}</p>
+            <h2>{{ productHelpers.getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(product.productId)) }}</h2>
+            <p>{{ productHelpers.getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(product.productId)) }}</p>
           </ion-label>
           <ion-icon v-if="isProductAvailableInShipment(product.productId)" color="success" :icon="checkmarkCircle" />
           <ion-button v-else fill="outline" @click="addtoShipment(product)">{{ translate("Add to Shipment") }}</ion-button>
@@ -70,7 +70,7 @@ import { closeOutline, checkmarkCircle } from 'ionicons/icons';
 import { mapGetters } from 'vuex'
 import { useStore } from "@/store";
 import { DxpShopifyImg, translate } from '@hotwax/dxp-components';
-import { showToast } from '@/utils'
+import { showToast, productHelpers } from '@/utils'
 
 export default defineComponent({
   name: "Modal",
@@ -101,6 +101,7 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       products: 'product/getProducts',
+      getProduct: 'product/getProduct',
       isScrollable: 'product/isScrollable',
       isProductAvailableInShipment: 'product/isProductAvailableInShipment',
       productIdentificationPref: 'user/getProductIdentificationPref',
@@ -172,7 +173,8 @@ export default defineComponent({
       closeOutline,
       checkmarkCircle,
       store,
-      translate
+      translate,
+      productHelpers
     };
   },
 });
diff --git a/src/views/AddProductToPOModal.vue b/src/views/AddProductToPOModal.vue
index 838913c8..e840b1ad 100644
--- a/src/views/AddProductToPOModal.vue
+++ b/src/views/AddProductToPOModal.vue
@@ -19,8 +19,8 @@
           </ion-thumbnail>
           <ion-label>
             <!-- Honouring the identifications set by the user on the settings page -->
-            <h2>{{ product[productIdentificationPref.primaryId] }}</h2>
-            <p>{{ product[productIdentificationPref.secondaryId] }}</p>
+            <h2>{{ productHelpers.getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(product.productId)) }}</h2>
+            <p>{{ productHelpers.getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(product.productId)) }}</p>
           </ion-label>
           <ion-icon v-if="isProductAvailableInOrder(product.productId)" color="success" :icon="checkmarkCircle" />
           <ion-button v-else fill="outline" @click="addtoOrder(product)">{{ translate("Add to Purchase Order") }}</ion-button>
@@ -61,7 +61,7 @@ import { closeOutline, checkmarkCircle } from 'ionicons/icons';
 import { mapGetters } from 'vuex'
 import { useStore } from "@/store";
 import { DxpShopifyImg, translate } from '@hotwax/dxp-components';
-import { showToast } from '@/utils'
+import { showToast, productHelpers } from '@/utils'
 
 export default defineComponent({
   name: "Modal",
@@ -92,6 +92,7 @@ export default defineComponent({
   computed: {
     ...mapGetters({
       products: 'product/getProducts',
+      getProduct: 'product/getProduct',
       isScrollable: 'product/isScrollable',
       isProductAvailableInOrder: 'order/isProductAvailableInOrder',
       productIdentificationPref: 'user/getProductIdentificationPref',
@@ -163,7 +164,8 @@ export default defineComponent({
       closeOutline,
       checkmarkCircle,
       store,
-      translate
+      translate,
+      productHelpers
     };
   },
 });