Merge pull request #192 from amansinghbais/picked-item-completed

Improved: fetch completed picklist payload to fetch picklist with status PICKLIST_PICKED
hotwax · Feb 8, 2024 · 95723f3 · 95723f3
2 parents b86a715 + f434aa1
commit 95723f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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/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",

diff --git 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()">