From 8e374395c5b7417d87c5ba9b848c2591c31a80f2 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Tue, 12 Nov 2024 18:48:44 +0530 Subject: [PATCH 1/5] Improved: fetching dynamic good identification types from store permissions (#494) --- src/views/StorePermissions.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/StorePermissions.vue b/src/views/StorePermissions.vue index 0f202619..3a3343c8 100644 --- 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) { From ce22e91a83749ddb7d947696d37983a9bcb04bfe Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Tue, 12 Nov 2024 19:04:58 +0530 Subject: [PATCH 2/5] Improved: showing not counted in case of rejected item with no qty (#494) --- src/locales/en.json | 2 +- src/views/ProductItemList.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/locales/en.json b/src/locales/en.json index 4d245de4..23f0f3e2 100644 --- 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/ProductItemList.vue b/src/views/ProductItemList.vue index 467b533f..149f03cb 100644 --- a/src/views/ProductItemList.vue +++ b/src/views/ProductItemList.vue @@ -9,13 +9,13 @@

{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].secondaryId, getProduct(item.productId)) }}

- {{ item.quantity === 0 ? 0 : item.quantity }} {{ translate("units") }} + {{ (!item.quantity && item.quantity !== 0) ? translate("not counted") : translate("units", { count: item.quantity }) }} {{ translate("accepted") }} - {{ item.quantity }} {{ translate("units") }} + {{ translate("units", { count: item.quantity }) }} {{ translate("pending") }} From 52b6b8cd13e9cdc5d9dbd23becdfd7dde25bca78 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Tue, 12 Nov 2024 19:16:17 +0530 Subject: [PATCH 3/5] Fixed: recount alert method call (#494) --- src/views/CountDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue index 829797a5..238394cd 100644 --- a/src/views/CountDetail.vue +++ b/src/views/CountDetail.vue @@ -428,7 +428,7 @@ async function scanProduct() { 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 = "" From 364fb1fc0a35f7b5b3522a1bd3f4787296bfe0c6 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Tue, 12 Nov 2024 19:26:05 +0530 Subject: [PATCH 4/5] Fixed: reseting input count to empty string on bringing it to view for the first time (#494) --- src/views/CountDetail.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue index 238394cd..a4323001 100644 --- a/src/views/CountDetail.vue +++ b/src/views/CountDetail.vue @@ -423,6 +423,7 @@ async function scanProduct() { element.scrollIntoView({ behavior: 'smooth' }); } }, 0); + if(!selectedItem.quantity && selectedItem.quantity !== 0) inputCount.value = "" } else if(selectedItem.itemStatusId === "INV_COUNT_CREATED") { if((!selectedItem.quantity && selectedItem.quantity !== 0) || product.value.isRecounting) { hasUnsavedChanges.value = true; From a43466e392dfc42a4e4a8e9559e0f1a8425a186b Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Tue, 12 Nov 2024 19:28:18 +0530 Subject: [PATCH 5/5] Improving: reseting the input count each time a new product comes in view (#494) --- src/views/CountDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue index a4323001..059dc1e2 100644 --- a/src/views/CountDetail.vue +++ b/src/views/CountDetail.vue @@ -423,7 +423,7 @@ async function scanProduct() { element.scrollIntoView({ behavior: 'smooth' }); } }, 0); - if(!selectedItem.quantity && selectedItem.quantity !== 0) inputCount.value = "" + inputCount.value = "" } else if(selectedItem.itemStatusId === "INV_COUNT_CREATED") { if((!selectedItem.quantity && selectedItem.quantity !== 0) || product.value.isRecounting) { hasUnsavedChanges.value = true;