From ab261be18ab5f5c37d4a902f9228895ef51fb2f2 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 11 Dec 2024 17:06:04 +0530 Subject: [PATCH 1/2] Improved: sending updated order detail post shipping label generation in the packOrder (#764) --- src/views/OrderDetail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue index 0f0b0a67..f30d8855 100644 --- a/src/views/OrderDetail.vue +++ b/src/views/OrderDetail.vue @@ -1632,7 +1632,7 @@ export default defineComponent({ modal.onDidDismiss().then((result: any) => { if(result.data?.packOrder) { - this.packOrder(order); + this.packOrder(this.order); } }) @@ -1646,8 +1646,8 @@ export default defineComponent({ modal.onDidDismiss().then((result: any) => { if(result.data?.moveToNext) { - if(this.isForceScanEnabled) this.scanOrder(order); - else this.packOrder(order); + if(this.isForceScanEnabled) this.scanOrder(this.order); + else this.packOrder(this.order); } }) From b324dd2e42a983e124d6e659abff54cf9bb77af3 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 18 Dec 2024 12:20:03 +0530 Subject: [PATCH 2/2] Fixed: null going in the list of shipping label pdf url array for print shipping label (#878) --- src/components/OrderLookupLabelActionsPopover.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/OrderLookupLabelActionsPopover.vue b/src/components/OrderLookupLabelActionsPopover.vue index 01bd8e6b..6f28e8f2 100644 --- a/src/components/OrderLookupLabelActionsPopover.vue +++ b/src/components/OrderLookupLabelActionsPopover.vue @@ -52,7 +52,7 @@ export default defineComponent({ shipmentPackages.map((shipmentPackage: any) => { shipmentIds.push(shipmentPackage.shipmentId) - shippingLabelPdfUrls.push(shipmentPackage.labelImageUrl) + shipmentPackage.labelImageUrl && shippingLabelPdfUrls.push(shipmentPackage.labelImageUrl) }) await OrderService.printShippingLabel(shipmentIds, shippingLabelPdfUrls)