From d80f048f5a51648ed3523b1596b325db9aea3258 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Fri, 29 Jun 2018 19:01:15 +0800 Subject: [PATCH] added po and invoice into show booking return integrated complete page frontend integrated po page frontend integrated po complete page frontend removed ETA for transfer page frontend --- app/Http/Controllers/BookingController.php | 10 + .../assets/js/pages/booking/completed.vue | 301 +++++++++++++---- resources/assets/js/pages/booking/po.vue | 303 +++++++++++++++--- .../assets/js/pages/booking/poComplete.vue | 288 +++++++++++++---- .../assets/js/pages/booking/transfer.vue | 2 - 5 files changed, 727 insertions(+), 177 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 33919d20..a75a253d 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -135,6 +135,8 @@ class BookingController extends Controller // just added to try $user_bankslip = $booking->userBankSlip()->first(); $china_bankslip = $booking->chinaBankSlip()->first(); + $po = $booking->purchaseOrder()->first(); + $invoice = $booking->invoice()->first(); if($booking){ @@ -150,6 +152,14 @@ class BookingController extends Controller $booking->china_bankslip_path = Storage::url($china_bankslip->china_bank_slip_path); } + if($po){ + $booking->user_po_path = Storage::url($po->image_path); + } + + if($invoice){ + $booking->invoice_path = Storage::url($invoice->invoice_path); + } + $date2 = new DateTime(); $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue index 42585d3c..8fdab73e 100644 --- a/resources/assets/js/pages/booking/completed.vue +++ b/resources/assets/js/pages/booking/completed.vue @@ -3,11 +3,13 @@
-

Order Completed

+

Processing Invoice


+ Go Back
+
- +
@@ -18,29 +20,14 @@ - - + + - - -
- Invoice - -
- - - - - - - - -
@@ -49,24 +36,37 @@
- - + + + + +
+ Invoice + +
+ + + + + + +
+ -
Order Details
- + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
Order Number :
+ 		+
{{ booking_details.id }}
+
+
Date :
+ 		+
{{ booking_details.created_at }}
+
+
Customer Marking :
+ 		+
CIEF/150ECE
+
+
+ 		+
+
+
Term :
+ 		+
{{ booking_details.term }}
+
+
+ 		+
+
+ + +
+ + + + + +
+
+
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
CNY/RMB :
+ 		+
CNY {{ booking_details.amount }}
+
+
+ Service Charge :
+ 		+
CNY {{ booking_details.service_charge }}
+
+
/ RATE :
+ 		+
{{ booking_details.rate }}
+
+
+ 		+
MYR {{ booking_details.bia }}
+
+
+ 		+
MYR {{ booking_details.bia }}
+
+
+ 		+
+
+ + +
+ + + + + +
+
+
+
@@ -87,12 +257,12 @@
- Order Bankin Slip + Payment Bankin Slip
- + @@ -100,13 +270,14 @@