Merge pull request #513 from amansinghbais/#494-fetch-identifier

Improved: fetching dynamic good identification from store permissions page and showing 'not counted' for rejected item without quantity (#494)
hotwax · Nov 12, 2024 · b4a25e9 · b4a25e9
2 parents aa2bdbd + a43466e
commit b4a25e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -289,7 +289,7 @@
   "Update time zone": "Update time zone",
   "Upload": "Upload",
   "Upload inventory count": "Upload inventory count",
-  "units": "units",
+  "units": "{count} units",
   "Username": "Username",
   "Variance": "Variance",
   "variance": "variance",

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
@@ -423,12 +423,13 @@ async function scanProduct() {
         element.scrollIntoView({ behavior: 'smooth' });
       }
     }, 0);
+    inputCount.value = ""
   } else if(selectedItem.itemStatusId === "INV_COUNT_CREATED") {
     if((!selectedItem.quantity && selectedItem.quantity !== 0) || product.value.isRecounting) {
       hasUnsavedChanges.value = true;
       inputCount.value++
     } else if(selectedItem.quantity >= 0 && selectedItem.itemStatusId !== "INV_COUNT_REJECTED" && selectedItem.itemStatusId !== "INV_COUNT_COMPLETED") {
-      this.openRecountAlert()
+      openRecountAlert()
     }
   }
   queryString.value = ""

diff --git a/src/views/ProductItemList.vue b/src/views/ProductItemList.vue
@@ -9,13 +9,13 @@
       <p>{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].secondaryId, getProduct(item.productId)) }}</p>
     </ion-label>
     <ion-badge slot="end" color="danger" v-if="item.itemStatusId === 'INV_COUNT_REJECTED'">
-      {{ item.quantity === 0 ? 0 : item.quantity }} {{ translate("units") }}
+      {{ (!item.quantity && item.quantity !== 0) ? translate("not counted") : translate("units", { count: item.quantity }) }}
     </ion-badge>
     <ion-note v-else-if="item.itemStatusId === 'INV_COUNT_COMPLETED'" color="success">
       {{ translate("accepted") }}
     </ion-note>
     <ion-badge slot="end" v-else-if="item.quantity >= 0 && item.statusId === 'INV_COUNT_ASSIGNED'">
-      {{ item.quantity }} {{ translate("units") }}
+      {{ translate("units", { count: item.quantity }) }}
     </ion-badge>
     <ion-note v-else-if="item.quantity === undefined || item.quantity === null && item.statusId === 'INV_COUNT_ASSIGNED'">
       {{ translate("pending") }}

diff --git a/src/views/StorePermissions.vue b/src/views/StorePermissions.vue
@@ -73,6 +73,7 @@ const productIdentifications = computed(() => store.getters["user/getGoodIdentif
 
 onIonViewWillEnter(async () => {
   await store.dispatch("user/getProductStoreSetting")
+  await store.dispatch("user/fetchGoodIdentificationTypes")
 })
 
 function updateProductStoreSetting(event: any, key: string) {