From a5633b77548f1229a7c816dbcbb504463aa9adb0 Mon Sep 17 00:00:00 2001
From: Nazri Hamzah <nazhamz95@gmail.com>
Date: Tue, 19 Jun 2018 17:26:37 +0800
Subject: [PATCH 01/43] supplier booking

---
 app/Booking.php                               |   7 +
 app/BookingSupplier.php                       |  17 +++
 app/Http/Controllers/BookingController.php    |  24 ++--
 .../Controllers/BookingSupplierController.php | 132 ++++++++++++++++++
 app/UserBankSlip.php                          |   7 +
 artisan                                       |   0
 public/bankslip/hello.jpg                     | Bin
 resources/lang/es/auth.php                    |   0
 resources/lang/es/pagination.php              |   0
 resources/lang/es/passwords.php               |   0
 resources/lang/es/validation.php              |   0
 routes/api.php                                |  12 +-
 12 files changed, 185 insertions(+), 14 deletions(-)
 create mode 100644 app/BookingSupplier.php
 create mode 100644 app/Http/Controllers/BookingSupplierController.php
 mode change 100755 => 100644 artisan
 mode change 100755 => 100644 public/bankslip/hello.jpg
 mode change 100755 => 100644 resources/lang/es/auth.php
 mode change 100755 => 100644 resources/lang/es/pagination.php
 mode change 100755 => 100644 resources/lang/es/passwords.php
 mode change 100755 => 100644 resources/lang/es/validation.php

diff --git a/app/Booking.php b/app/Booking.php
index 1add81f2..bc28e501 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -9,8 +9,15 @@ class Booking extends Model
     // protected $guarded = [];
     protected $fillable = ['term', 'amount', 'rate_id', 'user_id', 'account_name', 'account_num', 'bank_name', 'bank_branch', 'company_name', 'company_address', 'bank_address', 'swift_code', 'cnap' ,'verification_status'];
     public $timestamps = true;
+    
     public function user(){
         return $this->belongsTo('app\User');
     }
+
+    // has one userbankslip
+    public function uploadbankslip()
+    {
+        return $this->hasOne('app\UserBankSlip');
+    }
 }
 
diff --git a/app/BookingSupplier.php b/app/BookingSupplier.php
new file mode 100644
index 00000000..e6da1d32
--- /dev/null
+++ b/app/BookingSupplier.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class BookingSupplier extends Model
+{
+    // protected $guarded = [];
+    protected $fillable = ['rate','rebate','payment_amount','payment_method'];
+    public $timestamps = true;
+
+    public function user()
+    {
+        return $this->belongsTo('app\User');
+    }
+}
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f97afe4a..b6dd5cd4 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -117,14 +117,14 @@ class BookingController extends Controller
 
     public function uploadbankslip(Request $request, $id)
     {
-        $user_bankslip = Booking::where("user_id", Auth::user()->id)->first();
-        if (!$user_bankslip)
+        $booking = Booking::where("user_id", Auth::user()->id)->first();
+        if (!$booking)
         {
             return response()->json(['message'=>'Access denied'], 200);
         }
 
         $validator = Validator::make($request->all(), [
-            'bankslip_url'   => 'image|mimes:jpg,jpeg,bmp,png'
+            'bankslip_file'   => 'image|mimes:jpg,jpeg,bmp,png'
         ]);
 
         if($validator->fails())
@@ -132,19 +132,19 @@ class BookingController extends Controller
             return response()->json(['message'=>'Incorrect format'],200);
         }
 
-        if($file = $request->file('bankslip_url'))
+        if($file = $request->file('bankslip_file'))
         {
-            $bankslip_url = $request->file('bankslip_url');
-            $filename = $bankslip_url->getClientOriginalName();
+            $bankslip_file = $request->file('bankslip_file');
+            $filename = $bankslip_file->getClientOriginalName();
             $unique_name = 'bank_slip_' . md5($filename. time());
 
-            $file = $request->file('bankslip_url');
+            $file = $request->file('bankslip_file');
             $ext = $file->getClientOriginalExtension();
-            $input['bankslip_url'] = $filename;
+            $input['bankslip_file'] = $filename;
             Storage::putFileAs(
-                'bankslip_url',/*folder name*/ $file, $unique_name. '.' .$ext
+                'bankslip_file',/*folder name*/ $file, $unique_name. '.' .$ext
             );
-            $user_bankslip->bankslip_url = $unique_name. '.' .$ext; //update database
+            $user_bankslip->bankslip_file = $unique_name. '.' .$ext; //update database
         } //end if
         else {
             return response()->json(['message' => 'No file detected'], 400);
@@ -167,8 +167,8 @@ class BookingController extends Controller
 
     public function uploadPurchaseOrder(Request $request, $id)
     {
-        $user_po = Booking::where("user_id", Auth::user()->id)->first();
-        if (!$user_po)
+        $booking = Booking::where("user_id", Auth::user()->id)->first();
+        if (!$booking)
         {
             return response()->json(['message'=>'Access denied'], 200);
         }
diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
new file mode 100644
index 00000000..f1aa5af3
--- /dev/null
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\BookingSupplier;
+use App\UserBankSlip;
+use Illuminate\Http\Request;
+
+class BookingSupplierController extends Controller
+{
+
+    public function index()
+    {
+        $booking = BookingSupplier::all();
+
+        $response = [
+            'supplier-booking' => $booking
+        ];
+        return response()->json($response, 200);
+    }
+
+    // function show($id)
+    public function show($id)
+    {
+        $booking = BookingSupplier::has('supplier-booking')->findOrFail($id);
+
+        $response = [
+            'supplier-booking' => $booking
+        ];
+        return response()->json($response, 200);
+    }
+
+    //single booking detail : one customer bank slip
+    public function viewCustomerBookingDetail (Request $request, $id )
+    {
+        // display all booking that is already uploaded user bankin slip
+        // TODO: admin can access only 
+        // get current booking
+         
+        $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
+        if (!$booking)
+        {
+            return response()->json(['message'=>'Access denied'], 200);
+        }
+        return response()->json($booking, 200);
+
+    }
+
+
+
+    public function store(Request $request, $id)
+    {
+        //Calculation part
+        //single booking supplier
+        $amount = $request->input("payment_amount");
+        $rate = $request->input("rate");
+        $rebate = $request->input("rebate");
+
+        $amountInRMB = $amount * $rate;
+        $billing = 0.015 * $amount;
+        $sales_tax = 0.10 * $amount;
+        $gst = 0 * $amount;
+        $customerBankInAmount = round($amount + $gst + $sales_tax + $billing,2);
+        $rmbBankAmount = $customerBankInAmount + $rebate;
+
+        $user = Auth::user();
+        $booking = new BookingSupplier();
+
+        $supplier = SettingSupplier::find($id);
+        $booking->supplier_id = $supplier->id;
+
+        $booking->payment_method = $request->input('payment_method');
+        $booking->payment_amount = $request->input('payment_amount');
+        $booking->rate = $request->input('rate');
+        $booking->rebate = $request->input('rebate');
+
+        $booking->user()->associate($user);
+        $booking->amountInRMB = $amountInRMB;
+        $booking->rmbBankAmount = $rmbBankAmount;
+        $booking->save();
+
+        return response()->json($booking, 201);
+
+
+    }
+
+    public function update(Request $request, $id)
+    {
+
+        $booking = BookingSupplier::find($id);
+        $booking->payment_method = $request->input('payment_method');
+        $booking->payment_amount = $request->input('payment_amount');
+        $booking->rate = $request->input('rate');
+        $booking->rebate = $request->input('rebate');
+        // calculation
+        $amountInRMB = $amount * $rate;
+        $billing = 0.015 * $amount;
+        $sales_tax = 0.10 * $amount;
+        $gst = 0 * $amount;
+        $customerBankInAmount = round($amount + $gst + $sales_tax + $billing,2);
+        $rmbBankAmount = $customerBankInAmount + $rebate;
+
+        // save amount in rmb 
+        $booking->amountInRMB = $amountInRMB;
+        // save rmb bank amount 
+        $booking->rmbBankAmount = $rmbBankAmount;
+        $booking->save();
+
+        return response()->json(['book_id'=>$book_id],201);
+    }
+
+    public function destroy(BookingSupplier $id)
+    {
+        $id->delete($id);
+    }
+
+    public function supplierbookingreport(Request $request, $id)
+    {
+        $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
+        if (!$booking)
+        {
+            return response()->json(['message'=>'Access denied'], 200);
+        }
+        
+
+        
+
+        
+    }
+
+
+}
diff --git a/app/UserBankSlip.php b/app/UserBankSlip.php
index 8aa809a6..06fa7816 100644
--- a/app/UserBankSlip.php
+++ b/app/UserBankSlip.php
@@ -7,4 +7,11 @@ use Illuminate\Database\Eloquent\Model;
 class UserBankSlip extends Model
 {
     protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking'];
+
+    // belongs to booking 
+    public function uploadbankslip(){
+        return $this->belongsTo('app\Booking');
+    }
+
+
 }
diff --git a/artisan b/artisan
old mode 100755
new mode 100644
diff --git a/public/bankslip/hello.jpg b/public/bankslip/hello.jpg
old mode 100755
new mode 100644
diff --git a/resources/lang/es/auth.php b/resources/lang/es/auth.php
old mode 100755
new mode 100644
diff --git a/resources/lang/es/pagination.php b/resources/lang/es/pagination.php
old mode 100755
new mode 100644
diff --git a/resources/lang/es/passwords.php b/resources/lang/es/passwords.php
old mode 100755
new mode 100644
diff --git a/resources/lang/es/validation.php b/resources/lang/es/validation.php
old mode 100755
new mode 100644
diff --git a/routes/api.php b/routes/api.php
index 917a0732..50a91c54 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -80,6 +80,14 @@ Route::put('setting-supplier/{supplier}', 'SettingSupplierController@update');
 Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete');
 
 Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
-
+//customer booking
 Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
-Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
\ No newline at end of file
+Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
+
+//supplier booking
+Route::get('supplier-booking', 'BookingSupplierController@index');
+Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
+Route::get('supplier-booking/{id}', 'BookingSupplierController@viewCustomerBookingDetail');
+Route::post('supplier-booking', 'BookingSupplierController@store');
+Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
+Route::delete('supplier-booking/{id}', 'BookingSupplierController@destroy');
\ No newline at end of file

From 8fa4f158180929ef7cb81b542d596c3b1f03746d Mon Sep 17 00:00:00 2001
From: Nazri Hamzah <nazhamz95@gmail.com>
Date: Wed, 20 Jun 2018 12:08:15 +0800
Subject: [PATCH 02/43] WIP: fix discussion

---
 app/Booking.php         | 5 -----
 app/BookingSupplier.php | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Booking.php b/app/Booking.php
index bc28e501..5d6ac39e 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -14,10 +14,5 @@ class Booking extends Model
         return $this->belongsTo('app\User');
     }
 
-    // has one userbankslip
-    public function uploadbankslip()
-    {
-        return $this->hasOne('app\UserBankSlip');
-    }
 }
 
diff --git a/app/BookingSupplier.php b/app/BookingSupplier.php
index e6da1d32..f2838cb3 100644
--- a/app/BookingSupplier.php
+++ b/app/BookingSupplier.php
@@ -14,4 +14,9 @@ class BookingSupplier extends Model
     {
         return $this->belongsTo('app\User');
     }
+
+    public function bookingSupplier()
+    {
+        return $this->hasMany('App\Booking');
+    }
 }

From 32bf2f437542b6f7a5f513b3958665406443e0c6 Mon Sep 17 00:00:00 2001
From: Nazri Hamzah <nazhamz95@gmail.com>
Date: Wed, 20 Jun 2018 12:15:33 +0800
Subject: [PATCH 03/43] fix discussion 2

---
 .../Controllers/BookingSupplierController.php | 82 +++++++++++++------
 1 file changed, 57 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index f1aa5af3..cdb3938e 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -3,6 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\BookingSupplier;
+use App\Booking;
+use App\Rate;
+use App\User;
 use App\UserBankSlip;
 use Illuminate\Http\Request;
 
@@ -11,10 +14,10 @@ class BookingSupplierController extends Controller
 
     public function index()
     {
-        $booking = BookingSupplier::all();
+        $bookingsupplier = BookingSupplier::all();
 
         $response = [
-            'supplier-booking' => $booking
+            'supplier-booking' => $bookingsupplier
         ];
         return response()->json($response, 200);
     }
@@ -22,7 +25,7 @@ class BookingSupplierController extends Controller
     // function show($id)
     public function show($id)
     {
-        $booking = BookingSupplier::has('supplier-booking')->findOrFail($id);
+        $bookingsupplier = BookingSupplier::has('supplier-booking')->findOrFail($id);
 
         $response = [
             'supplier-booking' => $booking
@@ -52,7 +55,7 @@ class BookingSupplierController extends Controller
     {
         //Calculation part
         //single booking supplier
-        $amount = $request->input("payment_amount");
+        $payment_amount = $request->input("payment_amount");
         $rate = $request->input("rate");
         $rebate = $request->input("rebate");
 
@@ -64,22 +67,51 @@ class BookingSupplierController extends Controller
         $rmbBankAmount = $customerBankInAmount + $rebate;
 
         $user = Auth::user();
-        $booking = new BookingSupplier();
+        $bookingsupplier = new BookingSupplier();
 
         $supplier = SettingSupplier::find($id);
-        $booking->supplier_id = $supplier->id;
+        $bookingsupplier->supplier_id = $supplier->id;
 
-        $booking->payment_method = $request->input('payment_method');
-        $booking->payment_amount = $request->input('payment_amount');
-        $booking->rate = $request->input('rate');
-        $booking->rebate = $request->input('rebate');
+        $bookingsupplier->payment_method = $request->input('payment_method');
+        $bookingsupplier->payment_amount = $request->input('payment_amount');
+        $bookingsupplier->rate = $request->input('rate');
+        $bookingsupplier->rebate = $request->input('rebate');
 
-        $booking->user()->associate($user);
-        $booking->amountInRMB = $amountInRMB;
-        $booking->rmbBankAmount = $rmbBankAmount;
-        $booking->save();
+        $bookingsupplier->user()->associate($user);        
+        $bookingsupplier->amountInRMB = $amountInRMB;
+        $bookingsupplier->rmbBankAmount = $rmbBankAmount;
 
-        return response()->json($booking, 201);
+        $bookingsupplier->save();
+
+        //one bookingsupplier has many booking
+            foreach ($bookingsupplier as $booking)
+            {
+                $manybooking = new Booking(array(
+                    'book_id' =>  $booking->id,
+                    'term' => $booking['term'],
+                    'amount' => $booking['amount'],
+                    'account_name' => $booking['account_name'],
+                    'account_num' => $booking['account_num'],
+                    'bank_name' => $booking['bank_name'],
+                    'bank_branch' => $booking['account_name'],
+                    'company_name' => $booking['company_name'],
+                    'company_address' => $booking['company_address'],
+                    'bank_address' => $booking['bank_address'],
+                    'swift_code' => $booking['swift_code'],
+                    'cnap' => $booking['cnap'],
+                    'verification_status' => $booking['verification_status'],
+                    'rmb_book_amount' => $booking['rmb_book_amount'],
+                    'rmb_book_pay_method' => $booking['rmb_book_pay_method'],
+                    'rmb_book_account_name' => $booking['rmb_book_account_name'],
+                    'rmb_book_bank_name' => $booking['rmb_book_bank_name'],
+                    'rmb_book_acc_no' => $booking['rmb_book_acc_no'],
+                    'rmb_book_bank_branch' => $booking['rmb_book_bank_branch'],
+                ));
+
+                $manybooking->save();
+            }
+
+        return response()->json($bookingsupplier, 201);
 
 
     }
@@ -87,11 +119,11 @@ class BookingSupplierController extends Controller
     public function update(Request $request, $id)
     {
 
-        $booking = BookingSupplier::find($id);
-        $booking->payment_method = $request->input('payment_method');
-        $booking->payment_amount = $request->input('payment_amount');
-        $booking->rate = $request->input('rate');
-        $booking->rebate = $request->input('rebate');
+        $bookingsupplier = BookingSupplier::find($id);
+        $bookingsupplier->payment_method = $request->input('payment_method');
+        $bookingsupplier->payment_amount = $request->input('payment_amount');
+        $bookingsupplier->rate = $request->input('rate');
+        $bookingsupplier->rebate = $request->input('rebate');
         // calculation
         $amountInRMB = $amount * $rate;
         $billing = 0.015 * $amount;
@@ -101,10 +133,10 @@ class BookingSupplierController extends Controller
         $rmbBankAmount = $customerBankInAmount + $rebate;
 
         // save amount in rmb 
-        $booking->amountInRMB = $amountInRMB;
+        $bookingsupplier->amountInRMB = $amountInRMB;
         // save rmb bank amount 
-        $booking->rmbBankAmount = $rmbBankAmount;
-        $booking->save();
+        $bookingsupplier->rmbBankAmount = $rmbBankAmount;
+        $bookingsupplier->save();
 
         return response()->json(['book_id'=>$book_id],201);
     }
@@ -116,8 +148,8 @@ class BookingSupplierController extends Controller
 
     public function supplierbookingreport(Request $request, $id)
     {
-        $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
-        if (!$booking)
+        $bookingsupplier = BookingSupplier::where("admin_id", Auth::user()->id)->where('id', $id)->first();
+        if (!$bookingsupplier)
         {
             return response()->json(['message'=>'Access denied'], 200);
         }

From 32454973788534659c18ca80a408de7c987683eb Mon Sep 17 00:00:00 2001
From: Nazri Hamzah <nazhamz95@gmail.com>
Date: Wed, 20 Jun 2018 17:19:58 +0800
Subject: [PATCH 04/43] fix conflict

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

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index fd8e6db4..6f26a2f1 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -198,7 +198,7 @@ class BookingController extends Controller
 
         $user_bankslip = new UserBankSlip;
         $user_bankslip->booking_id = $booking->id;
-        $user_bankslip->bankslip_url =  $unique_image_url;
+        $user_bankslip->bankslip_file =  $unique_image_url;
         $user_bankslip->transfer_amount = $request->input('transfer_amount');
         $user_bankslip->save();
 

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 05/43] 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 06/43] 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 07/43] 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 08/43] 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 09/43] 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 10/43] 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 11/43] 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 12/43] 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 13/43] 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 14/43] 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 15/43] 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 f108d7ee51d94f86fd13030722f9d8aa5146ecc8 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 18:09:11 +0800
Subject: [PATCH 16/43] updated axios booking supplier form

---
 .../pages/admin/booking/supplierBooking.vue   | 43 +++++++++----------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index 095440a9..98134bde 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -336,30 +336,27 @@
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            let newConfirmation = {
-              amount: this.booking.amount,
-              term: this.term
-            }
+            let newSupplierBooking = this.supplierBookingForm
 
-            // 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)
-            // })
+            axios.post('/api/supplier-booking', newSupplierBooking)
+            .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{

From acfd8eeb48b67e57282f8f417457993c3d2ecbf9 Mon Sep 17 00:00:00 2001
From: Nazri Hamzah <nazhamz95@gmail.com>
Date: Tue, 26 Jun 2018 18:17:38 +0800
Subject: [PATCH 17/43] supplier booking (multiple booking removed)

---
 app/BookingSupplier.php                       |   8 +-
 .../Controllers/BookingSupplierController.php | 100 ++++++++++--------
 app/SupplierBookingItem.php                   |  25 +++++
 .../factories/SupplierBookingItemFactory.php  |   9 ++
 ..._supplierbooking_customerbooking_table.php |  34 ++++++
 ...18_06_21_025734_supplier_booking_table.php |  44 ++++++++
 ...31_create_supplier_booking_items_table.php |  39 +++++++
 vendor/composer/autoload_classmap.php         |  10 +-
 vendor/composer/autoload_static.php           |  20 ++--
 9 files changed, 239 insertions(+), 50 deletions(-)
 create mode 100644 app/SupplierBookingItem.php
 create mode 100644 database/factories/SupplierBookingItemFactory.php
 create mode 100644 database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php
 create mode 100644 database/migrations/2018_06_21_025734_supplier_booking_table.php
 create mode 100644 database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php

diff --git a/app/BookingSupplier.php b/app/BookingSupplier.php
index f2838cb3..aed75bc1 100644
--- a/app/BookingSupplier.php
+++ b/app/BookingSupplier.php
@@ -17,6 +17,12 @@ class BookingSupplier extends Model
 
     public function bookingSupplier()
     {
-        return $this->hasMany('App\Booking');
+        return $this->hasOne('App\Booking');
     }
+
+    public function supplierbookingitem()
+    {
+        return $this->hasMany('App\SupplierBookingItem');
+    }
+
 }
diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index cdb3938e..0d783f8c 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -7,6 +7,8 @@ use App\Booking;
 use App\Rate;
 use App\User;
 use App\UserBankSlip;
+use App\SettingBeneficiary;
+use App\SupplierBookingItem;
 use Illuminate\Http\Request;
 
 class BookingSupplierController extends Controller
@@ -15,20 +17,19 @@ class BookingSupplierController extends Controller
     public function index()
     {
         $bookingsupplier = BookingSupplier::all();
-
+    
         $response = [
             'supplier-booking' => $bookingsupplier
         ];
         return response()->json($response, 200);
     }
 
-    // function show($id)
     public function show($id)
     {
         $bookingsupplier = BookingSupplier::has('supplier-booking')->findOrFail($id);
 
         $response = [
-            'supplier-booking' => $booking
+            'supplier-booking' => $bookingsupplier
         ];
         return response()->json($response, 200);
     }
@@ -40,7 +41,7 @@ class BookingSupplierController extends Controller
         // TODO: admin can access only 
         // get current booking
          
-        $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
+        // $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
         if (!$booking)
         {
             return response()->json(['message'=>'Access denied'], 200);
@@ -50,7 +51,6 @@ class BookingSupplierController extends Controller
     }
 
 
-
     public function store(Request $request, $id)
     {
         //Calculation part
@@ -59,11 +59,11 @@ class BookingSupplierController extends Controller
         $rate = $request->input("rate");
         $rebate = $request->input("rebate");
 
-        $amountInRMB = $amount * $rate;
-        $billing = 0.015 * $amount;
-        $sales_tax = 0.10 * $amount;
-        $gst = 0 * $amount;
-        $customerBankInAmount = round($amount + $gst + $sales_tax + $billing,2);
+        $amountInRMB = $payment_amount * $rate;
+        $billing = 0.015 * $payment_amount;
+        $sales_tax = 0.10 * $payment_amount;
+        $gst = 0 * $payment_amount;
+        $customerBankInAmount = round($payment_amount + $gst + $sales_tax + $billing,2);
         $rmbBankAmount = $customerBankInAmount + $rebate;
 
         $user = Auth::user();
@@ -80,45 +80,34 @@ class BookingSupplierController extends Controller
         $bookingsupplier->user()->associate($user);        
         $bookingsupplier->amountInRMB = $amountInRMB;
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
-
         $bookingsupplier->save();
 
-        //one bookingsupplier has many booking
-            foreach ($bookingsupplier as $booking)
-            {
-                $manybooking = new Booking(array(
-                    'book_id' =>  $booking->id,
-                    'term' => $booking['term'],
-                    'amount' => $booking['amount'],
-                    'account_name' => $booking['account_name'],
-                    'account_num' => $booking['account_num'],
-                    'bank_name' => $booking['bank_name'],
-                    'bank_branch' => $booking['account_name'],
-                    'company_name' => $booking['company_name'],
-                    'company_address' => $booking['company_address'],
-                    'bank_address' => $booking['bank_address'],
-                    'swift_code' => $booking['swift_code'],
-                    'cnap' => $booking['cnap'],
-                    'verification_status' => $booking['verification_status'],
-                    'rmb_book_amount' => $booking['rmb_book_amount'],
-                    'rmb_book_pay_method' => $booking['rmb_book_pay_method'],
-                    'rmb_book_account_name' => $booking['rmb_book_account_name'],
-                    'rmb_book_bank_name' => $booking['rmb_book_bank_name'],
-                    'rmb_book_acc_no' => $booking['rmb_book_acc_no'],
-                    'rmb_book_bank_branch' => $booking['rmb_book_bank_branch'],
-                ));
+        //// one bookingsupplier has many booking
+        // $bookings = $request->input("booking");
+        // foreach ($bookings as $booking)
+        // {
+        //         $bookingsupplierbooking = new Booking(array(
+        //             'book_id' =>  $booking->id,
+        //             'supplierbooking_id' => $supplier->id
+        //         ));
+        //         $bookingsupplierbooking->save();
 
-                $manybooking->save();
-            }
+        //         $new_supplierbooking = new SupplierBookingItem(array(
+        //             'book_id' =>  $booking->id,
+        //             'bank_in_amount'=>$booking['bank_in_amount'],
+        //             'date'=>$booking['date'],
+        //             'details'=>$booking['details'],
+        //             'supplierbooking_id' => $supplier->id
+        //             ));
+        //         $new_supplierbooking->save();
 
+        // }
         return response()->json($bookingsupplier, 201);
-
-
     }
 
+
     public function update(Request $request, $id)
     {
-
         $bookingsupplier = BookingSupplier::find($id);
         $bookingsupplier->payment_method = $request->input('payment_method');
         $bookingsupplier->payment_amount = $request->input('payment_amount');
@@ -138,6 +127,16 @@ class BookingSupplierController extends Controller
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
         $bookingsupplier->save();
 
+        // $supplierbookingitems = $request->input("supplierbookingitem");      
+        // foreach ($bookings as $booking)
+        //  {
+        //         $update_supplierbookingitem = SupplierBookingItem::where('supplierbooking_id', $id)->first(); 
+        //         $update_supplierbookingitem->china_bankslip_url = $booking['china_bankslip_url'];
+        //         $update_supplierbookingitem->bank_in_amount = $booking['bank_in_amount'];
+        //         $update_supplierbookingitem->date = $booking['date'];
+        //         $update_supplierbookingitem->details = $booking['details'];
+        //         $update_supplierbookingitem->save();
+        //   }
         return response()->json(['book_id'=>$book_id],201);
     }
 
@@ -153,10 +152,27 @@ class BookingSupplierController extends Controller
         {
             return response()->json(['message'=>'Access denied'], 200);
         }
-        
 
-        
+        // //get customer booking id, date,amount, rate, total, gst, rebate, bank in amount, beneficiary account number, bank slip.
+        // return BookingSupplier::find($id);
 
