Merge pull request #577 from amansinghbais/#565-rejected

Improved: showing accepted or rejected status in the items in the assigned status (#565)
hotwax · Jan 9, 2025 · 285fa2f · 285fa2f
2 parents 4d60821 + 776ba05
commit 285fa2f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/components/AssignedCountPopover.vue b/src/components/AssignedCountPopover.vue
@@ -2,11 +2,11 @@
   <ion-content>
     <ion-list>
       <ion-list-header>{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].primaryId, getProduct(item.productId)) || getProduct(item.productId).productName }}</ion-list-header>
-      <ion-item :lines="item.quantity ? 'none' : 'full'">
+      <ion-item :lines="isRemoveItemEligible(item) ? 'full' : 'none'">
         <ion-label>{{ translate("Last counted")}}</ion-label>
         <ion-note slot="end">{{ timeFromNow(item.lastCountedDate) }}</ion-note>
       </ion-item>
-      <ion-item v-if="!item.quantity" lines="none" button @click="updateItem('remove')">
+      <ion-item v-if="isRemoveItemEligible(item)" lines="none" button @click="updateItem('remove')">
         <ion-label>{{ translate("Remove from count")}}</ion-label>
         <ion-icon slot="end" :icon="removeCircleOutline"/>
       </ion-item>
@@ -39,4 +39,8 @@ const productStoreSettings = computed(() => store.getters["user/getProductStoreS
 function updateItem(action: string) {
   popoverController.dismiss({ itemAction: action })
 }
+
+function isRemoveItemEligible(item: any) {
+  return item.itemStatusId !== 'INV_COUNT_REJECTED' && item.itemStatusId !== 'INV_COUNT_COMPLETED' && !item.quantity;
+}
 </script>
diff --git a/src/views/AssignedDetail.vue b/src/views/AssignedDetail.vue
@@ -77,6 +77,7 @@
                 <Image :src="getProduct(item.productId).mainImageUrl"/>
               </ion-thumbnail>
               <ion-label>
+                <p :class="item.itemStatusId === 'INV_COUNT_COMPLETED' ? 'overline status-success' : 'overline status-danger'" v-if="item.itemStatusId === 'INV_COUNT_COMPLETED' || item.itemStatusId === 'INV_COUNT_REJECTED'">{{ translate(item.itemStatusId === "INV_COUNT_COMPLETED" ? "accepted" : "rejected") }}</p>
                 <h2>{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].primaryId, getProduct(item.productId)) || getProduct(item.productId).productName }}</h2>
                 <p>{{ getProductIdentificationValue(productStoreSettings["productIdentificationPref"].secondaryId, getProduct(item.productId)) }}</p>
               </ion-label>
@@ -410,6 +411,14 @@ function updateCustomTime(event: any) {
   --padding-bottom: 80px;
 }
 
+.status-success {
+  color: var(--ion-color-success);
+}
+
+.status-danger {
+  color: var(--ion-color-danger);
+}
+
 @media (max-width: 991px) {
   .header {
     grid: "search"