From 293dfd6cd2e5fb1a978a4e20a0d8eb60fed9f9db Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 25 Jul 2018 22:33:14 +0800 Subject: [PATCH] temporary commented out rate and transfer amount from supplier booking --- app/Http/Controllers/BookingSupplierController.php | 5 ++--- database/seeds/BookTableSeeder.php | 4 ++-- .../js/pages/admin/booking/supplierBooking.vue | 14 ++++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 709662a0..94f87f37 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -87,10 +87,10 @@ class BookingSupplierController extends Controller // TODO : Multiple booking public function store(Request $request) { - $transfer_amount = $request->input("transfer_amount"); + //$transfer_amount = $request->input("transfer_amount"); $supplier_id = $request->input("supplier_id"); $booking_id = $request->input("booking_id"); - $rate = $request->input('rate'); + //$rate = $request->input('rate'); $rebate = $request->input('rebate'); // Calculation @@ -110,7 +110,6 @@ class BookingSupplierController extends Controller if (!$bookingsupplier){ $bookingsupplier = new SupplierBooking(); - } $bookingsupplier->supplier_id = $supplier->id; diff --git a/database/seeds/BookTableSeeder.php b/database/seeds/BookTableSeeder.php index 491032b7..9bbc0d9a 100644 --- a/database/seeds/BookTableSeeder.php +++ b/database/seeds/BookTableSeeder.php @@ -18,8 +18,8 @@ class BookTableSeeder extends Seeder $rate = Rate::all()->last(); DB::table('bookings')->insert([ - 'account_name' => 'milah', - 'account_num' => '99898', + 'account_name' => 'EXCHANGE SDN BHD', + 'account_num' => '99898239298123', 'bank_name' => 'maybank', 'bank_branch' => 'rembau', 'company_name' => 'ICEF', diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index dc4910c0..32042123 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -210,15 +210,15 @@ - + - + Generate Report @@ -260,7 +260,6 @@ supplier_options: null, supplierBookingForm: { supplier: null, - amount: null, rebate: null, rate: null, transfer_amount: null, @@ -333,10 +332,9 @@ let newReport = { booking_id: this.$route.params.id, supplier_id: this.supplierBookingForm.supplier, - amount: this.supplierBookingForm.amount, rebate: this.supplierBookingForm.rebate, - rate: this.supplierBookingForm.rate, - transfer_amount: this.supplierBookingForm.transfer_amount, + //rate: this.supplierBookingForm.rate, + //transfer_amount: this.supplierBookingForm.transfer_amount, } axios.post('/api/supplier-booking', newReport)