+        // //display report
+        // $bookingsupplier = BookingSupplier::with (['supplier_bookings' => function($query){
+        //     $query -> select ('book_id','date','transfer_amount','rate','rebate', 'amountInRMB', 'rmbBankAmount'); 
+        // }])->get();
+       
+        // //get uploaded customer booking bank slip
+        // $userbankslip = UserBankSlip::with (['user_bank_slips' => function($query){
+        //     $query -> select ('book_id','bankslip_url'); 
+        // }])->get();
+
+        // //get active beneficiary account
+        // $beneficiary = SettingBeneficiary::with (['setting_beneficiaries' => function($query){
+        //     $query -> select ('bank_name','acc_no'); 
+        // }])->get();
+
+        $supplier_booking = $booking->supplierBooking()->first();
+        $user_bankslip = $booking->userBankSlip()->first();
         
     }
 
diff --git a/app/SupplierBookingItem.php b/app/SupplierBookingItem.php
new file mode 100644
index 00000000..c0073d18
--- /dev/null
+++ b/app/SupplierBookingItem.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SupplierBookingItem extends Model
+{
+    protected $fillable = [
+        'id',
+        'china_bankslip_url',
+        'book_id',
+        'bank_in_amount',
+        'date',
+        'details',
+        'supplierbooking_id'
+    ];
+
+    public function bookingsupplier()
+    {
+        return $this->belongsTo('App\BookingSupplier');
+    }
+    
+
+}
diff --git a/database/factories/SupplierBookingItemFactory.php b/database/factories/SupplierBookingItemFactory.php
new file mode 100644
index 00000000..514eae24
--- /dev/null
+++ b/database/factories/SupplierBookingItemFactory.php
@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(App\SupplierBookingItem::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});
diff --git a/database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php b/database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php
new file mode 100644
index 00000000..bf18bb6a
--- /dev/null
+++ b/database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class SupplierbookingCustomerbookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('supplierbooking_customerbooking', function (Blueprint $table) {
+            $table->integer('supplierbooking_id')->unsigned();
+            $table->integer('booking_id')->unsigned();
+
+            $table->foreign('supplierbooking_id')->references('id')->on('supplier_bookings');
+            $table->foreign('booking_id')->references('id')->on('bookings');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('supplierbooking_customerbooking');
+    }
+}
diff --git a/database/migrations/2018_06_21_025734_supplier_booking_table.php b/database/migrations/2018_06_21_025734_supplier_booking_table.php
new file mode 100644
index 00000000..3d32b506
--- /dev/null
+++ b/database/migrations/2018_06_21_025734_supplier_booking_table.php
@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateBookingSuppliersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('supplier_bookings', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('payment_method');
+            $table->double('transfer_amount');
+            $table->double('rate');
+            $table->double('rebate');
+            $table->double('amountInRMB');
+            $table->double('rmbBankAmount');
+
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+
+            $table->integer('supplier_id')->unsigned();
+            $table->foreign('supplier_id')->references('id')->on('setting_suppliers');
+
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('booking_suppliers');
+    }
+}
diff --git a/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php
new file mode 100644
index 00000000..552f39f8
--- /dev/null
+++ b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSupplierBookingItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('supplier_booking_items', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('china_bankslip_url');
+            $table->integer('book_id')->unsigned();
+            $table->foreign('book_id')->references('id')->on('bookings');
+            $table->double('bank_in_amount');
+            $table->increments('date');
+            $table->increments('details');
+            $table->integer('supplierbooking_id')->unsigned();
+            $table->foreign('supplierbooking_id')->references('id')->on('supplier_bookings');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('supplier_booking_items');
+    }
+}
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index df4e674a..8879d5e3 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir);
 
 return array(
     'App\\Booking' => $baseDir . '/app/Booking.php',
+    'App\\BookingSupplier' => $baseDir . '/app/BookingSupplier.php',
     'App\\ChinaBankSlip' => $baseDir . '/app/ChinaBankSlip.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\EmailTakenException' => $baseDir . '/app/Exceptions/EmailTakenException.php',
@@ -17,8 +18,10 @@ return array(
     'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php',
     'App\\Http\\Controllers\\Auth\\ResetPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ResetPasswordController.php',
     'App\\Http\\Controllers\\BookingController' => $baseDir . '/app/Http/Controllers/BookingController.php',
+    'App\\Http\\Controllers\\BookingSupplierController' => $baseDir . '/app/Http/Controllers/BookingSupplierController.php',
     'App\\Http\\Controllers\\ChinaBankSlipController' => $baseDir . '/app/Http/Controllers/ChinaBankSlipController.php',
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
+    'App\\Http\\Controllers\\MarkingController' => $baseDir . '/app/Http/Controllers/MarkingController.php',
     'App\\Http\\Controllers\\RateController' => $baseDir . '/app/Http/Controllers/RateController.php',
     'App\\Http\\Controllers\\SettingBeneficiaryController' => $baseDir . '/app/Http/Controllers/SettingBeneficiaryController.php',
     'App\\Http\\Controllers\\SettingCreditController' => $baseDir . '/app/Http/Controllers/SettingCreditController.php',
@@ -35,6 +38,7 @@ return array(
     'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php',
     'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php',
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
+    'App\\Marking' => $baseDir . '/app/Marking.php',
     'App\\Notifications\\ResetPassword' => $baseDir . '/app/Notifications/ResetPassword.php',
     'App\\OAuthProvider' => $baseDir . '/app/OAuthProvider.php',
     'App\\Permission' => $baseDir . '/app/Permission.php',
@@ -49,6 +53,7 @@ return array(
     'App\\SettingBeneficiary' => $baseDir . '/app/SettingBeneficiary.php',
     'App\\SettingCredit' => $baseDir . '/app/SettingCredit.php',
     'App\\SettingSupplier' => $baseDir . '/app/SettingSupplier.php',
+    'App\\SupplierBookingItem' => $baseDir . '/app/SupplierBookingItem.php',
     'App\\User' => $baseDir . '/app/User.php',
     'App\\UserBankSlip' => $baseDir . '/app/UserBankSlip.php',
     'BookTableSeeder' => $baseDir . '/database/seeds/BookTableSeeder.php',
@@ -4128,12 +4133,15 @@ return array(
     'Tests\\Browser\\WelcomeTest' => $baseDir . '/tests/Browser/WelcomeTest.php',
     'Tests\\CreatesApplication' => $baseDir . '/tests/CreatesApplication.php',
     'Tests\\DuskTestCase' => $baseDir . '/tests/DuskTestCase.php',
+    'Tests\\Feature\\BookingTest' => $baseDir . '/tests/Feature/BookingTest.php',
     'Tests\\Feature\\LocaleTest' => $baseDir . '/tests/Feature/LocaleTest.php',
     'Tests\\Feature\\LoginTest' => $baseDir . '/tests/Feature/LoginTest.php',
+    'Tests\\Feature\\MarkingTest' => $baseDir . '/tests/Feature/MarkingTest.php',
+    'Tests\\Feature\\RateTest' => $baseDir . '/tests/Feature/RateTest.php',
     'Tests\\Feature\\RegisterTest' => $baseDir . '/tests/Feature/RegisterTest.php',
+    'Tests\\Feature\\SettingCreditTest' => $baseDir . '/tests/Feature/SettingCreditTest.php',
     'Tests\\Feature\\SettingsTest' => $baseDir . '/tests/Feature/SettingsTest.php',
     'Tests\\TestCase' => $baseDir . '/tests/TestCase.php',
-    'Tests\\Unit\\BookingTest\\BookingTest' => $baseDir . '/tests/Feature/BookingTest.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
     'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e2b83946..2ab5c4dc 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
+class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
@@ -435,6 +435,7 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
 
     public static $classMap = array (
         'App\\Booking' => __DIR__ . '/../..' . '/app/Booking.php',
+        'App\\BookingSupplier' => __DIR__ . '/../..' . '/app/BookingSupplier.php',
         'App\\ChinaBankSlip' => __DIR__ . '/../..' . '/app/ChinaBankSlip.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\EmailTakenException' => __DIR__ . '/../..' . '/app/Exceptions/EmailTakenException.php',
@@ -445,8 +446,10 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
         'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php',
         'App\\Http\\Controllers\\Auth\\ResetPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ResetPasswordController.php',
         'App\\Http\\Controllers\\BookingController' => __DIR__ . '/../..' . '/app/Http/Controllers/BookingController.php',
+        'App\\Http\\Controllers\\BookingSupplierController' => __DIR__ . '/../..' . '/app/Http/Controllers/BookingSupplierController.php',
         'App\\Http\\Controllers\\ChinaBankSlipController' => __DIR__ . '/../..' . '/app/Http/Controllers/ChinaBankSlipController.php',
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
+        'App\\Http\\Controllers\\MarkingController' => __DIR__ . '/../..' . '/app/Http/Controllers/MarkingController.php',
         'App\\Http\\Controllers\\RateController' => __DIR__ . '/../..' . '/app/Http/Controllers/RateController.php',
         'App\\Http\\Controllers\\SettingBeneficiaryController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingBeneficiaryController.php',
         'App\\Http\\Controllers\\SettingCreditController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingCreditController.php',
@@ -463,6 +466,7 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
         'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php',
         'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php',
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
+        'App\\Marking' => __DIR__ . '/../..' . '/app/Marking.php',
         'App\\Notifications\\ResetPassword' => __DIR__ . '/../..' . '/app/Notifications/ResetPassword.php',
         'App\\OAuthProvider' => __DIR__ . '/../..' . '/app/OAuthProvider.php',
         'App\\Permission' => __DIR__ . '/../..' . '/app/Permission.php',
@@ -477,6 +481,7 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
         'App\\SettingBeneficiary' => __DIR__ . '/../..' . '/app/SettingBeneficiary.php',
         'App\\SettingCredit' => __DIR__ . '/../..' . '/app/SettingCredit.php',
         'App\\SettingSupplier' => __DIR__ . '/../..' . '/app/SettingSupplier.php',
+        'App\\SupplierBookingItem' => __DIR__ . '/../..' . '/app/SupplierBookingItem.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
         'App\\UserBankSlip' => __DIR__ . '/../..' . '/app/UserBankSlip.php',
         'BookTableSeeder' => __DIR__ . '/../..' . '/database/seeds/BookTableSeeder.php',
@@ -4556,12 +4561,15 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
         'Tests\\Browser\\WelcomeTest' => __DIR__ . '/../..' . '/tests/Browser/WelcomeTest.php',
         'Tests\\CreatesApplication' => __DIR__ . '/../..' . '/tests/CreatesApplication.php',
         'Tests\\DuskTestCase' => __DIR__ . '/../..' . '/tests/DuskTestCase.php',
+        'Tests\\Feature\\BookingTest' => __DIR__ . '/../..' . '/tests/Feature/BookingTest.php',
         'Tests\\Feature\\LocaleTest' => __DIR__ . '/../..' . '/tests/Feature/LocaleTest.php',
         'Tests\\Feature\\LoginTest' => __DIR__ . '/../..' . '/tests/Feature/LoginTest.php',
+        'Tests\\Feature\\MarkingTest' => __DIR__ . '/../..' . '/tests/Feature/MarkingTest.php',
+        'Tests\\Feature\\RateTest' => __DIR__ . '/../..' . '/tests/Feature/RateTest.php',
         'Tests\\Feature\\RegisterTest' => __DIR__ . '/../..' . '/tests/Feature/RegisterTest.php',
+        'Tests\\Feature\\SettingCreditTest' => __DIR__ . '/../..' . '/tests/Feature/SettingCreditTest.php',
         'Tests\\Feature\\SettingsTest' => __DIR__ . '/../..' . '/tests/Feature/SettingsTest.php',
         'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
-        'Tests\\Unit\\BookingTest\\BookingTest' => __DIR__ . '/../..' . '/tests/Feature/BookingTest.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',
         'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',
@@ -4752,10 +4760,10 @@ class ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit6dcfe61ea7999ade723f072fea748b5a::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$classMap;
 
         }, null, ClassLoader::class);
     }

From 1f91cddda54769d64c88b0de88683c6089583dce Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 18:21:40 +0800
Subject: [PATCH 18/43] show top navigation only if user already login

---
 resources/assets/js/components/LocaleDropdown.vue | 15 ++++++++-------
 resources/assets/js/router/routes.js              | 14 +++++++-------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index f4b0d5c3..fb6f762c 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
   <ul class="nav navbar-nav">
-    <li class="nav-item dropdown">
+    <!-- <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" href="#" role="button"
         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         {{ locales[locale] }}
@@ -12,11 +12,11 @@
           {{ value }}
         </a>
       </div>
-    </li>
-    <li><a class="nav-link" href="#" role="button">Update Rate</a></li>
-    <li><a class="nav-link" href="#" role="button">Complete Order</a></li>
-    <li><a class="nav-link" href="#" role="button">Transaction History</a></li>
-    <li><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
+    </li> -->
+    <li v-if="user"><a class="nav-link" href="#" role="button">Update Rate</a></li>
+    <li v-if="user"><a class="nav-link" href="#" role="button">Complete Order</a></li>
+    <li v-if="user"><a class="nav-link" href="#" role="button">Transaction History</a></li>
+    <li v-if="user"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
   </ul>
  </div> 
 </template>
@@ -28,7 +28,8 @@ import { loadMessages } from '~/plugins/i18n'
 export default {
   computed: mapGetters({
     locale: 'lang/locale',
-    locales: 'lang/locales'
+    locales: 'lang/locales',
+    user: 'auth/user'
   }),
 
   methods: {
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 116f0d7f..e6b8f8de 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -62,13 +62,13 @@ export default [
   { path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
   { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
-  { path: '/admin',
-    component: Admin,
-    children: [
-      { path: '', redirect: { name: 'admin.index' } },
-      { path: 'index', name: 'admin.index', component: Admin },
-      { path: 'home', name: 'admin.home', component: AdminHome }
-    ] },
+  // { path: '/admin',
+  //   component: Admin,
+  //   children: [
+  //     { path: '', redirect: { name: 'admin.index' } },
+  //     { path: 'index', name: 'admin.index', component: Admin },
+  //     { path: 'home', name: 'admin.home', component: AdminHome }
+  //   ] },
   // Admin booking
   { path: '/booking/:id/verification', name: 'booking.admin.verification', component: Verification },
   { path: '/booking/:id/supplier', name: 'booking.admin.supplier', component: Supplier },

From 2ed9f51ffd2c4253001fc76befc6fa13c9f5a368 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Tue, 26 Jun 2018 18:30:41 +0800
Subject: [PATCH 19/43] update top nav only admin can see

---
 resources/assets/js/components/LocaleDropdown.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index fb6f762c..f5102e23 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -13,10 +13,10 @@
         </a>
       </div>
     </li> -->
-    <li v-if="user"><a class="nav-link" href="#" role="button">Update Rate</a></li>
-    <li v-if="user"><a class="nav-link" href="#" role="button">Complete Order</a></li>
-    <li v-if="user"><a class="nav-link" href="#" role="button">Transaction History</a></li>
-    <li v-if="user"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Complete Order</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Transaction History</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
   </ul>
  </div> 
 </template>
@@ -29,7 +29,8 @@ export default {
   computed: mapGetters({
     locale: 'lang/locale',
     locales: 'lang/locales',
-    user: 'auth/user'
+    user: 'auth/user',
+    role: 'auth/role'
   }),
 
   methods: {

From 299597ed165865c70f9ee4314db040bc929c39c2 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 09:58:09 +0800
Subject: [PATCH 20/43] update book supplier routes to admin routes

---
 .../Controllers/BookingSupplierController.php     |  1 +
 routes/api.php                                    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 0d783f8c..1eb32af0 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -21,6 +21,7 @@ class BookingSupplierController extends Controller
         $response = [
             'supplier-booking' => $bookingsupplier
         ];
+        
         return response()->json($response, 200);
     }
 
diff --git a/routes/api.php b/routes/api.php
index ce7e28e2..48dd5ea0 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -92,6 +92,13 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::get('marking/{beneficiary}', 'MarkingController@show');
 	Route::put('marking/{beneficiary}', 'MarkingController@update');
 	Route::delete('marking/{beneficiary}', 'MarkingController@delete');
+	
+	Route::get('supplier-booking', 'BookingSupplierController@index');
+	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
+	Route::get('supplier-booking/{id}', 'BookingSupplierController@viewCustomerBookingDetail');
+	Route::post('supplier-booking', 'BookingSupplierController@store');
+	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
+	Route::delete('supplier-booking/{id}', 'BookingSupplierController@destroy');
 });
 
 Route::get('update-rate', 'RateController@index');
@@ -103,10 +110,4 @@ Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
 Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
 Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
 
-//supplier booking
-Route::get('supplier-booking', 'BookingSupplierController@index');
-Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
-Route::get('supplier-booking/{id}', 'BookingSupplierController@viewCustomerBookingDetail');
-Route::post('supplier-booking', 'BookingSupplierController@store');
-Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
-Route::delete('supplier-booking/{id}', 'BookingSupplierController@destroy');
+

From f078be408dbcacc86c55d20d211ef8794cdc552d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 10:09:06 +0800
Subject: [PATCH 21/43] fix migration errors

---
 ...18_06_21_025734_supplier_booking_table.php |   2 +-
 ...supplierbooking_customerbooking_table.php} |   0
 ...31_create_supplier_booking_items_table.php |   2 -
 vendor/composer/autoload_classmap.php         | 139 +++++++---------
 vendor/composer/autoload_static.php           | 155 +++++++-----------
 5 files changed, 116 insertions(+), 182 deletions(-)
 rename database/migrations/{2018_06_21_024658_supplierbooking_customerbooking_table.php => 2018_06_21_034658_supplierbooking_customerbooking_table.php} (100%)

diff --git a/database/migrations/2018_06_21_025734_supplier_booking_table.php b/database/migrations/2018_06_21_025734_supplier_booking_table.php
index 3d32b506..25588fbe 100644
--- a/database/migrations/2018_06_21_025734_supplier_booking_table.php
+++ b/database/migrations/2018_06_21_025734_supplier_booking_table.php
@@ -4,7 +4,7 @@ use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
 
-class CreateBookingSuppliersTable extends Migration
+class SupplierBookingTable extends Migration
 {
     /**
      * Run the migrations.
diff --git a/database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php b/database/migrations/2018_06_21_034658_supplierbooking_customerbooking_table.php
similarity index 100%
rename from database/migrations/2018_06_21_024658_supplierbooking_customerbooking_table.php
rename to database/migrations/2018_06_21_034658_supplierbooking_customerbooking_table.php
diff --git a/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php
index 552f39f8..fad1a1c3 100644
--- a/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php
+++ b/database/migrations/2018_06_25_120731_create_supplier_booking_items_table.php
@@ -19,8 +19,6 @@ class CreateSupplierBookingItemsTable extends Migration
             $table->integer('book_id')->unsigned();
             $table->foreign('book_id')->references('id')->on('bookings');
             $table->double('bank_in_amount');
-            $table->increments('date');
-            $table->increments('details');
             $table->integer('supplierbooking_id')->unsigned();
             $table->foreign('supplierbooking_id')->references('id')->on('supplier_bookings');
             $table->timestamps();
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 8879d5e3..decc9192 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -21,6 +21,7 @@ return array(
     'App\\Http\\Controllers\\BookingSupplierController' => $baseDir . '/app/Http/Controllers/BookingSupplierController.php',
     'App\\Http\\Controllers\\ChinaBankSlipController' => $baseDir . '/app/Http/Controllers/ChinaBankSlipController.php',
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
+    'App\\Http\\Controllers\\HomeController' => $baseDir . '/app/Http/Controllers/HomeController.php',
     'App\\Http\\Controllers\\MarkingController' => $baseDir . '/app/Http/Controllers/MarkingController.php',
     'App\\Http\\Controllers\\RateController' => $baseDir . '/app/Http/Controllers/RateController.php',
     'App\\Http\\Controllers\\SettingBeneficiaryController' => $baseDir . '/app/Http/Controllers/SettingBeneficiaryController.php',
@@ -38,6 +39,7 @@ return array(
     'App\\Http\\Middleware\\TrimStrings' => $baseDir . '/app/Http/Middleware/TrimStrings.php',
     'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php',
     'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php',
+    'App\\Invoice' => $baseDir . '/app/Invoice.php',
     'App\\Marking' => $baseDir . '/app/Marking.php',
     'App\\Notifications\\ResetPassword' => $baseDir . '/app/Notifications/ResetPassword.php',
     'App\\OAuthProvider' => $baseDir . '/app/OAuthProvider.php',
@@ -1110,6 +1112,9 @@ return array(
     'Faker\\ValidGenerator' => $vendorDir . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
     'Fideloper\\Proxy\\TrustProxies' => $vendorDir . '/fideloper/proxy/src/TrustProxies.php',
     'Fideloper\\Proxy\\TrustedProxyServiceProvider' => $vendorDir . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
+    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
+    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
+    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
     'GuzzleHttp\\Client' => $vendorDir . '/guzzlehttp/guzzle/src/Client.php',
     'GuzzleHttp\\ClientInterface' => $vendorDir . '/guzzlehttp/guzzle/src/ClientInterface.php',
     'GuzzleHttp\\Cookie\\CookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -1613,7 +1618,6 @@ return array(
     'Illuminate\\Foundation\\Console\\MailMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
     'Illuminate\\Foundation\\Console\\ModelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
     'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
-    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
     'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PresetCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -1686,7 +1690,6 @@ return array(
     'Illuminate\\Foundation\\Testing\\WithoutEvents' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
     'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
     'Illuminate\\Foundation\\Validation\\ValidatesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
-    'Illuminate\\Hashing\\AbstractHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
     'Illuminate\\Hashing\\ArgonHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
     'Illuminate\\Hashing\\BcryptHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
     'Illuminate\\Hashing\\HashManager' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -2577,50 +2580,50 @@ return array(
     'PHPUnit\\Framework\\IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
     'PHPUnit\\Framework\\InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
     'PHPUnit\\Framework\\MissingCoversAnnotationException' => $vendorDir . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
-    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
-    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
-    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
-    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
+    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Generator.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invokable.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
+    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
+    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
+    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
+    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
     'PHPUnit\\Framework\\OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
     'PHPUnit\\Framework\\RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
     'PHPUnit\\Framework\\RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -2664,7 +2667,6 @@ return array(
     'PHPUnit\\Runner\\TestHook' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
     'PHPUnit\\Runner\\TestListenerAdapter' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
     'PHPUnit\\Runner\\TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
-    'PHPUnit\\Runner\\TestSuiteSorter' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
     'PHPUnit\\Runner\\Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
     'PHPUnit\\TextUI\\Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
     'PHPUnit\\TextUI\\ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -2699,7 +2701,7 @@ return array(
     'PHPUnit\\Util\\Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
     'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
     'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
+    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockObject.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
@@ -3277,7 +3279,6 @@ return array(
     'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
     'Psy\\CodeCleaner\\LeavePsyshAlonePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
     'Psy\\CodeCleaner\\LegacyEmptyPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
-    'Psy\\CodeCleaner\\ListPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ListPass.php',
     'Psy\\CodeCleaner\\LoopContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
     'Psy\\CodeCleaner\\MagicConstantsPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
     'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3319,10 +3320,10 @@ return array(
     'Psy\\Command\\SudoCommand' => $vendorDir . '/psy/psysh/src/Command/SudoCommand.php',
     'Psy\\Command\\ThrowUpCommand' => $vendorDir . '/psy/psysh/src/Command/ThrowUpCommand.php',
     'Psy\\Command\\TimeitCommand' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand.php',
-    'Psy\\Command\\TimeitCommand\\TimeitVisitor' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
     'Psy\\Command\\TraceCommand' => $vendorDir . '/psy/psysh/src/Command/TraceCommand.php',
     'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Command/WhereamiCommand.php',
     'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Command/WtfCommand.php',
+    'Psy\\Compiler' => $vendorDir . '/psy/psysh/src/Compiler.php',
     'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/ConfigPaths.php',
     'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Configuration.php',
     'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3339,7 +3340,6 @@ return array(
     'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Exception/TypeErrorException.php',
     'Psy\\ExecutionClosure' => $vendorDir . '/psy/psysh/src/ExecutionClosure.php',
     'Psy\\ExecutionLoop' => $vendorDir . '/psy/psysh/src/ExecutionLoop.php',
-    'Psy\\ExecutionLoopClosure' => $vendorDir . '/psy/psysh/src/ExecutionLoopClosure.php',
     'Psy\\ExecutionLoop\\AbstractListener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
     'Psy\\ExecutionLoop\\Listener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/Listener.php',
     'Psy\\ExecutionLoop\\ProcessForker' => $vendorDir . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3362,9 +3362,7 @@ return array(
     'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Readline/Libedit.php',
     'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Readline/Readline.php',
     'Psy\\Readline\\Transient' => $vendorDir . '/psy/psysh/src/Readline/Transient.php',
-    'Psy\\Reflection\\ReflectionClassConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
     'Psy\\Reflection\\ReflectionConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant.php',
-    'Psy\\Reflection\\ReflectionConstant_' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
     'Psy\\Reflection\\ReflectionLanguageConstruct' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
     'Psy\\Reflection\\ReflectionLanguageConstructParameter' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
     'Psy\\Shell' => $vendorDir . '/psy/psysh/src/Shell.php',
@@ -3525,9 +3523,6 @@ return array(
     'SebastianBergmann\\Environment\\OperatingSystem' => $vendorDir . '/sebastian/environment/src/OperatingSystem.php',
     'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
     'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
-    'SebastianBergmann\\FileIterator\\Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
-    'SebastianBergmann\\FileIterator\\Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
-    'SebastianBergmann\\FileIterator\\Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
     'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
     'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php',
     'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3548,6 +3543,7 @@ return array(
     'SebastianBergmann\\Timer\\RuntimeException' => $vendorDir . '/phpunit/php-timer/src/RuntimeException.php',
     'SebastianBergmann\\Timer\\Timer' => $vendorDir . '/phpunit/php-timer/src/Timer.php',
     'SebastianBergmann\\Version' => $vendorDir . '/sebastian/version/src/Version.php',
+    'SettingCreditSeeder' => $baseDir . '/database/seeds/SettingCreditSeeder.php',
     'Symfony\\Component\\Console\\Application' => $vendorDir . '/symfony/console/Application.php',
     'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => $vendorDir . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
     'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => $vendorDir . '/symfony/console/CommandLoader/ContainerCommandLoader.php',
@@ -3575,7 +3571,6 @@ return array(
     'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/console/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => $vendorDir . '/symfony/console/Exception/InvalidOptionException.php',
     'Symfony\\Component\\Console\\Exception\\LogicException' => $vendorDir . '/symfony/console/Exception/LogicException.php',
-    'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => $vendorDir . '/symfony/console/Exception/NamespaceNotFoundException.php',
     'Symfony\\Component\\Console\\Exception\\RuntimeException' => $vendorDir . '/symfony/console/Exception/RuntimeException.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Formatter/OutputFormatter.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -3596,7 +3591,6 @@ return array(
     'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => $vendorDir . '/symfony/console/Helper/SymfonyQuestionHelper.php',
     'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Helper/Table.php',
     'Symfony\\Component\\Console\\Helper\\TableCell' => $vendorDir . '/symfony/console/Helper/TableCell.php',
-    'Symfony\\Component\\Console\\Helper\\TableRows' => $vendorDir . '/symfony/console/Helper/TableRows.php',
     'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
     'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
     'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
@@ -3613,7 +3607,6 @@ return array(
     'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Output/BufferedOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Output/ConsoleOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Output/ConsoleOutputInterface.php',
-    'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => $vendorDir . '/symfony/console/Output/ConsoleSectionOutput.php',
     'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Output/NullOutput.php',
     'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Output/Output.php',
     'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Output/OutputInterface.php',
@@ -3627,7 +3620,6 @@ return array(
     'Symfony\\Component\\Console\\Terminal' => $vendorDir . '/symfony/console/Terminal.php',
     'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Tester/ApplicationTester.php',
     'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Tester/CommandTester.php',
-    'Symfony\\Component\\Console\\Tester\\TesterTrait' => $vendorDir . '/symfony/console/Tester/TesterTrait.php',
     'Symfony\\Component\\CssSelector\\CssSelectorConverter' => $vendorDir . '/symfony/css-selector/CssSelectorConverter.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/css-selector/Exception/ExceptionInterface.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => $vendorDir . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -3734,15 +3726,8 @@ return array(
     'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/ExpressionRequestMatcher.php',
     'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoFileException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
-    'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/PartialFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/File/Exception/UploadException.php',
     'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/File/File.php',
@@ -3756,7 +3741,6 @@ return array(
     'Symfony\\Component\\HttpFoundation\\File\\Stream' => $vendorDir . '/symfony/http-foundation/File/Stream.php',
     'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/File/UploadedFile.php',
     'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
-    'Symfony\\Component\\HttpFoundation\\HeaderUtils' => $vendorDir . '/symfony/http-foundation/HeaderUtils.php',
     'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/IpUtils.php',
     'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/JsonResponse.php',
     'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
@@ -3780,12 +3764,10 @@ return array(
     'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
-    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -3817,7 +3799,6 @@ return array(
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
-    'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -3932,7 +3913,6 @@ return array(
     'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
-    'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => $vendorDir . '/symfony/process/Exception/ProcessSignaledException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
     'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
     'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
@@ -3979,6 +3959,8 @@ return array(
     'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
+    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
+    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4077,7 +4059,6 @@ return array(
     'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => $vendorDir . '/symfony/var-dumper/Caster/EnumStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ExceptionCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => $vendorDir . '/symfony/var-dumper/Caster/FrameStub.php',
-    'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => $vendorDir . '/symfony/var-dumper/Caster/GmpCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => $vendorDir . '/symfony/var-dumper/Caster/LinkStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Caster/PdoCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => $vendorDir . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4097,24 +4078,13 @@ return array(
     'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
     'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
-    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
-    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
-    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
-    'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => $vendorDir . '/symfony/var-dumper/Command/ServerDumpCommand.php',
     'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Dumper/AbstractDumper.php',
     'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Dumper/CliDumper.php',
-    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
-    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
-    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
-    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
-    'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => $vendorDir . '/symfony/var-dumper/Dumper/ServerDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-    'Symfony\\Component\\VarDumper\\Server\\DumpServer' => $vendorDir . '/symfony/var-dumper/Server/DumpServer.php',
     'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
-    'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
     'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
@@ -4134,6 +4104,7 @@ return array(
     'Tests\\CreatesApplication' => $baseDir . '/tests/CreatesApplication.php',
     'Tests\\DuskTestCase' => $baseDir . '/tests/DuskTestCase.php',
     'Tests\\Feature\\BookingTest' => $baseDir . '/tests/Feature/BookingTest.php',
+    'Tests\\Feature\\ChinaBankSlipTest' => $baseDir . '/tests/Feature/ChinaBankSlipTest.php',
     'Tests\\Feature\\LocaleTest' => $baseDir . '/tests/Feature/LocaleTest.php',
     'Tests\\Feature\\LoginTest' => $baseDir . '/tests/Feature/LoginTest.php',
     'Tests\\Feature\\MarkingTest' => $baseDir . '/tests/Feature/MarkingTest.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 2ab5c4dc..c5049170 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,14 +4,13 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
+class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
-        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
@@ -54,7 +53,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
             'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Php56\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
-            'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Component\\VarDumper\\' => 28,
             'Symfony\\Component\\Translation\\' => 30,
             'Symfony\\Component\\Routing\\' => 26,
@@ -192,10 +190,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
         ),
-        'Symfony\\Polyfill\\Ctype\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
-        ),
         'Symfony\\Component\\VarDumper\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/var-dumper',
@@ -449,6 +443,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'App\\Http\\Controllers\\BookingSupplierController' => __DIR__ . '/../..' . '/app/Http/Controllers/BookingSupplierController.php',
         'App\\Http\\Controllers\\ChinaBankSlipController' => __DIR__ . '/../..' . '/app/Http/Controllers/ChinaBankSlipController.php',
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
+        'App\\Http\\Controllers\\HomeController' => __DIR__ . '/../..' . '/app/Http/Controllers/HomeController.php',
         'App\\Http\\Controllers\\MarkingController' => __DIR__ . '/../..' . '/app/Http/Controllers/MarkingController.php',
         'App\\Http\\Controllers\\RateController' => __DIR__ . '/../..' . '/app/Http/Controllers/RateController.php',
         'App\\Http\\Controllers\\SettingBeneficiaryController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingBeneficiaryController.php',
@@ -466,6 +461,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'App\\Http\\Middleware\\TrimStrings' => __DIR__ . '/../..' . '/app/Http/Middleware/TrimStrings.php',
         'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php',
         'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php',
+        'App\\Invoice' => __DIR__ . '/../..' . '/app/Invoice.php',
         'App\\Marking' => __DIR__ . '/../..' . '/app/Marking.php',
         'App\\Notifications\\ResetPassword' => __DIR__ . '/../..' . '/app/Notifications/ResetPassword.php',
         'App\\OAuthProvider' => __DIR__ . '/../..' . '/app/OAuthProvider.php',
@@ -1538,6 +1534,9 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Faker\\ValidGenerator' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
         'Fideloper\\Proxy\\TrustProxies' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustProxies.php',
         'Fideloper\\Proxy\\TrustedProxyServiceProvider' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
+        'File_Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
+        'File_Iterator_Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
+        'File_Iterator_Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
         'GuzzleHttp\\Client' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Client.php',
         'GuzzleHttp\\ClientInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/ClientInterface.php',
         'GuzzleHttp\\Cookie\\CookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -2041,7 +2040,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Illuminate\\Foundation\\Console\\MailMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
         'Illuminate\\Foundation\\Console\\ModelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
         'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
-        'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
         'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PresetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -2114,7 +2112,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Illuminate\\Foundation\\Testing\\WithoutEvents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
         'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
         'Illuminate\\Foundation\\Validation\\ValidatesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
-        'Illuminate\\Hashing\\AbstractHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
         'Illuminate\\Hashing\\ArgonHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
         'Illuminate\\Hashing\\BcryptHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
         'Illuminate\\Hashing\\HashManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -3005,50 +3002,50 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'PHPUnit\\Framework\\IncompleteTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
         'PHPUnit\\Framework\\InvalidCoversTargetException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
         'PHPUnit\\Framework\\MissingCoversAnnotationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
-        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
-        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
-        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
-        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
+        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Generator.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invokable.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
+        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
+        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
+        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
+        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
         'PHPUnit\\Framework\\OutputError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/OutputError.php',
         'PHPUnit\\Framework\\RiskyTest' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTest.php',
         'PHPUnit\\Framework\\RiskyTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -3092,7 +3089,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'PHPUnit\\Runner\\TestHook' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
         'PHPUnit\\Runner\\TestListenerAdapter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
         'PHPUnit\\Runner\\TestSuiteLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
-        'PHPUnit\\Runner\\TestSuiteSorter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
         'PHPUnit\\Runner\\Version' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Version.php',
         'PHPUnit\\TextUI\\Command' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Command.php',
         'PHPUnit\\TextUI\\ResultPrinter' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -3127,7 +3123,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'PHPUnit\\Util\\Type' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Type.php',
         'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Xml.php',
         'PHPUnit\\Util\\XmlTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
+        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockObject.php',
         'PHP_Token' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScope' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScopeAndVisibility' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
@@ -3705,7 +3701,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
         'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
         'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
-        'Psy\\CodeCleaner\\ListPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ListPass.php',
         'Psy\\CodeCleaner\\LoopContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
         'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
         'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3747,10 +3742,10 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Psy\\Command\\SudoCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/SudoCommand.php',
         'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ThrowUpCommand.php',
         'Psy\\Command\\TimeitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand.php',
-        'Psy\\Command\\TimeitCommand\\TimeitVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
         'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TraceCommand.php',
         'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WhereamiCommand.php',
         'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WtfCommand.php',
+        'Psy\\Compiler' => __DIR__ . '/..' . '/psy/psysh/src/Compiler.php',
         'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/ConfigPaths.php',
         'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Configuration.php',
         'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3767,7 +3762,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/TypeErrorException.php',
         'Psy\\ExecutionClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionClosure.php',
         'Psy\\ExecutionLoop' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop.php',
-        'Psy\\ExecutionLoopClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoopClosure.php',
         'Psy\\ExecutionLoop\\AbstractListener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
         'Psy\\ExecutionLoop\\Listener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/Listener.php',
         'Psy\\ExecutionLoop\\ProcessForker' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3790,9 +3784,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Libedit.php',
         'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Readline.php',
         'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Transient.php',
-        'Psy\\Reflection\\ReflectionClassConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
         'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant.php',
-        'Psy\\Reflection\\ReflectionConstant_' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
         'Psy\\Reflection\\ReflectionLanguageConstruct' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
         'Psy\\Reflection\\ReflectionLanguageConstructParameter' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
         'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Shell.php',
@@ -3953,9 +3945,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'SebastianBergmann\\Environment\\OperatingSystem' => __DIR__ . '/..' . '/sebastian/environment/src/OperatingSystem.php',
         'SebastianBergmann\\Environment\\Runtime' => __DIR__ . '/..' . '/sebastian/environment/src/Runtime.php',
         'SebastianBergmann\\Exporter\\Exporter' => __DIR__ . '/..' . '/sebastian/exporter/src/Exporter.php',
-        'SebastianBergmann\\FileIterator\\Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
-        'SebastianBergmann\\FileIterator\\Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
-        'SebastianBergmann\\FileIterator\\Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
         'SebastianBergmann\\GlobalState\\Blacklist' => __DIR__ . '/..' . '/sebastian/global-state/src/Blacklist.php',
         'SebastianBergmann\\GlobalState\\CodeExporter' => __DIR__ . '/..' . '/sebastian/global-state/src/CodeExporter.php',
         'SebastianBergmann\\GlobalState\\Exception' => __DIR__ . '/..' . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3976,6 +3965,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'SebastianBergmann\\Timer\\RuntimeException' => __DIR__ . '/..' . '/phpunit/php-timer/src/RuntimeException.php',
         'SebastianBergmann\\Timer\\Timer' => __DIR__ . '/..' . '/phpunit/php-timer/src/Timer.php',
         'SebastianBergmann\\Version' => __DIR__ . '/..' . '/sebastian/version/src/Version.php',
+        'SettingCreditSeeder' => __DIR__ . '/../..' . '/database/seeds/SettingCreditSeeder.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
         'Symfony\\Component\\Console\\CommandLoader\\ContainerCommandLoader' => __DIR__ . '/..' . '/symfony/console/CommandLoader/ContainerCommandLoader.php',
@@ -4003,7 +3993,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidOptionException.php',
         'Symfony\\Component\\Console\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/console/Exception/LogicException.php',
-        'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => __DIR__ . '/..' . '/symfony/console/Exception/NamespaceNotFoundException.php',
         'Symfony\\Component\\Console\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/console/Exception/RuntimeException.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatter.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -4024,7 +4013,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/SymfonyQuestionHelper.php',
         'Symfony\\Component\\Console\\Helper\\Table' => __DIR__ . '/..' . '/symfony/console/Helper/Table.php',
         'Symfony\\Component\\Console\\Helper\\TableCell' => __DIR__ . '/..' . '/symfony/console/Helper/TableCell.php',
-        'Symfony\\Component\\Console\\Helper\\TableRows' => __DIR__ . '/..' . '/symfony/console/Helper/TableRows.php',
         'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
         'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
         'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
@@ -4041,7 +4029,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Console\\Output\\BufferedOutput' => __DIR__ . '/..' . '/symfony/console/Output/BufferedOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutputInterface.php',
-        'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleSectionOutput.php',
         'Symfony\\Component\\Console\\Output\\NullOutput' => __DIR__ . '/..' . '/symfony/console/Output/NullOutput.php',
         'Symfony\\Component\\Console\\Output\\Output' => __DIR__ . '/..' . '/symfony/console/Output/Output.php',
         'Symfony\\Component\\Console\\Output\\OutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/OutputInterface.php',
@@ -4055,7 +4042,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Console\\Terminal' => __DIR__ . '/..' . '/symfony/console/Terminal.php',
         'Symfony\\Component\\Console\\Tester\\ApplicationTester' => __DIR__ . '/..' . '/symfony/console/Tester/ApplicationTester.php',
         'Symfony\\Component\\Console\\Tester\\CommandTester' => __DIR__ . '/..' . '/symfony/console/Tester/CommandTester.php',
-        'Symfony\\Component\\Console\\Tester\\TesterTrait' => __DIR__ . '/..' . '/symfony/console/Tester/TesterTrait.php',
         'Symfony\\Component\\CssSelector\\CssSelectorConverter' => __DIR__ . '/..' . '/symfony/css-selector/CssSelectorConverter.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExceptionInterface.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -4162,15 +4148,8 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/ExpressionRequestMatcher.php',
         'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoFileException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
-        'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/PartialFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UploadException.php',
         'Symfony\\Component\\HttpFoundation\\File\\File' => __DIR__ . '/..' . '/symfony/http-foundation/File/File.php',
@@ -4184,7 +4163,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\HttpFoundation\\File\\Stream' => __DIR__ . '/..' . '/symfony/http-foundation/File/Stream.php',
         'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => __DIR__ . '/..' . '/symfony/http-foundation/File/UploadedFile.php',
         'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
-        'Symfony\\Component\\HttpFoundation\\HeaderUtils' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderUtils.php',
         'Symfony\\Component\\HttpFoundation\\IpUtils' => __DIR__ . '/..' . '/symfony/http-foundation/IpUtils.php',
         'Symfony\\Component\\HttpFoundation\\JsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/JsonResponse.php',
         'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
@@ -4208,12 +4186,10 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
-        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -4245,7 +4221,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
-        'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -4360,7 +4335,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
-        'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessSignaledException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
         'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
         'Symfony\\Component\\Process\\ExecutableFinder' => __DIR__ . '/..' . '/symfony/process/ExecutableFinder.php',
@@ -4407,6 +4381,8 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/XmlFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/YamlFileLoader.php',
+        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
+        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4505,7 +4481,6 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/EnumStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ExceptionCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/FrameStub.php',
-        'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/GmpCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/LinkStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PdoCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4525,24 +4500,13 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
         'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
-        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
-        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
-        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
-        'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => __DIR__ . '/..' . '/symfony/var-dumper/Command/ServerDumpCommand.php',
         'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/AbstractDumper.php',
         'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/CliDumper.php',
-        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
-        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
-        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
-        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
-        'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ServerDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-        'Symfony\\Component\\VarDumper\\Server\\DumpServer' => __DIR__ . '/..' . '/symfony/var-dumper/Server/DumpServer.php',
         'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
-        'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
         'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
@@ -4562,6 +4526,7 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
         'Tests\\CreatesApplication' => __DIR__ . '/../..' . '/tests/CreatesApplication.php',
         'Tests\\DuskTestCase' => __DIR__ . '/../..' . '/tests/DuskTestCase.php',
         'Tests\\Feature\\BookingTest' => __DIR__ . '/../..' . '/tests/Feature/BookingTest.php',
+        'Tests\\Feature\\ChinaBankSlipTest' => __DIR__ . '/../..' . '/tests/Feature/ChinaBankSlipTest.php',
         'Tests\\Feature\\LocaleTest' => __DIR__ . '/../..' . '/tests/Feature/LocaleTest.php',
         'Tests\\Feature\\LoginTest' => __DIR__ . '/../..' . '/tests/Feature/LoginTest.php',
         'Tests\\Feature\\MarkingTest' => __DIR__ . '/../..' . '/tests/Feature/MarkingTest.php',
@@ -4760,10 +4725,10 @@ class ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInitebee75b176540aeb1d879b30f69e9dfc::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
 
         }, null, ClassLoader::class);
     }

From 5f053577df2ce0fd7b6a9acfef06b2bf19549cd5 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 10:12:35 +0800
Subject: [PATCH 22/43] removed viewCustomerBookingDetails, it was done in
 bookingController

---
 .../Controllers/BookingSupplierController.php | 20 ++-----------------
 routes/api.php                                |  3 +--
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 1eb32af0..0193e12c 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -21,7 +21,7 @@ class BookingSupplierController extends Controller
         $response = [
             'supplier-booking' => $bookingsupplier
         ];
-        
+
         return response()->json($response, 200);
     }
 
@@ -32,26 +32,10 @@ class BookingSupplierController extends Controller
         $response = [
             'supplier-booking' => $bookingsupplier
         ];
+
         return response()->json($response, 200);
     }
 
-    //single booking detail : one customer bank slip
-    public function viewCustomerBookingDetail (Request $request, $id )
-    {
-        // display all booking that is already uploaded user bankin slip
-        // TODO: admin can access only 
-        // get current booking
-         
-        // $booking = Booking::where("admin_id", Auth::user()->id)->where('id', $id)->first();
-        if (!$booking)
-        {
-            return response()->json(['message'=>'Access denied'], 200);
-        }
-        return response()->json($booking, 200);
-
-    }
-
-
     public function store(Request $request, $id)
     {
         //Calculation part
diff --git a/routes/api.php b/routes/api.php
index 48dd5ea0..66daf648 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -92,10 +92,9 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::get('marking/{beneficiary}', 'MarkingController@show');
 	Route::put('marking/{beneficiary}', 'MarkingController@update');
 	Route::delete('marking/{beneficiary}', 'MarkingController@delete');
-	
+
 	Route::get('supplier-booking', 'BookingSupplierController@index');
 	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
-	Route::get('supplier-booking/{id}', 'BookingSupplierController@viewCustomerBookingDetail');
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
 	Route::delete('supplier-booking/{id}', 'BookingSupplierController@destroy');

From b7f258f6a9162448a31506b37c5602e56985c3b3 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 10:30:01 +0800
Subject: [PATCH 23/43] refactor BookingsupplierController fix booking supplier
 model updated fields for bookg supplier frontend

---
 app/Booking.php                               |   5 +-
 app/BookingSupplier.php                       |   5 +-
 app/Http/Controllers/BookingController.php    |   2 +-
 .../Controllers/BookingSupplierController.php |  23 ++-
 .../pages/admin/booking/supplierBooking.vue   | 146 +++++++++---------
 5 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/app/Booking.php b/app/Booking.php
index b03276d9..fec84e1c 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -28,11 +28,14 @@ class Booking extends Model
                             
     public $timestamps = true;
     
-
     public function user(){
         return $this->belongsTo('app\User');
     }
 
+    public function bookingSupplier(){
+        return $this->belongsTo('app\BookingSupplier ');
+    }
+
     public function userBankSlip(){
         return $this->hasOne(UserBankSlip::class);
     }
diff --git a/app/BookingSupplier.php b/app/BookingSupplier.php
index aed75bc1..dbf1de39 100644
--- a/app/BookingSupplier.php
+++ b/app/BookingSupplier.php
@@ -15,12 +15,11 @@ class BookingSupplier extends Model
         return $this->belongsTo('app\User');
     }
 
-    public function bookingSupplier()
-    {
+    public function booking(){
         return $this->hasOne('App\Booking');
     }
 
-    public function supplierbookingitem()
+    public function supplierBookingTtem()
     {
         return $this->hasMany('App\SupplierBookingItem');
     }
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f190aefb..f893d614 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -164,9 +164,9 @@ class BookingController extends Controller
 
     public function store(Request $request)
     {
-        $rates = Rate::orderby('updated_at','desc')->first();
         $term = $request->input('term');
         $amount = $request->input("amount");    // in RMB
+        $rates = Rate::orderby('updated_at','desc')->first();
 		$creditLimit = SettingCredit::orderby('updated_at','desc')->first();
 
 		if (!$creditLimit){
diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 0193e12c..9e3640ed 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -36,37 +36,44 @@ class BookingSupplierController extends Controller
         return response()->json($response, 200);
     }
 
+    // Only for single booking 
+    // TODO : Multiple booking
     public function store(Request $request, $id)
     {
-        //Calculation part
-        //single booking supplier
         $payment_amount = $request->input("payment_amount");
         $rate = $request->input("rate");
         $rebate = $request->input("rebate");
-
+        $supplier_id = $request->input("supplier_id");
+        
+        // Calculation
         $amountInRMB = $payment_amount * $rate;
         $billing = 0.015 * $payment_amount;
         $sales_tax = 0.10 * $payment_amount;
-        $gst = 0 * $payment_amount;
+        $gst = 0 * $payment_amount; // do we still need this ? 
         $customerBankInAmount = round($payment_amount + $gst + $sales_tax + $billing,2);
         $rmbBankAmount = $customerBankInAmount + $rebate;
 
         $user = Auth::user();
+        $supplier = SettingSupplier::find($supplier_id);
+        $booking = Booking::find($id);
+
         $bookingsupplier = new BookingSupplier();
-
-        $supplier = SettingSupplier::find($id);
         $bookingsupplier->supplier_id = $supplier->id;
-
         $bookingsupplier->payment_method = $request->input('payment_method');
         $bookingsupplier->payment_amount = $request->input('payment_amount');
         $bookingsupplier->rate = $request->input('rate');
         $bookingsupplier->rebate = $request->input('rebate');
-
         $bookingsupplier->user()->associate($user);        
         $bookingsupplier->amountInRMB = $amountInRMB;
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
+        $bookingsupplier->booking()->associate($booking);
         $bookingsupplier->save();
 
+        // update booking status 
+		$booking->status = 4;
+		$booking->admin_status = 3; 
+		$booking->save();
+
         //// one bookingsupplier has many booking
         // $bookings = $request->input("booking");
         // foreach ($bookings as $booking)
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index 095440a9..f393a329 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -19,7 +19,7 @@
         <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>
@@ -147,7 +147,9 @@
                         <div class="cell"></div>
                       </td>
                       <td class="el-table_3_column_12 is-left ">
-                        <div class="cell"><b>MYR {{ booking_details.bia }}</b></div>
+                        <div class="cell">
+                          <b>MYR {{ booking_details.bia }}</b>
+                        </div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -199,41 +201,32 @@
         <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="amount">
-              <el-input v-model="supplierBookingForm.amount" type="text" placeholder="Amount" style="width: 80%" />
-            </el-form-item>
-            <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="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="generateReport('supplierBookingForm')">Generate Report</el-button>
-            </el-form-item>
-          </div>
-        </el-form>
+            <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="rate">
+                  <el-input v-model="supplierBookingForm.rate" type="text" placeholder="Rate" style="width: 80%" />
+                </el-form-item>
+                <el-form-item prop="rebate">
+                  <el-input v-model="supplierBookingForm.rebate" type="text" placeholder="Rebate" style="width: 80%" />
+                </el-form-item>
+                <el-form-item prop="transfer_amount">
+                  <el-input v-model="supplierBookingForm.payment_amount" type="text" placeholder="Payment Amount" style="width: 80%" />
+                </el-form-item>
+                <el-form-item>
+                  <el-button :loading="loading_btn" type="primary" @click="generateReport('supplierBookingForm')">Generate Report</el-button>
+                </el-form-item>
+              </div>
+            </el-form>
           </el-col>
-    
         </el-row>
       </el-card>
     </el-row>
@@ -256,7 +249,7 @@
       return {
         status: 3,
         loading_btn: false,
-        booking_details:{
+        booking_details: {
           id: null,
           amount: null,
           bia: null,
@@ -264,7 +257,7 @@
         },
         supplier: null,
         supplier_options: null,
-        supplierBookingForm:{
+        supplierBookingForm: {
           supplier: null,
           amount: null,
           rate: null,
@@ -276,62 +269,62 @@
             required: true,
             message: 'Please input amount',
             trigger: 'change'
-          } ],
-          amount: [{
+          }],
+          rebate: [{
             required: true,
             message: 'Please input bank name',
             trigger: 'change'
-          } ],
+          }],
           rate: [{
             required: true,
             message: 'Please input account name',
             trigger: 'change'
           }],
-          transfer_amount: [{
+          payment_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'
-        })
+    beforeCreate() {
+      const loading = this.$loading({
+        lock: true,
+        text: 'Please wait..',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
       })
 
-    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'
+      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'
+          })
+        })
+
+    },
     methods: {
-      generateReport (formName) {
+      generateReport(formName) {
         this.loading_btn = true
 
         this.$refs[formName].validate((valid) => {
@@ -360,9 +353,8 @@
             //   this.loading = false
             //   console.log(error)
             // })
-            
-          }
-          else{
+
+          } else {
             this.loading_btn = false
           }
         })

From 544d414deecd38e938f707682a9b50bb25a15dfc Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 10:30:56 +0800
Subject: [PATCH 24/43] remove destroy function for bookingsupplier

---
 app/Http/Controllers/BookingSupplierController.php | 4 ----
 routes/api.php                                     | 1 -
 2 files changed, 5 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 9e3640ed..9b40749a 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -132,10 +132,6 @@ class BookingSupplierController extends Controller
         return response()->json(['book_id'=>$book_id],201);
     }
 
-    public function destroy(BookingSupplier $id)
-    {
-        $id->delete($id);
-    }
 
     public function supplierbookingreport(Request $request, $id)
     {
diff --git a/routes/api.php b/routes/api.php
index 66daf648..e62fe183 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -97,7 +97,6 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
-	Route::delete('supplier-booking/{id}', 'BookingSupplierController@destroy');
 });
 
 Route::get('update-rate', 'RateController@index');

From b3cf440c4bcc5ecdf6c6c6e078fc31b04952d4ee Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 10:46:15 +0800
Subject: [PATCH 25/43] updated supplier booking controller

---
 .../Controllers/BookingSupplierController.php | 30 ++-----------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 9b40749a..6c986da3 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -133,35 +133,11 @@ class BookingSupplierController extends Controller
     }
 
 
-    public function supplierbookingreport(Request $request, $id)
+    public function report(Request $request, $id)
     {
-        $bookingsupplier = BookingSupplier::where("admin_id", Auth::user()->id)->where('id', $id)->first();
-        if (!$bookingsupplier)
-        {
-            return response()->json(['message'=>'Access denied'], 200);
-        }
+        $supplier_booking = Booking::firstOrFail($id)->supplierBooking()->firstOrFail();
 
-        // //get customer booking id, date,amount, rate, total, gst, rebate, bank in amount, beneficiary account number, bank slip.
-        // return BookingSupplier::find($id);
-
-        // //display report
-        // $bookingsupplier = BookingSupplier::with (['supplier_bookings' => function($query){
-        //     $query -> select ('book_id','date','transfer_amount','rate','rebate', 'amountInRMB', 'rmbBankAmount'); 
-        // }])->get();
-       
-        // //get uploaded customer booking bank slip
-        // $userbankslip = UserBankSlip::with (['user_bank_slips' => function($query){
-        //     $query -> select ('book_id','bankslip_url'); 
-        // }])->get();
-
-        // //get active beneficiary account
-        // $beneficiary = SettingBeneficiary::with (['setting_beneficiaries' => function($query){
-        //     $query -> select ('bank_name','acc_no'); 
-        // }])->get();
-
-        $supplier_booking = $booking->supplierBooking()->first();
-        $user_bankslip = $booking->userBankSlip()->first();
-        
+        return response()->json($supplier_booking ,200);
     }
 
 

From d1ce576109cad15fc4432fd9ff9743ce42f12ae1 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 12:01:49 +0800
Subject: [PATCH 26/43] changed model from bookingsupplier to supplier booking
 fix supplier booking controller make payment method nullable for supplier
 booking

---
 .../Controllers/BookingSupplierController.php | 44 ++++++++--------
 .../Controllers/SettingSupplierController.php |  2 +-
 ...ookingSupplier.php => SupplierBooking.php} |  2 +-
 ...18_06_21_025734_supplier_booking_table.php |  2 +-
 ...hod_nulltable_in_supplierbooking_table.php | 31 +++++++++++
 .../pages/admin/booking/supplierBooking.vue   | 51 ++++++++++---------
 resources/assets/js/router/routes.js          | 14 ++---
 vendor/composer/autoload_classmap.php         |  2 +-
 vendor/composer/autoload_static.php           |  2 +-
 9 files changed, 94 insertions(+), 56 deletions(-)
 rename app/{BookingSupplier.php => SupplierBooking.php} (93%)
 create mode 100644 database/migrations/2018_06_27_035705_make_paymentmethod_nulltable_in_supplierbooking_table.php

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 6c986da3..101359b8 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -2,13 +2,15 @@
 
 namespace App\Http\Controllers;
 
-use App\BookingSupplier;
+use Auth;
+use App\SupplierBooking;
 use App\Booking;
 use App\Rate;
 use App\User;
 use App\UserBankSlip;
 use App\SettingBeneficiary;
 use App\SupplierBookingItem;
+use App\SettingSupplier;
 use Illuminate\Http\Request;
 
 class BookingSupplierController extends Controller
@@ -16,7 +18,7 @@ class BookingSupplierController extends Controller
 
     public function index()
     {
-        $bookingsupplier = BookingSupplier::all();
+        $bookingsupplier = SupplierBooking::all();
     
         $response = [
             'supplier-booking' => $bookingsupplier
@@ -27,7 +29,7 @@ class BookingSupplierController extends Controller
 
     public function show($id)
     {
-        $bookingsupplier = BookingSupplier::has('supplier-booking')->findOrFail($id);
+        $bookingsupplier = SupplierBooking::has('supplier-booking')->findOrFail($id);
 
         $response = [
             'supplier-booking' => $bookingsupplier
@@ -38,35 +40,35 @@ class BookingSupplierController extends Controller
 
     // Only for single booking 
     // TODO : Multiple booking
-    public function store(Request $request, $id)
+    public function store(Request $request)
     {
-        $payment_amount = $request->input("payment_amount");
-        $rate = $request->input("rate");
-        $rebate = $request->input("rebate");
+        $transfer_amount = $request->input("transfer_amount");
         $supplier_id = $request->input("supplier_id");
+        $booking_id = $request->input("booking_id");
+        $rate = $request->input('rate');
+        $rebate = $request->input('rebate');
         
         // Calculation
-        $amountInRMB = $payment_amount * $rate;
-        $billing = 0.015 * $payment_amount;
-        $sales_tax = 0.10 * $payment_amount;
-        $gst = 0 * $payment_amount; // do we still need this ? 
-        $customerBankInAmount = round($payment_amount + $gst + $sales_tax + $billing,2);
+        $amountInRMB = $transfer_amount * $rate;
+        $billing = 0.015 * $transfer_amount;
+        $sales_tax = 0.10 * $transfer_amount;
+        $gst = 0 * $transfer_amount; // do we still need this ? 
+        $customerBankInAmount = round($transfer_amount + $gst + $sales_tax + $billing,2);
         $rmbBankAmount = $customerBankInAmount + $rebate;
 
         $user = Auth::user();
         $supplier = SettingSupplier::find($supplier_id);
-        $booking = Booking::find($id);
+        $booking = Booking::find($booking_id);
 
-        $bookingsupplier = new BookingSupplier();
+        $bookingsupplier = new SupplierBooking();
         $bookingsupplier->supplier_id = $supplier->id;
         $bookingsupplier->payment_method = $request->input('payment_method');
-        $bookingsupplier->payment_amount = $request->input('payment_amount');
-        $bookingsupplier->rate = $request->input('rate');
-        $bookingsupplier->rebate = $request->input('rebate');
-        $bookingsupplier->user()->associate($user);        
+        $bookingsupplier->transfer_amount = $transfer_amount;
+        $bookingsupplier->rate = $rate;
+        $bookingsupplier->rebate = $rebate;       
         $bookingsupplier->amountInRMB = $amountInRMB;
         $bookingsupplier->rmbBankAmount = $rmbBankAmount;
-        $bookingsupplier->booking()->associate($booking);
+        $bookingsupplier->book_id = $booking->id;
         $bookingsupplier->save();
 
         // update booking status 
@@ -100,9 +102,9 @@ class BookingSupplierController extends Controller
 
     public function update(Request $request, $id)
     {
-        $bookingsupplier = BookingSupplier::find($id);
+        $bookingsupplier = BSupplierBooking::find($id);
         $bookingsupplier->payment_method = $request->input('payment_method');
-        $bookingsupplier->payment_amount = $request->input('payment_amount');
+        $bookingsupplier->transfer_amount = $request->input('transfer_amount');
         $bookingsupplier->rate = $request->input('rate');
         $bookingsupplier->rebate = $request->input('rebate');
         // calculation
diff --git a/app/Http/Controllers/SettingSupplierController.php b/app/Http/Controllers/SettingSupplierController.php
index 6b1f8f12..d6bf1eda 100644
--- a/app/Http/Controllers/SettingSupplierController.php
+++ b/app/Http/Controllers/SettingSupplierController.php
@@ -12,7 +12,7 @@ class SettingSupplierController extends Controller
         $suppliers = SettingSupplier::all();
 
         foreach ($suppliers as $supplier) {
-            $supplier->value = $supplier->company_name;
+            $supplier->value = $supplier->id;
             $supplier->label = $supplier->company_name;
         }
         return $suppliers;
diff --git a/app/BookingSupplier.php b/app/SupplierBooking.php
similarity index 93%
rename from app/BookingSupplier.php
rename to app/SupplierBooking.php
index dbf1de39..9f660105 100644
--- a/app/BookingSupplier.php
+++ b/app/SupplierBooking.php
@@ -4,7 +4,7 @@ namespace App;
 
 use Illuminate\Database\Eloquent\Model;
 
-class BookingSupplier extends Model
+class SupplierBooking extends Model
 {
     // protected $guarded = [];
     protected $fillable = ['rate','rebate','payment_amount','payment_method'];
diff --git a/database/migrations/2018_06_21_025734_supplier_booking_table.php b/database/migrations/2018_06_21_025734_supplier_booking_table.php
index 25588fbe..2369cf24 100644
--- a/database/migrations/2018_06_21_025734_supplier_booking_table.php
+++ b/database/migrations/2018_06_21_025734_supplier_booking_table.php
@@ -39,6 +39,6 @@ class SupplierBookingTable extends Migration
      */
     public function down()
     {
-        Schema::dropIfExists('booking_suppliers');
+        Schema::dropIfExists('supplier_bookings');
     }
 }
diff --git a/database/migrations/2018_06_27_035705_make_paymentmethod_nulltable_in_supplierbooking_table.php b/database/migrations/2018_06_27_035705_make_paymentmethod_nulltable_in_supplierbooking_table.php
new file mode 100644
index 00000000..8baebdac
--- /dev/null
+++ b/database/migrations/2018_06_27_035705_make_paymentmethod_nulltable_in_supplierbooking_table.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class MakePaymentmethodNulltableInSupplierbookingTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('supplier_bookings', function($table)
+        {
+            $table->string('payment_method')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index f393a329..a47c37b6 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -219,7 +219,7 @@
                   <el-input v-model="supplierBookingForm.rebate" type="text" placeholder="Rebate" style="width: 80%" />
                 </el-form-item>
                 <el-form-item prop="transfer_amount">
-                  <el-input v-model="supplierBookingForm.payment_amount" type="text" placeholder="Payment Amount" style="width: 80%" />
+                  <el-input v-model="supplierBookingForm.transfer_amount" type="text" placeholder="Payment Amount" style="width: 80%" />
                 </el-form-item>
                 <el-form-item>
                   <el-button :loading="loading_btn" type="primary" @click="generateReport('supplierBookingForm')">Generate Report</el-button>
@@ -260,6 +260,7 @@
         supplierBookingForm: {
           supplier: null,
           amount: null,
+          rebate: null,
           rate: null,
           transfer_amount: null,
         },
@@ -329,30 +330,34 @@
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            let newConfirmation = {
-              amount: this.booking.amount,
-              term: this.term
+            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,
             }
 
-            // 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)
-            // })
+            axios.post('/api/supplier-booking', newReport)
+            .then((response) => {
+              this.loading_btn = 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_btn = false
+              console.log(error)
+            })
 
           } else {
             this.loading_btn = false
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 116f0d7f..e6b8f8de 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -62,13 +62,13 @@ export default [
   { path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
   { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
-  { path: '/admin',
-    component: Admin,
-    children: [
-      { path: '', redirect: { name: 'admin.index' } },
-      { path: 'index', name: 'admin.index', component: Admin },
-      { path: 'home', name: 'admin.home', component: AdminHome }
-    ] },
+  // { path: '/admin',
+  //   component: Admin,
+  //   children: [
+  //     { path: '', redirect: { name: 'admin.index' } },
+  //     { path: 'index', name: 'admin.index', component: Admin },
+  //     { path: 'home', name: 'admin.home', component: AdminHome }
+  //   ] },
   // Admin booking
   { path: '/booking/:id/verification', name: 'booking.admin.verification', component: Verification },
   { path: '/booking/:id/supplier', name: 'booking.admin.supplier', component: Supplier },
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index decc9192..5dead2dc 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -7,7 +7,6 @@ $baseDir = dirname($vendorDir);
 
 return array(
     'App\\Booking' => $baseDir . '/app/Booking.php',
-    'App\\BookingSupplier' => $baseDir . '/app/BookingSupplier.php',
     'App\\ChinaBankSlip' => $baseDir . '/app/ChinaBankSlip.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\EmailTakenException' => $baseDir . '/app/Exceptions/EmailTakenException.php',
@@ -55,6 +54,7 @@ return array(
     'App\\SettingBeneficiary' => $baseDir . '/app/SettingBeneficiary.php',
     'App\\SettingCredit' => $baseDir . '/app/SettingCredit.php',
     'App\\SettingSupplier' => $baseDir . '/app/SettingSupplier.php',
+    'App\\SupplierBooking' => $baseDir . '/app/SupplierBooking.php',
     'App\\SupplierBookingItem' => $baseDir . '/app/SupplierBookingItem.php',
     'App\\User' => $baseDir . '/app/User.php',
     'App\\UserBankSlip' => $baseDir . '/app/UserBankSlip.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index c5049170..7952bb99 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -429,7 +429,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
 
     public static $classMap = array (
         'App\\Booking' => __DIR__ . '/../..' . '/app/Booking.php',
-        'App\\BookingSupplier' => __DIR__ . '/../..' . '/app/BookingSupplier.php',
         'App\\ChinaBankSlip' => __DIR__ . '/../..' . '/app/ChinaBankSlip.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\EmailTakenException' => __DIR__ . '/../..' . '/app/Exceptions/EmailTakenException.php',
@@ -477,6 +476,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'App\\SettingBeneficiary' => __DIR__ . '/../..' . '/app/SettingBeneficiary.php',
         'App\\SettingCredit' => __DIR__ . '/../..' . '/app/SettingCredit.php',
         'App\\SettingSupplier' => __DIR__ . '/../..' . '/app/SettingSupplier.php',
+        'App\\SupplierBooking' => __DIR__ . '/../..' . '/app/SupplierBooking.php',
         'App\\SupplierBookingItem' => __DIR__ . '/../..' . '/app/SupplierBookingItem.php',
         'App\\User' => __DIR__ . '/../..' . '/app/User.php',
         'App\\UserBankSlip' => __DIR__ . '/../..' . '/app/UserBankSlip.php',

From fb6f3e398e0420a24ca50dce9eb4226420aba846 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 27 Jun 2018 12:34:19 +0800
Subject: [PATCH 27/43] update rate function done

---
 .../assets/js/components/LocaleDropdown.vue   | 52 ++++++++++++++++++-
 .../assets/js/pages/admin/complete-order.vue  | 39 ++++++++++++++
 resources/assets/js/router/routes.js          | 13 ++---
 3 files changed, 93 insertions(+), 11 deletions(-)
 create mode 100644 resources/assets/js/pages/admin/complete-order.vue

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index f4b0d5c3..99a8f7ff 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -13,11 +13,52 @@
         </a>
       </div>
     </li>
-    <li><a class="nav-link" href="#" role="button">Update Rate</a></li>
-    <li><a class="nav-link" href="#" role="button">Complete Order</a></li>
+    <li><el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
+          <div align="center">
+            <p>Today's Rate</p>
+            <p>X1 : Cash: 1.76 Cheque: 1.66 BA: 1.63</p>
+            <p>X2 : Cash: 1.65 Cheque: 1.70 BA: 1.58</p>
+          </div>
+          <div style="text-align: center; margin: 0">
+            <el-button type="primary" size="mini" @click="UpdateRatePopoverVisible = false; UpdateRateDialogVisible = true">Update rate</el-button>
+          </div>
+          <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
+        </el-popover></li>
+    <li><a class="nav-link" href="/admin/complete-order" role="button">Complete Order</a></li>
     <li><a class="nav-link" href="#" role="button">Transaction History</a></li>
     <li><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
   </ul>
+
+<!-- update rate dialog -->
+  <el-dialog align="center" :visible.sync="UpdateRateDialogVisible">
+    <el-form :inline="true" align="center">
+        <el-form-item>X1 : 
+            Cash : <el-input style=width:10% ></el-input>
+            Cheque : <el-input style=width:10%></el-input>
+            BA : <el-input style=width:10%></el-input>
+        </el-form-item>
+    </el-form>
+    <el-form :inline="true" align="center">
+        <el-form-item>X2 : 
+            Cash : <el-input style=width:10% ></el-input>
+            Cheque : <el-input style=width:10%></el-input>
+            BA : <el-input style=width:10%></el-input>
+        </el-form-item>
+    </el-form>
+    <div align="center">
+        <el-button type="text" @click="UpdateRateDialogVisible = false">Cancel</el-button>
+        <el-button type="primary" @click="UpdateRateDialogVisible = false; DoneUpdateRateDialogVisible = true">Save</el-button>
+    </div>
+  </el-dialog>
+<!-- update rate dialog end -->
+<!-- update rate dialog end -->
+  <el-dialog align="center" :visible.sync="DoneUpdateRateDialogVisible" width="30%">
+    <span>Rate Successfully Updated</span><br><br>
+    <div align="center">
+        <el-button type="primary" @click="DoneUpdateRateDialogVisible = false">OK</el-button>
+    </div>
+  </el-dialog>
+<!-- update rate dialog end -->
  </div> 
 </template>
 
@@ -26,6 +67,13 @@ import { mapGetters } from 'vuex'
 import { loadMessages } from '~/plugins/i18n'
 
 export default {
+  data() {
+    return {
+        UpdateRatePopoverVisible: false,
+        UpdateRateDialogVisible: false,
+        DoneUpdateRateDialogVisible: false
+      };
+  },
   computed: mapGetters({
     locale: 'lang/locale',
     locales: 'lang/locales'
diff --git a/resources/assets/js/pages/admin/complete-order.vue b/resources/assets/js/pages/admin/complete-order.vue
new file mode 100644
index 00000000..e9681fad
--- /dev/null
+++ b/resources/assets/js/pages/admin/complete-order.vue
@@ -0,0 +1,39 @@
+<template>
+<div>
+    <span align="center"><h2>Complete Order</h2></span><br>
+    <el-table :data="tableData" stripe style="width: 100%">
+        <el-table-column prop="order_no" label="Order No" sortable></el-table-column>
+        <el-table-column prop="cust_marking" label="Customer Marking" sortable></el-table-column>
+        <el-table-column prop="order_date" label="Order Date" sortable></el-table-column>
+        <el-table-column prop="transfer_amount" label="Transfer Amount (RMB)" sortable></el-table-column>
+        <el-table-column prop="status" label="Status"></el-table-column>
+    </el-table>
+    <div>
+        <span slot="footer" class="pagination-footer">
+            <el-pagination background layout="prev, pager, next" :total="5"></el-pagination>
+        </span>
+    </div>
+</div>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+        tableData: [{
+          order_no: '001',
+          cust_marking: 'CIEF/155ECE',
+          order_date: '27/6/2018',
+          transfer_amount: '1200',
+          status: 'Complete',
+        }, {
+          order_no: '002',
+          cust_marking: 'CIEF/143EDR',
+          order_date: '23/6/2018',
+          transfer_amount: '14000',
+          status: 'Complete',
+        }]
+      }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 116f0d7f..988d3878 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -14,8 +14,6 @@ const SettingsAdminCreditSetting = () => import('~/pages/settings/admin-credit-s
 const SettingsAdminChinaBank = () => import('~/pages/settings/admin-china-bank').then(m => m.default || m)
 const SettingsAdminBankSetting = () => import('~/pages/settings/admin-bank-setting').then(m => m.default || m)
 
-// const Admin = () => import('~/pages/admin/adminhome').then(m => m.default || m)
-const Admin = () => import('~/pages/admin/index').then(m => m.default || m)
 // Booking
 const Upload = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m)
 const Confirmation = () => import('~/pages/booking/confirmation').then(m => m.default || m)
@@ -32,7 +30,9 @@ const UploadCNSlip = () => import('~/pages/admin/booking/uploadChinaBankslip').t
 const UploadInvoice = () => import('~/pages/admin/booking/uploadInvoice').then(m => m.default || m)
 // const Completed = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m)
 
+// Admin pages
 const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
+const CompleteOrder = () => import('~/pages/admin/complete-order').then(m => m.default || m)
 
 export default [
   { path: '/', name: 'welcome', component: Welcome },
@@ -62,13 +62,6 @@ export default [
   { path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
   { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
-  { path: '/admin',
-    component: Admin,
-    children: [
-      { path: '', redirect: { name: 'admin.index' } },
-      { path: 'index', name: 'admin.index', component: Admin },
-      { path: 'home', name: 'admin.home', component: AdminHome }
-    ] },
   // Admin booking
   { path: '/booking/:id/verification', name: 'booking.admin.verification', component: Verification },
   { path: '/booking/:id/supplier', name: 'booking.admin.supplier', component: Supplier },
@@ -77,6 +70,8 @@ export default [
   { path: '/booking/:id/upload-invoice', name: 'booking.admin.invoice', component: UploadInvoice },
   // { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
+  // Admin pages
   { path: '/admin', name: 'admin.home', component: AdminHome },
+  { path: '/admin/complete-order', name: 'admin.complete-order', component: CompleteOrder },
   { path: '*', name: 'notfound', component: NotFound }
 ]

From 6e8c81f28596651007b4dca9db7794816e21c112 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 14:21:55 +0800
Subject: [PATCH 28/43] added logic if supplierbooking already exist prevent
 user from creating

---
 .../Controllers/BookingSupplierController.php |  10 +-
 .../pages/admin/booking/supplierBooking.vue   |  21 +-
 .../js/pages/admin/booking/supplierReport.vue | 242 ++++++++++++++++--
 3 files changed, 236 insertions(+), 37 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index 101359b8..f84c2502 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -42,11 +42,17 @@ class BookingSupplierController extends Controller
     // TODO : Multiple booking
     public function store(Request $request)
     {
+
         $transfer_amount = $request->input("transfer_amount");
         $supplier_id = $request->input("supplier_id");
         $booking_id = $request->input("booking_id");
         $rate = $request->input('rate');
         $rebate = $request->input('rebate');
+
+        if ($supplierbooking = SupplierBooking::where('book_id', $booking_id)->first()){
+            return response()->json(['success'=>false, 'message'=>'Bad request, please contact support'], 400);
+        }
+
         
         // Calculation
         $amountInRMB = $transfer_amount * $rate;
@@ -72,8 +78,8 @@ class BookingSupplierController extends Controller
         $bookingsupplier->save();
 
         // update booking status 
-		$booking->status = 4;
-		$booking->admin_status = 3; 
+		$booking->status = 5;
+		$booking->admin_status = 4; 
 		$booking->save();
 
         //// one bookingsupplier has many booking
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue
index a47c37b6..14ccd189 100644
--- a/resources/assets/js/pages/admin/booking/supplierBooking.vue
+++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue
@@ -342,21 +342,20 @@
             axios.post('/api/supplier-booking', newReport)
             .then((response) => {
               this.loading_btn = 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
+              
+              this.$router.push({
+                name: 'booking.admin.supplier.report',
+                params: {id: this.$route.params.id }
+              })
+              // redirect to supplier report 
+
             })
             .catch((error) => {
               this.loading_btn = false
               console.log(error)
+
+              // TODO : Show error message 
+
             })
 
           } else {
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index 37196cb3..07e7cfc4 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.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 Report</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,165 @@
           <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 +187,7 @@
               <el-table-column prop="data2" align="left" width="200" />
             </el-table>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-card>
     </el-row>
     <br>
@@ -37,12 +195,13 @@
     <el-row justify="center" align="center">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span>BankinSlip</span>
+          <span>Supplier Report</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-col>
         </el-row>
       </el-card>
@@ -55,20 +214,55 @@
   }
 </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
+    },
+    data() {
+      return {
+        status: 3,
+        loading_btn: false,
+        booking_details: {
+          id: null,
+          amount: null,
+          bia: null,
+          user_bankslip_path: null,
+        },
+        supplier: null,
+        supplier_options: null,
+      
+
+      }
+    },
+    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'
+          })
+        })
+
+    
+
+    },
+    methods: {
 
-export default {
-  components: {
-    'progress-track': ProgressTrack
-  },
-  data () {
-    return {
-      status: 4
     }
-  },
-  methods: {
-
   }
-}
-</script>
+</script>
\ No newline at end of file

From 390862a8be7bf68768968fdcf4b06b16ec1a997f Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 15:32:01 +0800
Subject: [PATCH 29/43] removed multiple booking on supplier booking controller
 WIP supplier booking report in image file WIP edit report page WIP upload
 chinabankslip

---
 .../Controllers/BookingSupplierController.php |  24 +-
 .../js/pages/admin/booking/supplierReport.vue |  30 +-
 .../admin/booking/uploadChinaBankslip.vue     | 353 ++++++++++++++++--
 3 files changed, 361 insertions(+), 46 deletions(-)

diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php
index f84c2502..8a358a6e 100644
--- a/app/Http/Controllers/BookingSupplierController.php
+++ b/app/Http/Controllers/BookingSupplierController.php
@@ -80,28 +80,10 @@ class BookingSupplierController extends Controller
         // update booking status 
 		$booking->status = 5;
 		$booking->admin_status = 4; 
-		$booking->save();
+        $booking->save();
+        
+        // TODO : generate a jpg version of report and save the path 
 
-        //// one bookingsupplier has many booking
-        // $bookings = $request->input("booking");
-        // foreach ($bookings as $booking)
-        // {
-        //         $bookingsupplierbooking = new Booking(array(
-        //             'book_id' =>  $booking->id,
-        //             'supplierbooking_id' => $supplier->id
-        //         ));
-        //         $bookingsupplierbooking->save();
-
-        //         $new_supplierbooking = new SupplierBookingItem(array(
-        //             'book_id' =>  $booking->id,
-        //             'bank_in_amount'=>$booking['bank_in_amount'],
-        //             'date'=>$booking['date'],
-        //             'details'=>$booking['details'],
-        //             'supplierbooking_id' => $supplier->id
-        //             ));
-        //         $new_supplierbooking->save();
-
-        // }
         return response()->json($bookingsupplier, 201);
     }
 
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue
index 07e7cfc4..957561cf 100644
--- a/resources/assets/js/pages/admin/booking/supplierReport.vue
+++ b/resources/assets/js/pages/admin/booking/supplierReport.vue
@@ -202,6 +202,27 @@
           <el-col :span="20" style="text-align:center">
 
           
+          </el-col>
+        </el-row>
+      </el-card>
+    <br>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>User BankinSlip</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 v-bind:src="booking_details.user_bankslip_path" class="image">
+          </el-col>
+        </el-row>
+      </el-card>
+   <br>
+      <el-card class="box-card">
+        <el-row :gutter="12">
+          <el-col :span="22" style="text-align:center">
+            <el-button :loading="loading_btn" @click="editReport" type="primary">Edit</el-button>
+            <el-button :loading="loading_btn" @click="completeReport" type="success">Done</el-button>
           </el-col>
         </el-row>
       </el-card>
@@ -223,7 +244,7 @@
     },
     data() {
       return {
-        status: 3,
+        status: 4,
         loading_btn: false,
         booking_details: {
           id: null,
@@ -262,6 +283,13 @@
 
     },
     methods: {
+      completeReport(){
+        // TODO : send request to change status
+        this.$router.push({
+          name: 'booking.admin.cnslip',
+          params: {id: this.$route.params.id }
+        })
+      }
 
     }
   }
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 37196cb3..c0345ad9 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.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> Upload China Bankslip To Customer </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,165 @@
           <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 +187,7 @@
               <el-table-column prop="data2" align="left" width="200" />
             </el-table>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-card>
     </el-row>
     <br>
@@ -37,12 +195,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">
+
+                <!-- upload image -->
+                <el-upload :action="'/api/booking/' + booking_id + '/upload-user-bankslip'" :on-preview="handlePictureCardPreview" :on-remove="handleRemove"
+                          list-type="picture-card" align="center">
+                  <i class="el-icon-plus" />
+                </el-upload>
+                <el-dialog :visible.sync="dialogVisible">
+                  <img :src="dialogImageUrl" width="100%" alt="">
+                </el-dialog>
+                <br>
+                <!-- upload image end -->
+                
+                <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="rate">
+                  <el-input v-model="supplierBookingForm.rate" type="text" placeholder="Rate" style="width: 80%" />
+                </el-form-item>
+                <el-form-item prop="rebate">
+                  <el-input v-model="supplierBookingForm.rebate" type="text" placeholder="Rebate" style="width: 80%" />
+                </el-form-item>
+                <el-form-item prop="transfer_amount">
+                  <el-input v-model="supplierBookingForm.transfer_amount" type="text" placeholder="Payment Amount" style="width: 80%" />
+                </el-form-item>
+                <el-form-item>
+                  <el-button :loading="loading_btn" type="primary" @click="generateReport('supplierBookingForm')">Generate Report</el-button>
+                </el-form-item>
+              </div>
+            </el-form>
           </el-col>
         </el-row>
       </el-card>
@@ -55,20 +248,132 @@
   }
 </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
-  },
-  data () {
-    return {
-      status: 4
+  export default {
+    components: {
+      'progress-track': ProgressTrack
+    },
+    data() {
+      return {
+        status: 5,
+        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,
+          rebate: null,
+          rate: null,
+          transfer_amount: null,
+        },
+        value: '',
+        rules: {
+          supplier: [{
+            required: true,
+            message: 'Please input amount',
+            trigger: 'change'
+          }],
+          rebate: [{
+            required: true,
+            message: 'Please input bank name',
+            trigger: 'change'
+          }],
+          rate: [{
+            required: true,
+            message: 'Please input account name',
+            trigger: 'change'
+          }],
+          payment_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'
+          })
+        })
+
+    },
+    methods: {
+      generateReport(formName) {
+        this.loading_btn = true
+
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            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,
+            }
+
+            axios.post('/api/supplier-booking', newReport)
+            .then((response) => {
+              this.loading_btn = false
+              
+              this.$router.push({
+                name: 'booking.admin.supplier.report',
+                params: {id: this.$route.params.id }
+              })
+              // redirect to supplier report 
+
+            })
+            .catch((error) => {
+              this.loading_btn = false
+              console.log(error)
+
+              // TODO : Show error message 
+
+            })
+
+          } else {
+            this.loading_btn = false
+          }
+        })
+
+      },
     }
-  },
-  methods: {
-
   }
-}
-</script>
+</script>
\ No newline at end of file

From 5e62b3e90d81bdee4ae8e28f8a2929377dab4de8 Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 27 Jun 2018 15:42:16 +0800
Subject: [PATCH 30/43] complete the top nav content

---
 .../assets/js/components/LocaleDropdown.vue   |  8 +--
 .../assets/js/pages/admin/complete-order.vue  |  8 +--
 .../js/pages/admin/transaction-history.vue    | 32 ++++++++++
 .../pages/admin/upload-supplier-bank-slip.vue | 61 +++++++++++++++++++
 .../pages/settings/admin-credit-setting.vue   | 20 +++---
 resources/assets/js/router/routes.js          |  4 ++
 6 files changed, 114 insertions(+), 19 deletions(-)
 create mode 100644 resources/assets/js/pages/admin/transaction-history.vue
 create mode 100644 resources/assets/js/pages/admin/upload-supplier-bank-slip.vue

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 99a8f7ff..8e5c634b 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -25,8 +25,8 @@
           <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
         </el-popover></li>
     <li><a class="nav-link" href="/admin/complete-order" role="button">Complete Order</a></li>
-    <li><a class="nav-link" href="#" role="button">Transaction History</a></li>
-    <li><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
+    <li><a class="nav-link" href="/admin/transaction-history" role="button">Transaction History</a></li>
+    <li><a class="nav-link" href="/admin/upload-supplier-bank-slip" role="button">Upload Supplier Bank Slip to System</a></li>
   </ul>
 
 <!-- update rate dialog -->
@@ -51,14 +51,14 @@
     </div>
   </el-dialog>
 <!-- update rate dialog end -->
-<!-- update rate dialog end -->
+<!-- update rate dialog done -->
   <el-dialog align="center" :visible.sync="DoneUpdateRateDialogVisible" width="30%">
     <span>Rate Successfully Updated</span><br><br>
     <div align="center">
         <el-button type="primary" @click="DoneUpdateRateDialogVisible = false">OK</el-button>
     </div>
   </el-dialog>
-<!-- update rate dialog end -->
+<!-- update rate dialog done end -->
  </div> 
 </template>
 
diff --git a/resources/assets/js/pages/admin/complete-order.vue b/resources/assets/js/pages/admin/complete-order.vue
index e9681fad..7c5f05f8 100644
--- a/resources/assets/js/pages/admin/complete-order.vue
+++ b/resources/assets/js/pages/admin/complete-order.vue
@@ -7,11 +7,9 @@
         <el-table-column prop="order_date" label="Order Date" sortable></el-table-column>
         <el-table-column prop="transfer_amount" label="Transfer Amount (RMB)" sortable></el-table-column>
         <el-table-column prop="status" label="Status"></el-table-column>
-    </el-table>
-    <div>
-        <span slot="footer" class="pagination-footer">
-            <el-pagination background layout="prev, pager, next" :total="5"></el-pagination>
-        </span>
+    </el-table><br><br>
+    <div align="right">
+        <el-pagination background layout="prev, pager, next" :total="30"></el-pagination>
     </div>
 </div>
 </template>
diff --git a/resources/assets/js/pages/admin/transaction-history.vue b/resources/assets/js/pages/admin/transaction-history.vue
new file mode 100644
index 00000000..6eaa4c36
--- /dev/null
+++ b/resources/assets/js/pages/admin/transaction-history.vue
@@ -0,0 +1,32 @@
+<template>
+    <div>
+        <span align="center"><h2>Transaction History</h2></span><br>
+        <el-table :data="tableData" stripe style="width: 100%">
+            <el-table-column prop="transaction_date" label="Transaction Date" sortable></el-table-column>
+            <el-table-column prop="booking_no" label="Booking No" sortable></el-table-column>
+            <el-table-column prop="marking" label="Marking" sortable></el-table-column>
+            <el-table-column prop="debit_in" label="Debit In"></el-table-column>
+            <el-table-column prop="credit_out" label="Credit Out"></el-table-column>
+            <el-table-column prop="balance" label="Balance"></el-table-column>
+            <el-table-column prop="bank_recon" label="Bank Recon"></el-table-column>
+        </el-table><br><br>
+        <div align="right">
+            <el-button>Export to Excel</el-button><el-button>Print</el-button><br><br>
+            <el-pagination background layout="prev, pager, next" :total="30"></el-pagination>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+
+      }
+    }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
new file mode 100644
index 00000000..7f853d77
--- /dev/null
+++ b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
@@ -0,0 +1,61 @@
+<template>
+    <div>
+        <span align="center"><h2>Uploaded Supplier Bank Slip</h2></span><br>
+        <div align="right">
+            <el-button type="primary" icon="el-icon-plus" @click="AddNewDialogVisible = true">Add New</el-button>
+        </div><br>
+            <el-table :data="tableData" stripe style="width: 100%">
+            <el-table-column label="Order No" sortable></el-table-column>
+            <el-table-column label="Amount (RMB)" sortable></el-table-column>
+            <el-table-column label="Date" sortable></el-table-column>
+            <el-table-column label="Bank Slip File"></el-table-column>
+        </el-table><br><br>
+
+    <!-- popup add new dialog -->
+    <el-dialog align="center" :visible.sync="AddNewDialogVisible">
+        <el-form :label-position="right" label-width="150px">
+            <el-form-item label="Select bank slip : " align="left">
+                <el-upload class="upload-slip" action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handlePreview" :on-remove="handleRemove" list-type="picture">
+                <el-button size="small" type="primary">Click to upload</el-button></el-upload>
+            </el-form-item>
+            <el-form-item label="For Order No : "><el-input></el-input></el-form-item>
+            <el-form-item label="Amount : "><el-input></el-input></el-form-item>
+            <el-form-item label="Date : " align="left"><el-date-picker v-model="date" type="date" placeholder="Pick a date"></el-date-picker></el-form-item>
+        </el-form>
+        <div align="center">
+            <el-button type="text" @click="AddNewDialogVisible = false">Cancel</el-button>
+            <el-button type="primary" @click="AddNewDialogVisible = false; DoneAddNewDialogVisible = true">Submit</el-button>
+        </div>
+    </el-dialog>
+<!-- popup add new dialog end -->
+<!-- popup done upload -->
+      <el-dialog align="center" :visible.sync="DoneAddNewDialogVisible" width="30%">
+        <span>Bank Slip Successfully Updated</span><br><br>
+        <div align="center">
+            <el-button type="primary" @click="DoneAddNewDialogVisible = false">Close</el-button>
+        </div>
+      </el-dialog>
+<!-- popup done upload end -->
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+      return {
+        AddNewDialogVisible: false,
+        DoneAddNewDialogVisible: false,
+        date: ''
+      }
+    },
+    methods: {
+        handlePreview(file) {
+        console.log(file);
+      }
+    }
+}
+</script>
+
+<style>
+
+</style>
diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue
index 61ce1b53..28f334a2 100644
--- a/resources/assets/js/pages/settings/admin-credit-setting.vue
+++ b/resources/assets/js/pages/settings/admin-credit-setting.vue
@@ -7,28 +7,28 @@
             <el-input size="mini" style=width:7% ></el-input>Hours
             <el-input size="mini" style=width:7% ></el-input>Minutes
             <el-input size="mini" style=width:7% ></el-input>Seconds
-            <el-button type="primary" size="mini"  @click="dialogVisible = true">Update Time Limit</el-button>
+            <el-button type="primary" size="mini"  @click="TimeLimitDialogVisible = true">Update Time Limit</el-button>
         </el-form-item>
     </el-form>
-    <el-dialog title="Time Limit" align="center" :visible.sync="dialogVisible" width="30%">
+    <el-dialog title="Time Limit" align="center" :visible.sync="TimeLimitDialogVisible" width="30%">
         <span>Time limit for customer bank slip submission is updated</span>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="dialogVisible = false">OK</el-button>
+            <el-button @click="TimeLimitDialogVisible = false">Cancel</el-button>
+            <el-button type="primary" @click="TimeLimitDialogVisible = false">OK</el-button>
         </span>
     </el-dialog>
     <el-form>
         <el-form-item align="center">
             Credit Limit for RMB : 
             <el-input placeholder="Amount" size="mini" style=width:10%></el-input>
-            <el-button type="primary" size="mini" @click="dialogVisible1 = true">Update Credit Limit</el-button>
+            <el-button type="primary" size="mini" @click="CreditLimitDialogVisible = true">Update Credit Limit</el-button>
         </el-form-item>
     </el-form>
-    <el-dialog title="Credit Limit" align="center" :visible.sync="dialogVisible1" width="30%">
+    <el-dialog title="Credit Limit" align="center" :visible.sync="CreditLimitDialogVisible" width="30%">
         <span>Credit limit for Customer Booking is updated</span>
         <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible1 = false">Cancel</el-button>
-            <el-button type="primary" @click="dialogVisible1 = false">OK</el-button>
+            <el-button @click="CreditLimitDialogVisible = false">Cancel</el-button>
+            <el-button type="primary" @click="CreditLimitDialogVisible = false">OK</el-button>
         </span>
     </el-dialog>
 </div>
@@ -38,8 +38,8 @@
   export default {
     data() {
       return {
-        dialogVisible: false,
-        dialogVisible1: false
+        TimeLimitDialogVisible: false,
+        CreditLimitDialogVisible: false
       };
     },
   };
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 988d3878..ead49491 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -33,6 +33,8 @@ const UploadInvoice = () => import('~/pages/admin/booking/uploadInvoice').then(m
 // Admin pages
 const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
 const CompleteOrder = () => import('~/pages/admin/complete-order').then(m => m.default || m)
+const TransactionHistory = () => import('~/pages/admin/transaction-history').then(m => m.default || m)
+const UploadSupplierBankSlip = () => import('~/pages/admin/upload-supplier-bank-slip').then(m => m.default || m)
 
 export default [
   { path: '/', name: 'welcome', component: Welcome },
@@ -73,5 +75,7 @@ export default [
   // Admin pages
   { path: '/admin', name: 'admin.home', component: AdminHome },
   { path: '/admin/complete-order', name: 'admin.complete-order', component: CompleteOrder },
+  { path: '/admin/transaction-history', name: 'admin.transaction-history', component: TransactionHistory },
+  { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-sli', component: UploadSupplierBankSlip },
   { path: '*', name: 'notfound', component: NotFound }
 ]

From 631472be50e7fe0e58980ace8db89491a5096139 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 15:47:47 +0800
Subject: [PATCH 31/43] comeplted upload china slip frontend

---
 .../admin/booking/uploadChinaBankslip.vue     | 118 ++++++++++--------
 1 file changed, 69 insertions(+), 49 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index c0345ad9..b2d169a1 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -195,44 +195,39 @@
     <el-row justify="center" align="center">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span>Supplier Form</span>
+          <span>Upload China Bankslip</span>
           <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
         </div>
         <el-row :gutter="12" style="text-align:center">
           <el-col :span="20" style="text-align:center">
 
-            <el-form ref="supplierBookingForm" :model="supplierBookingForm" :rules="rules">
+            <el-form ref="chinaSlipForm" :model="chinaSlipForm" :rules="rules">
               <div align="center">
 
                 <!-- upload image -->
-                <el-upload :action="'/api/booking/' + booking_id + '/upload-user-bankslip'" :on-preview="handlePictureCardPreview" :on-remove="handleRemove"
-                          list-type="picture-card" align="center">
-                  <i class="el-icon-plus" />
+                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handlePreview" :on-remove="handleRemove"
+                  :file-list="fileList2" list-type="picture">
+                  <el-button size="small" type="primary">Click to upload</el-button>
+                  <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 3mb</div>
                 </el-upload>
                 <el-dialog :visible.sync="dialogVisible">
                   <img :src="dialogImageUrl" width="100%" alt="">
                 </el-dialog>
                 <br>
                 <!-- upload image end -->
-                
-                <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 prop="date">
+                  <el-date-picker v-model="chinaSlipForm.date" type="date" placeholder="Pick a day" :picker-options="pickerOptions1">
+                  </el-date-picker>
+                </el-form-item>
+                <el-form-item prop="amount">
+                  <el-input v-model="chinaSlipForm.amount" type="text" placeholder="Amount" style="width: 80%" />
                 </el-form-item>
 
-                <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="rebate">
-                  <el-input v-model="supplierBookingForm.rebate" type="text" placeholder="Rebate" style="width: 80%" />
-                </el-form-item>
-                <el-form-item prop="transfer_amount">
-                  <el-input v-model="supplierBookingForm.transfer_amount" type="text" placeholder="Payment Amount" style="width: 80%" />
+                <el-form-item prop="details">
+                  <el-input v-model="chinaSlipForm.details" type="text" placeholder="Details" style="width: 80%" />
                 </el-form-item>
                 <el-form-item>
-                  <el-button :loading="loading_btn" type="primary" @click="generateReport('supplierBookingForm')">Generate Report</el-button>
+                  <el-button :loading="loading_btn" type="primary" @click="submitcChinaSlip('chinaSlipForm')">Submit</el-button>
                 </el-form-item>
               </div>
             </el-form>
@@ -267,36 +262,53 @@
         },
         supplier: null,
         supplier_options: null,
-        supplierBookingForm: {
-          supplier: null,
+        chinaSlipForm: {
           amount: null,
-          rebate: null,
-          rate: null,
-          transfer_amount: null,
+          date: null,
+          details: null,
         },
-        value: '',
         rules: {
-          supplier: [{
+          amount: [{
             required: true,
             message: 'Please input amount',
             trigger: 'change'
           }],
-          rebate: [{
+          date: [{
             required: true,
             message: 'Please input bank name',
             trigger: 'change'
           }],
-          rate: [{
+          details: [{
             required: true,
             message: 'Please input account name',
             trigger: 'change'
-          }],
-          payment_amount: [{
-            required: true,
-            message: 'Please input branch',
-            trigger: 'change'
           }]
         },
+        pickerOptions1: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+          shortcuts: [{
+            text: 'Today',
+            onClick(picker) {
+              picker.$emit('pick', new Date());
+            }
+          }, {
+            text: 'Yesterday',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit('pick', date);
+            }
+          }, {
+            text: 'A week ago',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', date);
+            }
+          }]
+        }
       }
     },
     beforeCreate() {
@@ -335,7 +347,7 @@
 
     },
     methods: {
-      generateReport(formName) {
+      submitcChinaSlip(formName) {
         this.loading_btn = true
 
         this.$refs[formName].validate((valid) => {
@@ -350,23 +362,25 @@
             }
 
             axios.post('/api/supplier-booking', newReport)
-            .then((response) => {
-              this.loading_btn = false
-              
-              this.$router.push({
-                name: 'booking.admin.supplier.report',
-                params: {id: this.$route.params.id }
+              .then((response) => {
+                this.loading_btn = false
+
+                this.$router.push({
+                  name: 'booking.admin.supplier.report',
+                  params: {
+                    id: this.$route.params.id
+                  }
+                })
+                // redirect to supplier report 
+
               })
-              // redirect to supplier report 
+              .catch((error) => {
+                this.loading_btn = false
+                console.log(error)
 
-            })
-            .catch((error) => {
-              this.loading_btn = false
-              console.log(error)
+                // TODO : Show error message 
 
-              // TODO : Show error message 
-
-            })
+              })
 
           } else {
             this.loading_btn = false
@@ -374,6 +388,12 @@
         })
 
       },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      }
     }
   }
 </script>
\ No newline at end of file

From edc3dbaa351dbbbeae0c276c0a8703c956f5b3e3 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 16:01:52 +0800
Subject: [PATCH 32/43] fixed upload chinabankslip removed unused code in
 bookingcontroller updated upload chinabankslip frontend moved some routes
 into authenticated route list

---
 app/Http/Controllers/BookingController.php    |  52 +++----
 .../Controllers/ChinaBankSlipController.php   | 144 ++++++------------
 .../admin/booking/uploadChinaBankslip.vue     |  16 +-
 routes/api.php                                |  14 +-
 4 files changed, 80 insertions(+), 146 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index f893d614..97c5d7ae 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -318,43 +318,33 @@ class BookingController extends Controller
             return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
         }
 
-        if(!$bankslip_file = $request->file('file'))
+        if($bankslip_file = $request->file('file'))
         {
-            $bankslip_file = $request->file('file');
+            /* End Validation */
             $filename = $bankslip_file->getClientOriginalName();
-            $unique_name = 'bank_slip_' . md5($filename. time());
+            $ext = $bankslip_file->getClientOriginalExtension();
 
-            $file = $request->file('file');
-            $ext = $file->getClientOriginalExtension();
-            $input['bankslip_file'] = $filename;
-            Storage::putFileAs(
-                'bankslip_file',/*folder name*/ $file, $unique_name. '.' .$ext
-            );
-            $user_bankslip->bankslip_file = $unique_name. '.' .$ext; //update database
-        } //end if
+
+            $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea 
+            $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 =  $upload_path;
+            $user_bankslip->transfer_amount = $request->input('transfer_amount');
+            $user_bankslip->save();
+
+
+            return response()->json(['message'=>"Success"],200);   
+        } 
         else {
             return response()->json(['message' => 'No file detected'], 400);
         }
-        /* End Validation */
-        $filename = $bankslip_file->getClientOriginalName();
-        $ext = $bankslip_file->getClientOriginalExtension();
-        $input['file'] = $filename;
-
-        $unique_name = 'bank_slip_' . md5($filename. time()); // probably not a good idea 
-		$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 =  $upload_path;
-        $user_bankslip->transfer_amount = $request->input('transfer_amount');
-        $user_bankslip->save();
-
-
-        return response()->json(['message'=>"Success"],200);
+      
     }
 
     public function updateBankSlipAmount(Request $request, $id){
diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 7e860d62..0391d0fe 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -9,112 +9,56 @@ use Validator;
 
 class ChinaBankSlipController extends Controller
 {
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index()
-    {
-        //
-    }
 
-    /**
-     * Show the form for creating a new resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function create()
-    {
-        //
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
     public function store(Request $request)
-    {
-        // Handle File Upload
-        if($request->hasFile('china_bank_slips')){
-            // Get filename with the extension
-            $filenameWithExt = $request->file('china_bank_slips')->getClientOriginalName();
-            // Get just filename
-            $filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
-            // Get just ext
-            $extension = $request->file('china_bank_slips')->getClientOriginalExtension();
-            // Filename to store
-            $fileNameToStore= $filename.'_'.time().'.'.$extension;
+    {   
+        // TODO : put this after check file exist 
+        // validate file format 
+        $validator = Validator::make($request->all(), [
+            'file'   => 'image|mimes:jpg,jpeg,bmp,png'
+        ]);
 
-            // 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 {
-            $fileNameToStore = 'hello.jpg';
+        if($validator->fails())
+        {
+            return response()->json(['message'=>'Incorrect format'],200);
         }
-        // Create Post
-        $post = new ChinaBankSlip;
-        $post->actual_transfer_amount = $request->input('actual_transfer_amount');
-        $post->date = $request->input('date');
-        $post->details = $request->input('details');
-        $post->china_bank_slip_path = $fileNameToStore;
-        $post->save();
-        return response()->json(['message'=>$post], 200);
-    }
 
 
-    /**
-     * Display the specified resource.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function show(ChinaBankSlip $chinaBankSlip)
-    {
-        //
+        $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);
+        }
+
+
+        if($bankslip_file = $request->hasFile('china_slip_file')){
+         
+            $filename = $bankslip_file->getClientOriginalName();
+            $ext = $bankslip_file->getClientOriginalExtension();
+            $unique_name = 'cnbank_slip_' . md5($filename. time()); // probably not a good idea 
+            $unique_image_path = $unique_name. '.' .$ext;
+    
+            // Upload Image
+            $upload_path = Storage::disk('public')->putFileAs(
+                'china_bank_slip', $bankslip_file, $unique_image_path
+            ); 
+
+
+        } else {
+            return response()->json(['message'=>'file not found'],200);
+        }
+   
+        $china_bankslip = new ChinaBankSlip;
+        $china_bankslip ->actual_transfer_amount = $request->input('actual_transfer_amount');
+        $china_bankslip ->date = $request->input('date');
+        $china_bankslip ->details = $request->input('details');
+        $china_bankslip ->china_bank_slip_path = $fileNameToStore;
+        $china_bankslip ->save();
+        
+        return response()->json(['message'=>'success'], 201);
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function edit(ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
-
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  \App\ChinaBankSlip  $chinaBankSlip
-     * @return \Illuminate\Http\Response
-     */
-    public function destroy(ChinaBankSlip $chinaBankSlip)
-    {
-        //
-    }
 }
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index b2d169a1..b7fc1f6e 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -205,8 +205,12 @@
               <div align="center">
 
                 <!-- upload image -->
-                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" :on-preview="handlePreview" :on-remove="handleRemove"
-                  :file-list="fileList2" list-type="picture">
+                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" 
+                  :on-preview="handlePreview" 
+                  :on-remove="handleRemove"
+                  :file-list="fileList2" 
+                  :multiple="false"
+                  list-type="picture">
                   <el-button size="small" type="primary">Click to upload</el-button>
                   <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 3mb</div>
                 </el-upload>
@@ -219,8 +223,8 @@
                   <el-date-picker v-model="chinaSlipForm.date" type="date" placeholder="Pick a day" :picker-options="pickerOptions1">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item prop="amount">
-                  <el-input v-model="chinaSlipForm.amount" type="text" placeholder="Amount" style="width: 80%" />
+                <el-form-item prop="actual_transfer_amount">
+                  <el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
                 </el-form-item>
 
                 <el-form-item prop="details">
@@ -263,12 +267,12 @@
         supplier: null,
         supplier_options: null,
         chinaSlipForm: {
-          amount: null,
+          actual_transfer_amount: null,
           date: null,
           details: null,
         },
         rules: {
-          amount: [{
+          actual_transfer_amount: [{
             required: true,
             message: 'Please input amount',
             trigger: 'change'
diff --git a/routes/api.php b/routes/api.php
index e62fe183..4712165c 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -68,6 +68,9 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::post('update-rate', 'RateController@store');
 	Route::put('update-rate/{rate}', 'RateController@update');
 	Route::delete('update-rate/{rate}', 'RateController@delete');
+	Route::get('update-rate', 'RateController@index');
+	Route::get('update-rate/{rate}', 'RateController@show');
+
 
 	Route::get('setting-credit', 'SettingCreditController@index');
 	Route::get('setting-credit/{credit}', 'SettingCreditController@show');
@@ -97,15 +100,8 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
+
+	Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
 });
 
-Route::get('update-rate', 'RateController@index');
-Route::get('update-rate/{rate}', 'RateController@show');
-
-
-Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
-//customer booking
-Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
-Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
-
 

From cea2857d0fd7fe9ac1b3679b8c07c363fdbf2201 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 16:16:48 +0800
Subject: [PATCH 33/43] added booking foreign key to china bankslip updated
 upload china bankslip routes

---
 .../Controllers/ChinaBankSlipController.php   | 19 +++++------
 ...ngid_foreignkey_to_chinabankslip_table.php | 32 +++++++++++++++++++
 .../admin/booking/uploadChinaBankslip.vue     |  6 ++--
 routes/api.php                                |  6 ++--
 4 files changed, 48 insertions(+), 15 deletions(-)
 create mode 100644 database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php

diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 0391d0fe..11bd4b7d 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\ChinaBankSlip;
+use App\Booking;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 use Validator;
@@ -10,8 +11,10 @@ use Validator;
 class ChinaBankSlipController extends Controller
 {
 
-    public function store(Request $request)
-    {   
+    public function store(Request $request, $id)
+    {      
+        $booking = Booking::where('id',$id)->firstOrFail();
+        
         // TODO : put this after check file exist 
         // validate file format 
         $validator = Validator::make($request->all(), [
@@ -34,7 +37,7 @@ class ChinaBankSlipController extends Controller
         }
 
 
-        if($bankslip_file = $request->hasFile('china_slip_file')){
+        if($bankslip_file = $request->file('file')){
          
             $filename = $bankslip_file->getClientOriginalName();
             $ext = $bankslip_file->getClientOriginalExtension();
@@ -52,12 +55,10 @@ class ChinaBankSlipController extends Controller
         }
    
         $china_bankslip = new ChinaBankSlip;
-        $china_bankslip ->actual_transfer_amount = $request->input('actual_transfer_amount');
-        $china_bankslip ->date = $request->input('date');
-        $china_bankslip ->details = $request->input('details');
-        $china_bankslip ->china_bank_slip_path = $fileNameToStore;
-        $china_bankslip ->save();
-        
+        $china_bankslip->booking_id = $booking->id;
+        $china_bankslip->china_bank_slip_path = $upload_path;
+        $china_bankslip->save();
+
         return response()->json(['message'=>'success'], 201);
     }
 
diff --git a/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php
new file mode 100644
index 00000000..5a184094
--- /dev/null
+++ b/database/migrations/2018_06_27_081455_add_bookingid_foreignkey_to_chinabankslip_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddBookingidForeignkeyToChinabankslipTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('china_bank_slips', function($table)
+        {
+            $table->integer('booking_id')->unsigned();
+            $table->foreign('booking_id')->references('id')->on('bookings');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index b7fc1f6e..79e389f4 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -205,10 +205,9 @@
               <div align="center">
 
                 <!-- upload image -->
-                <el-upload class="upload-demo" action="https://jsonplaceholder.typicode.com/posts/" 
+                <el-upload class="upload-demo" :action="'/api/booking/' + booking_id + '/upload-china-bankslip'"
                   :on-preview="handlePreview" 
-                  :on-remove="handleRemove"
-                  :file-list="fileList2" 
+                  :on-remove="handleRemove" 
                   :multiple="false"
                   list-type="picture">
                   <el-button size="small" type="primary">Click to upload</el-button>
@@ -258,6 +257,7 @@
       return {
         status: 5,
         loading_btn: false,
+        booking_id: this.$route.params.id,
         booking_details: {
           id: null,
           amount: null,
diff --git a/routes/api.php b/routes/api.php
index 4712165c..ace7e778 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -44,10 +44,10 @@ Route::group(['middleware' => 'auth:api'], function () {
     Route::post('booking/{book_id}/cancel', 'BookingController@cancel');
     Route::get('/booking', 'BookingController@index');
 	Route::get('/user', 'UserController@show');
-});
-
 	Route::patch('settings/profile', 'Settings\ProfileController@update');
 	Route::patch('settings/password', 'Settings\PasswordController@update');
+});
+
 
 
 Route::group(['middleware' => 'guest:api'], function () {
@@ -101,7 +101,7 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
 
-	Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
+	Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store');
 });
 
 

From 73000a9818afdf44547f649adf5d4a1438e7c6ad Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 27 Jun 2018 16:33:41 +0800
Subject: [PATCH 34/43] update route for admin top nav content

---
 resources/assets/js/components/LocaleDropdown.vue | 13 ++++++++-----
 resources/assets/js/router/routes.js              |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 8e5c634b..9fcb2565 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -13,7 +13,9 @@
         </a>
       </div>
     </li>
-    <li><el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
+    <ul class="navbar-nav mr-auto">
+    <li class="nav-item">
+      <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
           <div align="center">
             <p>Today's Rate</p>
             <p>X1 : Cash: 1.76 Cheque: 1.66 BA: 1.63</p>
@@ -23,10 +25,11 @@
             <el-button type="primary" size="mini" @click="UpdateRatePopoverVisible = false; UpdateRateDialogVisible = true">Update rate</el-button>
           </div>
           <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
-        </el-popover></li>
-    <li><a class="nav-link" href="/admin/complete-order" role="button">Complete Order</a></li>
-    <li><a class="nav-link" href="/admin/transaction-history" role="button">Transaction History</a></li>
-    <li><a class="nav-link" href="/admin/upload-supplier-bank-slip" role="button">Upload Supplier Bank Slip to System</a></li>
+        </el-popover>
+      </li></ul>
+      <li class="nav-item"><router-link :to="{ name: 'admin.complete-order' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
+      <li class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
+      <li class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
   </ul>
 
 <!-- update rate dialog -->
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index ead49491..f5eb718d 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -76,6 +76,6 @@ export default [
   { path: '/admin', name: 'admin.home', component: AdminHome },
   { path: '/admin/complete-order', name: 'admin.complete-order', component: CompleteOrder },
   { path: '/admin/transaction-history', name: 'admin.transaction-history', component: TransactionHistory },
-  { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-sli', component: UploadSupplierBankSlip },
+  { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-slip', component: UploadSupplierBankSlip },
   { path: '*', name: 'notfound', component: NotFound }
 ]

From addd89ceb8279b76d20140e2979d4854f2779ce4 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 16:37:48 +0800
Subject: [PATCH 35/43] added relantionship in chinabankslip model added update
 chinabankslip feature

---
 app/Booking.php                               |  4 ++
 app/ChinaBankSlip.php                         |  5 ++
 .../Controllers/ChinaBankSlipController.php   | 22 +++++++
 .../admin/booking/uploadChinaBankslip.vue     | 59 +++++++++----------
 routes/api.php                                |  1 +
 5 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/app/Booking.php b/app/Booking.php
index fec84e1c..a6be11c4 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -36,6 +36,10 @@ class Booking extends Model
         return $this->belongsTo('app\BookingSupplier ');
     }
 
+    public function chinaBankSlip(){
+        return $this->hasOne(ChinaBankSlip::class);
+    }
+    
     public function userBankSlip(){
         return $this->hasOne(UserBankSlip::class);
     }
diff --git a/app/ChinaBankSlip.php b/app/ChinaBankSlip.php
index d7354956..47e2fe4d 100644
--- a/app/ChinaBankSlip.php
+++ b/app/ChinaBankSlip.php
@@ -7,4 +7,9 @@ use Illuminate\Database\Eloquent\Model;
 class ChinaBankSlip extends Model
 {
     protected $fillable = ['actual_transfer_amount','date','details','china_bank_slip_path'];
+
+    public function booking()
+    {
+        return $this->belongsTo(Booking::class);
+    }
 }
diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 11bd4b7d..f691725c 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -62,4 +62,26 @@ class ChinaBankSlipController extends Controller
         return response()->json(['message'=>'success'], 201);
     }
 
+    public function update(Request $request, $id){
+        $booking = Booking::where('id',$id)->first();
+        $china_bankslip = $booking->chinaBankSlip()->first();
+
+        // TODO: first or fail 
+        if(!$china_bankslip){
+            return response()->json(["message"=> "not found"],400);
+		}
+		
+        $china_bankslip->actual_transfer_amount = $request->input('actual_transfer_amount');
+        $china_bankslip->date = $request->input('date');
+        $china_bankslip->details = $request->input('details');
+        $china_bankslip->save();
+
+        // update booking status 
+		$booking->status = 5;
+		$booking->admin_status = 6; 
+		$booking->save();
+
+        return response()->json(["message"=> "Success"],200);
+    }
+
 }
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 79e389f4..8cb31a77 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -205,17 +205,12 @@
               <div align="center">
 
                 <!-- upload image -->
-                <el-upload class="upload-demo" :action="'/api/booking/' + booking_id + '/upload-china-bankslip'"
-                  :on-preview="handlePreview" 
-                  :on-remove="handleRemove" 
-                  :multiple="false"
-                  list-type="picture">
+                <el-upload class="upload-demo" :action="'/api/booking/' + booking_id + '/upload-china-bankslip'" :on-preview="handlePreview"
+                  :on-remove="handleRemove" :multiple="false" list-type="picture">
                   <el-button size="small" type="primary">Click to upload</el-button>
                   <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 3mb</div>
                 </el-upload>
-                <el-dialog :visible.sync="dialogVisible">
-                  <img :src="dialogImageUrl" width="100%" alt="">
-                </el-dialog>
+
                 <br>
                 <!-- upload image end -->
                 <el-form-item prop="date">
@@ -230,7 +225,7 @@
                   <el-input v-model="chinaSlipForm.details" type="text" placeholder="Details" style="width: 80%" />
                 </el-form-item>
                 <el-form-item>
-                  <el-button :loading="loading_btn" type="primary" @click="submitcChinaSlip('chinaSlipForm')">Submit</el-button>
+                  <el-button :loading="loading_btn" type="primary" @click="submitChinaSlip('chinaSlipForm')">Submit</el-button>
                 </el-form-item>
               </div>
             </el-form>
@@ -284,7 +279,7 @@
           }],
           details: [{
             required: true,
-            message: 'Please input account name',
+            message: 'Please input details',
             trigger: 'change'
           }]
         },
@@ -351,39 +346,40 @@
 
     },
     methods: {
-      submitcChinaSlip(formName) {
+      submitChinaSlip(formName) {
         this.loading_btn = true
 
         this.$refs[formName].validate((valid) => {
           if (valid) {
-            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,
+            let newChinaSlip = {
+              date: this.chinaSlipForm.date,
+              actual_transfer_amount: this.chinaSlipForm.actual_transfer_amount,
+              details: this.chinaSlipForm.details,
             }
 
-            axios.post('/api/supplier-booking', newReport)
+            axios.patch('/api/booking/' + this.booking_id + '/upload-china-slip', newChinaSlip)
               .then((response) => {
-                this.loading_btn = false
-
-                this.$router.push({
-                  name: 'booking.admin.supplier.report',
-                  params: {
-                    id: this.$route.params.id
-                  }
+                this.$message({
+                  showClose: true,
+                  message: 'Your bankinslip has been submitted, please wait admin to approve.',
+                  type: 'success',
+                  duration: 5000
                 })
-                // redirect to supplier report 
 
+                console.log(response)
+                this.$router.push({
+                  name: 'home'
+                })
               })
               .catch((error) => {
-                this.loading_btn = false
+                this.loading = false
+                this.$message({
+                  showClose: true,
+                  message: 'Please upload your bankin slip first.',
+                  type: 'warning',
+                  duration: 10000
+                })
                 console.log(error)
-
-                // TODO : Show error message 
-
               })
 
           } else {
@@ -391,6 +387,7 @@
           }
         })
 
+
       },
       handleRemove(file, fileList) {
         console.log(file, fileList);
diff --git a/routes/api.php b/routes/api.php
index ace7e778..2d513052 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -102,6 +102,7 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
 
 	Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store');
+	Route::patch('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@update');
 });
 
 

From a5ea991a8d7608b348c3ade15ebbc427b3598d0d Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 16:54:02 +0800
Subject: [PATCH 36/43] changed routes name for update china bankslip

---
 .../assets/js/pages/admin/booking/uploadChinaBankslip.vue      | 3 ++-
 routes/api.php                                                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 8cb31a77..4970b41a 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -357,7 +357,7 @@
               details: this.chinaSlipForm.details,
             }
 
-            axios.patch('/api/booking/' + this.booking_id + '/upload-china-slip', newChinaSlip)
+            axios.patch('/api/booking/' + this.booking_id +'/update-china-bankslip', newChinaSlip)
               .then((response) => {
                 this.$message({
                   showClose: true,
@@ -380,6 +380,7 @@
                   duration: 10000
                 })
                 console.log(error)
+                this.loading_btn = false
               })
 
           } else {
diff --git a/routes/api.php b/routes/api.php
index 2d513052..1b2ca525 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -102,7 +102,7 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
 
 	Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store');
-	Route::patch('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@update');
+	Route::patch('/booking/{id}/update-china-bankslip','ChinaBankSlipController@update');
 });
 
 

From cc86e2272b74b5dc24695fa075e295099ca6a828 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 17:15:04 +0800
Subject: [PATCH 37/43] updated get booking status for admin

---
 app/Http/Controllers/BookingController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 97c5d7ae..2a0daed0 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -91,7 +91,7 @@ class BookingController extends Controller
 				// TODO : transfer_amount change name to bia 
 				$booking->transfer_amount = $booking->bia; 
 		
-				$booking->track_status = "(". $booking->admin_status ."/6)";
+				$booking->track_status = "(". $booking->admin_status ."/7)";
 				switch ($booking->admin_status) {
 					case 0:
 						$status_desc = "Waiting user to upload bankin slip";
@@ -109,10 +109,13 @@ class BookingController extends Controller
 						$status_desc = "Please update supplier booking status."; 
 						break;
 					case 5:
-						$status_desc = "Customer has uploaded the invoice, please upload purchase order"; 
+						$status_desc = "Upload China Bankslip"; 
 						break;
 					case 6:
-						$status_desc = "Booking completed"; 
+						$status_desc = "Customer has uploaded the invoice, please upload purchase order"; 
+                        break;
+                    case 7:
+						$status_desc = "Booking Completed"; 
 						break;
 					default:
 						$status_desc = "";

From 534ad41fd3bead017342dc090900a1445382cffe Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Wed, 27 Jun 2018 17:25:11 +0800
Subject: [PATCH 38/43] fix conflict

---
 .../assets/js/components/LocaleDropdown.vue   |   3 -
 vendor/composer/autoload_classmap.php         | 136 ++++++++++------
 vendor/composer/autoload_static.php           | 152 +++++++++++-------
 3 files changed, 181 insertions(+), 110 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 544f4d6d..01ab524f 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -12,7 +12,6 @@
           {{ value }}
         </a>
       </div>
-<<<<<<< HEAD
     </li>
     <ul class="navbar-nav mr-auto">
     <li class="nav-item">
@@ -31,13 +30,11 @@
       <li class="nav-item"><router-link :to="{ name: 'admin.complete-order' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
       <li class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
       <li class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
-=======
     </li> -->
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Complete Order</a></li>
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Transaction History</a></li>
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
->>>>>>> 781c78b942b6b1024c815441cfe55fd912e41551
   </ul>
 
 <!-- update rate dialog -->
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 5dead2dc..ba9afe6c 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1112,9 +1112,6 @@ return array(
     'Faker\\ValidGenerator' => $vendorDir . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
     'Fideloper\\Proxy\\TrustProxies' => $vendorDir . '/fideloper/proxy/src/TrustProxies.php',
     'Fideloper\\Proxy\\TrustedProxyServiceProvider' => $vendorDir . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
-    'File_Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
-    'File_Iterator_Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
-    'File_Iterator_Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
     'GuzzleHttp\\Client' => $vendorDir . '/guzzlehttp/guzzle/src/Client.php',
     'GuzzleHttp\\ClientInterface' => $vendorDir . '/guzzlehttp/guzzle/src/ClientInterface.php',
     'GuzzleHttp\\Cookie\\CookieJar' => $vendorDir . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -1618,6 +1615,7 @@ return array(
     'Illuminate\\Foundation\\Console\\MailMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
     'Illuminate\\Foundation\\Console\\ModelMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
     'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+    'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
     'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
     'Illuminate\\Foundation\\Console\\PresetCommand' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -1690,6 +1688,7 @@ return array(
     'Illuminate\\Foundation\\Testing\\WithoutEvents' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
     'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
     'Illuminate\\Foundation\\Validation\\ValidatesRequests' => $vendorDir . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+    'Illuminate\\Hashing\\AbstractHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
     'Illuminate\\Hashing\\ArgonHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
     'Illuminate\\Hashing\\BcryptHasher' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
     'Illuminate\\Hashing\\HashManager' => $vendorDir . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -2580,50 +2579,50 @@ return array(
     'PHPUnit\\Framework\\IncompleteTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
     'PHPUnit\\Framework\\InvalidCoversTargetException' => $vendorDir . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
     'PHPUnit\\Framework\\MissingCoversAnnotationException' => $vendorDir . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
-    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Generator.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Invokable.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
-    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
-    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
-    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
-    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
-    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
-    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
-    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
+    'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Match' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
+    'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Generator' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\InvocationMocker' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\Invokable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
+    'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+    'PHPUnit\\Framework\\MockObject\\MockBuilder' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
+    'PHPUnit\\Framework\\MockObject\\MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
+    'PHPUnit\\Framework\\MockObject\\RuntimeException' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
+    'PHPUnit\\Framework\\MockObject\\Stub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
+    'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
+    'PHPUnit\\Framework\\MockObject\\Verifiable' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
     'PHPUnit\\Framework\\OutputError' => $vendorDir . '/phpunit/phpunit/src/Framework/OutputError.php',
     'PHPUnit\\Framework\\RiskyTest' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTest.php',
     'PHPUnit\\Framework\\RiskyTestError' => $vendorDir . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -2667,6 +2666,7 @@ return array(
     'PHPUnit\\Runner\\TestHook' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
     'PHPUnit\\Runner\\TestListenerAdapter' => $vendorDir . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
     'PHPUnit\\Runner\\TestSuiteLoader' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+    'PHPUnit\\Runner\\TestSuiteSorter' => $vendorDir . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
     'PHPUnit\\Runner\\Version' => $vendorDir . '/phpunit/phpunit/src/Runner/Version.php',
     'PHPUnit\\TextUI\\Command' => $vendorDir . '/phpunit/phpunit/src/TextUI/Command.php',
     'PHPUnit\\TextUI\\ResultPrinter' => $vendorDir . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -2701,7 +2701,7 @@ return array(
     'PHPUnit\\Util\\Type' => $vendorDir . '/phpunit/phpunit/src/Util/Type.php',
     'PHPUnit\\Util\\Xml' => $vendorDir . '/phpunit/phpunit/src/Util/Xml.php',
     'PHPUnit\\Util\\XmlTestListRenderer' => $vendorDir . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit-mock-objects/src/MockObject.php',
+    'PHPUnit_Framework_MockObject_MockObject' => $vendorDir . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
     'PHP_Token' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScope' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
     'PHP_TokenWithScopeAndVisibility' => $vendorDir . '/phpunit/php-token-stream/src/Token.php',
@@ -3279,6 +3279,7 @@ return array(
     'Psy\\CodeCleaner\\InstanceOfPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
     'Psy\\CodeCleaner\\LeavePsyshAlonePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
     'Psy\\CodeCleaner\\LegacyEmptyPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
+    'Psy\\CodeCleaner\\ListPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/ListPass.php',
     'Psy\\CodeCleaner\\LoopContextPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
     'Psy\\CodeCleaner\\MagicConstantsPass' => $vendorDir . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
     'Psy\\CodeCleaner\\NamespaceAwarePass' => $vendorDir . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3320,10 +3321,10 @@ return array(
     'Psy\\Command\\SudoCommand' => $vendorDir . '/psy/psysh/src/Command/SudoCommand.php',
     'Psy\\Command\\ThrowUpCommand' => $vendorDir . '/psy/psysh/src/Command/ThrowUpCommand.php',
     'Psy\\Command\\TimeitCommand' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand.php',
+    'Psy\\Command\\TimeitCommand\\TimeitVisitor' => $vendorDir . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
     'Psy\\Command\\TraceCommand' => $vendorDir . '/psy/psysh/src/Command/TraceCommand.php',
     'Psy\\Command\\WhereamiCommand' => $vendorDir . '/psy/psysh/src/Command/WhereamiCommand.php',
     'Psy\\Command\\WtfCommand' => $vendorDir . '/psy/psysh/src/Command/WtfCommand.php',
-    'Psy\\Compiler' => $vendorDir . '/psy/psysh/src/Compiler.php',
     'Psy\\ConfigPaths' => $vendorDir . '/psy/psysh/src/ConfigPaths.php',
     'Psy\\Configuration' => $vendorDir . '/psy/psysh/src/Configuration.php',
     'Psy\\ConsoleColorFactory' => $vendorDir . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3340,6 +3341,7 @@ return array(
     'Psy\\Exception\\TypeErrorException' => $vendorDir . '/psy/psysh/src/Exception/TypeErrorException.php',
     'Psy\\ExecutionClosure' => $vendorDir . '/psy/psysh/src/ExecutionClosure.php',
     'Psy\\ExecutionLoop' => $vendorDir . '/psy/psysh/src/ExecutionLoop.php',
+    'Psy\\ExecutionLoopClosure' => $vendorDir . '/psy/psysh/src/ExecutionLoopClosure.php',
     'Psy\\ExecutionLoop\\AbstractListener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
     'Psy\\ExecutionLoop\\Listener' => $vendorDir . '/psy/psysh/src/ExecutionLoop/Listener.php',
     'Psy\\ExecutionLoop\\ProcessForker' => $vendorDir . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3362,7 +3364,9 @@ return array(
     'Psy\\Readline\\Libedit' => $vendorDir . '/psy/psysh/src/Readline/Libedit.php',
     'Psy\\Readline\\Readline' => $vendorDir . '/psy/psysh/src/Readline/Readline.php',
     'Psy\\Readline\\Transient' => $vendorDir . '/psy/psysh/src/Readline/Transient.php',
+    'Psy\\Reflection\\ReflectionClassConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
     'Psy\\Reflection\\ReflectionConstant' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant.php',
+    'Psy\\Reflection\\ReflectionConstant_' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
     'Psy\\Reflection\\ReflectionLanguageConstruct' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
     'Psy\\Reflection\\ReflectionLanguageConstructParameter' => $vendorDir . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
     'Psy\\Shell' => $vendorDir . '/psy/psysh/src/Shell.php',
@@ -3523,6 +3527,9 @@ return array(
     'SebastianBergmann\\Environment\\OperatingSystem' => $vendorDir . '/sebastian/environment/src/OperatingSystem.php',
     'SebastianBergmann\\Environment\\Runtime' => $vendorDir . '/sebastian/environment/src/Runtime.php',
     'SebastianBergmann\\Exporter\\Exporter' => $vendorDir . '/sebastian/exporter/src/Exporter.php',
+    'SebastianBergmann\\FileIterator\\Facade' => $vendorDir . '/phpunit/php-file-iterator/src/Facade.php',
+    'SebastianBergmann\\FileIterator\\Factory' => $vendorDir . '/phpunit/php-file-iterator/src/Factory.php',
+    'SebastianBergmann\\FileIterator\\Iterator' => $vendorDir . '/phpunit/php-file-iterator/src/Iterator.php',
     'SebastianBergmann\\GlobalState\\Blacklist' => $vendorDir . '/sebastian/global-state/src/Blacklist.php',
     'SebastianBergmann\\GlobalState\\CodeExporter' => $vendorDir . '/sebastian/global-state/src/CodeExporter.php',
     'SebastianBergmann\\GlobalState\\Exception' => $vendorDir . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3571,6 +3578,7 @@ return array(
     'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/console/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => $vendorDir . '/symfony/console/Exception/InvalidOptionException.php',
     'Symfony\\Component\\Console\\Exception\\LogicException' => $vendorDir . '/symfony/console/Exception/LogicException.php',
+    'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => $vendorDir . '/symfony/console/Exception/NamespaceNotFoundException.php',
     'Symfony\\Component\\Console\\Exception\\RuntimeException' => $vendorDir . '/symfony/console/Exception/RuntimeException.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => $vendorDir . '/symfony/console/Formatter/OutputFormatter.php',
     'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => $vendorDir . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -3591,6 +3599,7 @@ return array(
     'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => $vendorDir . '/symfony/console/Helper/SymfonyQuestionHelper.php',
     'Symfony\\Component\\Console\\Helper\\Table' => $vendorDir . '/symfony/console/Helper/Table.php',
     'Symfony\\Component\\Console\\Helper\\TableCell' => $vendorDir . '/symfony/console/Helper/TableCell.php',
+    'Symfony\\Component\\Console\\Helper\\TableRows' => $vendorDir . '/symfony/console/Helper/TableRows.php',
     'Symfony\\Component\\Console\\Helper\\TableSeparator' => $vendorDir . '/symfony/console/Helper/TableSeparator.php',
     'Symfony\\Component\\Console\\Helper\\TableStyle' => $vendorDir . '/symfony/console/Helper/TableStyle.php',
     'Symfony\\Component\\Console\\Input\\ArgvInput' => $vendorDir . '/symfony/console/Input/ArgvInput.php',
@@ -3607,6 +3616,7 @@ return array(
     'Symfony\\Component\\Console\\Output\\BufferedOutput' => $vendorDir . '/symfony/console/Output/BufferedOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutput' => $vendorDir . '/symfony/console/Output/ConsoleOutput.php',
     'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => $vendorDir . '/symfony/console/Output/ConsoleOutputInterface.php',
+    'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => $vendorDir . '/symfony/console/Output/ConsoleSectionOutput.php',
     'Symfony\\Component\\Console\\Output\\NullOutput' => $vendorDir . '/symfony/console/Output/NullOutput.php',
     'Symfony\\Component\\Console\\Output\\Output' => $vendorDir . '/symfony/console/Output/Output.php',
     'Symfony\\Component\\Console\\Output\\OutputInterface' => $vendorDir . '/symfony/console/Output/OutputInterface.php',
@@ -3620,6 +3630,7 @@ return array(
     'Symfony\\Component\\Console\\Terminal' => $vendorDir . '/symfony/console/Terminal.php',
     'Symfony\\Component\\Console\\Tester\\ApplicationTester' => $vendorDir . '/symfony/console/Tester/ApplicationTester.php',
     'Symfony\\Component\\Console\\Tester\\CommandTester' => $vendorDir . '/symfony/console/Tester/CommandTester.php',
+    'Symfony\\Component\\Console\\Tester\\TesterTrait' => $vendorDir . '/symfony/console/Tester/TesterTrait.php',
     'Symfony\\Component\\CssSelector\\CssSelectorConverter' => $vendorDir . '/symfony/css-selector/CssSelectorConverter.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/css-selector/Exception/ExceptionInterface.php',
     'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => $vendorDir . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -3726,8 +3737,15 @@ return array(
     'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => $vendorDir . '/symfony/http-foundation/ExpressionRequestMatcher.php',
     'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => $vendorDir . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => $vendorDir . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+    'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => $vendorDir . '/symfony/http-foundation/File/Exception/PartialFileException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => $vendorDir . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
     'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => $vendorDir . '/symfony/http-foundation/File/Exception/UploadException.php',
     'Symfony\\Component\\HttpFoundation\\File\\File' => $vendorDir . '/symfony/http-foundation/File/File.php',
@@ -3741,6 +3759,7 @@ return array(
     'Symfony\\Component\\HttpFoundation\\File\\Stream' => $vendorDir . '/symfony/http-foundation/File/Stream.php',
     'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => $vendorDir . '/symfony/http-foundation/File/UploadedFile.php',
     'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
+    'Symfony\\Component\\HttpFoundation\\HeaderUtils' => $vendorDir . '/symfony/http-foundation/HeaderUtils.php',
     'Symfony\\Component\\HttpFoundation\\IpUtils' => $vendorDir . '/symfony/http-foundation/IpUtils.php',
     'Symfony\\Component\\HttpFoundation\\JsonResponse' => $vendorDir . '/symfony/http-foundation/JsonResponse.php',
     'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
@@ -3764,10 +3783,12 @@ return array(
     'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => $vendorDir . '/symfony/http-foundation/Session/SessionInterface.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+    'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => $vendorDir . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => $vendorDir . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
     'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => $vendorDir . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -3799,6 +3820,7 @@ return array(
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+    'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => $vendorDir . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
     'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => $vendorDir . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -3913,6 +3935,7 @@ return array(
     'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/process/Exception/InvalidArgumentException.php',
     'Symfony\\Component\\Process\\Exception\\LogicException' => $vendorDir . '/symfony/process/Exception/LogicException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => $vendorDir . '/symfony/process/Exception/ProcessFailedException.php',
+    'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => $vendorDir . '/symfony/process/Exception/ProcessSignaledException.php',
     'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => $vendorDir . '/symfony/process/Exception/ProcessTimedOutException.php',
     'Symfony\\Component\\Process\\Exception\\RuntimeException' => $vendorDir . '/symfony/process/Exception/RuntimeException.php',
     'Symfony\\Component\\Process\\ExecutableFinder' => $vendorDir . '/symfony/process/ExecutableFinder.php',
@@ -3959,8 +3982,6 @@ return array(
     'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => $vendorDir . '/symfony/routing/Loader/PhpFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => $vendorDir . '/symfony/routing/Loader/XmlFileLoader.php',
     'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => $vendorDir . '/symfony/routing/Loader/YamlFileLoader.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-    'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => $vendorDir . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => $vendorDir . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
     'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => $vendorDir . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4059,6 +4080,7 @@ return array(
     'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => $vendorDir . '/symfony/var-dumper/Caster/EnumStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => $vendorDir . '/symfony/var-dumper/Caster/ExceptionCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => $vendorDir . '/symfony/var-dumper/Caster/FrameStub.php',
+    'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => $vendorDir . '/symfony/var-dumper/Caster/GmpCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => $vendorDir . '/symfony/var-dumper/Caster/LinkStub.php',
     'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => $vendorDir . '/symfony/var-dumper/Caster/PdoCaster.php',
     'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => $vendorDir . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4078,13 +4100,25 @@ return array(
     'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => $vendorDir . '/symfony/var-dumper/Cloner/DumperInterface.php',
     'Symfony\\Component\\VarDumper\\Cloner\\Stub' => $vendorDir . '/symfony/var-dumper/Cloner/Stub.php',
     'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => $vendorDir . '/symfony/var-dumper/Cloner/VarCloner.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+    'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => $vendorDir . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+    'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => $vendorDir . '/symfony/var-dumper/Command/ServerDumpCommand.php',
     'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => $vendorDir . '/symfony/var-dumper/Dumper/AbstractDumper.php',
     'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => $vendorDir . '/symfony/var-dumper/Dumper/CliDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => $vendorDir . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+    'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => $vendorDir . '/symfony/var-dumper/Dumper/ServerDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+    'Symfony\\Component\\VarDumper\\Server\\Connection' => $vendorDir . '/symfony/var-dumper/Server/Connection.php',
+    'Symfony\\Component\\VarDumper\\Server\\DumpServer' => $vendorDir . '/symfony/var-dumper/Server/DumpServer.php',
     'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
+    'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
     'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 7952bb99..dac5ecf9 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,13 +4,14 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
+class ComposerStaticInit50cdbea3724e5f1d6267359fe107641a
 {
     public static $files = array (
         '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
+        '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
         'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
         'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
@@ -53,6 +54,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
             'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Php56\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
+            'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Component\\VarDumper\\' => 28,
             'Symfony\\Component\\Translation\\' => 30,
             'Symfony\\Component\\Routing\\' => 26,
@@ -190,6 +192,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
         ),
+        'Symfony\\Polyfill\\Ctype\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
+        ),
         'Symfony\\Component\\VarDumper\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/var-dumper',
@@ -1534,9 +1540,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\ValidGenerator' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/ValidGenerator.php',
         'Fideloper\\Proxy\\TrustProxies' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustProxies.php',
         'Fideloper\\Proxy\\TrustedProxyServiceProvider' => __DIR__ . '/..' . '/fideloper/proxy/src/TrustedProxyServiceProvider.php',
-        'File_Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
-        'File_Iterator_Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
-        'File_Iterator_Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
         'GuzzleHttp\\Client' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Client.php',
         'GuzzleHttp\\ClientInterface' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/ClientInterface.php',
         'GuzzleHttp\\Cookie\\CookieJar' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/Cookie/CookieJar.php',
@@ -2040,6 +2043,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Illuminate\\Foundation\\Console\\MailMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/MailMakeCommand.php',
         'Illuminate\\Foundation\\Console\\ModelMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ModelMakeCommand.php',
         'Illuminate\\Foundation\\Console\\NotificationMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/NotificationMakeCommand.php',
+        'Illuminate\\Foundation\\Console\\ObserverMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/ObserverMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PackageDiscoverCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PackageDiscoverCommand.php',
         'Illuminate\\Foundation\\Console\\PolicyMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PolicyMakeCommand.php',
         'Illuminate\\Foundation\\Console\\PresetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Console/PresetCommand.php',
@@ -2112,6 +2116,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Illuminate\\Foundation\\Testing\\WithoutEvents' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutEvents.php',
         'Illuminate\\Foundation\\Testing\\WithoutMiddleware' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Testing/WithoutMiddleware.php',
         'Illuminate\\Foundation\\Validation\\ValidatesRequests' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/Validation/ValidatesRequests.php',
+        'Illuminate\\Hashing\\AbstractHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/AbstractHasher.php',
         'Illuminate\\Hashing\\ArgonHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/ArgonHasher.php',
         'Illuminate\\Hashing\\BcryptHasher' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/BcryptHasher.php',
         'Illuminate\\Hashing\\HashManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Hashing/HashManager.php',
@@ -3002,50 +3007,50 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Framework\\IncompleteTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/IncompleteTestError.php',
         'PHPUnit\\Framework\\InvalidCoversTargetException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/InvalidCoversTargetException.php',
         'PHPUnit\\Framework\\MissingCoversAnnotationException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MissingCoversAnnotationException.php',
-        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/BadMethodCallException.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Identity.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Match.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/MethodNameMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/NamespaceMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/ParametersMatch.php',
-        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Builder/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Generator.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/InvocationMocker.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/ObjectInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invocation/StaticInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Invokable.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyInvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/AnyParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/ConsecutiveParameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/DeferredError.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Invocation.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtIndex.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtLeastOnce.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedAtMostCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedCount.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/InvokedRecorder.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/MethodName.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/Parameters.php',
-        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Matcher/StatelessInvocation.php',
-        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockBuilder.php',
-        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/ForwardCompatibility/MockObject.php',
-        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Exception/RuntimeException.php',
-        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ConsecutiveCalls.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/Exception.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/MatcherCollection.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnArgument.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnCallback.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnReference.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnSelf.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnStub.php',
-        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Stub/ReturnValueMap.php',
-        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/Verifiable.php',
+        'PHPUnit\\Framework\\MockObject\\BadMethodCallException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/BadMethodCallException.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Identity' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Identity.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Match' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Match.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\MethodNameMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/MethodNameMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\NamespaceMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/NamespaceMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\ParametersMatch' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/ParametersMatch.php',
+        'PHPUnit\\Framework\\MockObject\\Builder\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Builder/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Generator' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Generator.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\InvocationMocker' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/InvocationMocker.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\ObjectInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/ObjectInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invocation\\StaticInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invocation/StaticInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\Invokable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Invokable.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyInvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyInvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\AnyParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/AnyParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\ConsecutiveParameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/ConsecutiveParameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\DeferredError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/DeferredError.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Invocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Invocation.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtIndex' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtIndex.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtLeastOnce' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedAtMostCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedAtMostCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedCount' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedCount.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\InvokedRecorder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/InvokedRecorder.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\MethodName' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/MethodName.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\Parameters' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/Parameters.php',
+        'PHPUnit\\Framework\\MockObject\\Matcher\\StatelessInvocation' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Matcher/StatelessInvocation.php',
+        'PHPUnit\\Framework\\MockObject\\MockBuilder' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockBuilder.php',
+        'PHPUnit\\Framework\\MockObject\\MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/ForwardCompatibility/MockObject.php',
+        'PHPUnit\\Framework\\MockObject\\RuntimeException' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Exception/RuntimeException.php',
+        'PHPUnit\\Framework\\MockObject\\Stub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ConsecutiveCalls' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ConsecutiveCalls.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\Exception' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/Exception.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\MatcherCollection' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/MatcherCollection.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnArgument' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnArgument.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnCallback' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnCallback.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnReference' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnReference.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnSelf' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnSelf.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnStub' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnStub.php',
+        'PHPUnit\\Framework\\MockObject\\Stub\\ReturnValueMap' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Stub/ReturnValueMap.php',
+        'PHPUnit\\Framework\\MockObject\\Verifiable' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/Verifiable.php',
         'PHPUnit\\Framework\\OutputError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/OutputError.php',
         'PHPUnit\\Framework\\RiskyTest' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTest.php',
         'PHPUnit\\Framework\\RiskyTestError' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/RiskyTestError.php',
@@ -3089,6 +3094,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Runner\\TestHook' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestHook.php',
         'PHPUnit\\Runner\\TestListenerAdapter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Hook/TestListenerAdapter.php',
         'PHPUnit\\Runner\\TestSuiteLoader' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteLoader.php',
+        'PHPUnit\\Runner\\TestSuiteSorter' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/TestSuiteSorter.php',
         'PHPUnit\\Runner\\Version' => __DIR__ . '/..' . '/phpunit/phpunit/src/Runner/Version.php',
         'PHPUnit\\TextUI\\Command' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/Command.php',
         'PHPUnit\\TextUI\\ResultPrinter' => __DIR__ . '/..' . '/phpunit/phpunit/src/TextUI/ResultPrinter.php',
@@ -3123,7 +3129,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PHPUnit\\Util\\Type' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Type.php',
         'PHPUnit\\Util\\Xml' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/Xml.php',
         'PHPUnit\\Util\\XmlTestListRenderer' => __DIR__ . '/..' . '/phpunit/phpunit/src/Util/XmlTestListRenderer.php',
-        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit-mock-objects/src/MockObject.php',
+        'PHPUnit_Framework_MockObject_MockObject' => __DIR__ . '/..' . '/phpunit/phpunit/src/Framework/MockObject/MockObject.php',
         'PHP_Token' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScope' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
         'PHP_TokenWithScopeAndVisibility' => __DIR__ . '/..' . '/phpunit/php-token-stream/src/Token.php',
@@ -3701,6 +3707,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\CodeCleaner\\InstanceOfPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/InstanceOfPass.php',
         'Psy\\CodeCleaner\\LeavePsyshAlonePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LeavePsyshAlonePass.php',
         'Psy\\CodeCleaner\\LegacyEmptyPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LegacyEmptyPass.php',
+        'Psy\\CodeCleaner\\ListPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/ListPass.php',
         'Psy\\CodeCleaner\\LoopContextPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/LoopContextPass.php',
         'Psy\\CodeCleaner\\MagicConstantsPass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/MagicConstantsPass.php',
         'Psy\\CodeCleaner\\NamespaceAwarePass' => __DIR__ . '/..' . '/psy/psysh/src/CodeCleaner/NamespaceAwarePass.php',
@@ -3742,10 +3749,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Command\\SudoCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/SudoCommand.php',
         'Psy\\Command\\ThrowUpCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/ThrowUpCommand.php',
         'Psy\\Command\\TimeitCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand.php',
+        'Psy\\Command\\TimeitCommand\\TimeitVisitor' => __DIR__ . '/..' . '/psy/psysh/src/Command/TimeitCommand/TimeitVisitor.php',
         'Psy\\Command\\TraceCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/TraceCommand.php',
         'Psy\\Command\\WhereamiCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WhereamiCommand.php',
         'Psy\\Command\\WtfCommand' => __DIR__ . '/..' . '/psy/psysh/src/Command/WtfCommand.php',
-        'Psy\\Compiler' => __DIR__ . '/..' . '/psy/psysh/src/Compiler.php',
         'Psy\\ConfigPaths' => __DIR__ . '/..' . '/psy/psysh/src/ConfigPaths.php',
         'Psy\\Configuration' => __DIR__ . '/..' . '/psy/psysh/src/Configuration.php',
         'Psy\\ConsoleColorFactory' => __DIR__ . '/..' . '/psy/psysh/src/ConsoleColorFactory.php',
@@ -3762,6 +3769,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Exception\\TypeErrorException' => __DIR__ . '/..' . '/psy/psysh/src/Exception/TypeErrorException.php',
         'Psy\\ExecutionClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionClosure.php',
         'Psy\\ExecutionLoop' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop.php',
+        'Psy\\ExecutionLoopClosure' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoopClosure.php',
         'Psy\\ExecutionLoop\\AbstractListener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/AbstractListener.php',
         'Psy\\ExecutionLoop\\Listener' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/Listener.php',
         'Psy\\ExecutionLoop\\ProcessForker' => __DIR__ . '/..' . '/psy/psysh/src/ExecutionLoop/ProcessForker.php',
@@ -3784,7 +3792,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Psy\\Readline\\Libedit' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Libedit.php',
         'Psy\\Readline\\Readline' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Readline.php',
         'Psy\\Readline\\Transient' => __DIR__ . '/..' . '/psy/psysh/src/Readline/Transient.php',
+        'Psy\\Reflection\\ReflectionClassConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionClassConstant.php',
         'Psy\\Reflection\\ReflectionConstant' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant.php',
+        'Psy\\Reflection\\ReflectionConstant_' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionConstant_.php',
         'Psy\\Reflection\\ReflectionLanguageConstruct' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstruct.php',
         'Psy\\Reflection\\ReflectionLanguageConstructParameter' => __DIR__ . '/..' . '/psy/psysh/src/Reflection/ReflectionLanguageConstructParameter.php',
         'Psy\\Shell' => __DIR__ . '/..' . '/psy/psysh/src/Shell.php',
@@ -3945,6 +3955,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'SebastianBergmann\\Environment\\OperatingSystem' => __DIR__ . '/..' . '/sebastian/environment/src/OperatingSystem.php',
         'SebastianBergmann\\Environment\\Runtime' => __DIR__ . '/..' . '/sebastian/environment/src/Runtime.php',
         'SebastianBergmann\\Exporter\\Exporter' => __DIR__ . '/..' . '/sebastian/exporter/src/Exporter.php',
+        'SebastianBergmann\\FileIterator\\Facade' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Facade.php',
+        'SebastianBergmann\\FileIterator\\Factory' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Factory.php',
+        'SebastianBergmann\\FileIterator\\Iterator' => __DIR__ . '/..' . '/phpunit/php-file-iterator/src/Iterator.php',
         'SebastianBergmann\\GlobalState\\Blacklist' => __DIR__ . '/..' . '/sebastian/global-state/src/Blacklist.php',
         'SebastianBergmann\\GlobalState\\CodeExporter' => __DIR__ . '/..' . '/sebastian/global-state/src/CodeExporter.php',
         'SebastianBergmann\\GlobalState\\Exception' => __DIR__ . '/..' . '/sebastian/global-state/src/exceptions/Exception.php',
@@ -3993,6 +4006,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Console\\Exception\\InvalidOptionException' => __DIR__ . '/..' . '/symfony/console/Exception/InvalidOptionException.php',
         'Symfony\\Component\\Console\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/console/Exception/LogicException.php',
+        'Symfony\\Component\\Console\\Exception\\NamespaceNotFoundException' => __DIR__ . '/..' . '/symfony/console/Exception/NamespaceNotFoundException.php',
         'Symfony\\Component\\Console\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/console/Exception/RuntimeException.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatter' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatter.php',
         'Symfony\\Component\\Console\\Formatter\\OutputFormatterInterface' => __DIR__ . '/..' . '/symfony/console/Formatter/OutputFormatterInterface.php',
@@ -4013,6 +4027,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Helper\\SymfonyQuestionHelper' => __DIR__ . '/..' . '/symfony/console/Helper/SymfonyQuestionHelper.php',
         'Symfony\\Component\\Console\\Helper\\Table' => __DIR__ . '/..' . '/symfony/console/Helper/Table.php',
         'Symfony\\Component\\Console\\Helper\\TableCell' => __DIR__ . '/..' . '/symfony/console/Helper/TableCell.php',
+        'Symfony\\Component\\Console\\Helper\\TableRows' => __DIR__ . '/..' . '/symfony/console/Helper/TableRows.php',
         'Symfony\\Component\\Console\\Helper\\TableSeparator' => __DIR__ . '/..' . '/symfony/console/Helper/TableSeparator.php',
         'Symfony\\Component\\Console\\Helper\\TableStyle' => __DIR__ . '/..' . '/symfony/console/Helper/TableStyle.php',
         'Symfony\\Component\\Console\\Input\\ArgvInput' => __DIR__ . '/..' . '/symfony/console/Input/ArgvInput.php',
@@ -4029,6 +4044,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Output\\BufferedOutput' => __DIR__ . '/..' . '/symfony/console/Output/BufferedOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutput.php',
         'Symfony\\Component\\Console\\Output\\ConsoleOutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleOutputInterface.php',
+        'Symfony\\Component\\Console\\Output\\ConsoleSectionOutput' => __DIR__ . '/..' . '/symfony/console/Output/ConsoleSectionOutput.php',
         'Symfony\\Component\\Console\\Output\\NullOutput' => __DIR__ . '/..' . '/symfony/console/Output/NullOutput.php',
         'Symfony\\Component\\Console\\Output\\Output' => __DIR__ . '/..' . '/symfony/console/Output/Output.php',
         'Symfony\\Component\\Console\\Output\\OutputInterface' => __DIR__ . '/..' . '/symfony/console/Output/OutputInterface.php',
@@ -4042,6 +4058,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Console\\Terminal' => __DIR__ . '/..' . '/symfony/console/Terminal.php',
         'Symfony\\Component\\Console\\Tester\\ApplicationTester' => __DIR__ . '/..' . '/symfony/console/Tester/ApplicationTester.php',
         'Symfony\\Component\\Console\\Tester\\CommandTester' => __DIR__ . '/..' . '/symfony/console/Tester/CommandTester.php',
+        'Symfony\\Component\\Console\\Tester\\TesterTrait' => __DIR__ . '/..' . '/symfony/console/Tester/TesterTrait.php',
         'Symfony\\Component\\CssSelector\\CssSelectorConverter' => __DIR__ . '/..' . '/symfony/css-selector/CssSelectorConverter.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExceptionInterface.php',
         'Symfony\\Component\\CssSelector\\Exception\\ExpressionErrorException' => __DIR__ . '/..' . '/symfony/css-selector/Exception/ExpressionErrorException.php',
@@ -4148,8 +4165,15 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\ExpressionRequestMatcher' => __DIR__ . '/..' . '/symfony/http-foundation/ExpressionRequestMatcher.php',
         'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\AccessDeniedException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/AccessDeniedException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\CannotWriteFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/CannotWriteFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\ExtensionFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/ExtensionFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\FileNotFoundException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FileNotFoundException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\FormSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/FormSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\IniSizeFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/IniSizeFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\NoTmpDirFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/NoTmpDirFileException.php',
+        'Symfony\\Component\\HttpFoundation\\File\\Exception\\PartialFileException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/PartialFileException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UnexpectedTypeException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UnexpectedTypeException.php',
         'Symfony\\Component\\HttpFoundation\\File\\Exception\\UploadException' => __DIR__ . '/..' . '/symfony/http-foundation/File/Exception/UploadException.php',
         'Symfony\\Component\\HttpFoundation\\File\\File' => __DIR__ . '/..' . '/symfony/http-foundation/File/File.php',
@@ -4163,6 +4187,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\File\\Stream' => __DIR__ . '/..' . '/symfony/http-foundation/File/Stream.php',
         'Symfony\\Component\\HttpFoundation\\File\\UploadedFile' => __DIR__ . '/..' . '/symfony/http-foundation/File/UploadedFile.php',
         'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
+        'Symfony\\Component\\HttpFoundation\\HeaderUtils' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderUtils.php',
         'Symfony\\Component\\HttpFoundation\\IpUtils' => __DIR__ . '/..' . '/symfony/http-foundation/IpUtils.php',
         'Symfony\\Component\\HttpFoundation\\JsonResponse' => __DIR__ . '/..' . '/symfony/http-foundation/JsonResponse.php',
         'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
@@ -4186,10 +4211,12 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpFoundation\\Session\\SessionInterface' => __DIR__ . '/..' . '/symfony/http-foundation/Session/SessionInterface.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\AbstractSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/AbstractSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MemcachedSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MemcachedSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MigratingSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MigratingSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\MongoDbSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/MongoDbSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NativeFileSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NativeFileSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\NullSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/NullSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\PdoSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/PdoSessionHandler.php',
+        'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\RedisSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/RedisSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\Handler\\StrictSessionHandler' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/Handler/StrictSessionHandler.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MetadataBag' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MetadataBag.php',
         'Symfony\\Component\\HttpFoundation\\Session\\Storage\\MockArraySessionStorage' => __DIR__ . '/..' . '/symfony/http-foundation/Session/Storage/MockArraySessionStorage.php',
@@ -4221,6 +4248,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/RequestValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\ServiceValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/ServiceValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\SessionValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/SessionValueResolver.php',
+        'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\TraceableValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/TraceableValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\VariadicValueResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentResolver/VariadicValueResolver.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ArgumentValueResolverInterface' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ArgumentValueResolverInterface.php',
         'Symfony\\Component\\HttpKernel\\Controller\\ContainerControllerResolver' => __DIR__ . '/..' . '/symfony/http-kernel/Controller/ContainerControllerResolver.php',
@@ -4335,6 +4363,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Process\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/process/Exception/InvalidArgumentException.php',
         'Symfony\\Component\\Process\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/process/Exception/LogicException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessFailedException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessFailedException.php',
+        'Symfony\\Component\\Process\\Exception\\ProcessSignaledException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessSignaledException.php',
         'Symfony\\Component\\Process\\Exception\\ProcessTimedOutException' => __DIR__ . '/..' . '/symfony/process/Exception/ProcessTimedOutException.php',
         'Symfony\\Component\\Process\\Exception\\RuntimeException' => __DIR__ . '/..' . '/symfony/process/Exception/RuntimeException.php',
         'Symfony\\Component\\Process\\ExecutableFinder' => __DIR__ . '/..' . '/symfony/process/ExecutableFinder.php',
@@ -4381,8 +4410,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\Routing\\Loader\\ProtectedPhpFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/PhpFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\XmlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/XmlFileLoader.php',
         'Symfony\\Component\\Routing\\Loader\\YamlFileLoader' => __DIR__ . '/..' . '/symfony/routing/Loader/YamlFileLoader.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperCollection' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperCollection.php',
-        'Symfony\\Component\\Routing\\Matcher\\Dumper\\DumperRoute' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/DumperRoute.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumper.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\MatcherDumperInterface' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/MatcherDumperInterface.php',
         'Symfony\\Component\\Routing\\Matcher\\Dumper\\PhpMatcherDumper' => __DIR__ . '/..' . '/symfony/routing/Matcher/Dumper/PhpMatcherDumper.php',
@@ -4481,6 +4508,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\VarDumper\\Caster\\EnumStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/EnumStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\ExceptionCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/ExceptionCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\FrameStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/FrameStub.php',
+        'Symfony\\Component\\VarDumper\\Caster\\GmpCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/GmpCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\LinkStub' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/LinkStub.php',
         'Symfony\\Component\\VarDumper\\Caster\\PdoCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PdoCaster.php',
         'Symfony\\Component\\VarDumper\\Caster\\PgSqlCaster' => __DIR__ . '/..' . '/symfony/var-dumper/Caster/PgSqlCaster.php',
@@ -4500,13 +4528,25 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Symfony\\Component\\VarDumper\\Cloner\\DumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/DumperInterface.php',
         'Symfony\\Component\\VarDumper\\Cloner\\Stub' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/Stub.php',
         'Symfony\\Component\\VarDumper\\Cloner\\VarCloner' => __DIR__ . '/..' . '/symfony/var-dumper/Cloner/VarCloner.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\CliDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/CliDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\DumpDescriptorInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/DumpDescriptorInterface.php',
+        'Symfony\\Component\\VarDumper\\Command\\Descriptor\\HtmlDescriptor' => __DIR__ . '/..' . '/symfony/var-dumper/Command/Descriptor/HtmlDescriptor.php',
+        'Symfony\\Component\\VarDumper\\Command\\ServerDumpCommand' => __DIR__ . '/..' . '/symfony/var-dumper/Command/ServerDumpCommand.php',
         'Symfony\\Component\\VarDumper\\Dumper\\AbstractDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/AbstractDumper.php',
         'Symfony\\Component\\VarDumper\\Dumper\\CliDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/CliDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\CliContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/CliContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\ContextProviderInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/ContextProviderInterface.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\RequestContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/RequestContextProvider.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ContextProvider\\SourceContextProvider' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ContextProvider/SourceContextProvider.php',
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
+        'Symfony\\Component\\VarDumper\\Dumper\\ServerDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/ServerDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
+        'Symfony\\Component\\VarDumper\\Server\\Connection' => __DIR__ . '/..' . '/symfony/var-dumper/Server/Connection.php',
+        'Symfony\\Component\\VarDumper\\Server\\DumpServer' => __DIR__ . '/..' . '/symfony/var-dumper/Server/DumpServer.php',
         'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
+        'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
         'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
@@ -4725,10 +4765,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0;
-            $loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$prefixesPsr0;
+            $loader->classMap = ComposerStaticInit50cdbea3724e5f1d6267359fe107641a::$classMap;
 
         }, null, ClassLoader::class);
     }

From 9432cdaaadcc020e83e90078c8c2dc558749bb2f Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Wed, 27 Jun 2018 18:28:58 +0800
Subject: [PATCH 39/43] updated upload invoice UI

---
 .../js/pages/admin/booking/completed.vue      | 165 +++++++
 .../js/pages/admin/booking/uploadInvoice.vue  | 404 ++++++++++++++++--
 resources/assets/js/router/routes.js          |   3 +-
 3 files changed, 539 insertions(+), 33 deletions(-)
 create mode 100644 resources/assets/js/pages/admin/booking/completed.vue

diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue
new file mode 100644
index 00000000..42585d3c
--- /dev/null
+++ b/resources/assets/js/pages/admin/booking/completed.vue
@@ -0,0 +1,165 @@
+<template>
+  <el-main>
+    <progress-track v-model="status"/>
+
+    <div align="center">
+      <h4 style="margin-top:5%;">Order Completed</h4>
+      <br>
+    </div>
+
+    <!-- upload card -->
+    <br>
+    <el-row :gutter="12" justify="center" align="center">
+      <el-col :span="8">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>Purchase Order</span>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+          </div>
+          <el-row :gutter="12" type="flex">
+            <el-col :span="12">
+              <a target=" _blank" href="https://placeholder.com">
+                <img width="100%" height="100%" src="http://via.placeholder.com/700x800">
+              </a>
+            </el-col>
+          </el-row>
+
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>Invoice</span>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+          </div>
+          <el-row :gutter="12" type="flex">
+            <el-col :span="12">
+              <a target=" _blank" href="https://placeholder.com">
+                <img width="100%" height="100%" src="http://via.placeholder.com/700x800">
+              </a>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>China Bank Slip</span>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+          </div>
+          <el-row :gutter="12" type="flex">
+            <el-col :span="12">
+              <a target=" _blank" href="https://placeholder.com">
+                <img width="100%" height="100%" src="http://via.placeholder.com/700x800">
+              </a>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+    <br>
+
+    <!-- order details -->
+    <el-row justify="center" align="center">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>Order Details</span>
+          <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+        </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" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="bookingConfirmTable2" :show-header="false" align="center">
+              <el-table-column prop="data1" align="right" width="200" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-row>
+    <br>
+
+    <el-row justify="center" align="center">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>Order Bankin Slip</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-col>
+        </el-row>
+      </el-card>
+    </el-row>
+  </el-main>
+</template>
+<style>
+    .booking-details {
+        font-weight: bold;
+    }
+</style>
+<script>
+import VueCountdown from '@dmaksimovic/vue-countdown'
+import ProgressTrack from '~/components/ProgressTrack'
+
+export default {
+  components: {
+    'progress-track': ProgressTrack
+  },
+  data () {
+    return {
+      status: 6,
+      bookingConfirmTable: [{
+        data1: 'Order Number :',
+        data2: '001'
+      }, {
+        data1: 'Date :',
+        data2: '25/5/2018'
+      }, {
+        data1: 'Customer Marking :',
+        data2: 'CIEF/150ECE'
+      }, {
+        data1: '',
+        data2: ''
+      }, {
+        data1: 'Payment Method :',
+        data2: 'Cash/Bank Transfer'
+      }, {
+        data1: '',
+        data2: ''
+      }],
+      bookingConfirmTable2: [{
+        data1: 'CNY/RMB :',
+        data2: 'CNY 120,500.00'
+      }, {
+        data1: '+ Service Charge :',
+        data2: 'CNY 20.00'
+      }, {
+        data1: '/ RATE :',
+        data2: '1.63'
+      }, {
+        data1: '',
+        data2: 'MYR 73,848.04'
+      }, {
+        data1: '+ GST 6% :',
+        data2: 'MYR 4,430.88'
+      }, {
+        data1: '',
+        data2: 'MYR 78,278.92'
+      }, {
+        data1: '',
+        data2: ''
+      }]
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
index 37196cb3..7a02b347 100644
--- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue
+++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
@@ -1,13 +1,20 @@
 <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>
+      <div v-if="po_status">
+        <h4>Upload Invoice</h4>
+      </div>
+      <div v-else>
+        <h4>Waiting for User to Upload Purchase Order </h4>
+        <br>
+        <el-button type="primary" @click="$router.go(-1)">Go Back</el-button>
+      </div>
       <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 +23,165 @@
           <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,23 +194,56 @@
               <el-table-column prop="data2" align="left" width="200" />
             </el-table>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-card>
     </el-row>
     <br>
 
-    <el-row justify="center" align="center">
-      <el-card class="box-card">
-        <div slot="header" class="clearfix">
-          <span>BankinSlip</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-col>
-        </el-row>
-      </el-card>
+    <el-row :gutter="12" justify="center" align="center">
+      <el-col :span="12">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>Upload Invoice</span>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+          </div>
+
+          <!-- upload image -->
+          <el-upload :action="'/api/booking/' + booking_id + '/upload-po'" :on-exceed="handleExceed" :on-preview="handlePreview"
+                     :on-remove="handleRemove"
+                     class="upload-demo"
+                     drag
+                     multiple>
+            <i class="el-icon-upload"/>
+            <div class="el-upload__text">Drop file here or
+              <em>click to upload</em>
+            </div>
+            <div slot="tip" class="el-upload__tip">jpg/png/pdf files with a size less than 3mb</div>
+          </el-upload>
+
+          <br>
+
+          <div class="bottom clearfix" style="text-align:right;">
+            <el-button :loading="loading" type="primary" @click="uploadPo">Submit</el-button>
+          </div>
+          <!-- upload image end -->
+
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>Customer Purchase Order</span>
+            <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+          </div>
+          <el-row :gutter="12" type="flex">
+            <el-col :span="12">
+              <a href="https://placeholder.com">
+                <img width="100%" height="100%" src="http://via.placeholder.com/700x800">
+              </a>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
     </el-row>
   </el-main>
 </template>
@@ -55,20 +253,162 @@
   }
 </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
-  },
-  data () {
-    return {
-      status: 4
+  export default {
+    components: {
+      'progress-track': ProgressTrack
+    },
+    data() {
+      return {
+        status: 6,
+        loading_btn: false,
+        po_status: null,
+        booking_id: this.$route.params.id,
+        booking_details: {
+          id: null,
+          amount: null,
+          bia: null,
+          user_bankslip_path: null,
+        },
+        supplier: null,
+        supplier_options: null,
+        chinaSlipForm: {
+          actual_transfer_amount: null,
+          date: null,
+          details: null,
+        },
+        rules: {
+          actual_transfer_amount: [{
+            required: true,
+            message: 'Please input amount',
+            trigger: 'change'
+          }],
+          date: [{
+            required: true,
+            message: 'Please input bank name',
+            trigger: 'change'
+          }],
+          details: [{
+            required: true,
+            message: 'Please input details',
+            trigger: 'change'
+          }]
+        },
+        pickerOptions1: {
+          disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+          shortcuts: [{
+            text: 'Today',
+            onClick(picker) {
+              picker.$emit('pick', new Date());
+            }
+          }, {
+            text: 'Yesterday',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit('pick', date);
+            }
+          }, {
+            text: 'A week ago',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', date);
+            }
+          }]
+        }
+      }
+    },
+    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'
+          })
+        })
+
+    },
+    methods: {
+      submitChinaSlip(formName) {
+        this.loading_btn = true
+
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let newChinaSlip = {
+              date: this.chinaSlipForm.date,
+              actual_transfer_amount: this.chinaSlipForm.actual_transfer_amount,
+              details: this.chinaSlipForm.details,
+            }
+
+            axios.patch('/api/booking/' + this.booking_id + '/update-china-bankslip', newChinaSlip)
+              .then((response) => {
+                this.$message({
+                  showClose: true,
+                  message: 'Your bankinslip has been submitted, please wait admin to approve.',
+                  type: 'success',
+                  duration: 5000
+                })
+
+                console.log(response)
+                this.$router.push({
+                  name: 'home'
+                })
+              })
+              .catch((error) => {
+                this.loading = false
+                this.$message({
+                  showClose: true,
+                  message: 'Please upload your bankin slip first.',
+                  type: 'warning',
+                  duration: 10000
+                })
+                console.log(error)
+                this.loading_btn = false
+              })
+
+          } else {
+            this.loading_btn = false
+          }
+        })
+
+
+      },
+      handleRemove(file, fileList) {
+        console.log(file, fileList);
+      },
+      handlePreview(file) {
+        console.log(file);
+      }
     }
-  },
-  methods: {
-
   }
-}
-</script>
+</script>
\ No newline at end of file
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index e6b8f8de..9af1c989 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -30,6 +30,7 @@ const Supplier = () => import('~/pages/admin/booking/supplierBooking').then(m =>
 const SupplierReport = () => import('~/pages/admin/booking/supplierReport').then(m => m.default || m)
 const UploadCNSlip = () => import('~/pages/admin/booking/uploadChinaBankslip').then(m => m.default || m)
 const UploadInvoice = () => import('~/pages/admin/booking/uploadInvoice').then(m => m.default || m)
+const adminCompleted = () => import('~/pages/admin/booking/completed').then(m => m.default || m)
 // const Completed = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m)
 
 const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
@@ -75,7 +76,7 @@ export default [
   { path: '/booking/:id/supplier-report', name: 'booking.admin.supplier.report', component: SupplierReport },
   { path: '/booking/:id/upload-cn-bankslip', name: 'booking.admin.cnslip', component: UploadCNSlip },
   { path: '/booking/:id/upload-invoice', name: 'booking.admin.invoice', component: UploadInvoice },
-  // { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
+  { path: '/booking/:id/admin/complete', name: 'booking.admin.complete', component: adminCompleted },
 
   { path: '/admin', name: 'admin.home', component: AdminHome },
   { path: '*', name: 'notfound', component: NotFound }

From 2b4ddadfcb3a115a175ebfecf931ad335f315d52 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 28 Jun 2018 10:06:26 +0800
Subject: [PATCH 40/43] rename book_id in po table to booking_id to perform ORM
 relantionship added relationship between booking and po updated settings
 shows for different role added function to display po for admin

---
 app/Booking.php                               |   4 +
 app/Http/Controllers/BookingController.php    |   7 ++
 app/PurchaseOrder.php                         |   5 +
 ..._rename_booking_foreignkey_in_po_table.php |  33 ++++++
 .../js/pages/admin/booking/uploadInvoice.vue  |   4 +-
 resources/assets/js/pages/settings/index.vue  | 100 ++++++++++--------
 routes/api.php                                |   3 +
 7 files changed, 110 insertions(+), 46 deletions(-)
 create mode 100644 database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php

diff --git a/app/Booking.php b/app/Booking.php
index a6be11c4..6daa1d89 100644
--- a/app/Booking.php
+++ b/app/Booking.php
@@ -43,5 +43,9 @@ class Booking extends Model
     public function userBankSlip(){
         return $this->hasOne(UserBankSlip::class);
     }
+
+    public function purchaseOrder(){
+        return $this->hasOne(PurchaseOrder::class);
+    }
 }
 
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 2a0daed0..396af86e 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -427,6 +427,13 @@ class BookingController extends Controller
         return response()->json(['message'=>'Success'],200);
     }
 
+    public function showPurchaseOrder($id){
+        $booking = Booking::where('id',$id)->first();
+        $user_po = $booking->purchaseOrder()->first();
+
+        return response()->json(['po_path'=> $user_po],200);
+    }
+
     public function delete(Booking $book_id)
     {
         $booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
diff --git a/app/PurchaseOrder.php b/app/PurchaseOrder.php
index 72345a6f..71227d02 100644
--- a/app/PurchaseOrder.php
+++ b/app/PurchaseOrder.php
@@ -7,4 +7,9 @@ use Illuminate\Database\Eloquent\Model;
 class PurchaseOrder extends Model
 {
     protected $fillable = ['image_url','amount','booking_id'];
+    
+    public function booking()
+    {
+        return $this->belongsTo(Booking::class);
+    }
 }
diff --git a/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php b/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
new file mode 100644
index 00000000..27f8b18a
--- /dev/null
+++ b/database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RenameBookingForeignkeyInPoTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('purchase_orders', function($table)
+        {
+            $table->dropForeign('book_id');
+            $table->integer('booking_id')->unsigned();
+            $table->foreign('booking_id')->references('id')->on('bookings');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
index 7a02b347..1c05fbc3 100644
--- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue
+++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue
@@ -345,7 +345,7 @@
         })
 
       axios
-        .get('/api/setting-supplier/')
+        .get('/api/booking/'+ this.$route.params.id +'/po')
         .then((response) => {
           loading.close()
           this.supplier_options = response.data
@@ -359,7 +359,7 @@
 
     },
     methods: {
-      submitChinaSlip(formName) {
+      uploadPo(formName) {
         this.loading_btn = true
 
         this.$refs[formName].validate((valid) => {
diff --git a/resources/assets/js/pages/settings/index.vue b/resources/assets/js/pages/settings/index.vue
index dcdac990..9dfd7811 100644
--- a/resources/assets/js/pages/settings/index.vue
+++ b/resources/assets/js/pages/settings/index.vue
@@ -4,9 +4,8 @@
       <card :title="$t('settings')" class="settings-card">
         <ul class="nav flex-column nav-pills">
           <li v-for="tab in tabs" :key="tab.route" class="nav-item">
-            <router-link :to="{ name: tab.route }" class="nav-link" active-class="active">
-              <fa :icon="tab.icon" fixed-width/>
-              {{ tab.name }}
+            <router-link v-if="(role == tab.role)" :to="{ name: tab.route }" class="nav-link" active-class="active">
+              <fa :icon="tab.icon" fixed-width/> {{ tab.name }}
             </router-link>
           </li>
         </ul>
@@ -22,50 +21,63 @@
 </template>
 
 <script>
-export default {
-  middleware: 'auth',
+  import {
+    mapGetters
+  } from 'vuex'
+  export default {
+    middleware: 'auth',
 
-  computed: {
-    tabs () {
-      return [
-        {
-          icon: 'user',
-          name: this.$t('profile'),
-          route: 'settings.profile'
-        },
-        {
-          icon: 'lock',
-          name: this.$t('password'),
-          route: 'settings.password'
-        },
-        {
-          icon: 'user',
-          name: this.$t('Supplier'),
-          route: 'settings.admin-supplier'
-        },
-        {
-          icon: 'cog',
-          name: this.$t('Credit Setting'),
-          route: 'settings.admin-credit-setting'
-        },
-        {
-          icon: 'flag',
-          name: this.$t('CIEF China Bank'),
-          route: 'settings.admin-china-bank'
-        },
-        {
-          icon: 'building',
-          name: this.$t('Bank Setting'),
-          route: 'settings.admin-bank-setting'
-        },
-      ]
+    computed: {
+      role() {
+        return this.$store.getters['auth/role']
+      },
+      tabs() {
+        return [{
+            icon: 'user',
+            name: this.$t('profile'),
+            route: 'settings.profile',
+            role: 'member'
+          },
+          {
+            icon: 'lock',
+            name: this.$t('password'),
+            route: 'settings.password',
+            role: 'member'
+          },
+          {
+            icon: 'user',
+            name: this.$t('Supplier'),
+            route: 'settings.admin-supplier',
+            role: 'admin'
+          },
+          {
+            icon: 'cog',
+            name: this.$t('Credit Setting'),
+            route: 'settings.admin-credit-setting',
+            role: 'admin'
+          },
+          {
+            icon: 'flag',
+            name: this.$t('CIEF China Bank'),
+            route: 'settings.admin-china-bank',
+            role: 'admin'
+          },
+          {
+            icon: 'building',
+            name: this.$t('Bank Setting'),
+            route: 'settings.admin-bank-setting',
+            role: 'admin'
+          },
+        ]
+      }
     }
+
+
   }
-}
 </script>
 
 <style>
-.settings-card .card-body {
-  padding: 0;
-}
-</style>
+  .settings-card .card-body {
+    padding: 0;
+  }
+</style>
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 1b2ca525..fe413583 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -103,6 +103,9 @@ Route::group(['middleware' => ['role:admin']], function() {
 
 	Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store');
 	Route::patch('/booking/{id}/update-china-bankslip','ChinaBankSlipController@update');
+
+	Route::get('/booking/{id}/po', 'BookingController@showPurchaseOrder');
+	
 });
 
 

From 7996450ab15f592da0958fbbc3c059278488ed5f Mon Sep 17 00:00:00 2001
From: Mohd Arief <ariefsohaimi@gmail.com>
Date: Thu, 28 Jun 2018 10:31:49 +0800
Subject: [PATCH 41/43] change rate to data variable

---
 .../assets/js/components/LocaleDropdown.vue   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 01ab524f..a10a05fb 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -1,7 +1,7 @@
 <template>
 <div>
   <ul class="nav navbar-nav">
-    <!-- <li class="nav-item dropdown">
+    <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" href="#" role="button"
         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         {{ locales[locale] }}
@@ -18,8 +18,8 @@
       <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
           <div align="center">
             <p>Today's Rate</p>
-            <p>X1 : Cash: 1.76 Cheque: 1.66 BA: 1.63</p>
-            <p>X2 : Cash: 1.65 Cheque: 1.70 BA: 1.58</p>
+            <p>X1 : Cash: {{x1_cash}} Cheque: {{x1_cheque}} BA: {{x1_ba}}</p>
+            <p>X2 : Cash: {{x2_cash}} Cheque: {{x2_cheque}} BA: {{x2_ba}}</p>
           </div>
           <div style="text-align: center; margin: 0">
             <el-button type="primary" size="mini" @click="UpdateRatePopoverVisible = false; UpdateRateDialogVisible = true">Update rate</el-button>
@@ -30,11 +30,10 @@
       <li class="nav-item"><router-link :to="{ name: 'admin.complete-order' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
       <li class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
       <li class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
-    </li> -->
-    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
+    <!-- <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Complete Order</a></li>
     <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Transaction History</a></li>
-    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
+    <li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li> -->
   </ul>
 
 <!-- update rate dialog -->
@@ -79,7 +78,13 @@ export default {
     return {
         UpdateRatePopoverVisible: false,
         UpdateRateDialogVisible: false,
-        DoneUpdateRateDialogVisible: false
+        DoneUpdateRateDialogVisible: false,
+        x1_cash: '1.56',
+        x1_cheque: '1.63',
+        x1_ba: '1.66',
+        x2_cash: '1.61',
+        x2_cheque: '1.70',
+        x2_ba: '1.72',
       };
   },
   computed: mapGetters({

From 1d740a08ea84ba2d2f48ebdddc29575a27bc192b Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 28 Jun 2018 10:33:00 +0800
Subject: [PATCH 42/43] added waiting invoice and po frontend

---
 app/Http/Controllers/BookingController.php            | 2 +-
 resources/assets/js/components/AdminProgressTrack.vue | 1 +
 resources/assets/js/components/ProgressTrack.vue      | 1 +
 resources/assets/js/pages/home.vue                    | 2 +-
 resources/assets/js/router/routes.js                  | 3 +++
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 396af86e..0aa06493 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -422,7 +422,7 @@ class BookingController extends Controller
     
     public function confirmPurchaseOrder($id){
         $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
-        $booking->status = 5; 
+        $booking->status = 6; 
         $booking->save();
         return response()->json(['message'=>'Success'],200);
     }
diff --git a/resources/assets/js/components/AdminProgressTrack.vue b/resources/assets/js/components/AdminProgressTrack.vue
index dfae9647..3cff63df 100644
--- a/resources/assets/js/components/AdminProgressTrack.vue
+++ b/resources/assets/js/components/AdminProgressTrack.vue
@@ -6,6 +6,7 @@
       <el-step title="Supplier Booking"/>
       <el-step title="Supplier Report"/>
       <el-step title="Upload China Bankslip To Booking"/>
+      <el-step title="Waiting Purchase Order"/>
       <el-step title="Invoice"/>
       <el-step title="Completed"/>
     </el-steps>
diff --git a/resources/assets/js/components/ProgressTrack.vue b/resources/assets/js/components/ProgressTrack.vue
index 00c85c5d..0161e8b0 100644
--- a/resources/assets/js/components/ProgressTrack.vue
+++ b/resources/assets/js/components/ProgressTrack.vue
@@ -6,6 +6,7 @@
       <el-step title="Order Confirmation"/>
       <el-step title="Processing Transfer"/>
       <el-step title="Transfer Complete"/>
+      <el-step title="Processing Invoice"/>
       <el-step title="Order Complete"/>
     </el-steps>
   </el-row>
diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue
index 26528fe4..a0b23006 100644
--- a/resources/assets/js/pages/home.vue
+++ b/resources/assets/js/pages/home.vue
@@ -57,7 +57,7 @@
         <div class="grid-content bg-purple" align="left">X1 :</div>
       </el-col>
       <el-col>
-        <div class="grid-content bg-purple" align="center">1.56</div>
+        <div class="grid-content bg-purple" align="center">1.70</div>
       </el-col>
       <el-col>
         <div class="grid-content bg-purple" align="center">1.64</div>
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 9af1c989..b7089932 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -23,6 +23,7 @@ const Transfer = () => import('~/pages/booking/transfer').then(m => m.default ||
 const UploadPo = () => import('~/pages/booking/uploadPo').then(m => m.default || m)
 const PoComplete = () => import('~/pages/booking/poComplete').then(m => m.default || m)
 const Completed = () => import('~/pages/booking/completed').then(m => m.default || m)
+const PurchaseOrder = () => import('~/pages/booking/po').then(m => m.default || m)
 
 // Admin booking
 const Verification = () => import('~/pages/admin/booking/verification').then(m => m.default || m)
@@ -61,8 +62,10 @@ export default [
   { path: '/booking/:id/transfer', name: 'booking.user.transfer', component: Transfer },
   { path: '/booking/:id/upload-po', name: 'booking.user.uploadpo', component: UploadPo },
   { path: '/booking/:id/po-complete', name: 'booking.user.pocomplete', component: PoComplete },
+  { path: '/booking/:id/po', name: 'booking.complete', component: PurchaseOrder },
   { path: '/booking/:id/complete', name: 'booking.complete', component: Completed },
 
+
   // { path: '/admin',
   //   component: Admin,
   //   children: [

From 0e212f2751a241be0f0aa2228ac54264d46150d6 Mon Sep 17 00:00:00 2001
From: Jack Goh <jackgoh0@gmail.com>
Date: Thu, 28 Jun 2018 10:33:21 +0800
Subject: [PATCH 43/43] added waiting po page

---
 resources/assets/js/pages/booking/po.vue | 115 +++++++++++++++++++++++
 1 file changed, 115 insertions(+)
 create mode 100644 resources/assets/js/pages/booking/po.vue

diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue
new file mode 100644
index 00000000..fe69da23
--- /dev/null
+++ b/resources/assets/js/pages/booking/po.vue
@@ -0,0 +1,115 @@
+<template>
+  <el-main>
+    <progress-track v-model="status"/>
+
+    <div align="center">
+      <h4 style="margin-top:5%;">Processing Invoice</h4>
+      <br>
+      <br>
+      <el-button type="primary" @click="$router.go(-1)">Go Back</el-button>
+    </div>
+    <br>
+    <el-row justify="center" align="center">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>Order Details</span>
+          <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
+        </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" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+          <el-col :span="12">
+            <el-table :data="bookingConfirmTable2" :show-header="false" align="center">
+              <el-table-column prop="data1" align="right" width="200" />
+              <el-table-column prop="data2" align="left" width="200" />
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-card>
+    </el-row>
+    <br>
+
+    <el-row justify="center" align="center">
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>BankinSlip</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-col>
+        </el-row>
+      </el-card>
+    </el-row>
+  </el-main>
+</template>
+<style>
+  .booking-details {
+    font-weight: bold;
+  }
+</style>
+<script>
+import VueCountdown from '@dmaksimovic/vue-countdown'
+import ProgressTrack from '~/components/ProgressTrack'
+
+export default {
+  components: {
+    'progress-track': ProgressTrack
+  },
+  data () {
+    return {
+      status: 4,
+      bookingConfirmTable: [{
+        data1: 'Order Number :',
+        data2: '001'
+      }, {
+        data1: 'Date :',
+        data2: '25/5/2018'
+      }, {
+        data1: 'Customer Marking :',
+        data2: 'CIEF/150ECE'
+      }, {
+        data1: '',
+        data2: ''
+      }, {
+        data1: 'Payment Method :',
+        data2: 'Cash/Bank Transfer'
+      }, {
+        data1: '',
+        data2: ''
+      }],
+      bookingConfirmTable2: [{
+        data1: 'CNY/RMB :',
+        data2: 'CNY 120,500.00'
+      }, {
+        data1: '+ Service Charge :',
+        data2: 'CNY 20.00'
+      }, {
+        data1: '/ RATE :',
+        data2: '1.63'
+      }, {
+        data1: '',
+        data2: 'MYR 73,848.04'
+      }, {
+        data1: '+ GST 6% :',
+        data2: 'MYR 4,430.88'
+      }, {
+        data1: '',
+        data2: 'MYR 78,278.92'
+      }, {
+        data1: '',
+        data2: ''
+      }
+      ]
+    }
+  },
+  methods: {
+
+  }
+}
+</script>