Skip to content

Commit 265b088

Browse files
committed
Improved: condition for fetching open orders by refering list page condition and changed the entity to fetch shipment status(hotwax#472)
1 parent 39ae51c commit 265b088

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/store/modules/order/actions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ const actions: ActionTree<OrderState , RootState> ={
416416
async getOrderDetail({ dispatch, state }, { payload, orderType }) {
417417
if(orderType === 'open') {
418418
payload['orderStatusId'] = "ORDER_APPROVED"
419-
payload['-shipmentStatusId'] = "*"
419+
payload['-shipmentStatusId'] = "(SHIPMENT_PACKED OR SHIPMENT_SHIPPED)"
420420
payload['-fulfillmentStatus'] = '(Cancelled OR Rejected)'
421421
} else if(orderType === 'packed') {
422422
payload['shipmentStatusId'] = "SHIPMENT_PACKED"

src/views/OrderDetailUpdated.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ export default defineComponent({
11791179
},
11801180
fieldList: ["shipmentId", "statusId", "statusDate"],
11811181
viewSize: 50,
1182-
entityName: "ShipmentStatus"
1182+
entityName: "ShipmentAndShipmentStatus"
11831183
}) as any
11841184
11851185
if(!hasError(resp) && shipmentStatusResp.data?.docs.length) {

0 commit comments

Comments
 (0)