diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 9acf3687..33919d20 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -134,9 +134,7 @@ class BookingController extends Controller $booking = Booking::where('user_id',Auth::user()->id)->where('id', $id)->first(); // just added to try $user_bankslip = $booking->userBankSlip()->first(); - - - + $china_bankslip = $booking->chinaBankSlip()->first(); if($booking){ @@ -148,6 +146,10 @@ class BookingController extends Controller $date1 = new DateTime($user_bankslip->updated_at); } + if($china_bankslip){ + $booking->china_bankslip_path = Storage::url($china_bankslip->china_bank_slip_path); + } + $date2 = new DateTime(); $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); @@ -455,7 +457,7 @@ class BookingController extends Controller return response()->json(['user_po_path'=> $user_po->image_path ],200); } - return response()->json(['message'=> 'waiting customer to upload their po'],400); + return response()->json(['message'=> 'waiting customer to upload their po'], 200); } public function delete(Booking $book_id) diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 650ad1e3..326d8b3f 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -310,10 +310,7 @@ duration: 5000 }) }) - - - - this.$router.push({ + this.$router.push({ name: 'booking.admin.cnslip', params: {id: this.$route.params.id } }) diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index 7e2d0d89..0f6dd21b 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -328,7 +328,9 @@ .get('/api/booking/'+ this.$route.params.id +'/po') .then((response) => { loading.close() - this.user_po_path = response.user_po_path + if(response.user_po_path){ + this.user_po_path = response.user_po_path + } }).catch((error) => { loading.close() console.log(error) diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue index a75afce3..a92a2b57 100644 --- a/resources/assets/js/pages/booking/uploadPo.vue +++ b/resources/assets/js/pages/booking/uploadPo.vue @@ -49,7 +49,7 @@ - + @@ -65,20 +65,160 @@ 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 }} +
+
+
+ 		+
+
+ + +
+ +
+
+

@@ -91,7 +231,7 @@ - + @@ -117,49 +257,37 @@ export default { booking_id: this.$route.params.id, status: 5, loading_btn: false, - bookingConfirmTable: [{ - data1: 'Order Number :', - data2: '001' - }, { - data1: 'Date :', - data2: '25/5/2018' - }, { - data1: 'Customer Marking :', - data2: 'CIEF/150ECE' - }, { - data1: '', - data2: '' - }, { - data1: 'Payment Method :', - data2: 'Cash/Bank Transfer' - }, { - data1: '', - data2: '' - }], - bookingConfirmTable2: [{ - data1: 'CNY/RMB :', - data2: 'CNY 120,500.00' - }, { - data1: '+ Service Charge :', - data2: 'CNY 20.00' - }, { - data1: '/ RATE :', - data2: '1.63' - }, { - data1: '', - data2: 'MYR 73,848.04' - }, { - data1: '+ GST 6% :', - data2: 'MYR 4,430.88' - }, { - data1: '', - data2: 'MYR 78,278.92' - }, { - data1: '', - data2: '' - }] + booking_details:{ + id: null, + amount: null, + bia: null, + user_bankslip_path: null, + china_bankslip_path: null, + } } }, + beforeCreate () { + const loading = this.$loading({ + lock: true, + text: 'Please wait..', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + + axios + .get('/api/booking/' + this.$route.params.id) + .then((response) => { + this.booking_details = response.data + loading.close() + + }).catch((error) => { + console.log(error) + loading.close() + this.$router.push({ + name: 'notfound' + }) + }) + }, methods: { uploadPo () { this.loading_btn = true