From 62d0d83cb6fc61317005ab2bd0adb4aff1dc2f9e Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Mon, 25 Jun 2018 17:34:34 +0800
Subject: [PATCH 01/14] 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 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img src="http://via.placeholder.com/600x400" class="image">
+            <img v-bind:src="'public/storage/user_bankslip/' + booking_details.user_bankslip_path" class="image">
           </el-col>
         </el-row>
       </el-card>
@@ -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 <jackgoh0@gmail.com>
Date: Mon, 25 Jun 2018 17:48:51 +0800
Subject: [PATCH 02/14] 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 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use Carbon\Carbon;
+
+class CreditTableSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('setting_credits')->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 <jackgoh0@gmail.com>
Date: Mon, 25 Jun 2018 17:52:41 +0800
Subject: [PATCH 03/14] 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);

From 20923d8f4a1ad9ec656e2c35f5d013e1ea27eafe Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 12:07:27 +0800
Subject: [PATCH 04/14] updated upload path

---
 app/Http/Controllers/BookingController.php | 41 ++++++++++++++--------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 607d70b2..6cbeebd2 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -29,8 +29,7 @@ class BookingController extends Controller
             // 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'));
+            $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U'));
             $booking->timeout = $difference_in_seconds;  
 
             // TODO : you can make it better
@@ -146,7 +145,7 @@ class BookingController extends Controller
 	public function adminShow($id)
     {   
 		$booking = Booking::where('id', $id)->first();
-		return $booking->userBankSlip()->get(); 
+		$booking->user_bankslip_path = Storage::url('user_bankslip/', 'bank_slip_598c85be224d7842102e99321c427e72.jpg');
 
 		if($booking){
         $date1 = new DateTime($booking->created_at);
@@ -167,7 +166,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);
         }
@@ -315,14 +319,15 @@ class BookingController extends Controller
         $input['file'] = $filename;
 
         $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea 
-        $unique_image_path = $unique_name. '.' .$ext;
-        Storage::putFileAs(
+		$unique_image_path = $unique_name. '.' .$ext;
+
+		$upload_path = Storage::disk('public')->putFileAs(
             'user_bankslip', $bankslip_file, $unique_image_path
-        ); 
+		); 
 
         $user_bankslip = new UserBankSlip;
         $user_bankslip->booking_id = $booking->id;
-        $user_bankslip->bankslip_path =  $unique_image_path;
+        $user_bankslip->bankslip_path =  $upload_path;
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
 
@@ -336,7 +341,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);
@@ -373,12 +384,12 @@ class BookingController extends Controller
         $input['file'] = $filename;
         $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
+        $upload_path = Storage::disk('public')->putFileAs(
+            'purchase_order',/*folder name*/ $user_input_file, $unique_image_path, 'public'
         );
 
         $user_po = new PurchaseOrder;
-        $user_po->image_path = $unique_image_path;
+        $user_po->image_path = $upload_path;
         $user_po->book_id = $booking->id;
         $user_po->save();
 
@@ -554,12 +565,12 @@ class BookingController extends Controller
         $input['invoice_path'] = $filename;
         $unique_name = 'invoice' . md5($filename. time());
         $unique_file_url = $unique_name. '.' .$ext;
-        Storage::putFileAs(
-            'invoice',/*folder name*/ $input_file, $unique_file_url
+        $upload_path = Storage::disk('public')->putFileAs(
+            'invoice',/*folder name*/ $input_file, $unique_file_url, 'public'
         );
         
         $invoice = new Invoice;
-        $invoice->invoice_path = $unique_file_url;
+        $invoice->invoice_path = $upload_path;
         $invoice->amount = $request->input('amount');
         $invoice->booking_id = $booking->id;
         $invoice->save();

From 9fff113250989ed3d97c7b3918047d40dd45162a Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 12:08:43 +0800
Subject: [PATCH 05/14] updated dockerfile to add storage symlink

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5eb8b990..9efcd1c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,5 +9,5 @@ RUN composer install
 
 COPY wait.sh /usr/local/bin/wait.sh
 RUN chmod +x /usr/local/bin/wait.sh
-CMD /usr/local/bin/wait.sh && composer dumpautoload && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && composer dumpautoload && php artisan storage:link && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000

From ae85886365924cd6717ce77d83366abfd8e6c130 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 12:12:02 +0800
Subject: [PATCH 06/14] updated user bankslip path in verification frontend

---
 resources/assets/js/pages/admin/booking/verification.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index 20bac84b..8d29575e 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -198,7 +198,7 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img src="http://via.placeholder.com/600x400" class="image">
+            <img v-bind:src="booking_details.user_bankslip_path" class="image">
           </el-col>
         </el-row>
       </el-card>
@@ -235,6 +235,7 @@
           id: null,
           amount: null,
           bia: null,
+          user_bankslip_path: null,
         }
       }
     },

