From d7ce380e265169dc521b8771a7d4111aa9100cb5 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Tue, 31 Dec 2024 12:53:30 +0530
Subject: [PATCH] Improved: showing accepted or rejected status in the items in
 the assigned status (#565)

---
 src/components/AssignedCountPopover.vue | 8 ++++++--
 src/views/AssignedDetail.vue            | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/AssignedCountPopover.vue b/src/components/AssignedCountPopover.vue
index 49403f6c..d20d1bcc 100644
--- 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>
\ No newline at end of file
diff --git a/src/views/AssignedDetail.vue b/src/views/AssignedDetail.vue
index 972c81cb..06ae0c23 100644
--- 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="overline" 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>