From 1b874d080059c38d0cfca148a4850cc52d15e4ab Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Sat, 21 Jul 2018 01:43:10 +0800 Subject: [PATCH] Fix conflit --- app/Http/Controllers/BookingController.php | 128 +++++++------- resources/assets/js/pages/admin/home.vue | 3 +- .../assets/js/pages/booking/transfer.vue | 18 +- .../assets/js/pages/booking/uploadPo.vue | 26 +-- .../js/pages/booking/uploadUserBankSlip.vue | 156 +++++++----------- resources/assets/js/pages/home.vue | 63 ++++++- 6 files changed, 206 insertions(+), 188 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 2d1a3858..05ce2205 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -21,7 +21,6 @@ class BookingController extends Controller { public function index(){ - return 123; $user = Auth::user(); $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', $user->id) @@ -78,74 +77,73 @@ class BookingController extends Controller } public function adminIndex(){ - return 123; - // $user = Auth::user(); - // $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') - // ->orderby('updated_at','desc') - // ->get(); + $user = Auth::user(); + $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') + ->orderby('updated_at','desc') + ->get(); - // // reformat to fit frontend structure - // foreach ($bookings as $booking) { - // // set timeout - // $date1 = new DateTime($booking->created_at); - // $date2 = new DateTime(); - // $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; - // $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); - // $booking->timeout = $difference_in_seconds; + // reformat to fit frontend structure + foreach ($bookings as $booking) { + // set timeout + $date1 = new DateTime($booking->created_at); + $date2 = new DateTime(); + $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; + $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); + $booking->timeout = $difference_in_seconds; - // // TODO : you can make it better - // if($difference_in_seconds < 0 ){ - // $booking->timeout = 0; - // } + // TODO : you can make it better + if($difference_in_seconds < 0 ){ + $booking->timeout = 0; + } - // // TODO : transfer_amount change name to bia - // $booking->transfer_amount = $booking->bia; + // TODO : transfer_amount change name to bia + $booking->transfer_amount = $booking->bia; - // $term = $booking->term; - // if($term == "x1_ba" || $term == "x2_cheque"){ - // $status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status; - // $booking->track_status = "(". $status ."/5)"; - // } - // else{ - // $booking->track_status = "(". $booking->admin_status ."/7)"; - // } + $term = $booking->term; + if($term == "x1_ba" || $term == "x2_cheque"){ + $status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status; + $booking->track_status = "(". $status ."/5)"; + } + else{ + $booking->track_status = "(". $booking->admin_status ."/7)"; + } - // switch ($booking->admin_status) { - // case 1: - // $status_desc = "Waiting customer upload bank slip"; - // break; - // case 2: - // $status_desc = "Verify user bank slip"; - // break; - // case 3: - // if($term !== "x1_ba" || $term !== "x2_cheque"){ - // $status_desc = "Generate supplier booking report"; - // break; - // } - // case 4: - // if($term !== "x1_ba" || $term !== "x2_cheque"){ - // $status_desc = "Supplier booking report. Please confirm with your booking."; - // break; - // } - // case 5: - // $status_desc = "Please, upload China Bankslip"; - // break; - // case 6: - // $status_desc = "Waiting customer to upload purchase order"; - // break; - // case 7: - // $status_desc = "Customer has uploaded purchase order, please upload invoice"; - // break; - // case 8: - // $status_desc = "Booking Completed"; - // break; - // default: - // $status_desc = ""; - // } - // $booking->marking = $booking->user->marking; - // $booking->status_desc = $status_desc; - // } - // return $bookings; + switch ($booking->admin_status) { + case 1: + $status_desc = "Waiting customer upload bank slip"; + break; + case 2: + $status_desc = "Verify user bank slip"; + break; + case 3: + if($term !== "x1_ba" || $term !== "x2_cheque"){ + $status_desc = "Generate supplier booking report"; + break; + } + case 4: + if($term !== "x1_ba" || $term !== "x2_cheque"){ + $status_desc = "Supplier booking report. Please confirm with your booking."; + break; + } + case 5: + $status_desc = "Please, upload China Bankslip"; + break; + case 6: + $status_desc = "Waiting customer to upload purchase order"; + break; + case 7: + $status_desc = "Customer has uploaded purchase order, please upload invoice"; + break; + case 8: + $status_desc = "Booking Completed"; + break; + default: + $status_desc = ""; + } + $booking->marking = $booking->user->marking; + $booking->status_desc = $status_desc; + } + return $bookings; } public function show($id) @@ -602,7 +600,7 @@ class BookingController extends Controller $svcharge = 20.00; } - $subtotal = $amount + $svcharge) / $rate; + $subtotal = round($amount + $svcharge / $rate,2); $taxAmount = round($subtotal * $taxrate,2); $billingChargeAmount = round(($amount + $svcharge) * $billingChargeRate, 2); $bankin_amount = round($subtotal + $taxAmount + $billingChargeAmount , 2); diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 09850a2c..501256b5 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -72,8 +72,7 @@ export default { getBooking() { let $this = this axios.get(this.url).then(response => { - // this.bookingTable = response.data - console.log(response); + this.bookingTable = response.data }) }, RefreshBooking() { diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue index b0b1ddfd..1346fc78 100644 --- a/resources/assets/js/pages/booking/transfer.vue +++ b/resources/assets/js/pages/booking/transfer.vue @@ -30,6 +30,10 @@ Term: {{ booking_details.term }} + + Beneficiary Account : + {{ booking_details.account_name }} + @@ -52,6 +56,10 @@ MYR {{ booking_details.bia }} + + Beneficiary Account Number : + {{ booking_details.account_num }} + @@ -63,20 +71,14 @@
- - -
- -

Download

 - - + +
->>>>>>> d3a995c6b5c0ede3a7b608e12c8e1d8c5f8e925e