From 852c64f35bf81b65f4000a8190884fe68573be80 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 12:27:09 +0800
Subject: [PATCH 07/14] completed display user bankslip in verification
 frontend

---
 app/Http/Controllers/BookingController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 6cbeebd2..ec90a1ab 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -145,7 +145,8 @@ class BookingController extends Controller
 	public function adminShow($id)
     {   
 		$booking = Booking::where('id', $id)->first();
-		$booking->user_bankslip_path = Storage::url('user_bankslip/', 'bank_slip_598c85be224d7842102e99321c427e72.jpg');
+		$user_bankslip_path = $booking->userBankSlip()->first()->bankslip_path;
+		$booking->user_bankslip_path = Storage::url($user_bankslip_path);
 
 		if($booking){
         $date1 = new DateTime($booking->created_at);

From 53663534842f76d8eb5a1a89e1958ba07bd1524c Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 14:41:37 +0800
Subject: [PATCH 08/14] updated loading button param

---
 resources/assets/js/pages/admin/booking/verification.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index 8d29575e..54da4315 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -206,8 +206,8 @@
       <el-card class="box-card">
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <el-button :loading="loading" @click="approveUserSlip" type="success">Aprroved</el-button>
-            <el-button :loading="loading" @click="rejectUserSlip" type="danger">Rejected</el-button>
+            <el-button :loading="loading_btn" @click="approveUserSlip" type="success">Aprroved</el-button>
+            <el-button :loading="loading_btn" @click="rejectUserSlip" type="danger">Rejected</el-button>
           </el-col>
         </el-row>
       </el-card>
@@ -230,7 +230,7 @@
     data() {
       return {
         status: 2,
-        loading: false,
+        loading_btn: false,
         booking_details:{
           id: null,
           amount: null,
@@ -263,6 +263,7 @@
   },
     methods: {
       approveUserSlip() {
+        this.loading_btn = true
         // axios.get('api/booking')
         //   .then((response) => {
         //     console.log(response)
@@ -270,6 +271,8 @@
         //   })
       },
       rejectUserSlip() {
+        // TODO reject with reason 
+        this.loading_btn = true
         // axios.get('api/booking')
         //   .then((response) => {
         //     console.log(response)

From 20230502186f0d03b21df61f18f7e0da15c0ceb2 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 14:44:48 +0800
Subject: [PATCH 09/14] fix conflict

---
 database/seeds/DatabaseSeeder.php                        | 4 ----
 resources/assets/js/pages/admin/booking/verification.vue | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index ec23be1c..95fb2c2f 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -16,10 +16,6 @@ class DatabaseSeeder extends Seeder
         $this->call(UserRoleSeeder::class);
         $this->call(RateTableSeeder::class);
         $this->call(BookTableSeeder::class);     
-<<<<<<< HEAD
-        $this->call(SettingCreditSeeder::class);
-=======
         $this->call(CreditTableSeeder::class);  
->>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
     }
 }
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index ac1699ab..54da4315 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -198,11 +198,7 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-<<<<<<< HEAD
             <img v-bind:src="booking_details.user_bankslip_path" class="image">
-=======
-            <img v-bind:src="'public/storage/user_bankslip/' + booking_details.user_bankslip_path" class="image">
->>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
           </el-col>
         </el-row>
       </el-card>
@@ -240,11 +236,7 @@
           amount: null,
           bia: null,
           user_bankslip_path: null,
-<<<<<<< HEAD
         }
-=======
-        },
->>>>>>> 89f5e34aa8019e334abed3cbf861c239758682ac
       }
     },
     beforeCreate () {

From fd03f5b24844fb55187eb04511fe377313542b1d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 17:40:44 +0800
Subject: [PATCH 10/14] updated approvebankslip booking not found updated
 update status upon userbankslip approved updated update status upon
 userbankslip rejected updated supplier index to display value and label for
 input select updated supplierBooking frontend completed booking accept and
 reject integration

---
 app/Http/Controllers/BookingController.php    |  23 +-
 .../Controllers/SettingSupplierController.php |   8 +-
 .../pages/admin/booking/supplierBooking.vue   | 366 ++++++++++++++++--
 .../js/pages/admin/booking/verification.vue   |  66 +++-
 4 files changed, 423 insertions(+), 40 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 90418e5c..3c192c5c 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -489,14 +489,16 @@ class BookingController extends Controller
 
     public function approveBankSlip(Request $request, $book_id)
     {
-        if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
+        $booking = Booking::where('id',$book_id)->first();
+
+        if (!$booking)
         {
-            return response()->json(['message'=>'Access denied'], 200);
+            return response()->json(['message'=>'Booking not found'], 400);
         }
 
         if(!$userBankSlip = UserBankSlip::where('booking_id',$booking->id)->first())
         {
-            return response()->json(['message'=>'Access denied'], 200);   
+            return response()->json(['message'=>'User bankslip not found'], 400);   
         }
 
         // Rejected bankslip cannot be approve again
@@ -508,12 +510,19 @@ class BookingController extends Controller
         $userBankSlip->is_approve = 1;
         $userBankSlip->estimated_arrival_time = $request->input('estimated_arrival_time');
         $userBankSlip->save();
+
+        // update booking status 
+		$booking->status = 4;
+		$booking->admin_status = 3; 
+        $booking->save();
+        
         return response()->json(['message'=>'Success'],200);
     }
 
     public function rejectBankSlip(Request $request, $book_id)
     {
-        if (!$booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
+        $booking = Booking::where('id',$book_id)->first();
+        if (!$booking)
         {
             return response()->json(['message'=>'Access denied'], 200);
         }
@@ -533,6 +542,12 @@ class BookingController extends Controller
         $userBankSlip->reject_reason = $request->reject_reason;
         $userBankSlip->save();
 
+        // TODO : reject user bankinslip 
+        // update booking status 
+		$booking->status = 0;
+		$booking->admin_status = 0; 
+        $booking->save();
+
         return response()->json(['message'=>'Success'],200);
     }
 
diff --git a/app/Http/Controllers/SettingSupplierController.php b/app/Http/Controllers/SettingSupplierController.php
index 96f0a861..6b1f8f12 100644
--- a/app/Http/Controllers/SettingSupplierController.php
+++ b/app/Http/Controllers/SettingSupplierController.php
@@ -9,7 +9,13 @@ class SettingSupplierController extends Controller
 {
     public function index()
     {
-        return SettingSupplier::all();
+        $suppliers = SettingSupplier::all();
+
+        foreach ($suppliers as $supplier) {
+            $supplier->value = $supplier->company_name;
+            $supplier->label = $supplier->company_name;
+        }
+        return $suppliers;
     }
 
     public function show(SettingSupplier $supplier)
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index 37196cb3..f2feaa71 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -1,13 +1,13 @@
 <template>
   <el-main>
-    <progress-track v-model="status"/>
+    <progress-track v-model="status" />
 
     <div align="center">
-      <h4 style="margin-top:5%;">Transfer In Progress</h4>
+      <h4 style="margin-top:5%;"></h4>
       <br>
-      <h5> ETA :  3 days 14 Hours </h5>
+      <h5> Supplier Booking </h5>
       <br>
-      <el-button type="primary" @click="$router.go(-1)">Go Back</el-button>
+      <!-- <el-button type="primary" @click="$router.go(-1)">Go Back</el-button> -->
     </div>
     <br>
     <el-row justify="center" align="center">
@@ -16,7 +16,163 @@
           <span>Order Details</span>
           <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
         </div>
-        <el-row :gutter="12">
+        <div class="el-row" style="margin-left: -6px; margin-right: -6px;">
+          <div class="el-col el-col-12" style="padding-left: 6px; padding-right: 6px;">
+            <div class="el-table el-table--fit el-table--enable-row-hover el-table--enable-row-transition" align="center">
+            
+              <div class="el-table__body-wrapper is-scrolling-none">
+                <table class="el-table__body" style="width: 400px;" cellspacing="0" cellpadding="0" border="0">
+                  <colgroup>
+                    <col name="el-table_2_column_9" width="200">
+                    <col name="el-table_2_column_10" width="200">
+                  </colgroup>
+                  <tbody>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell">Order Number :</div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell">{{ booking_details.id }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell">Date :</div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell">{{ booking_details.created_at }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell">Customer Marking :</div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell">CIEF/150ECE</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell"></div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell">Term :</div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell">{{ booking_details.term }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_2_column_9 is-right ">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="el-table_2_column_10 is-left ">
+                        <div class="cell"></div>
+                      </td>
+                    </tr>
+                    <!---->
+                  </tbody>
+                </table>
+                <!---->
+                <!---->
+              </div>
+              <!---->
+              <!---->
+              <!---->
+              <!---->
+              <div class="el-table__column-resize-proxy" style="display: none;"></div>
+            </div>
+          </div>
+          <div class="el-col el-col-12" style="padding-left: 6px; padding-right: 6px;">
+            <div class="el-table el-table--fit el-table--enable-row-hover el-table--enable-row-transition" align="center">
+              <div class="hidden-columns">
+                <div></div>
+                <div></div>
+              </div>
+              <!---->
+              <div class="el-table__body-wrapper is-scrolling-none">
+                <table class="el-table__body" style="width: 400px;" cellspacing="0" cellpadding="0" border="0">
+                  <colgroup>
+                    <col name="el-table_3_column_11" width="200">
+                    <col name="el-table_3_column_12" width="200">
+                  </colgroup>
+                  <tbody>
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell">CNY/RMB :</div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell">CNY {{ booking_details.amount }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell">+ Service Charge :</div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell">CNY {{ booking_details.service_charge }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell">/ RATE :</div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell">{{ booking_details.rate }}</div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell">MYR {{ booking_details.bia }}</div>
+                      </td>
+                    </tr>
+                    <!-- <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell">+ GST 6% :</div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell">MYR 4,430.88</div>
+                      </td>
+                    </tr> -->
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell"><b>MYR {{ booking_details.bia }}</b></div>
+                      </td>
+                    </tr>
+                    <tr class="el-table__row">
+                      <td class="el-table_3_column_11 is-right ">
+                        <div class="cell"></div>
+                      </td>
+                      <td class="el-table_3_column_12 is-left ">
+                        <div class="cell"></div>
+                      </td>
+                    </tr>
+                    <!---->
+                  </tbody>
+                </table>
+                <!---->
+                <!---->
+              </div>
+              <!---->
+              <!---->
+              <!---->
+              <!---->
+              <div class="el-table__column-resize-proxy" style="display: none;"></div>
+            </div>
+          </div>
+        </div>
+        <!-- <el-row :gutter="12">
           <el-col :span="12">
             <el-table :data="bookingConfirmTable" :show-header="false" align="center">
               <el-table-column prop="data1" align="right" width="200" />
@@ -29,7 +185,7 @@
               <el-table-column prop="data2" align="left" width="200" />
             </el-table>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-card>
     </el-row>
     <br>
@@ -37,13 +193,47 @@
     <el-row justify="center" align="center">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span>BankinSlip</span>
+          <span>Supplier Form</span>
           <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
         </div>
-        <el-row :gutter="12">
-          <el-col :span="22" style="text-align:center">
-            <img src="http://via.placeholder.com/600x400" class="image">
+        <el-row :gutter="12" style="text-align:center">
+          <el-col :span="20" style="text-align:center">
+
+        <el-form ref="supplierBookingForm" :model="supplierBookingForm" :rules="rules">
+          <div align="center">
+            
+         
+<el-form-item prop="supplier">
+              <el-select prop="supplier" v-model="supplierBookingForm.supplier" placeholder="Choose Supplier">
+                <el-option
+                  v-for="item in supplier_options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+ </el-form-item>
+            <el-form-item prop="bank_name">
+              <el-input v-model="supplierBookingForm.amount" type="text" placeholder="Amount" style="width: 80%" />
+            </el-form-item>
+            <el-form-item prop="bank_branch">
+              <el-input v-model="supplierBookingForm.rate" type="text" placeholder="Rate" style="width: 80%" />
+            </el-form-item>
+            <el-form-item prop="account_num">
+              <el-input v-model="supplierBookingForm.transfer_amount" type="text" placeholder="Transfer Amount" style="width: 80%"
+              />
+            </el-form-item>
+            <el-form-item>
+              <el-button :loading="loading_btn" type="primary" @click="getCalculationValue('bookingForm')">Generate Report</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+
+       
+           
+
           </el-col>
+    
         </el-row>
       </el-card>
     </el-row>
@@ -55,20 +245,150 @@
   }
 </style>
 <script>
-import VueCountdown from '@dmaksimovic/vue-countdown'
-import ProgressTrack from '~/components/AdminProgressTrack'
+  import ProgressTrack from '~/components/AdminProgressTrack'
+  import axios from 'axios'
 
-export default {
-  components: {
-    'progress-track': ProgressTrack
+  export default {
+    components: {
+      'progress-track': ProgressTrack
+    },
+    data() {
+      return {
+        status: 3,
+        loading_btn: false,
+        booking_details:{
+          id: null,
+          amount: null,
+          bia: null,
+          user_bankslip_path: null,
+        },
+        supplier: null,
+        supplier_options: null,
+        supplierBookingForm:{
+          supplier: null,
+          amount: null,
+          rate: null,
+          transfer_amount: null,
+        },
+        value: '',
+        rules: {
+          supplier: [{
+            required: true,
+            message: 'Please input amount',
+            trigger: 'change'
+          } ],
+          amount: [{
+            required: true,
+            message: 'Please input bank name',
+            trigger: 'change'
+          } ],
+          rate: [{
+            required: true,
+            message: 'Please input account name',
+            trigger: 'change'
+          }],
+          transfer_amount: [{
+            required: true,
+            message: 'Please input branch',
+            trigger: 'change'
+          }]
+      },
+      }
+    },
+    beforeCreate () {
+    const loading = this.$loading({
+      lock: true,
+      text: 'Please wait..',
+      spinner: 'el-icon-loading',
+      background: 'rgba(0, 0, 0, 0.7)'
+    })
+
+    axios
+      .get('/api/admin/booking/' + this.$route.params.id)
+      .then((response) => {
+        loading.close()
+        this.booking_details = response.data
+      }).catch((error) => {
+        console.log(error)
+        loading.close()
+        this.$router.push({
+          name: 'notfound'
+        })
+      })
+
+    axios
+      .get('/api/setting-supplier/')
+      .then((response) => {
+        loading.close()
+        this.supplier_options = response.data
+      }).catch((error) => {
+        loading.close()
+        console.log(error) 
+        this.$router.push({
+          name: 'notfound'
+        })
+      })
+      
   },
-  data () {
-    return {
-      status: 4
+    methods: {
+      approveUserSlip() {
+        this.loading_btn = true
+
+        let newApprove = {
+         estimated_arrival_time: this.estimated_arrival_time
+        }
+
+        axios.post('/api/booking/' + this.$route.params.id  + '/approve-bank-slip', newApprove)
+          .then((response) => {
+            this.loading_btn = false
+
+          this.$message({
+            showClose: true,
+            message: 'User bankinslip accepted. Proceed with book with supplier.',
+            type: 'success',
+            duration: 5000
+          })
+
+          this.$router.push({
+            name: 'booking.admin.supplier'
+          })
+
+            // pass variable to another router
+          })
+          .catch((error) => {
+            this.loading_btn = false
+            console.log(error)
+          })
+      },
+      rejectUserSlip() {
+        this.loading_btn = true
+
+        let newApprove = {
+         estimated_arrival_time: this.estimated_arrival_time
+        }
+
+        axios.post('/api/booking/' + this.$route.params.id  + '/reject-bank-slip', newApprove)
+          .then((response) => {
+            this.loading_btn = false
+
+          this.$message({
+            showClose: true,
+            message: 'User bankinslip rejected. Waiting user to reupload their user bankslip.',
+            type: 'warning',
+            duration: 5000
+          })
+
+          this.$router.push({
+            name: 'admin.home'
+          })
+
+            // pass variable to another router
+          })
+          .catch((error) => {
+            this.loading_btn = false
+            console.log(error)
+          })
+      },
     }
-  },
-  methods: {
-
   }
-}
-</script>
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue
index 54da4315..b789f8ad 100644
--- a/resources/assets/js/pages/admin/booking/verification.vue
+++ b/resources/assets/js/pages/admin/booking/verification.vue
@@ -236,7 +236,8 @@
           amount: null,
           bia: null,
           user_bankslip_path: null,
-        }
+        },
+        estimated_arrival_time : null,
       }
     },
     beforeCreate () {
@@ -264,20 +265,61 @@
     methods: {
       approveUserSlip() {
         this.loading_btn = true
-        // axios.get('api/booking')
-        //   .then((response) => {
-        //     console.log(response)
-        //     this.list = response.data
-        //   })
+
+        let newApprove = {
+         estimated_arrival_time: this.estimated_arrival_time
+        }
+
+        axios.post('/api/booking/' + this.$route.params.id  + '/approve-bank-slip', newApprove)
+          .then((response) => {
+            this.loading_btn = false
+
+          this.$message({
+            showClose: true,
+            message: 'User bankinslip accepted. Proceed with book with supplier.',
+            type: 'success',
+            duration: 5000
+          })
+
+          this.$router.push({
+            name: 'booking.admin.supplier'
+          })
+
+            // pass variable to another router
+          })
+          .catch((error) => {
+            this.loading_btn = false
+            console.log(error)
+          })
       },
       rejectUserSlip() {
-        // TODO reject with reason 
         this.loading_btn = true
-        // axios.get('api/booking')
-        //   .then((response) => {
-        //     console.log(response)
-        //     this.list = response.data
-        //   })
+
+        let newApprove = {
+         estimated_arrival_time: this.estimated_arrival_time
+        }
+
+        axios.post('/api/booking/' + this.$route.params.id  + '/reject-bank-slip', newApprove)
+          .then((response) => {
+            this.loading_btn = false
+
+          this.$message({
+            showClose: true,
+            message: 'User bankinslip rejected. Waiting user to reupload their user bankslip.',
+            type: 'warning',
+            duration: 5000
+          })
+
+          this.$router.push({
+            name: 'admin.home'
+          })
+
+            // pass variable to another router
+          })
+          .catch((error) => {
+            this.loading_btn = false
+            console.log(error)
+          })
       },
     }
   }

From 21338401c401d71d4e8c66529109663e6c25bdc5 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 17:56:51 +0800
Subject: [PATCH 11/14] update supplierbooking frontend

---
 .../pages/admin/booking/supplierBooking.vue   | 91 +++++++------------
 1 file changed, 35 insertions(+), 56 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index f2feaa71..095440a9 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -213,18 +213,18 @@
                 </el-option>
               </el-select>
  </el-form-item>
-            <el-form-item prop="bank_name">
+            <el-form-item prop="amount">
               <el-input v-model="supplierBookingForm.amount" type="text" placeholder="Amount" style="width: 80%" />
             </el-form-item>
-            <el-form-item prop="bank_branch">
+            <el-form-item prop="rate">
               <el-input v-model="supplierBookingForm.rate" type="text" placeholder="Rate" style="width: 80%" />
             </el-form-item>
-            <el-form-item prop="account_num">
+            <el-form-item prop="transfer_amount">
               <el-input v-model="supplierBookingForm.transfer_amount" type="text" placeholder="Transfer Amount" style="width: 80%"
               />
             </el-form-item>
             <el-form-item>
-              <el-button :loading="loading_btn" type="primary" @click="getCalculationValue('bookingForm')">Generate Report</el-button>
+              <el-button :loading="loading_btn" type="primary" @click="generateReport('supplierBookingForm')">Generate Report</el-button>
             </el-form-item>
           </div>
         </el-form>
@@ -331,63 +331,42 @@
       
   },
     methods: {
-      approveUserSlip() {
+      generateReport (formName) {
         this.loading_btn = true
 
-        let newApprove = {
-         estimated_arrival_time: this.estimated_arrival_time
-        }
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let newConfirmation = {
+              amount: this.booking.amount,
+              term: this.term
+            }
 
-        axios.post('/api/booking/' + this.$route.params.id  + '/approve-bank-slip', newApprove)
-          .then((response) => {
+            // axios.post('api/booking/calculation', newConfirmation)
+            // .then((response) => {
+            //   this.loading = 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
+            // })
+            // .catch((error) => {
+            //   this.loading = false
+            //   console.log(error)
+            // })
+            
+          }
+          else{
             this.loading_btn = false
+          }
+        })
 
-          this.$message({
-            showClose: true,
-            message: 'User bankinslip accepted. Proceed with book with supplier.',
-            type: 'success',
-            duration: 5000
-          })
-
-          this.$router.push({
-            name: 'booking.admin.supplier'
-          })
-
-            // pass variable to another router
-          })
-          .catch((error) => {
-            this.loading_btn = false
-            console.log(error)
-          })
-      },
-      rejectUserSlip() {
-        this.loading_btn = true
-
-        let newApprove = {
-         estimated_arrival_time: this.estimated_arrival_time
-        }
-
-        axios.post('/api/booking/' + this.$route.params.id  + '/reject-bank-slip', newApprove)
-          .then((response) => {
-            this.loading_btn = false
-
-          this.$message({
-            showClose: true,
-            message: 'User bankinslip rejected. Waiting user to reupload their user bankslip.',
-            type: 'warning',
-            duration: 5000
-          })
-
-          this.$router.push({
-            name: 'admin.home'
-          })
-
-            // pass variable to another router
-          })
-          .catch((error) => {
-            this.loading_btn = false
-            console.log(error)
-          })
       },
     }
   }

From fdcaa31ffe92344728b263cef2ed7982fc96951c Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Tue, 26 Jun 2018 21:39:24 +0800
Subject: [PATCH 12/14] Add upload file maxsize checking in booking controller

---
 app/Http/Controllers/BookingController.php | 30 +++++++++++-
 database/seeds/DatabaseSeeder.php          |  1 +
 tests/Feature/BookingTest.php              | 55 +++++++++++++---------
 3 files changed, 63 insertions(+), 23 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 5f6ae880..e1095315 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -284,7 +284,7 @@ class BookingController extends Controller
  
         return response()->json(['book_id'=>$book_id],200);
     }
