From 7ca1f165de231195b66de3436aa2947c6366be67 Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 3 May 2019 10:29:59 +0800 Subject: [PATCH] multiple po and invoice fix --- app/Http/Controllers/BookingController.php | 13 ++++++-- .../assets/js/pages/booking/completed.vue | 30 +++++++++++++++---- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 505b0a46..2097d693 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -246,7 +246,7 @@ class BookingController extends Controller $user_bankslip = $booking->userBankSlip()->first(); $china_bankslip = $booking->chinaBankSlip()->get(); - $po = $booking->purchaseOrder()->first(); + $po = $booking->purchaseOrder()->get(); $invoice = $booking->invoice()->first(); if ($user_bankslip){ @@ -268,12 +268,19 @@ class BookingController extends Controller } if($po){ - $booking->user_po_path = Storage::url($po->image_path); + for($index = 0;$index < count($po); $index++){ + $po[$index] = Storage::url($po[$index]->image_path); + } + $booking->user_po_path = $po; } if($invoice){ - $booking->invoice_path = Storage::url($invoice->invoice_path); + for($index = 0;$index < count($invoice); $index++){ + $invoice[$index] = Storage::url($invoice[$index]->invoice_path); + } + $booking->invoice_path = $invoice; } + $booking->service_charge = 0; if($booking){ if ($booking->amount < 10000 && ($booking->term === 'x2_cash' || $booking->term === 'x2_cheque' || $booking->term === 'x2_ba')) { diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue index 2d4dc588..4209672e 100644 --- a/resources/assets/js/pages/booking/completed.vue +++ b/resources/assets/js/pages/booking/completed.vue @@ -12,13 +12,22 @@
Purchase Order
- + + + + + + + +
@@ -39,13 +48,22 @@
Invoice
- + + + + + + + +