diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 101359b8..f84c2502 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -42,11 +42,17 @@ class BookingSupplierController extends Controller // TODO : Multiple booking public function store(Request $request) { + $transfer_amount = $request->input("transfer_amount"); $supplier_id = $request->input("supplier_id"); $booking_id = $request->input("booking_id"); $rate = $request->input('rate'); $rebate = $request->input('rebate'); + + if ($supplierbooking = SupplierBooking::where('book_id', $booking_id)->first()){ + return response()->json(['success'=>false, 'message'=>'Bad request, please contact support'], 400); + } + // Calculation $amountInRMB = $transfer_amount * $rate; @@ -72,8 +78,8 @@ class BookingSupplierController extends Controller $bookingsupplier->save(); // update booking status - $booking->status = 4; - $booking->admin_status = 3; + $booking->status = 5; + $booking->admin_status = 4; $booking->save(); //// one bookingsupplier has many booking diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index a47c37b6..14ccd189 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -342,21 +342,20 @@ axios.post('/api/supplier-booking', newReport) .then((response) => { this.loading_btn = false - console.log(response) - // this.bookingConfirmTable.date = response.data.date - // this.bookingConfirmTable.marking = response.data.marking - // this.bookingConfirmTable.payment_method = response.data.payment_method - // this.bookingConfirmTable.amount = response.data.amount - // this.bookingConfirmTable.service_charge = response.data.service_charge - // this.bookingConfirmTable.rate = response.data.rate - // this.bookingConfirmTable.bankin_amount = response.data.bankin_amount - // this.bookingConfirmTable.account_name = this.bookingForm.account_name - // this.dialogFormVisible = false - // this.dialogFormVisible1 = true + + this.$router.push({ + name: 'booking.admin.supplier.report', + params: {id: this.$route.params.id } + }) + // redirect to supplier report + }) .catch((error) => { this.loading_btn = false console.log(error) + + // TODO : Show error message + }) } else { diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 37196cb3..07e7cfc4 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -1,13 +1,13 @@