-
+    //upload
     public function uploadbankslip(Request $request, $id)
     {
         $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
@@ -304,6 +304,14 @@ class BookingController extends Controller
             return response()->json(['message'=>'Incorrect format'],200);
         }
 
+        $validator = Validator::make($request->all(), [
+            'file'   => 'max:3072'
+        ]);
+
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
+        }
 
         if(!$bankslip_file = $request->file('file'))
         {
@@ -361,6 +369,15 @@ class BookingController extends Controller
                 return response()->json(['message'=>'Incorrect format'],200);
             }
 
+            $validator = Validator::make($request->all(), [
+                'file'   => 'max:3072'
+            ]);
+
+            if($validator->fails())
+            {
+                return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
+            }
+
             if(!$user_input_file = $request->file('file'))
             {
                 return response()->json(['message' => 'No file detected'], 400);
@@ -523,7 +540,7 @@ class BookingController extends Controller
 
         return response()->json(['message'=>'Success'],200);
     }
-
+    //upload
     public function uploadInvoice(Request $request, $id)
     {
         $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
@@ -543,6 +560,15 @@ class BookingController extends Controller
                 return response()->json(['message'=>'Incorrect format'],200);
             }
 
+            $validator = Validator::make($request->all(), [
+                'invoice_path'   => 'max:3072'
+            ]);
+
+            if($validator->fails())
+            {
+                return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
+            }
+
             if(!$input_file = $request->file('invoice_path'))
             {
                 return response()->json(['message'=>'No file detected'], 400);
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index bcf98f78..d40a4e4b 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -1,6 +1,7 @@
 <?php
 
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class DatabaseSeeder extends Seeder
 {
diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php
index c44ed4b5..7e1ef5fd 100644
--- a/tests/Feature/BookingTest.php
+++ b/tests/Feature/BookingTest.php
@@ -17,6 +17,7 @@ use App\Booking;
 use App\UserBankSlip;
 use App\Role; 
 use App\SettingCredit;
+use Illuminate\Support\Facades\File;
 
 class BookingTest extends TestCase
 {
@@ -83,17 +84,21 @@ class BookingTest extends TestCase
     public function testuploadbankslip()
     {
         Storage::fake('file');
-        $bankslip_path = UploadedFile::fake()->image('comp.jpg');
-
-        if(!file_exists($bankslip_path)){
-            $response->assertStatus(400);
-        }
+        $size_in_kb = 3072;    // 3072KB = 3MB
+        $bankslip_path = UploadedFile::fake()->image('comp.jpg')->size($size_in_kb);
 
+        $response = 
         $this->actingAs($this->user)
             ->json('POST', '/api/booking/' . $this->booking->id . '/upload-user-bankslip', [
                 'file' => $bankslip_path
-            ])
-            ->assertSuccessful();
+            ]);
+
+        if(!file_exists($bankslip_path) || $size_in_kb > 3072){
+            $response->assertStatus(400);    
+        }
+        else{
+            $response->assertSuccessful();
+        }
     }
 
     public function testUpdateBankslipAmount()
@@ -108,18 +113,22 @@ class BookingTest extends TestCase
     public function testuploadPO()
     {
         Storage::fake('file');
-        $image_path = UploadedFile::fake()->image('comp.jpg');
-
-        if(!file_exists($image_path)){
-            $response->assertStatus(400);    
-        }
+        $size_in_kb = 3072;    // 3072KB = 3MB
+        $image_path = UploadedFile::fake()->image('comp.jpg')->size($size_in_kb);
         
+        $response = 
         $this->actingAs($this->user)
             ->json('POST', '/api/booking/' . $this->booking->id . '/upload-po', [
                 'file' =>  $image_path,
                 'amount' => '12345'
-            ])
-            ->assertSuccessful();
+            ]);
+
+        if(!file_exists($image_path) || $size_in_kb > 3072){
+            $response->assertStatus(400);    
+        }
+        else{
+            $response->assertSuccessful();
+        }
     }
 
     public function testCancel()
