From 62d0d83cb6fc61317005ab2bd0adb4aff1dc2f9e Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 25 Jun 2018 17:34:34 +0800 Subject: [PATCH 1/3] attempt to fetch user bankslip --- app/Http/Controllers/BookingController.php | 10 +++++----- .../assets/js/pages/admin/booking/verification.vue | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index ea7332b2..f18d5a76 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -144,8 +144,8 @@ class BookingController extends Controller public function adminShow($id) { $booking = Booking::where('id', $id)->first(); - return $booking->userBankSlip()->get(); - + $booking->user_bankslip_path = $booking->userBankSlip()->first()->bankslip_path; + if($booking){ $date1 = new DateTime($booking->created_at); $date2 = new DateTime(); @@ -315,7 +315,7 @@ class BookingController extends Controller $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea $unique_image_path = $unique_name. '.' .$ext; Storage::putFileAs( - 'user_bankslip', $bankslip_file, $unique_image_path + 'user_bankslip', $bankslip_file, $unique_image_path, 'public' ); $user_bankslip = new UserBankSlip; @@ -372,7 +372,7 @@ class BookingController extends Controller $unique_name = 'purchase_order_' . md5($filename. time()); $unique_image_path = $unique_name. '.' .$ext; Storage::putFileAs( - 'purchase_order',/*folder name*/ $user_input_file, $unique_image_path + 'purchase_order',/*folder name*/ $user_input_file, $unique_image_path, 'public' ); $user_po = new PurchaseOrder; @@ -553,7 +553,7 @@ class BookingController extends Controller $unique_name = 'invoice' . md5($filename. time()); $unique_file_url = $unique_name. '.' .$ext; Storage::putFileAs( - 'invoice',/*folder name*/ $input_file, $unique_file_url + 'invoice',/*folder name*/ $input_file, $unique_file_url, 'public' ); $invoice = new Invoice; diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 20bac84b..d01ceba4 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -198,7 +198,7 @@ - + @@ -235,7 +235,8 @@ id: null, amount: null, bia: null, - } + user_bankslip_path: null, + }, } }, beforeCreate () { From ffe1023bba6e57b2b33286451631b9668c88f0c0 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 25 Jun 2018 17:48:51 +0800 Subject: [PATCH 2/3] added credit limit seeder, it causes error when creating booking --- app/Http/Controllers/BookingController.php | 7 ++++++- database/seeds/CreditTableSeeder.php | 22 ++++++++++++++++++++++ database/seeds/DatabaseSeeder.php | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 database/seeds/CreditTableSeeder.php diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index f18d5a76..6e192344 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -165,7 +165,12 @@ class BookingController extends Controller $rates = Rate::orderby('updated_at','desc')->first(); $term = $request->input('term'); $amount = $request->input("amount"); // in RMB - $creditLimit = SettingCredit::orderby('updated_at','desc')->first(); + $creditLimit = SettingCredit::orderby('updated_at','desc')->first(); + + if (!$creditLimit){ + return response()->json("Credit limit not set, please contact admin", 405); + } + if($amount > $creditLimit->rmb_credit_limit){ return response()->json("Exceed credit limit, need approved from admin", 401); } diff --git a/database/seeds/CreditTableSeeder.php b/database/seeds/CreditTableSeeder.php new file mode 100644 index 00000000..0f6e4932 --- /dev/null +++ b/database/seeds/CreditTableSeeder.php @@ -0,0 +1,22 @@ +insert([ + 'rmb_credit_limit' => 20000, + 'usd_credit_limit' => 20000, + 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), + 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), + ]); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 098d40f3..95fb2c2f 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -16,5 +16,6 @@ class DatabaseSeeder extends Seeder $this->call(UserRoleSeeder::class); $this->call(RateTableSeeder::class); $this->call(BookTableSeeder::class); + $this->call(CreditTableSeeder::class); } } From 89f5e34aa8019e334abed3cbf861c239758682ac Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 25 Jun 2018 17:52:41 +0800 Subject: [PATCH 3/3] update booking status on stage 2 --- app/Http/Controllers/BookingController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 6e192344..59fe7006 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -339,7 +339,13 @@ class BookingController extends Controller if(!$user_bankslip){ return response()->json(["message"=> "not found"],400); - } + } + + // update booking status + $booking->status = 3; + $booking->admin_status = 2; + $booking->save(); + $user_bankslip->transfer_amount = $request->input('transfer_amount'); $user_bankslip->save(); return response()->json(["message"=> "Success"],200);