From 0bf0631cd831d7a6e6e538dc8c8468403c65dae7 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 8 Feb 2024 10:45:48 +0530
Subject: [PATCH 1/2] Improved: fetch completed picklist payload to fetch
 picklist with status PICKED

---
 src/store/modules/picklist/actions.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/picklist/actions.ts b/src/store/modules/picklist/actions.ts
index 54b931d..20d20d0 100644
--- a/src/store/modules/picklist/actions.ts
+++ b/src/store/modules/picklist/actions.ts
@@ -53,7 +53,8 @@ const actions: ActionTree<PicklistState, RootState> = {
     let resp;
     const params = {
       "inputFields": {
-        "statusId": "PICKLIST_COMPLETED",
+        "statusId": ["PICKLIST_COMPLETED", "PICKLIST_PICKED"],
+        "statusId_op": "in",
         "facilityId": this.state.user.currentFacility.facilityId,
       },
       "orderBy": "picklistDate DESC",

From f434aa1c5726700fe7d75023dad1f8d77387d580 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Thu, 8 Feb 2024 11:55:12 +0530
Subject: [PATCH 2/2] Improved: checks and conditions for picked status as same
 as completed status

---
 src/components/Picklist-detail-item.vue | 2 +-
 src/views/Picklist-Detail.vue           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Picklist-detail-item.vue b/src/components/Picklist-detail-item.vue
index dbb12ed..60d355c 100644
--- a/src/components/Picklist-detail-item.vue
+++ b/src/components/Picklist-detail-item.vue
@@ -10,7 +10,7 @@
       <p>{{ $t("Color") }} : {{ $filters.getFeatures(getProduct(picklistItem.productId).featureHierarchy, '1/COLOR/') }}</p>
       <p>{{ $t("Size") }} : {{ $filters.getFeatures(getProduct(picklistItem.productId).featureHierarchy, '1/SIZE/') }}</p>
     </ion-label>
-    <ion-checkbox v-if="picklistItem.statusId !== 'PICKLIST_COMPLETED'" :modelValue="picklistItem.isChecked" slot="end" />
+    <ion-checkbox v-if="picklistItem.statusId !== 'PICKLIST_COMPLETED' && picklistItem.statusId !== 'PICKLIST_PICKED'" :modelValue="picklistItem.isChecked" slot="end" />
   </ion-item>
 </template>
 
diff --git a/src/views/Picklist-Detail.vue b/src/views/Picklist-Detail.vue
index dca3a0f..f7d6237 100644
--- a/src/views/Picklist-Detail.vue
+++ b/src/views/Picklist-Detail.vue
@@ -24,7 +24,7 @@
         <ion-back-button default-href="/" slot="start" />
         <ion-title>{{ id }}</ion-title>
         <ion-buttons slot="end">
-          <ion-button @click="selectAll" v-if="picklist.statusId !== 'PICKLIST_COMPLETED'">{{ $t ("Select all") }}</ion-button>
+          <ion-button @click="selectAll" v-if="picklist.statusId !== 'PICKLIST_COMPLETED' && picklist.statusId !== 'PICKLIST_PICKED'">{{ $t ("Select all") }}</ion-button>
           <ion-menu-button>
             <ion-icon :icon="swapVerticalOutline" />
           </ion-menu-button>
@@ -46,7 +46,7 @@
       </ion-list>
      </ion-content>
 
-     <ion-footer v-if="picklist.statusId !== 'PICKLIST_COMPLETED'">
+     <ion-footer v-if="picklist.statusId !== 'PICKLIST_COMPLETED' && picklist.statusId !== 'PICKLIST_PICKED'">
       <ion-toolbar>
         <ion-buttons class="footer-buttons">
           <ion-button class="action-button" fill="outline" color="secondary" @click="scanCode()">