From 91c0bec289abe0a0fa47cfc50acd9fac0e731d11 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 13 Aug 2018 11:36:26 +0800
Subject: [PATCH] added bank name and bank branch to booking calcualation

---
 app/Http/Controllers/BookingController.php |  6 ++----
 resources/assets/js/pages/home.vue         | 13 ++++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index efd7dc3c..db980e42 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -78,10 +78,6 @@ class BookingController extends Controller
         return $bookings;
 	}
     
-
-
- 
-    
     public function userComplete(){
 		$user = Auth::user();
         $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
@@ -786,6 +782,8 @@ class BookingController extends Controller
              'taxAmount' => $taxAmount,
              'billingChargeAmount' => $billingChargeAmount,
              'bankin_amount' => $bankin_amount,
+             'bank_name'=> $request->input('bank_name'),
+             'bank_branch'=> $request->input('bank_branch'),
              'acc_name' => $request->input('acc_name'),
              'acc_no' => $request->input('acc_no')
          ], 200);
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index d635fd68..92d97033 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -250,8 +250,11 @@
           </tr>
           <tr>
             <td>China Beneficiary Acc : <br>
-             Name : {{ bookingConfirmTable.acc_name }} <br>
-              Account No. : {{ bookingConfirmTable.acc_no }}</td>
+              Name : {{ bookingConfirmTable.acc_name }} <br>
+              Account No. : {{ bookingConfirmTable.acc_no }} <br>
+              Bank : {{ bookingConfirmTable.bank_name }}<br>
+              Branch. : {{ bookingConfirmTable.bank_branch }}
+            </td>
             <td></td>
           </tr>
           <tr>
@@ -512,6 +515,8 @@ export default {
         rate: 'undefined',
         bankin_amount: 'undefined',
         china_beneficiary: 'undefined',
+        bank_name: null,
+        bank_branch: null,
         status: 2
       }
     }
@@ -640,7 +645,9 @@ export default {
             order_no: this.bookingForm.order_no,
             payment_for: this.bookingForm.payment_for,
             acc_name: this.bookingForm.account_name,
-            acc_no: this.bookingForm.account_num
+            acc_no: this.bookingForm.account_num,
+            bank_name: this.bookingForm.bank_name,
+            bank_branch: this.bookingForm.bank_branch
           }
           axios.post('api/booking/calculation', newConfirmation)
             .then((response) => {