Merge pull request #597 from amansinghbais/#528-fixes

Fixed: wrong button getting displayed in case of unmatched product (#528)
hotwax · Jan 9, 2025 · 7420d5e · 7420d5e
2 parents 40af5f4 + 37f7847
commit 7420d5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/views/HardCountDetail.vue b/src/views/HardCountDetail.vue
@@ -40,7 +40,7 @@
 
         <!--Product details-->
         <main :class="itemsList?.length ? 'product-detail' : ''">
-          <template v-if="itemsList?.length">
+          <template v-if="itemsList?.length && Object.keys(currentProduct)?.length">
             <div class="product" @scroll="onScroll">
               <div class="image ion-padding-top" v-for="item in itemsList" :key="item.importItemSeqId || item.scannedId" :data-product-id="item.productId" :data-seq="item.importItemSeqId" :id="isItemAlreadyAdded(item) ? `${item.productId}-${item.importItemSeqId}` :  item.scannedId" :data-isMatching="item.isMatching" :data-scanned-id="item.scannedId">
                 <Image :src="getProduct(item.productId)?.mainImageUrl" />

diff --git a/src/views/ProductItemList.vue b/src/views/ProductItemList.vue
@@ -70,6 +70,8 @@ async function navigateToDetail(item: any) {
     const element = document.getElementById(isItemAlreadyAdded(item) ? `${item.productId}-${item.importItemSeqId}` : item.scannedId);
     if (element) {
       element.scrollIntoView({ behavior: 'smooth' });
+    } else {
+      store.dispatch("product/currentProduct", item);
     }
   }, 0);
 }