Merge branch 'main' of https://github.com/hotwax/fulfillment-pwa into #…

…801
hotwax · Dec 18, 2024 · fd6e4f8 · fd6e4f8
2 parents 803b336 + 80fdefe
commit fd6e4f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/OrderLookupLabelActionsPopover.vue b/src/components/OrderLookupLabelActionsPopover.vue
@@ -54,7 +54,7 @@ export default defineComponent({
         if(!shipmentIds.includes(shipmentPackage.shipmentId)) {
           shipmentIds.push(shipmentPackage.shipmentId)
         }
-        shippingLabelPdfUrls.push(shipmentPackage.labelImageUrl)
+        shipmentPackage.labelImageUrl && shippingLabelPdfUrls.push(shipmentPackage.labelImageUrl)
       })
 
       await OrderService.printShippingLabel(shipmentIds, shippingLabelPdfUrls)

diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
@@ -1638,7 +1638,7 @@ export default defineComponent({
 
       modal.onDidDismiss().then((result: any) => {
         if(result.data?.packOrder) {
-          this.packOrder(order);
+          this.packOrder(this.order);
         }
       })
 
@@ -1652,8 +1652,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);
         }
       })