@@ -152,18 +161,22 @@ class BookingTest extends TestCase
         $this->user->roles()->sync([]);
         $this->user->attachRole(Role::Where('name','admin')->first());
 
+        $size_in_kb = 3072;
         Storage::fake('invoice_path');
-        $invoice_path = UploadedFile::fake()->create('document.pdf');
-
-        if(!file_exists($invoice_path)){
-            $response->assertStatus(400);    
-        }
+        $invoice_path = UploadedFile::fake()->create('document.pdf',$size_in_kb);
         
+        $response = 
         $this->actingAs($this->user)
             ->json('POST', '/api/booking/' . $this->booking->id . '/upload-invoice', [
                 'invoice_path' => $invoice_path,
                 'amount' => '12345'
-            ])
-            ->assertSuccessful();
+            ]);
+        
+        if(!file_exists($invoice_path) || $size_in_kb > 3072){
+            $response->assertStatus(400);    
+        }
+        else{
+            $response->assertSuccessful();
+        }
     }
 }

From 436b284a3b15f2525204712b5b4f66d40d79d0bc Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Tue, 26 Jun 2018 22:23:10 +0800
Subject: [PATCH 13/14] Add file size checking. Rename bankslip_url to
 china_bank_slip_path in chinabankslip table

---
 app/ChinaBankSlip.php                         |  2 +-
 .../Controllers/ChinaBankSlipController.php   | 17 +++++++-
 ...abanksli_path_in_china_bank_slip_table.php | 31 +++++++++++++++
 tests/Feature/BookingTest.php                 |  1 -
 tests/Feature/ChinaBankSlipTest.php           | 39 +++++++++++++++++++
 5 files changed, 86 insertions(+), 4 deletions(-)
 create mode 100644 database/migrations/2018_06_26_141337_rename_bankslip_url_to_chinabanksli_path_in_china_bank_slip_table.php
 create mode 100644 tests/Feature/ChinaBankSlipTest.php

