Merge pull request #139 from disha1202/fix_search_query

Updated query for searching PO and fixed default facility location not set on item in case PO history does not exists
hotwax · Oct 3, 2022 · 71dff3c · 71dff3c
2 parents 3d92fb8 + e3dcb71
commit 71dff3c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/store/modules/order/actions.ts b/src/store/modules/order/actions.ts
@@ -167,6 +167,8 @@ const actions: ActionTree<OrderState, RootState> = {
         "entityName": "ShipmentReceiptAndItem",
         "fieldList": ["datetimeReceived", "productId", "quantityAccepted", "quantityRejected", "receivedByUserLoginId", "shipmentId", 'locationSeqId']
       }
+      const facilityLocations = await this.dispatch('user/getFacilityLocations', this.state.user.currentFacility.facilityId);
+      const locationSeqId = facilityLocations.length > 0 ? facilityLocations[0].locationSeqId : "";
       resp = await OrderService.fetchPOHistory(params)
       if (resp.status === 200 && !hasError(resp) && resp.data?.count > 0) {
         const poHistory = resp.data.docs;
@@ -175,14 +177,16 @@ const actions: ActionTree<OrderState, RootState> = {
           products[item.productId] = item.locationSeqId
           return products
         }, {});
-        const facilityLocations = await this.dispatch('user/getFacilityLocations', this.state.user.currentFacility.facilityId)
-        const locationSeqId = facilityLocations ? facilityLocations[0].locationSeqId : "";
+
         current.items.map((item: any) => {
           item.locationSeqId = facilityLocationByProduct[item.productId] ? facilityLocationByProduct[item.productId] : locationSeqId;
         });
         commit(types.ORDER_CURRENT_UPDATED, current);
         return poHistory;
       } else {
+        current.items.map((item: any) => {
+          item.locationSeqId = locationSeqId;
+        });
         current.poHistory.items = [];
       }
     } catch(error){

diff --git a/src/store/modules/user/actions.ts b/src/store/modules/user/actions.ts
@@ -170,9 +170,11 @@ const actions: ActionTree<UserState, RootState> = {
         return facilityLocations;
       } else {
         console.error(resp);
+        return [];
       }
     } catch(err) {
       console.error(err);
+      return [];
     }
   },
 

diff --git a/src/views/Returns.vue b/src/views/Returns.vue
@@ -88,6 +88,14 @@ export default defineComponent({
         payload.inputFields["externalId_op"] = "contains";
         payload.inputFields["externalId_ic"] = "Y";
         payload.inputFields["externalId_grp"] = "3";
+        payload.inputFields["hcOrderId"] = this.queryString;
+        payload.inputFields["hcOrderId_op"] = "contains";
+        payload.inputFields["hcOrderId_ic"] = "Y";
+        payload.inputFields["hcOrderId_grp"] = "4";
+        payload.inputFields["shopifyOrderName"] = this.queryString;
+        payload.inputFields["shopifyOrderName_op"] = "contains";
+        payload.inputFields["shopifyOrderName_ic"] = "Y";
+        payload.inputFields["shopifyOrderName_grp"] = "5";
       }
       await this.store.dispatch("return/findReturn", payload);
     },