Merge pull request #504 from amansinghbais/#494-recount-current

Improved: UI for the recount to show previous count and updated validation to allow user save 0 as count (#494)
hotwax · Nov 12, 2024 · f5fa523 · f5fa523
2 parents bfba8bf + 7c43782
commit f5fa523
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -60,7 +60,6 @@
   "Created": "Created",
   "CSV data is missing or incorrect. Please check your file.": "CSV data is missing or incorrect. Please check your file.",
   "CSV Mapping": "CSV Mapping",
-  "Current count": "Current count",
   "Cycle Count": "Cycle Count",
   "Cycle count": "Cycle count",
   "Cycle count cancelled successfully.": "Cycle count cancelled successfully.",
@@ -152,6 +151,7 @@
   "Make sure you've reviewed the products and their counts before uploading them for review": "Make sure you've reviewed the products and their counts before uploading them for review",
   "Map all required fields": "Map all required fields",
   "Mapping name": "Mapping name",
+  "New Count": "New Count",
   "New mapping": "New mapping",
   "No cycle counts found": "No cycle counts found",
   "No items found": "No items found",
@@ -222,6 +222,7 @@
   "Save new count": "Save new count",
   "Saved mappings": "Saved mappings",
   "Saving recount will replace the existing count for item.": "Saving recount will replace the existing count for item.",
+  "Scan a count before saving changes": "Scan a count before saving changes",
   "Scan items": "Scan items",
   "Scanned item does not match current product": "Scanned item does not match current product",
   "Scan or search products": "Scan or search products",

diff --git a/src/views/CountDetail.vue b/src/views/CountDetail.vue
@@ -115,6 +115,9 @@
                 <ion-list v-if="product.isRecounting">
                   <ion-item>
                     <ion-input :label="translate('Count')" :disabled="productStoreSettings['forceScan']" :placeholder="translate('submit physical count')" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                    <ion-button slot="end" fill="clear" size="default" class="ion-no-padding" @click="inputCount = 0">
+                      <ion-icon :icon="closeOutline" stot="icon-only" />
+                    </ion-button>
                   </ion-item>
 
                   <template v-if="productStoreSettings['showQoh']">
@@ -173,6 +176,9 @@
                   </ion-item>
                   <ion-item v-else>
                     <ion-input :label="translate('Count')" :placeholder="translate('submit physical count')" :disabled="productStoreSettings['forceScan']" name="value" v-model="inputCount" id="value" type="number" min="0" required @ionInput="hasUnsavedChanges=true" @keydown="inputCountValidation"/>
+                    <ion-button slot="end" fill="clear" size="default" class="ion-no-padding" @click="inputCount = 0">
+                      <ion-icon :icon="closeOutline" stot="icon-only" />
+                    </ion-button>
                   </ion-item>
 
                   <template v-if="productStoreSettings['showQoh']">
@@ -232,7 +238,7 @@ import {
   onIonViewDidLeave,
   alertController
 } from '@ionic/vue';
-import { chevronDownCircleOutline, chevronUpCircleOutline } from "ionicons/icons";
+import { chevronDownCircleOutline, chevronUpCircleOutline, closeOutline } from "ionicons/icons";
 import { translate } from '@/i18n'
 import { computed, defineProps, ref } from 'vue';
 import { useStore } from "@/store";
@@ -299,6 +305,7 @@ onIonViewDidEnter(async() => {
 
 onIonViewDidLeave(async() => {
   await store.dispatch('count/updateCycleCountItems', []);
+  store.dispatch("product/currentProduct", {});
 })
 
 onBeforeRouteLeave(async (to) => {
@@ -400,6 +407,7 @@ async function scanProduct() {
 
   if(!selectedItem) {
     showToast(translate("Scanned item is not present in the count."))
+    queryString.value = ""
     return;
   }
 
@@ -420,6 +428,7 @@ async function scanProduct() {
       inputCount.value++
     }
   }
+  queryString.value = ""
 }
 
 function updateFilteredItems() {
@@ -515,8 +524,8 @@ function getVariance(item , isRecounting) {
 }
 
 async function saveCount(currentProduct) {
-  if (!inputCount.value) {
-    showToast(translate("Enter a count before saving changes"))
+  if (!inputCount.value && inputCount.value !== 0) {
+    showToast(translate(productStoreSettings.value['forceScan'] ? "Scan a count before saving changes" : "Enter a count before saving changes"))
     return;
   }
   try {
@@ -566,7 +575,7 @@ async function openRecountAlert() {
     {
       text: translate('Re-count'),
       handler: () => {
-        inputCount.value = 0; 
+        inputCount.value = product.value.quantity; 
         product.value.isRecounting = true;
       }
     }]
@@ -575,8 +584,8 @@ async function openRecountAlert() {
 }
 
 async function openRecountSaveAlert() {
-  if (!inputCount.value) {
-    showToast(translate("Enter a count before saving changes"));
+  if (!inputCount.value && inputCount.value !== 0) {
+    showToast(translate(productStoreSettings.value['forceScan'] ? "Scan a count before saving changes" : "Enter a count before saving changes"));
     return;
   }
 

diff --git a/src/views/ProductItemList.vue b/src/views/ProductItemList.vue
@@ -49,7 +49,7 @@ const productStoreSettings = computed(() => store.getters["user/getProductStoreS
 const currentProduct = computed(() => store.getters["product/getCurrentProduct"])
 
 onMounted(() => {
-  if (currentProduct.value) {
+  if (Object.keys(currentProduct.value).length) {
     navigateToDetail(currentProduct.value);
   }
 })