diff --git a/app/ChinaBankSlip.php b/app/ChinaBankSlip.php
index c607ec34..d7354956 100644
--- a/app/ChinaBankSlip.php
+++ b/app/ChinaBankSlip.php
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class ChinaBankSlip extends Model
 {
-    protected $fillable = ['actual_transfer_amount','date','details','china_bank_slips'];
+    protected $fillable = ['actual_transfer_amount','date','details','china_bank_slip_path'];
 }
diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 9a2048d6..fd781cbd 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -4,6 +4,8 @@ namespace App\Http\Controllers;
 
 use App\ChinaBankSlip;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Storage;
+use Validator;
 
 class ChinaBankSlipController extends Controller
 {
@@ -45,6 +47,16 @@ class ChinaBankSlipController extends Controller
             $extension = $request->file('china_bank_slips')->getClientOriginalExtension();
             // Filename to store
             $fileNameToStore= $filename.'_'.time().'.'.$extension;
+
+            // File size checking
+            $validator = Validator::make($request->all(), [
+                'china_bank_slips'   => 'max:3072'
+            ]);
+            
+            if($validator->fails())
+            {
+                return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
+            }
             // Upload Image
             $path = $request->file('china_bank_slips')->storeAs('public/bankslip', $fileNameToStore);
         } else {
@@ -55,8 +67,9 @@ class ChinaBankSlipController extends Controller
         $post->actual_transfer_amount = $request->input('actual_transfer_amount');
         $post->date = $request->input('date');
         $post->details = $request->input('details');
-        $post->china_bank_slips = $fileNameToStore;
-        $post->save();;
+        $post->china_bank_slip_path = "123";
+        $post->save();
+        return response()->json(['message'=>$post], 200);
     }
 
 
diff --git a/database/migrations/2018_06_26_141337_rename_bankslip_url_to_chinabanksli_path_in_china_bank_slip_table.php b/database/migrations/2018_06_26_141337_rename_bankslip_url_to_chinabanksli_path_in_china_bank_slip_table.php
new file mode 100644
index 00000000..9c23bfc8
--- /dev/null
+++ b/database/migrations/2018_06_26_141337_rename_bankslip_url_to_chinabanksli_path_in_china_bank_slip_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameBankslipUrlToChinabanksliPathInChinaBankSlipTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('china_bank_slips', function($table)
+        {
+            $table->renameColumn('bankslip_url', 'china_bank_slip_path');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php
index 7e1ef5fd..616b6b25 100644
--- a/tests/Feature/BookingTest.php
+++ b/tests/Feature/BookingTest.php
@@ -17,7 +17,6 @@ use App\Booking;
 use App\UserBankSlip;
 use App\Role; 
 use App\SettingCredit;
-use Illuminate\Support\Facades\File;
 
 class BookingTest extends TestCase
 {
diff --git a/tests/Feature/ChinaBankSlipTest.php b/tests/Feature/ChinaBankSlipTest.php
new file mode 100644
index 00000000..9d499b33
--- /dev/null
+++ b/tests/Feature/ChinaBankSlipTest.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Tests\Feature;
+
+use Tests\TestCase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Http\UploadedFile;
+use Artisan;
+
+class ChinaBankSlipTest extends TestCase
+{
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testStore(){
+    	Storage::fake('file');
+    	$size_in_kb = 3072;    // 3072KB = 3MB
+    	$china_bank_slips_path = UploadedFile::fake()->image('comp.jpg')->size($size_in_kb);
+        
+    	$response = 
+		$this->postJson('api/upload-china-bankslip',[
+			'china_bank_slips' => $china_bank_slips_path,
+			'actual_transfer_amount' => '12',
+			'details' => "123123",
+			'date' => "123123"
+		]);
+
+		if(!file_exists($china_bank_slips_path) || $size_in_kb > 3072){
+		    $response->assertStatus(400);    
+		}
+		else{
+		    $response->assertSuccessful();
+		}
+    }
+}

From 819da146848363512f1e2d5835cbb2b8d8f74817 Mon Sep 17 00:00:00 2001
From: Too <sengweitoo@gmail.com>
Date: Tue, 26 Jun 2018 22:24:47 +0800
Subject: [PATCH 14/14] revert back changes during debug

---
 app/Http/Controllers/ChinaBankSlipController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index fd781cbd..7e860d62 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -67,7 +67,7 @@ class ChinaBankSlipController extends Controller
         $post->actual_transfer_amount = $request->input('actual_transfer_amount');
         $post->date = $request->input('date');
         $post->details = $request->input('details');
-        $post->china_bank_slip_path = "123";
+        $post->china_bank_slip_path = $fileNameToStore;
         $post->save();
         return response()->json(['message'=>$post], 200);
     }