Added navigation notice in user home page

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug

# Conflicts:
#	resources/assets/js/pages/home.vue

.dockerignore

@@ -1,2 +1,9 @@
 vendor
 node_modules
+
+.git
+.idea
+.env
+storage/framework/cache/**
+storage/framework/sessions/**
+storage/framework/views/**

.env-example

@@ -0,0 +1,80 @@
+APP_NAME=IZYIM
+APP_ENV=local
+APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=default
+DB_USERNAME=default
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+APP_NAME=exchange
+APP_ENV=local
+APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
+APP_DEBUG=true
+APP_URL=http://localhost
+
+LOG_CHANNEL=stack
+
+DB_CONNECTION=mysql
+DB_HOST=mysql
+DB_PORT=3306
+DB_DATABASE=default
+DB_USERNAME=default
+DB_PASSWORD=secret
+
+BROADCAST_DRIVER=log
+CACHE_DRIVER=file
+SESSION_DRIVER=file
+SESSION_LIFETIME=120
+QUEUE_DRIVER=sync
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+MAIL_DRIVER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+
+PUSHER_APP_ID=
+PUSHER_APP_KEY=
+PUSHER_APP_SECRET=
+PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+JWT_SECRET=FwYZ3SPFgjpEDqAwcaSIV6eEmQiMtGWt

.gitignore

@@ -3,6 +3,7 @@
 /public/storage
 /public/js
 /public/css
+public/mix-manifest.json
 /storage/*.key
 /vendor/**
 /.idea
@@ -15,4 +16,7 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 .env
-
+.env.prod
+vendor/composer/autoload_static.php
+vendor/composer/autoload_classmap.php
+package-lock.json

5.0.0-alpha.2

@@ -1,2 +0,0 @@
-+ eslint@4.19.1
-added 67 packages and updated 1 package in 41.428s

Dockerfile

@@ -4,10 +4,14 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
 RUN docker-php-ext-install pdo pdo_mysql zip gd
 WORKDIR /app
-COPY . /app
+ADD . /app
+RUN chown -R www-data:www-data /app
+RUN chmod 755 /app/storage
+
 RUN composer install
+RUN php artisan clear-compiled
 
 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 storage:link && php artisan migrate && php artisan db:seed && php artisan serve --host=0.0.0.0 --port=8000
+CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan storage:link && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000
 EXPOSE 8000

Procfile

@@ -0,0 +1 @@
+web: vendor/bin/heroku-php-apache2 public/ && npm run production

app/Booking.php

@@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model;
 class Booking extends Model
 {
     // protected $guarded = [];
-    protected $hidden = array('user_id',  
+    protected $hidden = array(  "user",
+                                "user_id",
                                 "rate_id",
                                 "rmb_book_amount",
                                 "rmb_book_pay_method",
@@ -29,7 +30,7 @@ class Booking extends Model
     public $timestamps = true;
     
     public function user(){
-        return $this->belongsTo('app\User');
+        return $this->belongsTo(User::class);
     }
 
     public function supplierBooking(){

app/Http/Controllers/Auth/RegisterController.php

@@ -46,7 +46,8 @@ class RegisterController extends Controller
     protected function validator(array $data)
     {
         return Validator::make($data, [
-            'name' => 'required|max:255',
+            'name' => 'required|name|max:255',
+            'marking' => 'required|max:255|unique:markings',
             'email' => 'required|email|max:255|unique:users',
             'password' => 'required|min:6|confirmed',
         ]);
@@ -61,21 +62,27 @@ class RegisterController extends Controller
     protected function create(Request $data)
     {
         $marking = Marking::Where('email',$data['email'])->first();
+
         if(!$marking){
-            return response()->json('Access Denied', 401);
+            return response()->json(["message"=>"Marking does not exist, please contact sales team to get one"], 400);
         }
         if($marking->marking != $data['marking']){
-            return response()->json('Wrong Marking', 400);   
+            return response()->json(["message"=>"Incorrect marking"], 400);   
         }
         
+        if(User::Where('email',$data['email'])->first()){
+            return response()->json(["message"=>"Email already exist in the system"], 400);      
+        }
+
         $role = Role::where('name','=','member')->first();
         $user = new User();
         $user->name = $data['name'];
         $user->email = $data['email'];
+        $user->marking = $marking->marking;
         $user->password = bcrypt($data['password']);
+
         $user->save();
         $user->attachRole($role);
-
         return response()->json($user, 201);   
     }
 }

app/Http/Controllers/BookingController.php

@@ -20,12 +20,11 @@ class BookingController extends Controller
 
     public function index(){
 		$user = Auth::user();
-        $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+        $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status')
                                     ->where('user_id', $user->id)
                                     ->orderby('updated_at','desc')
                                     ->paginate(10);
 
-
         // reformat to fit frontend structure 
         foreach ($bookings as $booking) {
             // set timeout 
@@ -42,7 +41,7 @@ class BookingController extends Controller
 
             // TODO : transfer_amount change name to bia 
             $booking->transfer_amount = $booking->bia; 
- 
+            
             $booking->track_status = "(". $booking->status ."/7)";
             switch ($booking->status) {
                 case 1:
@@ -69,15 +68,15 @@ class BookingController extends Controller
                 default:
                     $status_desc = "";
             }
-            $booking->status_desc = $status_desc; 
+            $booking->marking = $booking->user->marking;
         }
-
+       
         return $bookings;
 	}
 	
 	public function adminIndex(){
 		$user = Auth::user(); 
-		$bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
+		$bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status')
         ->orderby('updated_at','desc')
         ->get();
 
@@ -98,7 +97,15 @@ class BookingController extends Controller
 				// TODO : transfer_amount change name to bia 
 				$booking->transfer_amount = $booking->bia; 
 		
-				$booking->track_status = "(". $booking->admin_status ."/7)";
+                $term = $booking->term;
+                if($term == "x1_ba" || $term == "x2_cheque"){
+                    $status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status;
+                    $booking->track_status = "(". $status ."/5)";
+                }
+                else{
+				    $booking->track_status = "(". $booking->admin_status ."/7)";
+                }
+
 				switch ($booking->admin_status) {
 					case 1:
 						$status_desc = "Waiting customer upload bank slip"; 
@@ -107,11 +114,15 @@ class BookingController extends Controller
 						$status_desc = "Verify user bank slip";  
 						break;    
 					case 3:
-						$status_desc = "Generate supplier booking report";    
-						break;  
+                        if($term !== "x1_ba" || $term !== "x2_cheque"){
+                            $status_desc = "Generate supplier booking report";    
+                            break;  
+                        }
 					case 4:
-						$status_desc = "Supplier booking report. Please confirm with your booking."; 
-						break;
+                        if($term !== "x1_ba" || $term !== "x2_cheque"){
+    						$status_desc = "Supplier booking report. Please confirm with your booking."; 
+    						break;
+                        }
 					case 5:
 						$status_desc = "Please, upload China Bankslip"; 
 						break;
@@ -126,7 +137,8 @@ class BookingController extends Controller
 						break;
 					default:
 						$status_desc = "";
-				}
+                }
+                $booking->marking = $booking->user->marking;
 				$booking->status_desc = $status_desc; 
 			}
 			return $bookings;
@@ -169,6 +181,7 @@ class BookingController extends Controller
             $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
             $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
             $booking->timeout = $difference_in_seconds; 
+            $booking->marking = $booking->user->marking;
 
             if (!$booking){
                 return response()->json(['success'=>false, 'message'=>'not found'], 404);
@@ -214,6 +227,7 @@ class BookingController extends Controller
             $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit;
             $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U'));
             $booking->timeout = $difference_in_seconds; 
+            $booking->marking = $booking->user->marking;
 
             if (!$booking){
                 return response()->json(['success'=>false, 'message'=>'not found'], 404);
@@ -350,7 +364,7 @@ class BookingController extends Controller
  
         return response()->json(['book_id'=>$book_id],200);
     }
-    //upload
+
     public function uploadbankslip(Request $request, $id)
     {
         $booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
@@ -410,8 +424,7 @@ class BookingController extends Controller
         } 
         else {
             return response()->json(['message' => 'No file detected'], 400);
-        }
-      
+        } 
     }
 
     public function updateBankSlipAmount(Request $request, $id){
@@ -487,7 +500,6 @@ class BookingController extends Controller
 
         return response()->json(['message'=>'Success'],200);
     }
-    
 
     public function showPurchaseOrder($id){
         $booking = Booking::where('id',$id)->first();
@@ -526,6 +538,7 @@ class BookingController extends Controller
         $term = $request->input('term');
         $china_beneficiary = $request->input('china_beneficiary');
         $rates = Rate::orderby('updated_at','desc')->first();
+        $marking = $user = Auth::user()->marking;
 
         $creditLimit = SettingCredit::orderby('updated_at','desc')->first();
 
@@ -536,9 +549,7 @@ class BookingController extends Controller
         if($amount > $creditLimit->rmb_credit_limit){
             return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400);
         }
- 
-        // TODO : get marking 
-        $marking = "123X";
+
  
         switch ($term) {
          case "x1_cash":
@@ -620,7 +631,10 @@ class BookingController extends Controller
 
         // update booking status 
 		$booking->status = 4;
-		$booking->admin_status = 3; 
+        if($booking->term !== "x1_ba" || $booking->term !== "x2_cheque")
+    		$booking->admin_status = 3;
+        else
+            $booking->admin_status = 5;
         $booking->save();
         
         return response()->json(['message'=>'Success'],200);
@@ -656,7 +670,7 @@ class BookingController extends Controller
 
         return response()->json(['message'=>'Success'],200);
     }
-    //upload
+    
     public function uploadInvoice(Request $request, $id)
     {
         $booking = Booking::where('id',$id)->first();
@@ -754,4 +768,23 @@ class BookingController extends Controller
         }
     }
 
+    public function adminShowCompletedOrders()
+    {
+        $bookings = Booking::select('id','created_at','user_id','rate','amount', 'bia', 'admin_status')
+               ->where('admin_status', 7)
+               ->orderBy('id', 'desc')
+               ->get();
+               
+        foreach ($bookings as $booking) {
+            $booking->id;
+            $booking->created_at;
+            $booking->marking = $booking->user->marking;
+            $booking->rate;
+            $booking->amount;
+            $booking->bia;
+            $booking->admin_status = "(". $booking->admin_status ."/7)";;
+        }
+        return $bookings;
+    }
+
 }

app/Http/Controllers/BookingSupplierController.php

@@ -47,7 +47,6 @@ 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");

app/Http/Controllers/SettingActiveBankController.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\SettingActiveBank;
+
+class SettingActiveBankController extends Controller
+{
+    public function index()
+    {
+        $active_bank_setting = SettingActiveBank::latest()->first();
+        return response()->json($active_bank_setting, 201);
+    }
+
+    public function update(Request $request)
+    {
+        if($active_bank_setting = SettingActiveBank::latest()->first())
+            $active_bank_setting->update($request->all());
+        else
+            $active_bank_setting = SettingActiveBank::create($request->all());
+
+        return response()->json($active_bank_setting, 200);
+    }
+}

app/Http/Controllers/SettingCreditController.php

@@ -9,7 +9,8 @@ class SettingCreditController extends Controller
 {
     public function index()
     {
-        return SettingCredit::all();
+        $credit_setting = SettingCredit::latest()->first();
+        return response()->json($credit_setting, 201);
     }
 
     public function show(SettingCredit $credit)
@@ -24,11 +25,12 @@ class SettingCreditController extends Controller
         return response()->json($credit, 201);
     }
 
-    public function update(Request $request, SettingCredit $credit)
+    public function update(Request $request)
     {
-        $credit->update($request->all());
+        $credit_setting = SettingCredit::latest()->first();
+        $credit_setting->update($request->all());
 
-        return response()->json($credit, 200);
+        return response()->json($credit_setting, 200);
     }
 
     public function delete(SettingCredit $credit)

app/Http/Controllers/SettingMalaysiaBankController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\SettingMalaysiaBank;
+
+class SettingMalaysiaBankController extends Controller
+{
+    public function index()
+    {
+        return SettingMalaysiaBank::all();
+    }
+
+    public function show(SettingMalaysiaBank $malaysiaBank)
+    {
+        return $malaysiaBank;
+    }
+
+    public function store(Request $request)
+    {
+        $malaysiaBank = SettingMalaysiaBank::create($request->all());
+
+        return response()->json($malaysiaBank, 201);
+    }
+
+    public function update(Request $request, SettingMalaysiaBank $malaysiaBank)
+    {
+        $malaysiaBank->update($request->all());
+
+        return response()->json($malaysiaBank, 200);
+    }
+
+    public function delete(SettingMalaysiaBank $malaysiaBank)
+    {
+        $malaysiaBank->delete();
+
+        return response()->json(null, 204);
+    }
+}

app/Http/Kernel.php

@@ -39,7 +39,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:60,1',
+            // 'throttle:60,1',
             'bindings',
         ],
     ];

app/SettingActiveBank.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingActiveBank extends Model
+{
+    protected $fillable = ['x1_bank_id','x2_bank_id','beneficiary_id'];
+}

app/SettingMalaysiaBank.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingMalaysiaBank extends Model
+{
+  	protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch'];
+}

app/User.php

@@ -29,7 +29,7 @@ class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $hidden = [
-        'password', 'remember_token',
+        'password', 'remember_token'
     ];
 
     /**
@@ -98,7 +98,7 @@ class User extends Authenticatable implements JWTSubject
         return [];
     }
 
-    public function booking(){
+    public function bookings(){
         return $this->hasMany(Booking::class);
     }
 

build/deploy.sh

@@ -0,0 +1,35 @@
+# Save latest Git commit message
+MESSAGE=$(git log -1 --pretty=%B)
+
+# Add it as a secret variable on CI environment
+git remote set-url origin $REMOTE_REPOSITORY
+git config user.email $DEPLOY_GIT_EMAIL
+git config user.name $DEPLOY_GIT_USERNAME
+
+if git ls-remote $REMOTE_REPOSITORY | grep -sw "deploy" 2>&1>/dev/null; then
+    git checkout . && git checkout deploy;
+else
+    git checkout --orphan deploy;
+fi
+
+# Remove all files except .git, node_modules and vendor folder
+find . -path ./.git -prune -o \( \! -path ./dist \) -prune -o \( \! -path ./vendor \) -exec rm -rf {} \; 2> /dev/null
+# Add master branch files
+git archive master | tar x -C .
+
+# Generate i18n string for the front-end
+composer install -n --prefer-dist
+php artisan vue-i18n:generate
+
+# Compile front-end stuff
+yarn --pure-lockfile
+yarn production
+
+# Those files are ignored on master branch, force add it
+git add -f public/css
+git add -f public/js
+
+# Push to the deploy branch
+git add .
+git commit -am "[${CI_COMMIT_SHA:0:8}]: $MESSAGE"
+git push -u origin deploy

caddy/Caddyfile

@@ -0,0 +1,28 @@
+# Docs: https://caddyserver.com/docs/caddyfile
+https://exchange-staging.izyim.com {
+    root /var/www/public
+    fastcgi / 127.0.0.1:9000 php {
+        index index.php
+    }
+
+    # To handle .html extensions with laravel change ext to
+    # ext / .html
+
+    rewrite {
+        to {path} {path}/ /index.php?{query}
+    }
+    gzip
+    browse
+    log stdout
+    errors stdout
+    on startup php-fpm --nodaemonize
+    # Uncomment to enable TLS (HTTPS)
+    # Change the first list to listen on port 443 when enabling TLS
+    tls admin@izyim.com
+
+    # To use Lets encrpt tls with a DNS provider uncomment these
+    # lines and change the provider as required
+    #tls {
+    #  dns cloudflare
+    #}
+}

caddy/Dockerfile

@@ -0,0 +1,17 @@
+FROM php:7.1-fpm
+LABEL maintainer="Paul Redmond <paul@bitpress.io>"
+
+# Install application dependencies
+RUN curl --silent --show-error --fail --location \
+      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
+      "https://caddyserver.com/download/linux/amd64?plugins=http.expires,http.realip&license=personal" \
+    | tar --no-same-owner -C /usr/bin/ -xz caddy \
+    && chmod 0755 /usr/bin/caddy \
+    && /usr/bin/caddy -version \
+    && docker-php-ext-install mbstring pdo pdo_mysql
+
+COPY Caddyfile /etc/Caddyfile
+
+WORKDIR /var/www/public
+
+CMD ["/usr/bin/caddy", "--conf", "/etc/Caddyfile", "--log", "stdout"]

composer.json

@@ -1,7 +1,7 @@
 {
-    "name": "cretueusebiu/laravel-vue-spa",
-    "description": "A Laravel-Vue SPA starter project template.",
-    "keywords": ["spa", "laravel", "vue"],
+    "name": "IZYIM Exchange",
+    "description": "A currency exchange system.",
+    "keywords": ["exchange", "izyim", "vue"],
     "license": "MIT",
     "type": "project",
     "require": {

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3f411d272d823b9e69fdedb77a2abf73",
+    "content-hash": "61c96f9a80f168154bc8f5383f0a85c1",
     "packages": [
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -39,74 +39,6 @@
             "description": "implementation of xdg base directory specification for php",
             "time": "2014-10-24T07:27:01+00:00"
         },
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "time": "2017-12-06T07:11:42+00:00"
-        },
         {
             "name": "doctrine/cache",
             "version": "v1.7.1",
@@ -181,170 +113,33 @@
             ],
             "time": "2017-08-25T07:02:50+00:00"
         },
-        {
-            "name": "doctrine/collections",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/collections.git",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "~0.1@dev",
-                "phpunit/phpunit": "^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Collections\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Collections Abstraction library",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "array",
-                "collections",
-                "iterator"
-            ],
-            "time": "2017-07-22T10:37:32+00:00"
-        },
-        {
-            "name": "doctrine/common",
-            "version": "v2.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/common.git",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "1.*",
-                "doctrine/cache": "1.*",
-                "doctrine/collections": "1.*",
-                "doctrine/inflector": "1.*",
-                "doctrine/lexer": "1.*",
-                "php": "~7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\": "lib/Doctrine/Common"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common Library for Doctrine projects",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "collections",
-                "eventmanager",
-                "persistence",
-                "spl"
-            ],
-            "time": "2017-08-31T08:43:38+00:00"
-        },
         {
             "name": "doctrine/dbal",
-            "version": "v2.7.1",
+            "version": "v2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5"
+                "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/5140a64c08b4b607b9bedaae0cedd26f04a0e621",
+                "reference": "5140a64c08b4b607b9bedaae0cedd26f04a0e621",
                 "shasum": ""
             },
             "require": {
-                "doctrine/common": "^2.7.1",
+                "doctrine/cache": "^1.0",
+                "doctrine/event-manager": "^1.0",
                 "ext-pdo": "*",
                 "php": "^7.1"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^4.0",
-                "phpunit/phpunit": "^7.0",
+                "jetbrains/phpstorm-stubs": "^2018.1.2",
+                "phpstan/phpstan": "^0.10.1",
+                "phpunit/phpunit": "^7.1.2",
                 "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
-                "symfony/console": "^2.0.5||^3.0",
+                "symfony/console": "^2.0.5|^3.0|^4.0",
                 "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
             },
             "suggest": {
@@ -356,7 +151,8 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7.x-dev"
+                    "dev-master": "2.8.x-dev",
+                    "dev-develop": "3.0.x-dev"
                 }
             },
             "autoload": {
@@ -394,7 +190,81 @@
                 "persistence",
                 "queryobject"
             ],
-            "time": "2018-04-07T18:44:18+00:00"
+            "time": "2018-07-13T03:16:35+00:00"
+        },
+        {
+            "name": "doctrine/event-manager",
+            "version": "v1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/event-manager.git",
+                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+                "reference": "a520bc093a0170feeb6b14e9d83f3a14452e64b3",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "conflict": {
+                "doctrine/common": "<2.9@dev"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^4.0",
+                "phpunit/phpunit": "^7.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\": "lib/Doctrine/Common"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                },
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com"
+                }
+            ],
+            "description": "Doctrine Event Manager component",
+            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
+            "keywords": [
+                "event",
+                "eventdispatcher",
+                "eventmanager"
+            ],
+            "time": "2018-06-11T11:59:03+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -1063,16 +933,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v5.6.26",
+            "version": "v5.6.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "7047df295e77cecb6a2f84736a732af66cc6789c"
+                "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/7047df295e77cecb6a2f84736a732af66cc6789c",
-                "reference": "7047df295e77cecb6a2f84736a732af66cc6789c",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
+                "reference": "40ba2ee0e61cb4bc3c9f1dab04908e6acf06b86f",
                 "shasum": ""
             },
             "require": {
@@ -1198,7 +1068,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2018-06-20T14:21:11+00:00"
+            "time": "2018-07-17T14:15:36+00:00"
         },
         {
             "name": "laravel/socialite",
@@ -1441,7 +1311,7 @@
                 {
                     "name": "Luís Otávio Cobucci Oblonczyk",
                     "email": "lcobucci@gmail.com",
-                    "role": "Developer"
+                    "role": "developer"
                 }
             ],
             "description": "A simple library to work with JSON Web Token and JSON Web Signature",
@@ -1794,16 +1664,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.0.2",
+            "version": "v4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12"
+                "reference": "bd088dc940a418f09cda079a9b5c7c478890fb8d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/35b8caf75e791ba1b2d24fec1552168d72692b12",
-                "reference": "35b8caf75e791ba1b2d24fec1552168d72692b12",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bd088dc940a418f09cda079a9b5c7c478890fb8d",
+                "reference": "bd088dc940a418f09cda079a9b5c7c478890fb8d",
                 "shasum": ""
             },
             "require": {
@@ -1841,20 +1711,20 @@
                 "parser",
                 "php"
             ],
-            "time": "2018-06-03T11:33:10+00:00"
+            "time": "2018-07-15T17:25:16+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.15",
+            "version": "v2.0.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09"
+                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/10bcb46e8f3d365170f6de9d05245aa066b81f09",
-                "reference": "10bcb46e8f3d365170f6de9d05245aa066b81f09",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d",
+                "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d",
                 "shasum": ""
             },
             "require": {
@@ -1890,7 +1760,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2018-06-08T15:26:40+00:00"
+            "time": "2018-07-04T16:31:37+00:00"
         },
         {
             "name": "psr/container",
@@ -2240,16 +2110,16 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v6.0.2",
+            "version": "v6.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc"
+                "reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/412333372fb6c8ffb65496a2bbd7321af75733fc",
-                "reference": "412333372fb6c8ffb65496a2bbd7321af75733fc",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/7d760881d266d63c5e7a1155cbcf2ac656a31ca8",
+                "reference": "7d760881d266d63c5e7a1155cbcf2ac656a31ca8",
                 "shasum": ""
             },
             "require": {
@@ -2260,10 +2130,14 @@
                 "mockery/mockery": "~0.9.1",
                 "symfony/phpunit-bridge": "~3.3@dev"
             },
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses",
+                "true/punycode": "Needed to support internationalized email addresses, if ext-intl is not installed"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "6.0-dev"
+                    "dev-master": "6.1-dev"
                 }
             },
             "autoload": {
@@ -2285,13 +2159,13 @@
                 }
             ],
             "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "http://swiftmailer.symfony.com",
+            "homepage": "https://swiftmailer.symfony.com",
             "keywords": [
                 "email",
                 "mail",
                 "mailer"
             ],
-            "time": "2017-09-30T22:39:41+00:00"
+            "time": "2018-07-13T07:04:35+00:00"
         },
         {
             "name": "symfony/console",
@@ -3394,28 +3268,28 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v2.4.0",
+            "version": "v2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c"
+                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
-                "reference": "3cc116adbe4b11be5ec557bf1d24dc5e3a21d18c",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
+                "reference": "6ae3e2e6494bb5e58c2decadafc3de7f1453f70a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.9"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
+                "phpunit/phpunit": "^4.8.35 || ^5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.4-dev"
+                    "dev-master": "2.5-dev"
                 }
             },
             "autoload": {
@@ -3425,7 +3299,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "BSD-3-Clause-Attribution"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
@@ -3440,7 +3314,7 @@
                 "env",
                 "environment"
             ],
-            "time": "2016-09-01T10:05:43+00:00"
+            "time": "2018-07-01T10:25:50+00:00"
         },
         {
             "name": "zizaco/entrust",
@@ -3699,16 +3573,16 @@
         },
         {
             "name": "fzaninotto/faker",
-            "version": "v1.7.1",
+            "version": "v1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de",
+                "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de",
                 "shasum": ""
             },
             "require": {
@@ -3716,7 +3590,7 @@
             },
             "require-dev": {
                 "ext-intl": "*",
-                "phpunit/phpunit": "^4.0 || ^5.0",
+                "phpunit/phpunit": "^4.8.35 || ^5.7",
                 "squizlabs/php_codesniffer": "^1.5"
             },
             "type": "library",
@@ -3745,7 +3619,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2017-08-15T16:48:10+00:00"
+            "time": "2018-07-12T10:23:15+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -4035,22 +3909,22 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "1.0.1",
+            "version": "1.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
+                "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
+                "phar-io/version": "^2.0",
                 "php": "^5.6 || ^7.0"
             },
             "type": "library",
@@ -4086,20 +3960,20 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
+            "time": "2018-07-08T19:23:20+00:00"
         },
         {
             "name": "phar-io/version",
-            "version": "1.0.1",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6",
+                "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6",
                 "shasum": ""
             },
             "require": {
@@ -4133,7 +4007,7 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
+            "time": "2018-07-08T19:19:57+00:00"
         },
         {
             "name": "phpdocumentor/reflection-common",
@@ -4601,16 +4475,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.2.6",
+            "version": "7.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f"
+                "reference": "8e878aff7917ef66e702e03d1359b16eee254e2c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/400a3836ee549ae6f665323ac3f21e27eac7155f",
-                "reference": "400a3836ee549ae6f665323ac3f21e27eac7155f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e878aff7917ef66e702e03d1359b16eee254e2c",
+                "reference": "8e878aff7917ef66e702e03d1359b16eee254e2c",
                 "shasum": ""
             },
             "require": {
@@ -4621,8 +4495,8 @@
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "myclabs/deep-copy": "^1.7",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
+                "phar-io/manifest": "^1.0.2",
+                "phar-io/version": "^2.0",
                 "php": "^7.1",
                 "phpspec/prophecy": "^1.7",
                 "phpunit/php-code-coverage": "^6.0.7",
@@ -4681,7 +4555,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2018-06-21T13:13:39+00:00"
+            "time": "2018-07-15T05:20:50+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -4730,16 +4604,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "3.0.1",
+            "version": "3.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "591a30922f54656695e59b1f39501aec513403da"
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/591a30922f54656695e59b1f39501aec513403da",
-                "reference": "591a30922f54656695e59b1f39501aec513403da",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
+                "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da",
                 "shasum": ""
             },
             "require": {
@@ -4790,7 +4664,7 @@
                 "compare",
                 "equality"
             ],
-            "time": "2018-06-14T15:05:28+00:00"
+            "time": "2018-07-12T15:12:46+00:00"
         },
         {
             "name": "sebastian/diff",

config/app.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Laravel'),
+    'name' => env('APP_NAME', 'Exchange'),
 
     /*
     |--------------------------------------------------------------------------
@@ -65,7 +65,7 @@ return [
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'Asia/Kuala_Lumpur',
 
     /*
     |--------------------------------------------------------------------------

config/auth.php

@@ -96,7 +96,7 @@ return [
         'users' => [
             'provider' => 'users',
             'table' => 'password_resets',
-            'expire' => 60,
+            'expire' => 3000,
         ],
     ],
 

database/.gitignore

@@ -1 +0,0 @@
-*.sqlite

database/factories/SettingActiveBankFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(Model::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/factories/SettingMalaysiaBankFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(Model::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/factories/UserFactory.php

@@ -21,5 +21,6 @@ $factory->define(App\User::class, function (Faker $faker) {
         'email' => $faker->unique()->safeEmail,
         'password' => $password ?: $password = bcrypt('secret'),
         'remember_token' => str_random(10),
+        'marking' => $faker->name,
     ];
 });

database/migrations/2018_04_25_090057_create_setting_beneficiaries_table.php

@@ -17,7 +17,7 @@ class CreateSettingBeneficiariesTable extends Migration
             $table->increments('id');
             $table->string('company_name');
             $table->string('bank_name');
-            $table->string('acc_no');
+            $table->string('acc_no')->unique();
             $table->string('bank_address');
             $table->string('swift');
             $table->string('cnap');

database/migrations/2018_05_24_082214_create_user_bank_slips_table.php

@@ -19,7 +19,6 @@ class CreateUserBankSlipsTable extends Migration
             $table->string('bankslip_url')->nullable();
             $table->double('transfer_amount')->nullable();
             $table->string('cust_marking')->nullable();
-
             $table->integer('book_id')->unsigned();
             $table->foreign('book_id')->references('id')->on('bookings');
 

database/migrations/2018_07_02_022752_remove_user_in_users_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveUserInUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('name');
+         });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('name');
+        });
+    }
+}

database/migrations/2018_07_05_041532_add_name_in_users_table.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNameInUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function($table)
+        {
+            $table->string('name');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('name');
+         });
+
+    }
+}

database/migrations/2018_07_05_053554_update_name_to_nullable_in_users_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateNameToNullableInUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function($table)
+        {
+            $table->string('name')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_05_095441_add_marking_to_user_table.php

@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMarkingToUserTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function($table)
+        {
+            $table->string('marking');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_05_102323_create_setting_malaysia_bank_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSettingMalaysiaBankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('setting_malaysia_banks', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('company_name');
+            $table->string('bank_name');
+            $table->string('acc_no')->unique();
+            $table->string('bank_address');
+            $table->string('swift');
+            $table->string('cnap');
+            $table->string('bank_branch');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('setting_malaysia_banks');
+    }
+}

database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNullableSettingMalaysiaBankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_malaysia_banks', function(Blueprint $table) {
+            $table->string('company_name')->nullable()->change();
+            $table->string('bank_name')->nullable()->change();
+            $table->string('acc_no')->nullable()->change();
+            $table->string('bank_address')->nullable()->change();
+            $table->string('swift')->nullable()->change();
+            $table->string('cnap')->nullable()->change();
+            $table->string('bank_branch')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_06_075408_create_setting_active_bank_table.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSettingActiveBankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('setting_active_banks', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('x1_bank_id')->unique();
+            $table->string('x2_bank_id')->unique();
+            $table->string('beneficiary_id')->unique();
+            $table->foreign('x1_bank_id')
+                ->references('acc_no')->on('setting_malaysia_banks')
+                ->onDelete('cascade');
+            $table->foreign('x2_bank_id')
+                ->references('acc_no')->on('setting_malaysia_banks')
+                ->onDelete('cascade');
+            $table->foreign('beneficiary_id')
+                ->references('acc_no')->on('setting_beneficiaries')
+                ->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('setting_active_banks');
+    }
+}

database/migrations/2018_07_08_033026_change_foreignkey_type_in_activebank_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeForeignkeyTypeInActivebankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_active_banks', function(Blueprint $table)
+        {
+            $table->dropForeign('setting_active_banks_x1_bank_id_foreign');
+            $table->foreign('x1_bank_id')
+            ->references('acc_no')->on('setting_malaysia_banks');
+            
+            $table->dropForeign('setting_active_banks_x2_bank_id_foreign');
+            $table->foreign('x2_bank_id')
+            ->references('acc_no')->on('setting_malaysia_banks');
+
+            $table->dropForeign('setting_active_banks_beneficiary_id_foreign');
+            $table->foreign('beneficiary_id')
+            ->references('acc_no')->on('setting_beneficiaries');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_10_173148_add_not_nullable_setting_malaysia_bank_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNotNullableSettingMalaysiaBankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+       Schema::table('setting_malaysia_banks', function(Blueprint $table) {
+           $table->string('company_name')->nullable(false)->change();
+           $table->string('bank_name')->nullable(false)->change();
+           $table->string('acc_no')->nullable()->change();  // reference key at select active bank
+           $table->string('bank_address')->nullable(false)->change();
+           $table->string('swift')->nullable(false)->change();
+           $table->string('cnap')->nullable(false)->change();
+           $table->string('bank_branch')->nullable(false)->change();
+       });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php

@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdateAccnoToIdSettingActiveTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_active_banks', function(Blueprint $table)
+        {
+            $table->dropForeign('setting_active_banks_x1_bank_id_foreign');
+            $table->dropForeign('setting_active_banks_x2_bank_id_foreign');
+            $table->dropForeign('setting_active_banks_beneficiary_id_foreign');
+            $table->dropColumn('x1_bank_id');
+            $table->dropColumn('x2_bank_id');
+            $table->dropColumn('beneficiary_id');
+        });
+
+        Schema::table('setting_active_banks', function(Blueprint $table)
+        {
+            $table->unsignedInteger('x1_bank_id')->unique();
+            $table->foreign('x1_bank_id')
+                ->references('id')->on('setting_malaysia_banks');
+
+            $table->unsignedInteger('x2_bank_id')->unique();
+            $table->foreign('x2_bank_id')
+                ->references('id')->on('setting_malaysia_banks');
+
+            $table->unsignedInteger('beneficiary_id')->unique();
+            $table->foreign('beneficiary_id')
+                ->references('id')->on('setting_beneficiaries');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

database/seeds/BookTableSeeder.php

@@ -35,7 +35,7 @@ class BookTableSeeder extends Seeder
             'rate_id' => $rate->id,
             'user_id' => $user->id,
             'status' => 2,
-            'admin_status' => 1,
+            'admin_status' => 2,
             'created_at' => Carbon::now()->format('Y-m-d H:i:s'),
             'updated_at' => Carbon::now()->format('Y-m-d H:i:s'),
         ]);

database/seeds/DatabaseSeeder.php

@@ -12,6 +12,8 @@ class DatabaseSeeder extends Seeder
      */
     public function run()
     {
+        Eloquent::unguard();
+        
         $this->call(UsersTableSeeder::class);
         $this->call(RolesAndPermissionsSeeder::class);
         $this->call(UserRoleSeeder::class);
@@ -19,5 +21,11 @@ class DatabaseSeeder extends Seeder
         $this->call(BookTableSeeder::class);     
         $this->call(SettingCreditSeeder::class);  
         $this->call(SuppliersTableSeeder::class);  
+        $this->call(MarkingSeeder::class);  
+        DB::statement('SET FOREIGN_KEY_CHECKS=0;');
+        $this->call(SettingMalaysiaBankSeeder::class);  
+        $this->call(SettingBeneficiarySeeder::class);  
+        $this->call(SettingActiveBankSeeder::class);
+        DB::statement('SET FOREIGN_KEY_CHECKS=1;');
     }
 }

database/seeds/MarkingSeeder.php

@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class MarkingSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('markings')->truncate();
+        DB::table('markings')->insert([
+        	'marking' => 'hehe',
+        	'email' => 'hehe@gmail.com'
+        ]);
+    }
+}

database/seeds/SettingActiveBankSeeder.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\SettingMalaysiaBank;
+use App\SettingBeneficiary;
+
+class SettingActiveBankSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $bankx1 = SettingMalaysiaBank::where('acc_no', "=" ,'malaysiaacc01')->first();
+        $bankx2 = SettingMalaysiaBank::where('acc_no', "=",'malaysiaacc02')->first();
+        $chinabank = SettingBeneficiary::where('acc_no', "=" ,'123456789')->first();
+
+        DB::table('setting_active_banks')->truncate();
+        DB::table('setting_active_banks')->insert([
+        	'x1_bank_id' => $bankx1->id,
+        	'x2_bank_id' => $bankx2->id,
+        	'beneficiary_id' => $chinabank->id
+        ]);
+    }
+}

database/seeds/SettingBeneficiarySeeder.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\SettingBeneficiary;
+
+class SettingBeneficiarySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+		DB::table('setting_beneficiaries')->truncate();
+        DB::table('setting_beneficiaries')->insert([
+        	'company_name' => 'CIEF2',
+        	'bank_name' => 'Mayban222k',
+        	'acc_no' => '5555555',
+        	'bank_address' => 'Jalan putrajaya',
+        	'swift' => 'ABC122223',
+        	'cnap' => 'CED232224',
+        	'bank_branch' => 'Putra'
+        ]);
+        DB::table('setting_beneficiaries')->insert([
+        	'company_name' => 'Bota',
+        	'bank_name' => 'CIMB',
+        	'acc_no' => '123456789',
+        	'bank_address' => 'Jalan cyberjaya',
+        	'swift' => 'AB3333',
+        	'cnap' => 'CADSeed',
+        	'bank_branch' => 'cyberjaa
+            '
+        ]);
+    }
+}

database/seeds/SettingMalaysiaBankSeeder.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class SettingMalaysiaBankSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+		DB::table('setting_active_banks')->truncate();
+        DB::table('setting_malaysia_banks')->truncate();
+        DB::table('setting_malaysia_banks')->insert([
+        	'company_name' => 'CIEF',
+        	'bank_name' => 'Maybank',
+        	'acc_no' => 'malaysiaacc01',
+        	'bank_address' => 'Jalan putrajaya',
+        	'swift' => 'ABC123',
+        	'cnap' => 'CED234',
+        	'bank_branch' => 'Putra'
+        ]);
+        DB::table('setting_malaysia_banks')->insert([
+            'company_name' => 'CIEF',
+            'bank_name' => 'Maybank',
+            'acc_no' => 'malaysiaacc02',
+            'bank_address' => 'Jalan putrajaya',
+            'swift' => 'ABC123',
+            'cnap' => 'CED234',
+            'bank_branch' => 'Putra'
+        ]);
+    }
+}

database/seeds/UsersTableSeeder.php

@@ -16,8 +16,8 @@ class UsersTableSeeder extends Seeder
         DB::table('users')->delete();
         
         $users = array(
-            ['name' => 'User', 'email' => 'user@example.com', 'password' => Hash::make('secret')],
-            ['name' => 'Admin', 'email' => 'admin@example.com', 'password' => Hash::make('secret')],
+            ['name' => 'User', 'marking'=> 'X9', 'email' => 'user@example.com', 'password' => Hash::make('secret')],
+            ['name' => 'Admin', 'marking'=> 'X10', 'email' => 'admin@example.com', 'password' => Hash::make('secret')],
         );
 
         foreach ($users as $user)

docker-prod.yml

@@ -0,0 +1,71 @@
+version: '2'
+
+networks:
+  frontend:
+    driver: bridge
+  backend:
+    driver: bridge
+
+services:
+  # api
+  app:
+    build: .
+    ports:
+      - "8000:8000"
+    volumes:
+      - .:/app
+    env_file: .env
+    working_dir: /app
+    depends_on:
+      - mysql
+    links:
+      - mysql
+    networks:
+      - frontend
+      - backend
+
+
+  # caddy Server 
+  caddy:
+    build: ./caddy
+    volumes:
+      - .:/var/www
+      - ./caddy/Caddyfile:/etc/Caddyfile
+      - ./logs/caddy:/var/log/caddy
+      - ./data:/root/.caddy
+    ports:
+      - "80:80"
+      - "443:443"
+    networks:
+      - frontend
+      - backend
+    depends_on:
+      - app
+
+
+  # database
+  mysql:
+    build:
+      context: ./docker/mysql
+      args:
+        - MYSQL_VERSION=5.6
+    environment:
+      - MYSQL_DATABASE=default
+      - MYSQL_USER=default
+      - MYSQL_PASSWORD=secret
+      - MYSQL_ROOT_PASSWORD=root
+      - TZ=UTC
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./docker/mysql/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+    networks:
+      - frontend
+      - backend
+    ports:
+      - "3306:3306"
+  # redis
+  cache:
+    image: redis:3.0-alpine
+
+volumes:
+  dbdata:

package.json

@@ -16,26 +16,29 @@
     "@fortawesome/fontawesome-free-brands": "^5.0.8",
     "@fortawesome/fontawesome-free-regular": "^5.0.8",
     "@fortawesome/fontawesome-free-solid": "^5.0.8",
-    "@fortawesome/vue-fontawesome": "^0.0.22",
+    "@fortawesome/vue-fontawesome": "0.0.22",
     "@xkeshi/vue-countdown": "^0.6.0",
     "axios": "^0.18.0",
     "bootstrap": "^4.0.0",
     "canvas2image": "^1.0.5",
-    "element-ui": "^2.3.9",
+    "element-ui": "^2.4.4",
     "jquery": "^3.3.1",
     "js-cookie": "^2.2.0",
     "npm": "^6.0.1",
     "popper.js": "^1.14.1",
     "sweetalert2": "^7.15.1",
+    "vee-validate": "^2.1.0-beta.5",
     "vform": "^1.0.0",
     "vue": "^2.5.16",
+    "vue-axios": "^2.1.1",
+    "vue-button-spinner": "^2.2.0",
     "vue-i18n": "^7.6.0",
-    "vue-loader": "14.2.2",
+    "vue-loader": "^14.2.2",
+    "vue-loading-spinner": "^1.0.11",
     "vue-meta": "^1.4.4",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
-    "vuex-router-sync": "^5.0.0",
-    "webpack": "^4.14.0"
+    "vuex-router-sync": "^5.0.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-eslint": "^3.0.0-beta.6",

phpunit.xml

@@ -7,7 +7,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <testsuites>
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>

readme.md

@@ -14,16 +14,16 @@
 - Login, register and password reset
 - Authentication with JWT
 - Socialite integration
-- Bootstrap 4 + Font Awesome 5
+- Bootstrap 4 + Font Awesome 5 + Element UI
 
 ## Installation
-
-- `git clone git@gitlab.com:CIEFWorldwideSdnBhd/exchange.git`
-- Copy `.env-example` to `.env`
-- Edit `.env` and set your database connection details
-- `Comp` run `php artisan key:generate` and `php artisan jwt:secret`)
-- `php artisan migrate`
-- `yarn` / `npm install`
+- Install [Git](https://git-scm.com) , [Docker CE](https://docs.docker.com/) and [Docker compose](https://docs.docker.com/compose/install/), [Node](https://nodejs.org/en/download/) 
+- Clone the repo into working folder `git clone git@gitlab.com:CIEFWorldwideSdnBhd/exchange.git`
+- `cd` in your working folder 
+- Copy env file `cp .env-example .env`
+- Run `docker-compose up` 
+- Open another git bash run `npm install`
+- Run `npm run watch`
 
 ## Usage
 

resources/assets/js/app.js

@@ -10,6 +10,27 @@ import locale from 'element-ui/lib/locale/lang/en'
 import '~/plugins'
 import '~/components'
 
+import VeeValidate from 'vee-validate';
+const config = {
+ errorBagName: 'errors', // change if property conflicts.
+ fieldsBagName: 'fields',
+ delay: 0,
+ // locale: 'zh_CN',
+ strict: true,
+ enableAutoClasses: false,
+ classNames: {
+  touched: 'touched', // the control has been blurred
+  untouched: 'untouched', // the control hasn't been blurred
+  valid: 'valid', // model is valid
+  invalid: 'invalid', // model is invalid
+  pristine: 'pristine', // control has not been interacted with
+  dirty: 'dirty' // control has been interacted with
+ },
+ events: 'blur',
+ inject: true
+};
+Vue.use(VeeValidate, config);
+
 Vue.config.productionTip = false
 
 Vue.use(ElementUI, { locale })

resources/assets/js/components/AdminProgressTrack.vue

@@ -1,10 +1,10 @@
 <template>
   <el-row>
-    <el-steps :value="value" :active="value" :align-center="true" process-status="wait" finish-status="success">
+    <el-steps :value="(value.term === 'x1_ba' || value.term === 'x2_cheque') && value.status > 2 ? value.status - 2 : value.status" :active="(value.term === 'x1_ba' || value.term === 'x2_cheque') && value.status > 2 ? value.status - 2 : value.status" :align-center="true" process-status="wait" finish-status="success">
       <el-step title="Booking"/>
       <el-step title="Verification"/>
-      <el-step title="Supplier Booking"/>
-      <el-step title="Supplier Report"/>
+      <el-step title="Supplier Booking" v-if="!(value.term === 'x1_ba' || value.term === 'x2_cheque')"/>
+      <el-step title="Supplier Report" v-if="!(value.term === 'x1_ba' || value.term === 'x2_cheque')"/>
       <el-step title="Upload China Bankslip To Booking"/>
       <el-step title="Purchase Order/Invoice"/>
       <el-step title="Completed"/>
@@ -40,7 +40,6 @@
 export default {
   props: ['value'],
   data: () => ({
-    status: 1
   })
 }
 </script>

resources/assets/js/components/LocaleDropdown.vue

@@ -13,49 +13,52 @@
         </a>
       </div>
     </li> -->
-    <ul class="navbar-nav mr-auto">
-    <li v-if="(user && role == 'admin')" class="nav-item">
-      <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
-          <div align="center">
-            <p>Today's Rate</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>
-          </div>
-          <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
+    <ul class="navbar-nav">
+      <li v-if="(user && role == 'admin')" class="nav-item">
+        <el-popover placement="top" width="300" v-model="UpdateRatePopoverVisible">
+            <div align="center">
+              <p>Today's Rate</p>
+              <p>X1 : Cash: {{rate.x1_cash}} Cheque: {{rate.x1_cheque}} BA: {{rate.x1_ba}}</p>
+              <p>X2 : Cash: {{rate.x2_cash}} Cheque: {{rate.x2_cheque}} BA: {{rate.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>
+            </div>
+            <a class="nav-link" href="#" role="button" slot="reference">Update Rate</a>
         </el-popover>
-      </li></ul>
-      <!-- <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.complete' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li> -->
-      <li v-if="(user && role == 'admin')" class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
-      <!-- <li v-if="(user && role == 'admin')" 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>
+    </ul>
+      <li v-if="(user && role == 'admin')" class="nav-item">
+        <router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">
+          {{ $t('Transaction History') }}
+        </router-link>
+      </li>
+      <li v-if="(user && role == 'admin')" class="nav-item">
+        <router-link :to="{ name: 'admin.complete' }" class="nav-link">
+          {{ $t('Completed Orders') }}
+        </router-link>
+      </li>
   </ul>
+<!-- update rate dialog start -->
+ <el-dialog align="center" :visible.sync="UpdateRateDialogVisible" width="900px">
+    <el-form :inline="true" align="center" ref="rateForm" :model="rateForm" :rules="rules">
 
-<!-- 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-item prop="x1_cash" >X1: &nbsp;&nbsp;&nbsp;Cash : <el-input v-model.number="rateForm.x1_cash" style=width:25% ></el-input></el-form-item>
+        <el-form-item prop="x1_cheque" >Cheque : <el-input  v-model.number="rateForm.x1_cheque" style=width:25%></el-input></el-form-item>
+        <el-form-item prop="x1_ba">BA : <el-input v-model.number="rateForm.x1_ba" style=width:25%></el-input></el-form-item>
+        <br>
+        <el-form-item prop="x2_cash" >X2: &nbsp;&nbsp;&nbsp;Cash : <el-input  v-model.number="rateForm.x2_cash" style=width:25% ></el-input></el-form-item>
+        <el-form-item prop="x2_cheque" >Cheque : <el-input  v-model.number="rateForm.x2_cheque" style=width:25%></el-input></el-form-item>
+        <el-form-item prop="x2_ba" >BA : <el-input  v-model.number="rateForm.x2_ba" style=width:25%></el-input></el-form-item>
     </el-form>
+    <br>
     <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>
+        <el-button type="primary" @click="updateRate('rateForm'); UpdateRateDialogVisible = false; DoneUpdateRateDialogVisible = true" >Save</el-button>
     </div>
-  </el-dialog>
-<!-- update rate dialog end -->
+  </el-dialog> 
 <!-- update rate dialog done -->
+
   <el-dialog align="center" :visible.sync="DoneUpdateRateDialogVisible" width="30%">
     <span>Rate Successfully Updated</span><br><br>
     <div align="center">
@@ -69,6 +72,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { loadMessages } from '~/plugins/i18n'
+import axios from 'axios'
 
 export default {
   data() {
@@ -76,13 +80,49 @@ export default {
         UpdateRatePopoverVisible: false,
         UpdateRateDialogVisible: 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',
-      };
+        rate: {
+        x1_ba: null,
+        x1_cheque: null,
+        x1_cash: null,
+        x2_ba: null,
+        x2_cash: null,
+        x2_cheque: null,
+        },
+        rateForm: {
+        x1_cash: '',
+        x1_cheque: '',
+        x1_ba: '',
+        x1_cash: '',
+        x1_cheque: '',
+        x1_ba: '',
+       },
+      rules: {
+        x1_cash: [
+          { required: true, message: 'Please input rate for X1 Cash', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+         ],
+        x1_cheque: [
+          { required: true, message: 'Please input rate for X1 Cheque', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+          ],
+        x1_ba: [
+          { required: true, message: 'Please input rate for X1 BA', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+        ],
+        x2_cash: [
+          { required: true, message: 'Please input rate for X2 Cash', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+          ],
+        x2_cheque: [
+          { required: true, message: 'Please input rate for X2 Cheque', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+          ],
+        x2_ba: [
+          { required: true, message: 'Please input rate for X2 BA', trigger: 'change'},
+          { type: 'number', message: 'Rate must be a number'}
+        ]
+       }
+      }
   },
   computed: mapGetters({
     locale: 'lang/locale',
@@ -91,6 +131,10 @@ export default {
     role: 'auth/role'
   }),
 
+    mounted () {
+    this.getRate()
+  },
+
   methods: {
     setLocale (locale) {
       if (this.$i18n.locale !== locale) {
@@ -98,7 +142,88 @@ export default {
 
         this.$store.dispatch('lang/setLocale', { locale })
       }
-    }
+    },
+    getRate() {
+      let $this = this
+      axios.get('/api/rate').then(response => {
+        this.rate = response.data
+        console.log(this.rate)
+      })
+    },
+
+    createRate: function () {
+      this.loading = true,
+      this.dialogFormVisible1 = true
+          let newRate = {
+            x1_cash: this.rateForm.x1_cash,
+            x1_cheque: this.rateForm.x1_cheque,
+            x1_ba: this.rateForm.x1_ba,
+            x2_cash: this.rateForm.x2_cash,
+            x2_cheque: this.rateForm.x2_cheque,
+            x2_ba: this.rateForm.x2_ba
+          }
+
+          console.log(newRate)
+          axios.post('/api/update-rate', newRate)
+            .then((response) => {
+              this.loading = false
+              this.rate = response.data
+            })
+            .catch((error) => {
+              console.log(error)
+              this.loading = false
+              this.$message({
+                showClose: true,
+                message: 'Error : All rate must be inserted',
+                type: 'error',
+                duration: 10000
+              })
+            })        
+    },
+
+    updateRate(formName) {
+        this.loading = true
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let newRate = {
+            x1_cash: this.rateForm.x1_cash,
+            x1_cheque: this.rateForm.x1_cheque,
+            x1_ba: this.rateForm.x1_ba,
+            x2_cash: this.rateForm.x2_cash,
+            x2_cheque: this.rateForm.x2_cheque,
+            x2_ba: this.rateForm.x2_ba,
+            }
+
+            axios.post('/api/update-rate', newRate)
+            .then((response) => {
+              this.loading = false
+              this.rate = response.data
+
+            })
+            .catch((error) => {
+              this.loading = false
+              this.$message({
+                showClose: true,
+                message: 'Error : All rate must be inserted',
+                type: 'error',
+                duration: 10000
+              })
+            })
+          } else {
+            this.loading = false
+            DoneUpdateRateDialogVisible = false
+            UpdateRateDialogVisible = true
+            this.$message({
+                  showClose: true,
+                  message: 'Please fill the form',
+                  type: 'error',
+                  duration: 10000
+                })
+           }
+        })
+
+      },
   }
+   
 }
 </script>

resources/assets/js/components/Navbar.vue

@@ -10,7 +10,7 @@
       </button>
 
       <div id="navbarToggler" class="collapse navbar-collapse">
-        <ul class="navbar-nav">
+        <ul class="navbar-nav ml-auto">
           <locale-dropdown/>
           <!-- <li class="nav-item">
             <a class="nav-link" href="#">Link</a>
@@ -19,7 +19,25 @@
 
         <ul class="navbar-nav ml-auto">
           <!-- Authenticated -->
-          <li v-if="user" class="nav-item dropdown">
+          <template v-if="user">
+            <!-- <el-badge :value="12" class="item">
+              <el-button size="share-button"><i class="el-icon-bell"></i></el-button>
+            </el-badge> -->
+            <!-- <el-dropdown trigger="click">
+              <el-badge :value="12" class="item">
+                <el-button icon="el-icon-bell" circle></el-button>
+              </el-badge>
+              <el-dropdown-menu slot="dropdown" style="max-width: 30%" id="notification">
+                <a v-for="item in notification" :href="item.link">
+                  <el-dropdown-item>
+                    {{item.message}}
+                  </el-dropdown-item>
+                </a>
+              </el-dropdown-menu>
+            </el-dropdown> -->
+
+
+            <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle text-dark"
                href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               <img :src="user.photo_url" class="rounded-circle profile-photo mr-1">
@@ -38,6 +56,8 @@
               </a>
             </div>
           </li>
+          </template>
+          </li>
           <!-- Guest -->
           <template v-else>
             <li class="nav-item">
@@ -67,7 +87,16 @@ export default {
   },
 
   data: () => ({
-    appName: window.config.appName
+    appName: window.config.appName,
+    notification:[{
+      message : "You have an unread message",
+      link : "http://www.google.com"
+    },
+    {
+      message : "There are 10 booking for your approval",
+      link : "http://www.yahoo.com"
+    }]
+
   }),
 
   computed: mapGetters({

resources/assets/js/pages/admin/booking/completed.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status"/>
+    <progress-track v-model="trackerConfig"/>
 
     <div align="center">
       <h4 style="margin-top:5%;">Order Completed</h4>
@@ -20,7 +20,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
-              <a target=" _blank" href="#">
+              <a target=" _blank" :href="booking_details.user_po_path">
                 <img v-bind:src="booking_details.user_po_path" class="image">
               </a>
             </el-col>
@@ -36,7 +36,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
-              <a target=" _blank" href="#">
+              <a target=" _blank" :href="booking_details.china_bankslip_path">
                 <img v-bind:src="booking_details.china_bankslip_path" class="image">
               </a>
             </el-col>
@@ -50,8 +50,10 @@
             <!-- <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">     
+            <el-col :span="12">
+              <a target="_blank" :href="booking_details.invoice_path">     
                 <img v-bind:src="booking_details.invoice_path" class="image">
+              </a>
             </el-col>
           </el-row>
         </el-card>
@@ -112,7 +114,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -262,7 +264,9 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            <a target="_blank" :href="booking_details.user_bankslip_path">
+              <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            </a>
           </el-col>
         </el-row>
       </el-card>
@@ -273,6 +277,17 @@
   .booking-details {
     font-weight: bold;
   }
+  .image {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      margin-left: auto;
+      margin-right: auto;
+      width: 150px;
+      display: block;
+  }
+  .image:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
 </style>
 <script>
 import VueCountdown from '@dmaksimovic/vue-countdown'
@@ -285,7 +300,10 @@ export default {
   },
   data () {
     return {
-      status: 8,
+      trackerConfig :{
+          status: 8,
+          term: null
+        },
       loading_btn: false,
       booking_details:{
           id: null,
@@ -307,8 +325,8 @@ export default {
       .get('/api/admin/booking/' + this.$route.params.id)
       .then((response) => {
         this.booking_details = response.data
+        this.trackerConfig.term = response.data.term;
         loading.close()
-
       }).catch((error) => {
         console.log(error)
         loading.close()

resources/assets/js/pages/admin/booking/supplierBooking.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status" />
+    <progress-track v-model="trackerConfig" />
 
     <div align="center">
       <h4 style="margin-top:5%;"></h4>
@@ -48,7 +48,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -247,7 +247,10 @@
     },
     data() {
       return {
-        status: 3,
+        trackerConfig :{
+          status: 3,
+          term: null
+        },
         loading_btn: false,
         booking_details: {
           id: null,
@@ -301,6 +304,7 @@
         .get('/api/admin/booking/' + this.$route.params.id)
         .then((response) => {   
           this.booking_details = response.data
+          this.trackerConfig.term = response.data.term;
         }).catch((error) => {
           console.log(error)
           this.$router.push({
@@ -353,11 +357,16 @@
               console.log(error)
 
               // TODO : Show error message 
-
             })
 
           } else {
             this.loading_btn = false
+            this.$message({
+                  showClose: true,
+                  message: 'Please fill the supplier form',
+                  type: 'error',
+                  duration: 10000
+                })
           }
         })
 

resources/assets/js/pages/admin/booking/supplierReport.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status" />
+    <progress-track v-model="trackerConfig" />
 
     <div align="center">
       <h4 style="margin-top:5%;"></h4>
@@ -48,7 +48,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -215,7 +215,9 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            <a target="_blank" :href="booking_details.user_bankslip_path">
+              <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            </a>
           </el-col>
         </el-row>
       </el-card>
@@ -235,6 +237,17 @@
   .booking-details {
     font-weight: bold;
   }
+  .image {
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 150px;
+    display: block;
+  }
+  .image:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
 </style>
 <script>
   import ProgressTrack from '~/components/AdminProgressTrack'
@@ -247,7 +260,10 @@
     },
     data() {
       return {
-        status: 4,
+        trackerConfig :{
+          status: 4,
+          term: null
+        },
         loading_btn: false,
         booking_details: {
           id: null,
@@ -257,13 +273,23 @@
         },
         supplier_booking:{
         },
+        active_bank_setting: {
+          x1_bank_id: null,
+          x2_bank_id: null,
+          beneficiary_id: null
+        },
+        beneficiaryDetail:{
+          company_name: '奕继椿',
+          bank_name: '民生银行 深川红荔支行',
+          acc_no: '123456789',
+        },
         supplier: null,
         supplier_options: null,
         exampleContent: "This is TEXT"
-
       }
     },
     beforeCreate() {
+      
       const loading = this.$loading({
         lock: true,
         text: 'Please wait..',
@@ -274,41 +300,65 @@
       axios
         .get('/api/admin/booking/' + this.$route.params.id)
         .then((response) => {
-          loading.close()
           this.booking_details = response.data
+          this.trackerConfig.term = response.data.term;
         }).catch((error) => {
           console.log(error)
-          loading.close()
           this.$router.push({
             name: 'notfound'
           })
         })
 
-      axios
-        .get('/api/supplier-booking/' + this.$route.params.id)
+      axios.get('/api/supplier-booking/' + this.$route.params.id)
         .then((response) => {
-          loading.close()
           this.supplier_booking = response.data
         }).catch((error) => {
           console.log(error)
-          loading.close()
           this.$router.push({
             name: 'notfound'
           })
         })
 
-
-
+	  axios.get('/api/active-bank')
+          .then((response) => {
+            axios.get('/api/setting-beneficiary/' + response.data.beneficiary_id)
+	          .then((response) => {
+          		loading.close();
+	            this.supplier_booking.china_bank_name = response.data.bank_name;
+	            this.supplier_booking.china_company_name = response.data.company_name;
+	            this.supplier_booking.china_acc_no = response.data.acc_no;
+	          })
+	          .catch((error) => {
+          		loading.close();
+	            console.log(error);
+	            this.$message({
+	              showClose: true,
+	              message: 'Fetch data fail',
+	              type: 'error',
+	              duration: 10000
+	            });
+	          });
+          })
+          .catch((error) => {
+          	loading.close();
+            console.log(error);
+            this.$message({
+              showClose: true,
+              message: 'Fetch data fail',
+              type: 'error',
+              duration: 10000
+            });
+          });
     },
     methods: {
       downloadReport(){
         let canvas = document.getElementById('myCanvas')
-     var dataString = canvas.toDataURL("image/png");
-     console.log(dataString)
-      var link = document.createElement("a");
-      link.download = 'image';
-      link.href = dataString;
-      link.click();
+        var dataString = canvas.toDataURL("image/png");
+        console.log(dataString)
+        var link = document.createElement("a");
+        link.download = 'image';
+        link.href = dataString;
+        link.click();
       },
       goToSupplierBooking(){
           this.$router.push({
@@ -317,7 +367,7 @@
           })
       },
       completeReport() {
-        // TODO : send request to change status
+    	// TODO : send request to change status
         this.loading_btn = true
         axios
           .post('/api/booking/' + this.$route.params.id + '/confirm-supplier')
@@ -349,174 +399,179 @@
             id: this.$route.params.id
           }
         })
-      }
-
+      },
     },
     directives: {
       insertMessage: function (canvasElement, binding) {
-        ////////////////// variable //////////////////////////
-        var canvasWidth = 450;
-        var rowHeight = [20, 40, 60, 80, 100, 120, 140, 170, 190, 210, 230, 250, 270, 290, 310, 330, 350, 390, 410,
-          470, 490, 510, 610, 630
-        ]
-        const canvasHeight = rowHeight[rowHeight.length - 1];
+      	setTimeout(function (canvasElement, binding) {
+            ////////////////// variable //////////////////////////
+            var canvasWidth = 450;
+            var rowHeight = [20, 40, 60, 80, 100, 120, 140, 170, 190, 210, 230, 250, 270, 290, 310, 330, 350, 390, 410,
+              470, 490, 510, 610, 630
+            ]
+            const canvasHeight = rowHeight[rowHeight.length - 1];
 
-        var column1X = 220;
-        var column2X = 320;
-        var column3X = 420;
+            var column1X = 220;
+            var column2X = 320;
+            var column3X = 420;
 
-        ///////////////////Canvast Init////////////////////
-        var canvas = document.getElementById("myCanvas");
-        canvas.width = canvasWidth;
-        canvas.height = canvasHeight;
-        // Get canvas context
-        var ctx = canvasElement.getContext("2d");
-        // Clear the canvas
-        ctx.clearRect(0, 0, 300, 150);
+            ///////////////////Canvast Init////////////////////
+            var canvas = document.getElementById("myCanvas");
+            canvas.width = canvasWidth;
+            canvas.height = canvasHeight;
+            // Get canvas context
+            var ctx = canvasElement.getContext("2d");
+            // Clear the canvas
+            ctx.clearRect(0, 0, 300, 150);
 
-        ctx.fillStyle = "#FFFFFF";
-        ctx.fillRect(0, 0, canvasWidth, rowHeight[0]);
-        for (var i = 1; i < rowHeight.length; i++) {
-          if (i % 2 == 1)
-            ctx.fillStyle = "#A9D08E";
-          else
             ctx.fillStyle = "#FFFFFF";
-          ctx.fillRect(0, rowHeight[i - 1], canvasWidth, rowHeight[i]);
-        }
-        ///////////// fillup with text////////////////
-        //// config canvas
-        ctx.fillStyle = "#000000";
-        ctx.font = "13px Arial";
-        ctx.textAlign = "right";
-        //// Row 1
-        ctx.fillText("Payment Voucher :", column1X, rowHeight[1] - 5);
-        ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5);
-        //// Row 2
-        ctx.fillText("Date :", column1X, rowHeight[2] - 5);
-        ctx.fillText(binding.value.date, column3X, rowHeight[2] - 5);
-        //// Row 3
-        ctx.fillText("Marking :", column1X, rowHeight[3] - 5);
-        ctx.font = "bold 14px Arial";
-        ctx.fillStyle = "#0070D5";
-        ctx.fillText("CIEF/605HOS", column3X, rowHeight[3] - 5);
-        ctx.fillStyle = "#000000";
-        ctx.font = "13px Arial";
-        //// Row 4
-        ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5);
-        ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5);
-        //// Row 4
-        ctx.fillText("Payment For :", column1X, rowHeight[5] - 5);
-        ctx.fillText("Full Payment", column3X, rowHeight[5] - 5);
-        //// Row 5
-        ctx.fillText("Payment Method :", column1X, rowHeight[6] - 5);
-        ctx.fillText(binding.value.payment_method, column3X, rowHeight[6] - 5);
-        //// Row 6
-        ctx.fillText("Remark :", column1X, rowHeight[7] - 10);
-        //// Row 7
-        // Empty
-        //// Row 8
-        ctx.fillText("MYR/RM :", column1X, rowHeight[9] - 5);
-        ctx.fillText("MYR", column2X, rowHeight[9] - 5);
-        ctx.font = "bold 14px Arial";
-        ctx.fillText(binding.value.transfer_amount, column3X, rowHeight[9] - 5);
-        ctx.font = "13px Arial";
-        //// Row 8
-        ctx.fillText("* RATE :", column1X, rowHeight[10] - 5);
-        ctx.fillText(binding.value.rate, column3X, rowHeight[10] - 5);
-        //// Row 9
-        // Empty
-        //// Row 10
-        ctx.font = "bold 14px Arial";
-        ctx.fillText("CNY", column2X, rowHeight[12] - 5);
-        ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[12] - 5);
-        ctx.font = "13px Arial";
-        //line
-        ctx.beginPath();
-        ctx.lineWidth = 1;
-        ctx.moveTo(column1X + 30, rowHeight[11]);
-        ctx.lineTo(column3X + 20, rowHeight[11]);
-        ctx.stroke();
-        ctx.beginPath();
-        ctx.lineWidth = 2;
-        ctx.moveTo(column1X + 30, rowHeight[12]);
-        ctx.lineTo(column3X + 20, rowHeight[12]);
-        ctx.stroke();
-        //// Row 11
-        ctx.fillText("MYR/RM :", column1X, rowHeight[14] - 5);
-        ctx.fillText("MYR", column2X, rowHeight[14] - 5);
-        ctx.fillText("4830.68", column3X, rowHeight[14] - 5);
-        //// Row 12
-        ctx.fillText("Billing(1.0%) :", column1X, rowHeight[15] - 5);
-        ctx.fillText("MYR", column2X, rowHeight[15] - 5);
-        ctx.fillText(binding.value.billing_amount, column3X, rowHeight[15] - 5);
-        //// Row 13
-        ctx.fillText("+ SALES TAX (10%) :", column1X, rowHeight[16] - 5);
-        ctx.fillText("MYR", column2X, rowHeight[16] - 5);
-        ctx.fillText(binding.value.salestax_amount, column3X, rowHeight[16] - 5);
-        //// Row 14
-        ctx.fillText("+ GST 6% :", column1X, rowHeight[17] - 15);
-        ctx.fillText("MYR", column2X, rowHeight[17] - 15);
-        ctx.fillText("289.84", column3X, rowHeight[17] - 15);
-        //// Row 15
-        ctx.font = "bold 14px Arial";
-        ctx.fillText("Customer Bank In Amount :", column1X, rowHeight[18] - 5);
-        ctx.fillStyle = "#0070D5";
-        ctx.fillText("MYR", column2X, rowHeight[18] - 5);
-        ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[18] - 5);
-        ctx.fillStyle = "#000000";
-        ctx.font = "13px Arial";
-        //line
-        ctx.lineWidth = 1;
-        ctx.beginPath();
-        ctx.moveTo(column1X + 30, rowHeight[17]);
-        ctx.lineTo(column3X + 20, rowHeight[17]);
-        ctx.stroke();
-        ctx.beginPath();
-        ctx.moveTo(column1X + 30, rowHeight[18] + 1);
-        ctx.lineTo(column3X + 20, rowHeight[18] + 1);
-        ctx.stroke();
-        ctx.beginPath();
-        ctx.moveTo(column1X + 30, rowHeight[18] - 2);
-        ctx.lineTo(column3X + 20, rowHeight[18] - 2);
-        ctx.stroke();
-        //// Row 16
-        ctx.fillText("Rebate :", column1X, rowHeight[19] - 25);
-        ctx.fillText("CNY", column2X, rowHeight[19] - 25);
-        ctx.fillText("224.68", column3X, rowHeight[19] - 25);
-        //// Row 16
-        ctx.font = "bold 14px Arial";
-        ctx.fillText("Bank In to Account Below :", column1X, rowHeight[20] - 5);
-        ctx.font = "bold italic 15px Arial";
-        ctx.fillStyle = "#0070D5";
-        ctx.fillText("CNY", column2X, rowHeight[20] - 5);
-        ctx.fillText("7692.17", column3X - 20, rowHeight[20] - 5);
-        ctx.fillStyle = "#000000";
-        ctx.font = "13px Arial";
-        //// Row 17
-        //// Row 18
-        //// Row 19
-        var img = new Image();
-        img.src = "/banklogo.png";
-        img.crossOrigin = "anonymous";
-        var maxwidth = 70;
-        var ratio = maxwidth / img.width;
-        var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2);
-        var y = rowHeight[21] + offset; // to make it always center
+            ctx.fillRect(0, 0, canvasWidth, rowHeight[0]);
+            for (var i = 1; i < rowHeight.length; i++) {
+              if (i % 2 == 1)
+                ctx.fillStyle = "#A9D08E";
+              else
+                ctx.fillStyle = "#FFFFFF";
+              ctx.fillRect(0, rowHeight[i - 1], canvasWidth, rowHeight[i]);
+            }
+            ///////////// fillup with text////////////////
+            //// config canvas
+            ctx.fillStyle = "#000000";
+            ctx.font = "13px Arial";
+            ctx.textAlign = "right";
+            //// Row 1
+            ctx.fillText("Payment Voucher :", column1X, rowHeight[1] - 5);
+            ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5);
+            //// Row 2
+            ctx.fillText("Date :", column1X, rowHeight[2] - 5);
+            ctx.fillText(binding.value.date, column3X, rowHeight[2] - 5);
+            //// Row 3
+            ctx.fillText("Marking :", column1X, rowHeight[3] - 5);
+            ctx.font = "bold 14px Arial";
+            ctx.fillStyle = "#0070D5";
+            ctx.fillText("CIEF/605HOS", column3X, rowHeight[3] - 5);
+            ctx.fillStyle = "#000000";
+            ctx.font = "13px Arial";
+            //// Row 4
+            ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5);
+            ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5);
+            //// Row 4
+            ctx.fillText("Payment For :", column1X, rowHeight[5] - 5);
+            ctx.fillText("Full Payment", column3X, rowHeight[5] - 5);
+            //// Row 5
+            ctx.fillText("Payment Method :", column1X, rowHeight[6] - 5);
+            ctx.fillText(binding.value.payment_method, column3X, rowHeight[6] - 5);
+            //// Row 6
+            ctx.fillText("Remark :", column1X, rowHeight[7] - 10);
+            //// Row 7
+            // Empty
+            //// Row 8
+            ctx.fillText("MYR/RM :", column1X, rowHeight[9] - 5);
+            ctx.fillText("MYR", column2X, rowHeight[9] - 5);
+            ctx.font = "bold 14px Arial";
+            ctx.fillText(binding.value.transfer_amount, column3X, rowHeight[9] - 5);
+            ctx.font = "13px Arial";
+            //// Row 8
+            ctx.fillText("* RATE :", column1X, rowHeight[10] - 5);
+            ctx.fillText(binding.value.rate, column3X, rowHeight[10] - 5);
+            //// Row 9
+            // Empty
+            //// Row 10
+            ctx.font = "bold 14px Arial";
+            ctx.fillText("CNY", column2X, rowHeight[12] - 5);
+            ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[12] - 5);
+            ctx.font = "13px Arial";
+            //line
+            ctx.beginPath();
+            ctx.lineWidth = 1;
+            ctx.moveTo(column1X + 30, rowHeight[11]);
+            ctx.lineTo(column3X + 20, rowHeight[11]);
+            ctx.stroke();
+            ctx.beginPath();
+            ctx.lineWidth = 2;
+            ctx.moveTo(column1X + 30, rowHeight[12]);
+            ctx.lineTo(column3X + 20, rowHeight[12]);
+            ctx.stroke();
+            //// Row 11
+            ctx.fillText("MYR/RM :", column1X, rowHeight[14] - 5);
+            ctx.fillText("MYR", column2X, rowHeight[14] - 5);
+            ctx.fillText("4830.68", column3X, rowHeight[14] - 5);
+            //// Row 12
+            ctx.fillText("Billing(1.0%) :", column1X, rowHeight[15] - 5);
+            ctx.fillText("MYR", column2X, rowHeight[15] - 5);
+            ctx.fillText(binding.value.billing_amount, column3X, rowHeight[15] - 5);
+            //// Row 13
+            ctx.fillText("+ SALES TAX (10%) :", column1X, rowHeight[16] - 5);
+            ctx.fillText("MYR", column2X, rowHeight[16] - 5);
+            ctx.fillText(binding.value.salestax_amount, column3X, rowHeight[16] - 5);
+            //// Row 14
+            ctx.fillText("+ GST 6% :", column1X, rowHeight[17] - 15);
+            ctx.fillText("MYR", column2X, rowHeight[17] - 15);
+            ctx.fillText("289.84", column3X, rowHeight[17] - 15);
+            //// Row 15
+            ctx.font = "bold 14px Arial";
+            ctx.fillText("Customer Bank In Amount :", column1X, rowHeight[18] - 5);
+            ctx.fillStyle = "#0070D5";
+            ctx.fillText("MYR", column2X, rowHeight[18] - 5);
+            ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[18] - 5);
+            ctx.fillStyle = "#000000";
+            ctx.font = "13px Arial";
+            //line
+            ctx.lineWidth = 1;
+            ctx.beginPath();
+            ctx.moveTo(column1X + 30, rowHeight[17]);
+            ctx.lineTo(column3X + 20, rowHeight[17]);
+            ctx.stroke();
+            ctx.beginPath();
+            ctx.moveTo(column1X + 30, rowHeight[18] + 1);
+            ctx.lineTo(column3X + 20, rowHeight[18] + 1);
+            ctx.stroke();
+            ctx.beginPath();
+            ctx.moveTo(column1X + 30, rowHeight[18] - 2);
+            ctx.lineTo(column3X + 20, rowHeight[18] - 2);
+            ctx.stroke();
+            //// Row 16
+            ctx.fillText("Rebate :", column1X, rowHeight[19] - 25);
+            ctx.fillText("CNY", column2X, rowHeight[19] - 25);
+            ctx.fillText("224.68", column3X, rowHeight[19] - 25);
+            //// Row 16
+            ctx.font = "bold 14px Arial";
+            ctx.fillText("Bank In to Account Below :", column1X, rowHeight[20] - 5);
+            ctx.font = "bold italic 15px Arial";
+            ctx.fillStyle = "#0070D5";
+            ctx.fillText("CNY", column2X, rowHeight[20] - 5);
+            ctx.fillText("7692.17", column3X - 20, rowHeight[20] - 5);
+            ctx.fillStyle = "#000000";
+            ctx.font = "13px Arial";
+            //// Row 17
+            //// Row 18
+            //// Row 19
+            var img = new Image();
+            img.src = "/banklogo.png";
+            img.crossOrigin = "anonymous";
+            var maxwidth = 70;
+            var ratio = maxwidth / img.width;
+            var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2);
+            var y = rowHeight[21] + offset; // to make it always center
 
-        img.onload=function(){
-		      ctx.drawImage(img, 50, 530, 80, 50);
-	      };
-
-        // text
-        ctx.font = "bold 14px Arial";
-        ctx.textAlign = "center";
-        ctx.fillText("China beneficiary Account", column2X - 40, rowHeight[22] - 80);
-        ctx.fillText("户名 : 奕继椿", column2X - 40, rowHeight[22] - 60);
-        ctx.fillText("6226 1906 8014 3314", column2X - 40, rowHeight[22] - 40);
-        ctx.fillText("民生银行 深川红荔支行", column2X - 40, rowHeight[22] - 20);
-        ctx.font = "13px Arial";
+            img.onload=function(){
+    		      ctx.drawImage(img, 50, 530, 80, 50);
+    	      };
 
+            // text
+            ctx.font = "bold 14px Arial";
+            ctx.textAlign = "center";
+            console.log(binding.value.amountInRMB);
+            console.log(binding.value);
+            ctx.fillText("China beneficiary Account", column2X - 40, rowHeight[22] - 80);
+            ctx.fillText("户名 : " + binding.value.china_company_name, column2X - 40, rowHeight[22] - 60);
+            ctx.fillText(binding.value.china_acc_no, column2X - 40, rowHeight[22] - 40);
+            ctx.fillText(binding.value.china_bank_name , column2X - 40, rowHeight[22] - 20);
+            
+            ctx.font = "13px Arial";
+    	}, 1000,canvasElement,binding);
+	        
       }
     }
+
   }
 </script>

resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status" />
+    <progress-track v-model="trackerConfig" />
 
     <div align="center">
       <h4 style="margin-top:5%;"></h4>
@@ -48,7 +48,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -208,7 +208,7 @@
                 <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>
+                  <div slot="tip" class="el-upload__tip">jpg/png files with a size less than 3 MB</div>
                 </el-upload>
 
                 <br>
@@ -250,7 +250,10 @@
     },
     data() {
       return {
-        status: 5,
+        trackerConfig :{
+          status: 5,
+          term: null
+        },
         loading_btn: false,
         booking_id: this.$route.params.id,
         booking_details: {
@@ -321,8 +324,9 @@
       axios
         .get('/api/admin/booking/' + this.$route.params.id)
         .then((response) => {      
-          loading.close()
           this.booking_details = response.data
+          this.trackerConfig.term = response.data.term;
+          loading.close()
         }).catch((error) => {
           loading.close()
           console.log(error)
@@ -358,23 +362,26 @@
                 })
               })
               .catch((error) => {
-                this.loading = false
+                console.log(error)
+                this.loading_btn = 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
+            this.$message({
+                  showClose: true,
+                  message: 'Please upload your bankin slip first.',
+                  type: 'warning',
+                  duration: 10000
+                })
           }
         })
-
-
       },
       handleRemove(file, fileList) {
         console.log(file, fileList);

resources/assets/js/pages/admin/booking/uploadInvoice.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status" />
+    <progress-track v-model="trackerConfig" />
 
     <div align="center">
       <h4 style="margin-top:5%;"></h4>
@@ -55,7 +55,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -219,7 +219,9 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
+              <a target="_blank" :href="booking_details.user_po_path">
                 <img v-bind:src="booking_details.user_po_path" class="image">
+              </a>
             </el-col>
           </el-row>
         </el-card>
@@ -231,6 +233,17 @@
   .booking-details {
     font-weight: bold;
   }
+  .image {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      margin-left: auto;
+      margin-right: auto;
+      width: 150px;
+      display: block;
+  }
+  .image:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
 </style>
 <script>
   import ProgressTrack from '~/components/AdminProgressTrack'
@@ -242,7 +255,10 @@
     },
     data() {
       return {
-        status: 6,
+        trackerConfig :{
+          status: 6,
+          term: null
+        },
         loading_btn: false,
         booking_id: this.$route.params.id,
         booking_details: {
@@ -315,7 +331,7 @@
         .then((response) => {
           loading.close()
           this.booking_details = response.data
-          console.log(this.booking_details)
+          this.trackerConfig.term = response.data.term;
         }).catch((error) => {
           console.log(error)
           loading.close()

resources/assets/js/pages/admin/booking/verification.vue

@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <progress-track v-model="status" />
+    <progress-track v-model="trackerConfig" />
 
     <div align="center">
       <h4 style="margin-top:5%;"></h4>
@@ -50,7 +50,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -201,16 +201,20 @@
           <!-- <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">
+          <a target="_blank" :href="booking_details.user_bankslip_path">
             <img v-bind:src="booking_details.user_bankslip_path" class="image">
-          </el-col>
+          </a>
+          <!--<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>
 
       <el-card class="box-card">
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <el-button :loading="loading_btn" @click="approveUserSlip" type="success">Aprrove</el-button>
+            <el-button :loading="loading_btn" @click="approveUserSlip" type="success">Approve</el-button>
             <el-button :loading="loading_btn" @click="rejectDialogVisible = true" type="danger">Reject</el-button>
           </el-col>
         </el-row>
@@ -239,6 +243,17 @@
   .booking-details {
     font-weight: bold;
   }
+  .image {
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 150px;
+    display: block;
+  }
+  .image:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
 </style>
 <script>
   import ProgressTrack from '~/components/AdminProgressTrack'
@@ -250,7 +265,10 @@
     },
     data() {
       return {
-        status: 2,
+        trackerConfig :{
+          status: 2,
+          term: null
+        },
         loading_btn: false,
         rejectDialogVisible: false,
         reject_reason: null,
@@ -274,7 +292,8 @@
       axios
         .get('/api/admin/booking/' + this.$route.params.id)
         .then((response) => {
-          this.booking_details = response.data
+          this.booking_details = response.data;
+          this.trackerConfig.term = response.data.term;
           loading.close()
 
         }).catch((error) => {
@@ -305,7 +324,7 @@
             })
 
             this.$router.push({
-              name: 'booking.admin.supplier'
+              name: this.booking_details.term === 'x1_ba' || this.booking_details.term === 'x2_cheque' ? 'booking.admin.cnslip' : 'booking.admin.supplier'
             })
 
             // pass variable to another router

resources/assets/js/pages/admin/complete-order.vue

@@ -1,37 +0,0 @@
-<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><br><br>
-    <div align="right">
-        <el-pagination background layout="prev, pager, next" :total="30"></el-pagination>
-    </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>

resources/assets/js/pages/admin/complete-orders.vue

@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <div align="right">
+      <el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshCompletedOrders()">Refresh</el-button>
+
+    </div>
+    <h1 align="center" style="margin-bottom:50px;">Completed Orders</h1>
+    <el-table :data="tableData" stripe height="500" style="width: 100%">
+        <el-table-column label="No." prop="id" sortable></el-table-column>
+        <el-table-column label="Order Date"  prop="created_at" width="180" sortable></el-table-column>
+        <el-table-column label="Marking" width="120" prop="marking"></el-table-column>
+        <el-table-column label="Rate" prop="rate" width="74"></el-table-column>
+        <el-table-column label="Amount" prop="amount" sortable></el-table-column>
+        <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandler" label="Transfer Amount" prop="bia"></el-table-column>
+        <el-table-column label="Status" width="106" prop="admin_status">
+          <template slot-scope="scope">
+            <el-tag size="medium" type="success">{{ scope.row.admin_status }}</el-tag>
+          </template>        
+        </el-table-column>
+        <el-table-column :filters="[{ text: 'Success', value: 'Success' }, { text: 'Pending', value: 'Pending' }]" :filter-method="filterTag" width="180" filter-placement="bottom-end">
+          <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> View Status </el-button>
+        </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+  import axios from 'axios'
+  export default {
+      data() {
+        return {
+          tableData: [],
+          url: '/api/admin/complete-orders',
+                loading_btn: false,
+
+        }
+      },
+      mounted () {
+        this.RefreshCompletedOrders()
+      },
+      methods: {
+        RefreshCompletedOrders() {
+          let $this = this
+                this.loading_btn = true
+          axios.get(this.url).then(response => {
+        this.loading_btn = false;
+            this.tableData = response.data
+          })
+        },
+        filterTag (value, row) {
+          return row.tag === value
+        },
+        filterHandler (value, row, column) {
+          const property = column['property']
+          return row[property] === value
+        },
+        BookingStatus (status, booking_id) {
+          // TODO : Get booking status from server
+          this.status = status
+          console.log(this.status)
+          switch (this.status) {
+            case 1:
+              this.$router.push({
+                name: 'booking.admin.pending',
+                params: {id: booking_id }
+              })
+              break
+            case 2:
+              this.$router.push({
+                name: 'booking.admin.verification',
+                params: {id: booking_id }
+              })
+              break
+            case 3:
+              this.$router.push({
+                name: 'booking.admin.supplier',
+                params: {id: booking_id }
+              })
+              break
+            case 4:
+              this.$router.push({
+                name: 'booking.admin.supplier.report',
+                params: {id: booking_id }
+              })
+              break
+            case 5:
+              this.$router.push({
+                name: 'booking.admin.cnslip',
+                params: {id: booking_id }
+              })
+              break
+
+            case 6:
+              this.$router.push({
+                name: 'booking.admin.invoice',
+                params: {id: booking_id }
+              })
+              break
+
+            case 7:
+              this.$router.push({
+                name: 'booking.admin.complete',
+                params: {id: booking_id }
+              })
+              break
+            default:
+              break
+          }
+      }
+    }
+  }
+</script>

resources/assets/js/pages/admin/home.vue

@@ -1,7 +1,11 @@
 <template>
 <div>
   <div align="right">
-<el-button icon="el-icon-refresh" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button></div>
+<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button>
+</div>
+
+ 
+
   <!-- Booking Table -->
   <el-row :gutter="20">
     <div>
@@ -11,7 +15,8 @@
           <el-button slot-scope="scope" type="text" @click="(event) => { BookingStatus(scope.row.admin_status, scope.row.id) }"> {{ scope.row.id }}</el-button>
         </el-table-column>
         <el-table-column label="DateTime" prop="created_at" width="180" sortable/>
-        <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/> -->
+        <el-table-column label="Marking" width="120" prop="marking" />
+        <el-table-column :filters="[{text: 'X1', value: 'X1'}, {text: 'X2', value: 'X2'}]" :filter-method="filterHandler" label="Term" prop="term" width="100"/>
         <el-table-column label="Rate" width="74" prop="rate" />
         <el-table-column label="Amount" prop="amount" justify="center" width="110" />
         <el-table-column :filters="[{text: 'RMB', value: 'RMB'}, {text: 'USD', value: 'USD'}]" :filter-method="filterHandler" label="Transfer Amount"
@@ -57,7 +62,9 @@ export default {
       status: null,
       bookingTable: [
       ],
-      url: 'api/admin/booking',
+      url: 'api/admin/booking',   
+      loading_btn: false,
+
     }
   },
   mounted () {
@@ -66,7 +73,9 @@ export default {
   methods: {
     RefreshBooking() {
       let $this = this
+      this.loading_btn = true
       axios.get(this.url).then(response => {
+        this.loading_btn = false;
         this.bookingTable = response.data
       })
     },

resources/assets/js/pages/auth/login.vue

@@ -1,55 +1,57 @@
 <template>
-  <div class="row">
-    <div class="col-lg-8 m-auto">
-      <card :title="$t('login')">
-        <form @submit.prevent="login" @keydown="form.onKeydown($event)">
-          <!-- Email -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
-              <has-error :form="form" field="email"/>
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-8 m-auto">
+        <card :title="$t('login')">
+          <form @submit.prevent="login" @keydown="form.onKeydown($event)">
+            <!-- Email -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
+                <has-error :form="form" field="email"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Password -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" class="form-control" type="password" name="password">
-              <has-error :form="form" field="password"/>
+            <!-- Password -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" class="form-control" type="password" name="password">
+                <has-error :form="form" field="password"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Remember Me -->
-          <div class="form-group row">
-            <div class="col-md-3"/>
-            <div class="col-md-7 d-flex">
-              <checkbox v-model="remember" name="remember">
-                {{ $t('remember_me') }}
-              </checkbox>
+            <!-- Remember Me -->
+            <div class="form-group row">
+              <div class="col-md-3"/>
+              <div class="col-md-7 d-flex">
+                <checkbox v-model="remember" name="remember">
+                  {{ $t('remember_me') }}
+                </checkbox>
 
-              <router-link :to="{ name: 'password.request' }" class="small ml-auto my-auto">
-                {{ $t('forgot_password') }}
-              </router-link>
+                <router-link :to="{ name: 'password.request' }" class="small ml-auto my-auto">
+                  {{ $t('forgot_password') }}
+                </router-link>
+              </div>
             </div>
-          </div>
 
-          <div class="form-group row">
-            <div class="col-md-7 offset-md-3 d-flex">
-              <!-- Submit Button -->
-              <v-button :loading="form.busy">
-                {{ $t('login') }}
-              </v-button>
+            <div class="form-group row">
+              <div class="col-md-7 offset-md-3 d-flex">
+                <!-- Submit Button -->
+                <v-button :loading="form.busy">
+                  {{ $t('login') }}
+                </v-button>
 
-              <!-- <el-button type="primary" @click="openFullScreen2">As a service</el-button> -->
+                <!-- <el-button type="primary" @click="openFullScreen2">As a service</el-button> -->
 
-              <!-- GitHub Login Button -->
-              <login-with-github/>
+                <!-- GitHub Login Button -->
+                <login-with-github/>
+              </div>
             </div>
-          </div>
-        </form>
-      </card>
+          </form>
+        </card>
+      </div>
     </div>
   </div>
 </template>

resources/assets/js/pages/auth/password/email.vue

@@ -1,29 +1,31 @@
 <template>
-  <div class="row">
-    <div class="col-lg-8 m-auto">
-      <card :title="$t('reset_password')">
-        <form @submit.prevent="send" @keydown="form.onKeydown($event)">
-          <alert-success :form="form" :message="status"/>
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-8 m-auto">
+        <card :title="$t('reset_password')">
+          <form @submit.prevent="send" @keydown="form.onKeydown($event)">
+            <alert-success :form="form" :message="status"/>
 
-          <!-- Email -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
-              <has-error :form="form" field="email"/>
+            <!-- Email -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
+                <has-error :form="form" field="email"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Submit Button -->
-          <div class="form-group row">
-            <div class="col-md-9 ml-md-auto">
-              <v-button :loading="form.busy">
-                {{ $t('send_password_reset_link') }}
-              </v-button>
+            <!-- Submit Button -->
+            <div class="form-group row">
+              <div class="col-md-9 ml-md-auto">
+                <v-button :loading="form.busy">
+                  {{ $t('send_password_reset_link') }}
+                </v-button>
+              </div>
             </div>
-          </div>
-        </form>
-      </card>
+          </form>
+        </card>
+      </div>
     </div>
   </div>
 </template>

resources/assets/js/pages/auth/password/reset.vue

@@ -1,47 +1,49 @@
 <template>
-  <div class="row">
-    <div class="col-lg-8 m-auto">
-      <card :title="$t('reset_password')">
-        <form @submit.prevent="reset" @keydown="form.onKeydown($event)">
-          <alert-success :form="form" :message="status"/>
+  <div class="container">
+    <div class="row">
+      <div class="col-lg-8 m-auto">
+        <card :title="$t('reset_password')">
+          <form @submit.prevent="reset" @keydown="form.onKeydown($event)">
+            <alert-success :form="form" :message="status"/>
 
-          <!-- Email -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email" readonly>
-              <has-error :form="form" field="email"/>
+            <!-- Email -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email" readonly>
+                <has-error :form="form" field="email"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Password -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" class="form-control" type="password" name="password">
-              <has-error :form="form" field="password"/>
+            <!-- Password -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" class="form-control" type="password" name="password">
+                <has-error :form="form" field="password"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Password Confirmation -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.password_confirmation" :class="{ 'is-invalid': form.errors.has('password_confirmation') }" class="form-control" type="password" name="password_confirmation">
-              <has-error :form="form" field="password_confirmation"/>
+            <!-- Password Confirmation -->
+            <div class="form-group row">
+              <label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
+              <div class="col-md-7">
+                <input v-model="form.password_confirmation" :class="{ 'is-invalid': form.errors.has('password_confirmation') }" class="form-control" type="password" name="password_confirmation">
+                <has-error :form="form" field="password_confirmation"/>
+              </div>
             </div>
-          </div>
 
-          <!-- Submit Button -->
-          <div class="form-group row">
-            <div class="col-md-9 ml-md-auto">
-              <v-button :loading="form.busy">
-                {{ $t('reset_password') }}
-              </v-button>
+            <!-- Submit Button -->
+            <div class="form-group row">
+              <div class="col-md-9 ml-md-auto">
+                <v-button :loading="form.busy">
+                  {{ $t('reset_password') }}
+                </v-button>
+              </div>
             </div>
-          </div>
-        </form>
-      </card>
+          </form>
+        </card>
+      </div>
     </div>
   </div>
 </template>

resources/assets/js/pages/auth/register.vue

@@ -1,107 +1,167 @@
 <template>
-  <div class="row">
-    <div class="col-lg-8 m-auto">
-      <card :title="$t('register')">
-        <form @submit.prevent="register" @keydown="form.onKeydown($event)">
-          <!-- Name -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('name') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.name" :class="{ 'is-invalid': form.errors.has('name') }" class="form-control" type="text" name="name">
-              <has-error :form="form" field="name"/>
-            </div>
-          </div>
+	<div class="container">
+		<div class="row">
+			<div class="col-lg-8 m-auto">
+				<card :title="$t('register')">
+					<form @submit.prevent="register" @keydown="form.onKeydown($event)">
+						<!-- Marking -->
+						<div class="form-group row" :class="{'has-error': errors.has('marking') }">
+							<label class="col-md-3 col-form-label text-md-right">{{ $t('Marking') }}</label>
+							<div class="col-md-7">
+								<el-input v-model="form.marking" v-validate="'required|max:255'" type="text" name="marking" placeholder="Marking Number">
+								</el-input>
+								<span class="text-danger" v-if="errors.has('marking')">{{ errors.first('marking') }}<br/></span>
+							</div>
+						</div>
 
-          <!-- Email -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
-              <has-error :form="form" field="email"/>
-            </div>
-          </div>
+						<!-- Email -->
+						<div class="form-group row" :class="{'has-error': errors.has('email') }">
+							<label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
+							<div class="col-md-7">
+								<el-input v-model="form.email" v-validate="'required|max:255'" type="email" name="email" placeholder="Email">
+								</el-input>
+								<span class="text-danger" v-if="errors.has('email')">{{ errors.first('email') }}</span>
+							</div>
+						</div>
 
-          <!-- Password -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.password" :class="{ 'is-invalid': form.errors.has('password') }" class="form-control" type="password" name="password">
-              <has-error :form="form" field="password"/>
-            </div>
-          </div>
+						<!-- Password -->
+						<div class="form-group row" :class="{'has-error': errors.has('password') }">
+							<label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
+							<div class="col-md-7">
+								<el-input v-if="password_visible" v-model="form.password" v-validate="'required|min:6|max:255'" type="text" name="password" placeholder="Password">
+									<template slot="append">
+										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button>
+									</template>
+								</el-input>
+								<el-input v-else v-model="form.password" v-validate="'required|min:6|max:255'" type="password" name="password" placeholder="Password">
+									<template slot="append">
+										<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button>
+									</template>
+								</el-input>
+								<span class="text-danger" v-if="errors.has('password')">{{ errors.first('password') }}</span>
+							</div>
+						</div>
 
-          <!-- Password Confirmation -->
-          <div class="form-group row">
-            <label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
-            <div class="col-md-7">
-              <input v-model="form.password_confirmation" :class="{ 'is-invalid': form.errors.has('password_confirmation') }" class="form-control" type="password" name="password_confirmation">
-              <has-error :form="form" field="password_confirmation"/>
-            </div>
-          </div>
+						<!-- Password Confirmation -->
+						<div class="form-group row" :class="{'has-error': errors.has('confirm_password') }">
+							<label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
+							<div class="col-md-7">
+								<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" v-validate="'required|min:6|max:255'" type="text" name="password_confirmation" placeholder="Confirm Password">
+									<template slot="append">
+										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button>
+									</template>
+								</el-input>
+								<el-input v-else v-model="form.password_confirmation" v-validate="'required|min:6|max:255'" type="password" name="password_confirmation" placeholder="Confirm Password">
+									<template slot="append">
+										<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button>
+									</template>
+								</el-input>
+								<span class="text-danger" v-if="errors.has('password_confirmation')">{{ errors.first('password_confirmation') }}<br/></span>
+							</div>
+						</div>
 
-          <div class="form-group row">
-            <div class="col-md-7 offset-md-3 d-flex">
-              <!-- Submit Button -->
-              <v-button :loading="form.busy">
-                {{ $t('register') }}
-              </v-button>
+						<div class="form-group row">
+							<div class="col-md-7 offset-md-3 d-flex">
+								<!-- Submit Button -->
+								<v-button :loading="form.busy" :disabled="errors.any() || form.password=='' || form.password_confirmation=='' || form.email=='' || form.marking=='' ? true : false">
+									{{ $t('register') }}
+								</v-button>
 
-              <!-- GitHub Register Button -->
-              <login-with-github/>
-            </div>
-          </div>
-        </form>
-      </card>
-    </div>
-  </div>
+								<!-- GitHub Register Button -->
+								<login-with-github/>
+							</div>
+						</div>
+					</form>
+				</card>
+			</div>
+		</div>
+	</div>
 </template>
 
 <script>
 import Form from 'vform'
 import LoginWithGithub from '~/components/LoginWithGithub'
 import store from '~/store'
+import Vue from 'vue'
+import VeeValidate from 'vee-validate';
+Vue.use(VeeValidate);
 
 export default {
-  middleware: 'guest',
+	middleware: 'guest',
 
-  components: {
-    LoginWithGithub
-  },
+	components: {
+		LoginWithGithub
+	},
 
-  metaInfo () {
-    return { title: this.$t('register') }
-  },
+	metaInfo () {
+		return { title: this.$t('register') }
+	},
 
-  data: () => ({
-    form: new Form({
-      name: '',
-      email: '',
-      password: '',
-      password_confirmation: ''
-    })
-  }),
+	data: () => ({
+		form: new Form({
+			marking:'',
+			email: '',
+			password: '',
+			password_confirmation: ''
+		}),
+		email : '',
+		password_visible : false,
+		password_confirmation_visible : false
+	}),
 
-  methods: {
-    async register () {
-      // Register the user.
-      const { data } = await this.form.post('/api/register')
 
-      // Log in the user.
-      const { data: { token } } = await this.form.post('/api/login')
+	methods: {
+		async register () {
+			var token
+			var data 
+			// Register the user.
+			await this.form.post('/api/register')
+			.then( (response) => {
+				 data = response.data
+			    this.$message({
+				message: "Success. Logging in..",
+				type: 'success'
+				})
+			})
+			.catch( (error) => {
+				console.log(error)
+			    this.$message({
+				message: error.response.data.message,
+				type: 'error'
+				})
+			}
+			)
 
-      // Save the token.
-      this.$store.dispatch('auth/saveToken', { token })
+			
+			await this.form.post('/api/login')
+			.then( (response) => {
+				console.log(response.data)
+				token = response.data.token
+			})
+			.catch( (error) => {
+				console.log(error)
+			    this.$message({
+				message: error.response.data.message,
+				type: 'error'
+				})
+			}
+			)
 
-      // Update the user.
-      await this.$store.dispatch('auth/updateUser', { user: data })
+			console.log(token)
+			// Save the token.
+			this.$store.dispatch('auth/saveToken', { token } )
 
-      // Redirect home.
-      if (store.getters['auth/user'].role === 'admin') {
-        this.$router.push({ name: 'admin.home' })
-      } else {
-        this.$router.push({ name: 'home' })
-      }
-    }
-  }
+			// Update the user.
+			await this.$store.dispatch('auth/updateUser', { user: data })
+
+			// Redirect home.
+			if (store.getters['auth/user'].role === 'admin') {
+				this.$router.push({ name: 'admin.home' })
+			} else {
+				this.$router.push({ name: 'home' })
+			}
+
+		}
+	}
 }
 </script>

resources/assets/js/pages/booking/completed.vue

@@ -112,7 +112,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">

resources/assets/js/pages/booking/confirmation.vue

@@ -60,7 +60,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -205,7 +205,7 @@
     <el-row justify="center" align="center">
       <el-card class="box-card">
         <div slot="header" class="clearfix">
-          <span>BankinSlip</span>
+          <span>Banking Slip</span>
           <!-- <el-button style="float: right; padding: 3px 0" type="text">Operation button</el-button> -->
         </div>
         <el-row :gutter="12">

resources/assets/js/pages/booking/po.vue

@@ -20,7 +20,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
-              <a target=" _blank" href="#">
+              <a target=" _blank" :href="booking_details.user_po_path">
                 <img v-bind:src="booking_details.user_po_path" class="image">
               </a>
             </el-col>
@@ -36,7 +36,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
-              <a target=" _blank" href="#">
+              <a target=" _blank" :href="booking_details.china_bankslip_path">
                 <img v-bind:src="booking_details.china_bankslip_path" class="image">
               </a>
             </el-col>
@@ -51,7 +51,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">     
-                <img width="100%" height="100%" src="http://via.placeholder.com/700x800">   
+                <img width="100%" height="100%" src="http://via.placeholder.com/900x1615">   
             </el-col>
           </el-row>
         </el-card>
@@ -112,7 +112,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -262,7 +262,9 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            <a target="_blank" :href="booking_details.user_bankslip_path">
+              <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            </a>
           </el-col>
         </el-row>
       </el-card>
@@ -273,6 +275,17 @@
   .booking-details {
     font-weight: bold;
   }
+  .image {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      margin-left: auto;
+      margin-right: auto;
+      width: 150px;
+      display: block;
+  }
+  .image:hover {
+    box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+  }
 </style>
 <script>
 import VueCountdown from '@dmaksimovic/vue-countdown'

resources/assets/js/pages/booking/poComplete.vue

@@ -112,7 +112,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">

resources/assets/js/pages/booking/transfer.vue

@@ -60,7 +60,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">

resources/assets/js/pages/booking/uploadPo.vue

@@ -48,7 +48,7 @@
           </div>
           <el-row :gutter="12" type="flex">
             <el-col :span="12">
-              <a href="https://placeholder.com">
+              <a target="_blank" :href="booking_details.china_bankslip_path">
                 <img v-bind:src="booking_details.china_bankslip_path" class="image">
               </a>
             </el-col>
@@ -97,7 +97,7 @@
                         <div class="cell">Customer Marking :</div>
                       </td>
                       <td class="el-table_2_column_10 is-left ">
-                        <div class="cell">CIEF/150ECE</div>
+                        <div class="cell">{{ booking_details.marking }}</div>
                       </td>
                     </tr>
                     <tr class="el-table__row">
@@ -231,7 +231,9 @@
         </div>
         <el-row :gutter="12">
           <el-col :span="22" style="text-align:center">
-            <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            <a target="_blank" :href="booking_details.user_bankslip_path">
+              <img v-bind:src="booking_details.user_bankslip_path" class="image">
+            </a>
           </el-col>
         </el-row>
       </el-card>
@@ -242,6 +244,17 @@
     .booking-details {
         font-weight: bold;
     }
+    .image {
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      margin-left: auto;
+      margin-right: auto;
+      width: 150px;
+      display: block;
+  }
+    .image:hover {
+      box-shadow: 0 0 2px 1px rgba(0, 140, 186, 0.5);
+    }
 </style>
 <script>
 import VueCountdown from '@dmaksimovic/vue-countdown'

resources/assets/js/pages/booking/uploadUserBankSlip.vue

@@ -1,103 +1,103 @@
 <template>
-  <el-main>
-    <progress-track v-model="status"/>
+	<el-main>
+	<progress-track v-model="status"/>
 
-    <div align="center" v-if="booking.user_bankslip_path">
-      <h4 style="margin-top:5%" >
-        Your Bankslip Has Been Rejected, Please Reupload Your Bankslip <br>
-        Reason : {{ booking.reject_reason }}
-      </h4>
-      <br>
-      <br>
-    </div>
+	<div align="center" v-if="booking.user_bankslip_path">
+		<h4 style="margin-top:5%" >
+		Your Bankslip Has Been Rejected, Please Reupload Your Bankslip <br>
+		Reason : {{ booking.reject_reason }}
+		</h4>
+		<br>
+		<br>
+	</div>
 
-     <div v-else align="center">
-      <h4 style="margin-top:5%;">Waiting For Payment</h4>
-    </div>
+	 <div v-else align="center">
+		<h4 style="margin-top:5%;">Waiting For Payment</h4>
+	</div>
 
-    <el-row justify="center" align="center">
-      <table class="table-responsive el-table" style="display:table; width:50%; margin: 0 auto;">
-        <tbody>
-          <tr>
-            <td class="el-table_2_column_9 is-right ">Amount : </td>
-            <td class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
-              <b> RMB {{ booking.amount }} </b>
-            </td>
-          </tr>
-          <tr>
-            <td width="200" class="el-table_2_column_9 is-right ">Bankin Amount : </td>
-            <td width="200" class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
-              <b> MYR {{ booking.bankin_amount }} </b>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-      <table class="table-responsive el-table" style="display:table; width:50%; margin: 0 auto;"  align="center">
-      <tr>
-        <td align="center">TC Global Trade (M) Sdn Bhd (1190583-A) <br> GST : 001408413696 <br> HLB : 2200 0010 531 <br> MBB : 5148 4233 6341</td>
-        
-      </tr>
-            <!-- <tr><td align="center">GST : 001408413696</td></tr>
-            <tr><td align="center">HLB : 2200 0010 531</td></tr>
-            <tr><td align="center">MBB : 5148 4233 6341</td></tr>   -->
-            </table>
-    </el-row>
-    <br>
+	<el-row justify="center" align="center">
+		<table class="table-responsive el-table" style="display:table; width:50%; margin: 0 auto;">
+		<tbody>
+			<tr>
+			<td class="el-table_2_column_9 is-right ">Amount : </td>
+			<td class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
+				<b> RMB {{ booking.amount }} </b>
+			</td>
+			</tr>
+			<tr>
+			<td width="200" class="el-table_2_column_9 is-right ">Bankin Amount : </td>
+			<td width="200" class="el-table_2_column_9 is-left ">&nbsp;&nbsp;
+				<b> MYR {{ booking.bankin_amount }} </b>
+			</td>
+			</tr>
+		</tbody>
+		</table>
+		<table class="table-responsive el-table" style="display:table; width:50%; margin: 0 auto;"  align="center">
+		<tr>
+			<td align="center">
+				{{bankDetail.company_name}}<br/>
+				{{bankDetail.bank_name}} : {{bankDetail.acc_no}}
+			</td>
+			
+		</tr>
+		</table>
+	</el-row>
+	<br>
 
-    <!-- action="https://jsonplaceholder.typicode.com/posts/" -->
+	<!-- action="https://jsonplaceholder.typicode.com/posts/" -->
 
-    <div align="center">
+	<div align="center">
 
-      <vue-countdown :countdownend="handleCoutdownend" :time="booking.timeout">
-        <template slot-scope="props">Time Remaining：<br>{{ props.days }} days, {{ props.hours }} hours, {{ props.minutes }} minutes, {{ props.seconds }} seconds.</template>
-      </vue-countdown>
-      <!-- <button v-on:click="startTimer">Start timer</button> -->
-    </div>
-    <br>
+		<vue-countdown :countdownend="handleCoutdownend" :time="booking.timeout">
+		<template slot-scope="props">Time Remaining：<br>{{ props.days }} days, {{ props.hours }} hours, {{ props.minutes }} minutes, {{ props.seconds }} seconds.</template>
+		</vue-countdown>
+		<!-- <button v-on:click="startTimer">Start timer</button> -->
+	</div>
+	<br>
 
-    <!-- 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 -->
+	<!-- 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 label-width="300px">
-        <el-form-item label="Amount (RM) :"> -->
-    <div align="center">
-      Bankin Amount (RM) :
-      <el-form ref="user_slip_form" :model="user_slip_form" :rules="rules">
-        <div align="center">
-          <el-form-item prop="transfer_amount">
-            <el-input v-model="user_slip_form.transfer_amount" type="text" placeholder="Transfer Amount" style="width: 20%"
-            />
-          </el-form-item>
-          <el-form-item>
-            <div align="center">
-              <el-button :loading="loading" type="primary" @click="submitUserSlip('user_slip_form')">Submit</el-button>
-              <router-link :to="{ name: 'home' }" class="small ml-auto my-auto">
-                Upload Later
-              </router-link>
-            </div>
-          </el-form-item>
-        </div>
-      </el-form>
-      <br>
-      <br>
-    </div>
-    <!-- </el-form-item>
-    </el-form> -->
+	<!-- <el-form label-width="300px">
+	<el-form-item label="Amount (RM) :"> -->
+	<div align="center">
+		Bankin Amount (RM) :
+		<el-form ref="user_slip_form" :model="user_slip_form" :rules="rules">
+		<div align="center">
+			<el-form-item prop="transfer_amount">
+			<el-input v-model="user_slip_form.transfer_amount" type="text" placeholder="Transfer Amount" style="width: 20%"
+			/>
+			</el-form-item>
+			<el-form-item>
+			<div align="center">
+				<el-button :loading="loading" type="primary" @click="submitUserSlip('user_slip_form')">Submit</el-button>
+				<router-link :to="{ name: 'home' }" class="small ml-auto my-auto">
+				Upload Later
+				</router-link>
+			</div>
+			</el-form-item>
+		</div>
+		</el-form>
+		<br>
+		<br>
+	</div>
+	<!-- </el-form-item>
+	</el-form> -->
 
-  </el-main>
+	</el-main>
 </template>
 <style>
-  .booking-details {
-    font-weight: bold;
-  }
+	.booking-details {
+	font-weight: bold;
+	}
 </style>
 <script>
 import VueCountdown from '@xkeshi/vue-countdown'
@@ -105,148 +105,197 @@ import ProgressTrack from '~/components/ProgressTrack'
 import axios from 'axios'
 
 export default {
-  middleware: ['auth'],
-  name: 'MyComponent',
-  components: {
-    'vue-countdown': VueCountdown,
-    'progress-track': ProgressTrack
-  },
-  data () {
-    return {
-      status: 2,
-      start: false,
-      loading: false,
-      dialogImageUrl: '',
-      dialogVisible: false,
-      booking_id: this.$route.params.id,
-      user_slip_form: {
-        transfer_amount: ''
-      },
-      booking: {
-        amount: '',
-        bankin_amount: '',
-        timeout: 1,
-        user_bankslip_path: null,
-        reject_reason: null,
-      },
-      rules: {
-        transfer_amount: [{
-          required: true,
-          message: 'Please input amount',
-          trigger: 'change'
-        } ]}
-    }
-  },
-  beforeCreate () {
-    const loading = this.$loading({
-      lock: true,
-      text: 'Please wait..',
-      spinner: 'el-icon-loading',
-      background: 'rgba(0, 0, 0, 0.7)'
-    })
+	middleware: ['auth'],
+	name: 'MyComponent',
+	components: {
+	'vue-countdown': VueCountdown,
+	'progress-track': ProgressTrack
+	},
+	data () {
+		return {
+			status: 2,
+			start: false,
+			loading: false,
+			dialogImageUrl: '',
+			dialogVisible: false,
+			booking_id: this.$route.params.id,
+			user_slip_form: {
+			transfer_amount: ''
+			},
+			booking: {
+			amount: '',
+			bankin_amount: '',
+			timeout: 1,
+			term : '123',
+			user_bankslip_path: null,
+			reject_reason: null,
+			},
+			rules: {
+			transfer_amount: [{
+				required: true,
+				message: 'Please input amount',
+				trigger: 'change'
+			}]
+			},
+			active_bank_setting: {
+				x1_bank_id: null,
+				x2_bank_id: null,
+				beneficiary_id: null
+			},
+			bankDetail : {},
 
-    axios
-      .get('/api/booking/' + this.$route.params.id)
-      .then((response) => {
-        console.log(response)
-        this.booking.amount = response.data.amount
-        this.booking.bankin_amount = response.data.bia
-        this.booking.timeout = response.data.timeout * 1000
+		}
+	},
+	beforeCreate () {
+		const loading = this.$loading({
+		lock: true,
+		text: 'Please wait..',
+		spinner: 'el-icon-loading',
+		background: 'rgba(0, 0, 0, 0.7)'
+		})
 
-        if (response.data.user_bankslip_path)
-        {
-          this.booking.user_bankslip_path = response.data.user_bankslip_path
-          this.booking.reject_reason = response.data.reject_reason
-        }
+		axios.get('/api/booking/' + this.$route.params.id)
+		.then((response) => {
+		this.booking.amount = response.data.amount;
+		this.booking.bankin_amount = response.data.bia;
+		this.booking.timeout = response.data.timeout * 1000;
+		this.booking.term = response.data.term;
 
-        this.start = true
-        loading.close()
+		if (response.data.user_bankslip_path)
+		{
+			this.booking.user_bankslip_path = response.data.user_bankslip_path
+			this.booking.reject_reason = response.data.reject_reason
+		}
 
-        if (this.booking.timeout < 0) {
-          this.$message({
-            showClose: true,
-            message: 'Booking timeout, please make another booking.',
-            type: 'error',
-            duration: 30000
-          })
-          this.$router.push({
-            name: 'home'
-          })
-        }
-      }).catch((error) => {
-        console.log(error)
-        loading.close()
-        this.$router.push({
-          name: 'notfound'
-        })
-      })
-  },
-  methods: {
-    handleCoutdownend () {
-      this.$message({
-        showClose: true,
-        message: 'Booking timeout, please make another booking.',
-        type: 'error',
-        duration: 30000
-      })
-      this.$router.push({
-        name: 'home'
-      })
-    },
-    handleRemove (file, fileList) {
-      console.log(file, fileList)
-    },
-    handlePictureCardPreview (file) {
-      this.dialogImageUrl = file.url
-      this.dialogVisible = true
-    },
-    submitUserSlip (formName) {
-      this.loading = true
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let newConfirmation = {
-            amount: this.booking.amount,
-            term: this.term
-          }
-        } else {
-          this.loading = false
-        }
-      })
-      let newUserSlip = {
-        transfer_amount: this.user_slip_form.transfer_amount
-      }
-      axios.patch('/api/booking/' + this.booking_id + '/bankslip-amount', newUserSlip)
-        .then((response) => {
-          this.$message({
-            showClose: true,
-            message: 'Your bankinslip has been submitted, please wait admin to approve.',
-            type: 'success',
-            duration: 5000
-          })
+		this.start = true
+		loading.close()
 
-          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)
-        })
-    },
-    handleTimeExpire () {
-      alert('Booking expired')
-    },
-    startTimer () {
-      this.start = true
-    }
+		if (this.booking.timeout < 0){
+			this.$message({
+			showClose: true,
+			message: 'Booking timeout, please make another booking.',
+			type: 'error',
+			duration: 30000
+			})
+			this.$router.push({
+			name: 'home'
+			})
+		}
+		}).catch((error) => {
+		console.log(error)
+		loading.close()
+		this.$router.push({
+			name: 'notfound'
+		})
+		})
+	},
+	beforeMount(){
+		this.updateBankDetail();
+	},
+	methods: {
+		handleCoutdownend () {
+			this.$message({
+			showClose: true,
+			message: 'Booking timeout, please make another booking.',
+			type: 'error',
+			duration: 30000
+			})
+			this.$router.push({
+			name: 'home'
+			})
+		},
+		handleRemove (file, fileList) {
+			// console.log(file, fileList)
+		},
+		handlePictureCardPreview (file) {
+			this.dialogImageUrl = file.url
+			this.dialogVisible = true
+		},
+		submitUserSlip (formName) {
+			this.loading = true
+			this.$refs[formName].validate((valid) => {
+			if (valid) {
+				let newConfirmation = {
+				amount: this.booking.amount,
+				term: this.term
+				}
+			} else {
+				this.loading = false
+			}
+			})
+			let newUserSlip = {
+			transfer_amount: this.user_slip_form.transfer_amount
+			}
+			axios.patch('/api/booking/' + this.booking_id + '/bankslip-amount', newUserSlip)
+			.then((response) => {
+				this.$message({
+				showClose: true,
+				message: 'Your bankinslip has been submitted, please wait admin to approve.',
+				type: 'success',
+				duration: 5000
+				})
 
-  }
+				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)
+			})
+		},
+		handleTimeExpire () {
+			alert('Booking expired')
+		},
+		startTimer () {
+			this.start = true;
+		},
+		updateBankDetail(){
+			axios.get('/api/active-bank')
+			.then((response) => {
+				this.active_bank_setting = response.data;
+				console.log(this.active_bank_setting.x1_bank_id);
+				this.getBankDetailWithTerm();
+			})
+			.catch((error) => {
+				console.log(error);
+				this.$message({
+					showClose: true,
+					message: 'Fetch data fail',
+					type: 'error',
+					duration: 10000
+				});
+			});
+		},
+		getBankDetailWithTerm(){
+			var url = '';
+			if(this.booking.term === 'x1_cash' || this.booking.term === 'x1_cheque' ||this.booking.term === 'x1_ba'){
+				url = '/api/malaysia-bank/' + this.active_bank_setting.x1_bank_id;
+			}
+			else if(this.booking.term === 'x2_cash' || this.booking.term === 'x2_cheque' ||this.booking.term === 'x2_ba'){
+				url = '/api/malaysia-bank/' + this.active_bank_setting.x2_bank_id;
+			}
+
+			axios.get(url)
+				.then((response) => {
+					this.bankDetail = response.data;
+				})
+				.catch((error) => {
+					console.log(error);
+					this.$message({
+						showClose: true,
+						message: 'Fetch data fail',
+						type: 'error',
+						duration: 10000
+					});
+				});
+		}
+	}
 }
 </script>

resources/assets/js/pages/errors/404.vue

@@ -1,13 +1,15 @@
 <template>
-  <card class="text-center">
-    <h3 class="mb-4">{{ $t('page_not_found') }}</h3>
+  <div class="container">
+    <card class="text-center">
+      <h3 class="mb-4">{{ $t('page_not_found') }}</h3>
 
-    <div class="links">
-      <router-link :to="{ name: 'home' }">
-        {{ $t('go_home') }}
-      </router-link>
-    </div>
-  </card>
+      <div class="links">
+        <router-link :to="{ name: 'home' }">
+          {{ $t('go_home') }}
+        </router-link>
+      </div>
+    </card>
+  </div>
 </template>
 
 <script>

resources/assets/js/pages/home.vue

@@ -1,7 +1,5 @@
 <template>
-
   <el-main>
-
     <!-- Input-Amount -->
     <el-row :gutter="20" type="flex" justify="center" align="middle">
       <el-col :span="20">
@@ -235,9 +233,9 @@
     <br>
     <hr>
     <div align="right">
-    <el-button icon="el-icon-refresh" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button></div>
-    <br>
-  <!-- Booking Table -->
+<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button></div>
+<p class="mobile-view"> Scroll left or right to navigate the table  <i class="fas fa-arrows-alt-h"></i> </p>
+<!-- Booking Table -->
     <el-row :gutter="20">
       <div>
         <el-table :data="bookingTable">
@@ -294,6 +292,11 @@
   .el-tag {
     cursor: pointer;
   }
+  @media only screen and (min-width: 768px) {
+    .mobile-view {
+      display: none;
+    }
+  }
 </style>
 <script>
 import Form from 'vform'
@@ -318,7 +321,7 @@ export default {
         x2_cash: null,
         x2_cheque: null,
       },
-      loading: false,
+      loading_btn: false,
       status: '',
       booking: {
         amount: '',
@@ -411,10 +414,14 @@ export default {
     },
     RefreshBooking() {
       let $this = this
+      this.loading_btn = true
       axios.get(this.url).then(response => {
-        this.bookingTable = response.data.data
+        this.loading_btn = false;
+        this.bookingTable = response.data
       })
     },
+
+    
     makePagination(data){
       let pagination =  {
         current_page: data.current_page,
@@ -485,45 +492,51 @@ export default {
               console.log(error)
             })
         } else {
-
+          this.loading = false
+          this.$message({
+                showClose: true,
+                message: 'Please fill the booking form in full.',
+                type: 'error',
+                duration: 10000
+              })
         }
       })
     },
     createBooking: function () {
       this.loading = true,
       this.dialogFormVisible1 = true
+          let newBooking = {
+            account_name: this.bookingForm.account_name,
+            account_num: this.bookingForm.account_num,
+            bank_name: this.bookingForm.bank_name,
+            bank_branch: this.bookingForm.bank_branch,
+            amount: this.booking.amount,
+            term: this.term
+          }
 
-      let newBooking = {
-        account_name: this.bookingForm.account_name,
-        account_num: this.bookingForm.account_num,
-        bank_name: this.bookingForm.bank_name,
-        bank_branch: this.bookingForm.bank_branch,
-        amount: this.booking.amount,
-        term: this.term
-      }
+          console.log(newBooking)
+          axios.post('api/booking', newBooking)
+            .then((response) => {
+              this.loading = false
+              // push with return id
+              this.$router.push({
+                name: 'booking.user.upload',
+                params: {id: response.data.id }
+              })
 
-      console.log(newBooking)
-      axios.post('api/booking', newBooking)
-        .then((response) => {
-          this.loading = false
-          // push with return id
-          this.$router.push({
-            name: 'booking.user.upload',
-            params: {id: response.data.id }
-          })
-
-          // pass variable to another router
-        })
-        .catch((error) => {
-          this.loading = false
-          this.$message({
-            showClose: true,
-            message: 'Internal server issues. Please contact support',
-            type: 'error',
-            duration: 10000
-          })
-          console.log(error)
-        })
+              // pass variable to another router
+            })
+            .catch((error) => {
+              console.log(error)
+              this.loading = false
+              this.$message({
+                showClose: true,
+                message: 'Internal server issues. Please contact support',
+                type: 'error',
+                duration: 10000
+              })
+             
+            })
     },
     BookingStatus (status, booking_id) {
       console.log(status)

resources/assets/js/pages/settings/admin-bank-setting.vue

@@ -3,30 +3,154 @@
     <span align="center"><h4>Bank Setting</h4></span><br>
     <el-form :inline="true">
         <el-form-item>
-        Active CIEF bank account for today : 
-            X1 : <el-select size="mini">
-                    <el-option>Maybank</el-option>
-                    <el-option>Affinbank</el-option>
-                    <el-option>Bank Islam</el-option>
-                </el-select>
-            X2 : <el-select size="mini">
-                <el-option>Maybank</el-option>
-                <el-option>Affinbank</el-option>
-                <el-option>Bank Islam</el-option>
+            Active CIEF bank account for today : 
+            X1 : 
+            <el-select v-model="active_bank_setting.x1_bank_id" size="mini">
+                <el-option
+                  v-for="item in options_CIEF"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
             </el-select>
-            <el-button type="primary" size="mini">Update</el-button>
         </el-form-item>
-    </el-form>
-    <el-form :inline="true">
         <el-form-item>
-        Active CIEF China Beneficiary Account for Today : 
-            <el-select size="mini">
-                    <el-option>Bank of China</el-option>
-                    <el-option>China Bank</el-option>
-                    <el-option>Bank</el-option>
+            X2 : 
+            <el-select v-model="active_bank_setting.x2_bank_id" size="mini">
+                <el-option
+                  v-for="item in options_CIEF"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
             </el-select>
-            <el-button type="primary" size="mini">Update</el-button>
+        </el-form-item>
+        <el-form-item>
+            Active CIEF China Beneficiary Account for Today : 
+            <el-select v-model="active_bank_setting.beneficiary_id" size="mini">
+                <el-option
+                  v-for="item in options_china_bank"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" size="mini" :loading="loading_btn" @click="EditActiveBankSetting">Update</el-button>
         </el-form-item>
     </el-form>
 </div>
-</template>
+</template>
+
+<script type="text/javascript">
+import axios from 'axios'
+
+export default {
+    // TODO : update credit limit and timeout 
+    data() {
+        return {
+            options_CIEF: [],
+            options_china_bank: [],
+            active_bank_setting : {
+                x1_bank_id: null,
+                x2_bank_id: null,
+                beneficiary_id: null
+            },
+            loading_btn: false
+        };
+    },
+    beforeMount(){
+        this.UpdateMalaysiaBankOption();
+        this.UpdateChinaBankOption();
+        this.UpdateActiveBankSetting();
+    },
+    methods :{
+        UpdateMalaysiaBankOption : function(){
+            var malaysiaBankData;
+            axios.get('/api/setting-malaysia-bank')
+                .then((response) => {
+                    malaysiaBankData = response.data;
+                    this.options_CIEF = malaysiaBankData.map(function(item){
+                        return {
+                            value : item.id,
+                            label : item.acc_no,
+                        };
+                    });
+                })
+                .catch((error) => {
+                    console.log(error);
+                    this.$message({
+                        showClose: true,
+                        message: 'Fetch data fail',
+                        type: 'error',
+                        duration: 10000
+                    });
+                });
+        },
+        UpdateChinaBankOption : function(){
+            var chinaBankData;
+            axios.get('/api/setting-beneficiary')
+                .then((response) => {
+                    chinaBankData = response.data;
+                    this.options_china_bank = chinaBankData.map(function(item){
+                        return {
+                            value : item.id,
+                            label : item.acc_no,
+                        };
+                    });
+                })
+                .catch((error) => {
+                    console.log(error);
+                    this.$message({
+                        showClose: true,
+                        message: 'Fetch data fail',
+                        type: 'error',
+                        duration: 10000
+                    });
+                });
+        },
+        UpdateActiveBankSetting : function(){
+            axios.get('/api/setting-active-bank')
+                .then((response) => {
+                    this.active_bank_setting = response.data;
+                })
+                .catch((error) => {
+                    console.log(error);
+                    this.$message({
+                        showClose: true,
+                        message: 'Fetch data fail',
+                        type: 'error',
+                        duration: 10000
+                    });
+                });
+        },
+        EditActiveBankSetting : function(){
+            this.loading_btn = true;
+            axios.put('/api/setting-active-bank', this.active_bank_setting)
+            .then((response) => {
+                this.loading_btn = false;
+                this.$message({
+                    showClose: true,
+                    message: 'Success',
+                    type: 'success',
+                    duration: 5000
+                });
+            })
+            .catch((error) => {
+                this.loading_btn = false;
+                console.log(error);
+                this.$message({
+                    showClose: true,
+                    message: 'Update failed, please contact support',
+                    type: 'error',
+                    duration: 10000
+                });
+            })
+        },
+    }
+
+}
+
+
+</script>

resources/assets/js/pages/settings/admin-china-bank.vue

@@ -1,114 +1,259 @@
 <template>
 <div>
-  <span align="center"><h4>CIEF China Bank Details</h4></span><br>
-    <el-table :data="tableData" border style="width: 100%">
-      <el-table-column prop="comp_name" label="Company Name" width="90px"></el-table-column>
-      <el-table-column prop="bank_name" label="Bank Name"></el-table-column>
-      <el-table-column prop="bank_acc_no" label="Bank Account No" width="115px"></el-table-column>
-      <el-table-column prop="bank_address" label="Bank Address" width="111px"></el-table-column>
-      <el-table-column prop="swift_code" label="SWIFT Code"></el-table-column>
-      <el-table-column prop="cnap" label="CNAP" width="80px"></el-table-column>
-      <el-table-column prop="bank_branch" label="Bank Branch"></el-table-column>
-      <el-table-column label="Action">
-          <template slot-scope="scope">
-              <el-button type="text" size="small" @click="EditDatadialogVisible = true">Edit</el-button>
-              <el-button type="text" size="small" @click="DeleteAdddialogVisible = true">Delete</el-button>
-          </template>
-      </el-table-column>
-    </el-table><br>
-    <div align="right">
-      <el-button type="primary" icon="el-icon-plus" @click="AddDatadialogVisible = true">Add New Data</el-button>
-    </div>
-    <!-- popup add new data -->
-      <el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
-          <el-form :label-position="right" label-width="150px">
-            <el-form-item label="Company Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Account No"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Address"><el-input></el-input></el-form-item>
-            <el-form-item label="SWIFT Code"><el-input></el-input></el-form-item>
-            <el-form-item label="CNAP"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Branch"><el-input></el-input></el-form-item>
-          </el-form>
-        <div align="center">
-            <el-button @click="AddDatadialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="AddDatadialogVisible = false; DoneAddDatadialogVisible = true">OK</el-button>
-        </div>
-        <span slot="footer" class="dialog-footer">
-            * Please key in the data in Chinese
-        </span>
-      </el-dialog>
-      <el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
-        <span>Data Added Successfully</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup add new data end -->
-    <!-- popup edit data -->
-      <el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
-          <el-form :label-position="right" label-width="150px">
-            <el-form-item label="Company Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Account No"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Address"><el-input></el-input></el-form-item>
-            <el-form-item label="SWIFT Code"><el-input></el-input></el-form-item>
-            <el-form-item label="CNAP"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Branch"><el-input></el-input></el-form-item>
-          </el-form>
-        <div align="center">
-            <el-button @click="EditDatadialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="EditDatadialogVisible = false; DoneUpdateDatadialogVisible = true">Submit</el-button>
-        </div>
-        <span slot="footer" class="dialog-footer">
-            * Please key in the data in Chinese
-        </span>
-      </el-dialog>
-      <el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
-        <span>Data Updated Successfully</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup edit data end -->
-    <!-- popup delete -->
-      <el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
-        <span>Data Deleted</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup delete end -->
+	<span align="center"><h4>CIEF China Bank Details</h4></span><br>
+		<el-table :data="tableData" border style="width: 100%">
+			<el-table-column prop="company_name" label="Company Name" width="90px"></el-table-column>
+			<el-table-column prop="bank_name" label="Bank Name"></el-table-column>
+			<el-table-column prop="acc_no" label="Bank Account No" width="115px"></el-table-column>
+			<el-table-column prop="bank_address" label="Bank Address" width="111px"></el-table-column>
+			<el-table-column prop="swift" label="SWIFT Code"></el-table-column>
+			<el-table-column prop="cnap" label="CNAP" width="80px"></el-table-column>
+			<el-table-column prop="bank_branch" label="Bank Branch"></el-table-column>
+			<el-table-column label="Action">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="PopOutEditBeneficiaries(scope.$index)">Edit</el-button>
+					<el-button type="text" size="small" @click="DeleteBeneficiaries(tableData[scope.$index].id)">Delete</el-button>
+				</template>
+			</el-table-column>
+		</el-table><br>
+		<div align="right">
+			<el-button type="primary" icon="el-icon-plus" @click="PopOutAddBeneficiaries">Add New Data</el-button>
+		</div>
+		<!-- popup add new data -->
+			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="CreateBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">OK</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
+				<span>Data Added Successfully</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup add new data end -->
+		<!-- popup edit data -->
+			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="beneficiariesForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="beneficiariesForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="beneficiariesForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="beneficiariesForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="beneficiariesForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="beneficiariesForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="beneficiariesForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="EditBeneficiaries" :disabled="errors.any() || beneficiariesForm.company_name=='' || beneficiariesForm.bank_name=='' || beneficiariesForm.acc_no=='' || beneficiariesForm.bank_address=='' || beneficiariesForm.swift =='' || beneficiariesForm.cnap=='' || beneficiariesForm.bank_branch=='' ? true : false">Submit</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
+				<span>Data Updated Successfully</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup edit data end -->
+		<!-- popup delete -->
+			<el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
+				<span>Data Deleted</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup delete end -->
 </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        tableData: [{
-            comp_name: 'CIEF Worldwide',
-            bank_name: 'Myabank',
-            bank_acc_no: '6725137521',
-            bank_address: 'Cyberjaya',
-            swift_code: '2376abc',
-            cnap: 'ghi123',
-            bank_branch: 'Klang'
-        }, {
-            comp_name: 'DPulze',
-            bank_name: 'AFFbank',
-            bank_acc_no: '246891247',
-            bank_address: 'Putrajaya',
-            swift_code: 'qwe4567',
-            cnap: '7890po',
-            bank_branch: 'Jawa'
-        }],
-        EditDatadialogVisible: false,
-        DeleteAdddialogVisible: false,
-        AddDatadialogVisible: false,
-        DoneAddDatadialogVisible: false,
-        DoneUpdateDatadialogVisible: false
-      }
-    }
-  }
-</script>
+	import axios from 'axios'
+
+	export default {
+		data() {
+			return {
+				tableData: [],
+				beneficiariesForm : {
+					company_name : '',
+					bank_name : '',
+					acc_no : '',
+					bank_address : '',
+					swift : '',
+					cnap : '',
+					bank_branch : '',
+				},
+				EditDatadialogVisible: false,
+				DeleteAdddialogVisible: false,
+				AddDatadialogVisible: false,
+				DoneAddDatadialogVisible: false,
+				DoneUpdateDatadialogVisible: false,
+				currentEdit : -1,
+			}
+		},
+		beforeMount(){
+			this.UpdateTableData();
+		},
+		methods: {
+			CreateBeneficiaries : function(){
+				this.AddDatadialogVisible = false;
+				axios.post('/api/setting-beneficiary', this.beneficiariesForm)
+					.then((response) => {
+						this.DoneAddDatadialogVisible = true;
+						this.ClearBeneficiariesForm();
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Create Fail',
+							type: 'error',
+							duration: 10000
+						});
+						this.ClearBeneficiariesForm();
+					});
+			},
+			UpdateTableData : function(){
+				axios.get('/api/setting-beneficiary', this.beneficiariesForm)
+					.then((response) => {
+						this.tableData = response.data;
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Fetch data fail',
+							type: 'error',
+							duration: 10000
+						});
+					})
+			},
+			DeleteBeneficiaries : function(beneficiaries_id){
+				this.DeleteAdddialogVisible = true;
+				axios.delete('/api/setting-beneficiary/' + beneficiaries_id)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Delete data fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			EditBeneficiaries : function(){
+				this.EditDatadialogVisible = false; 
+				this.DoneUpdateDatadialogVisible = true;
+
+				axios.put('/api/setting-beneficiary/' + this.currentEdit, this.beneficiariesForm)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Update Fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			PopOutAddBeneficiaries : function(){
+				this.AddDatadialogVisible = true;
+				this.ClearBeneficiariesForm();
+			},
+			PopOutEditBeneficiaries : function(tableDataRow){
+				this.EditDatadialogVisible = true;
+				this.FillupBeneficiariesForm(tableDataRow);
+				this.currentEdit = this.tableData[tableDataRow].id;
+			},
+			ClearBeneficiariesForm : function(){
+				this.beneficiariesForm.company_name = '';
+				this.beneficiariesForm.bank_name = '';
+				this.beneficiariesForm.acc_no = '';
+				this.beneficiariesForm.bank_address = '';
+				this.beneficiariesForm.swift = '';
+				this.beneficiariesForm.cnap = '';
+				this.beneficiariesForm.bank_branch = '';
+			},
+			FillupBeneficiariesForm : function(tableDataRow){
+				this.beneficiariesForm.company_name = this.tableData[tableDataRow].company_name;
+				this.beneficiariesForm.bank_name = this.tableData[tableDataRow].bank_name;
+				this.beneficiariesForm.acc_no = this.tableData[tableDataRow].acc_no;
+				this.beneficiariesForm.bank_address = this.tableData[tableDataRow].bank_address;
+				this.beneficiariesForm.swift = this.tableData[tableDataRow].swift;
+				this.beneficiariesForm.cnap = this.tableData[tableDataRow].cnap;
+				this.beneficiariesForm.bank_branch = this.tableData[tableDataRow].bank_branch;
+			}
+		}
+	}
+</script>
+<style type="text/css">
+	.error-message{
+		position: absolute;
+		left: 0;
+	}
+</style>
+

resources/assets/js/pages/settings/admin-credit-setting.vue

@@ -1,46 +1,83 @@
 <template>
-<div>
-    <span align="center"><h4>Limitation</h4></span><br>
-    <el-form :inline="true" align="center">
-        <el-form-item>
-        Time Limit for Customer to Upload Bank Slip : 
-            <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="TimeLimitDialogVisible = true">Update Time Limit</el-button>
-        </el-form-item>
-    </el-form>
-    <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="TimeLimitDialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="TimeLimitDialogVisible = false">OK</el-button>
+    <div>
+        <span align="center">
+            <h4>User Credit Limit Setting</h4>
         </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="CreditLimitDialogVisible = true">Update Credit Limit</el-button>
-        </el-form-item>
-    </el-form>
-    <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="CreditLimitDialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="CreditLimitDialogVisible = false">OK</el-button>
-        </span>
-    </el-dialog>
-</div>
+        <br>
+        <el-form>
+            <el-form-item align="center">
+                Time Limit for Customer to Upload Bank Slip :
+                <br>
+                <el-input size="mini" v-model="credit_setting.time_limit" style=width:20%></el-input> Seconds
+            </el-form-item>
+            <el-form-item align="center">
+                Credit Limit for RMB :
+                <el-input placeholder="Amount" v-model="credit_setting.rmb_credit_limit" size="mini" style=width:10%></el-input>
+            </el-form-item>
+            <el-form-item align="center">
+                <el-button type="primary" align="center" :loading="loading_btn" size="primary" @click="updateCreditSetting">Update</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        TimeLimitDialogVisible: false,
-        CreditLimitDialogVisible: false
-      };
-    },
-  };
+    import axios from 'axios'
+    export default {
+        // TODO : update credit limit and timeout 
+        data() {
+            return {
+                loading_btn: false,
+                credit_setting: {
+                    rmb_credit_limit: null,
+                    time_limit: null
+                },
+                TimeLimitDialogVisible: false,
+                CreditLimitDialogVisible: false
+            };
+        },
+        mounted() {
+            this.getCreditSetting();
+        },
+        methods: {
+            ValidateAll : function(){
+                var working;
+                this.$validator.validateAll().then((result) => {
+                    working = result;
+                }).catch(() => {
+                    });
+            },
+            getCreditSetting() {
+                axios.get('/api/setting-credit').then(response => {
+                    this.credit_setting = response.data
+                })
+            },
+            updateCreditSetting (){
+                if(this.ValidateAll())
+                    return;
+                
+                this.loading_btn = true
+				axios.put('/api/setting-credit', this.credit_setting)
+				.then((response) => {
+                    this.loading_btn = false
+						this.$message({
+						showClose: true,
+						message: 'Success',
+						type: 'success',
+						duration: 5000
+					});
+				})
+				.catch((error) => {
+                    this.loading_btn = false
+					console.log(error);
+					this.$message({
+						showClose: true,
+						message: 'Update failed, please contact support',
+						type: 'error',
+						duration: 10000
+					});
+				})
+			},
+        }
+    };
 </script>

resources/assets/js/pages/settings/admin-malaysia-bank.vue

@@ -0,0 +1,260 @@
+<template>
+<div>
+	<span align="center"><h4>Malaysia Bank Details</h4></span><br>
+		<el-table :data="tableData" border style="width: 100%">
+			<el-table-column prop="company_name" label="Company Name" width="90px"></el-table-column>
+			<el-table-column prop="bank_name" label="Bank Name"></el-table-column>
+			<el-table-column prop="acc_no" label="Bank Account No" width="115px"></el-table-column>
+			<el-table-column prop="bank_address" label="Bank Address" width="111px"></el-table-column>
+			<el-table-column prop="swift" label="SWIFT Code"></el-table-column>
+			<el-table-column prop="cnap" label="CNAP" width="80px"></el-table-column>
+			<el-table-column prop="bank_branch" label="Bank Branch"></el-table-column>
+			<el-table-column label="Action">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="PopOutEditMalaysiaBank(scope.$index)">Edit</el-button>
+					<el-button type="text" size="small" @click="DeleteMalaysiaBank(tableData[scope.$index].id)">Delete</el-button>
+				</template>
+			</el-table-column>
+		</el-table><br>
+		<div align="right">
+			<el-button type="primary" icon="el-icon-plus" @click="PopOutAddMalaysiaBank">Add New Data</el-button>
+		</div>
+		<!-- popup add new data -->
+			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="CreateMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">OK</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
+				<span>Data Added Successfully</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup add new data end -->
+		<!-- popup edit data -->
+			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="EditMalaysiaBank" :disabled="errors.any() || malaysiaBankForm.company_name=='' || malaysiaBankForm.bank_name=='' || malaysiaBankForm.acc_no=='' || malaysiaBankForm.bank_address=='' || malaysiaBankForm.swift =='' || malaysiaBankForm.cnap=='' || malaysiaBankForm.bank_branch=='' ? true : false">Submit</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
+				<span>Data Updated Successfully</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup edit data end -->
+		<!-- popup delete -->
+			<el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
+				<span>Data Deleted</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup delete end -->
+</div>
+</template>
+
+<script>
+	import axios from 'axios'
+
+	export default {
+		data() {
+			return {
+				tableData: [],
+				malaysiaBankForm : {
+					company_name : '',
+					bank_name : '',
+					acc_no : '',
+					bank_address : '',
+					swift : '',
+					cnap : '',
+					bank_branch : '',
+				},
+				EditDatadialogVisible: false,
+				DeleteAdddialogVisible: false,
+				AddDatadialogVisible: false,
+				DoneAddDatadialogVisible: false,
+				DoneUpdateDatadialogVisible: false,
+				currentEdit : -1,
+			}
+		},
+	    mounted(){
+	    	this.UpdateTableData();
+	    },
+		methods: {
+			CreateMalaysiaBank : function(){
+	            this.AddDatadialogVisible = false;
+				axios.post('/api/setting-malaysia-bank', this.malaysiaBankForm)
+					.then((response) => {
+						this.DoneAddDatadialogVisible = true;
+						this.ClearMalaysiaBankForm();
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Create Fail',
+							type: 'error',
+							duration: 10000
+						});
+						this.ClearMalaysiaBankForm();
+					});
+			},
+			UpdateTableData : function(){
+				axios.get('/api/setting-malaysia-bank', this.malaysiaBankForm)
+					.then((response) => {
+						this.tableData = response.data;
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Fetch data fail',
+							type: 'error',
+							duration: 10000
+						});
+					})
+			},
+			DeleteMalaysiaBank : function(malaysiaBank_id){
+				this.DeleteAdddialogVisible = true;
+				axios.delete('/api/setting-malaysia-bank/' + malaysiaBank_id)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Delete data fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			EditMalaysiaBank : function(){
+				this.EditDatadialogVisible = false;
+				this.DoneUpdateDatadialogVisible = true;
+				axios.put('/api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Update Fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			PopOutAddMalaysiaBank : function(){
+				this.AddDatadialogVisible = true;
+				this.ClearMalaysiaBankForm();
+				this.$validator.validateAll();
+				console.log(this.errors.count());
+			},
+			PopOutEditMalaysiaBank : function(tableDataRow){
+				this.EditDatadialogVisible = true;
+				this.FillupMalaysiaBankForm(tableDataRow);
+				this.currentEdit = this.tableData[tableDataRow].id;
+			},
+			ClearMalaysiaBankForm : function(){
+				this.malaysiaBankForm.company_name = '';
+				this.malaysiaBankForm.bank_name = '';
+				this.malaysiaBankForm.acc_no = '';
+				this.malaysiaBankForm.bank_address = '';
+				this.malaysiaBankForm.swift = '';
+				this.malaysiaBankForm.cnap = '';
+				this.malaysiaBankForm.bank_branch = '';
+			},
+			FillupMalaysiaBankForm : function(tableDataRow){
+				this.malaysiaBankForm.company_name = this.tableData[tableDataRow].company_name;
+				this.malaysiaBankForm.bank_name = this.tableData[tableDataRow].bank_name;
+				this.malaysiaBankForm.acc_no = this.tableData[tableDataRow].acc_no;
+				this.malaysiaBankForm.bank_address = this.tableData[tableDataRow].bank_address;
+				this.malaysiaBankForm.swift = this.tableData[tableDataRow].swift;
+				this.malaysiaBankForm.cnap = this.tableData[tableDataRow].cnap;
+				this.malaysiaBankForm.bank_branch = this.tableData[tableDataRow].bank_branch;
+			}
+		}
+	}
+</script>
+<style type="text/css">
+	.error-message{
+		position: absolute;
+		left: 0;
+	}
+</style>
+

resources/assets/js/pages/settings/admin-marking-setting.vue

@@ -0,0 +1,72 @@
+<template>
+<div>
+	<span align="center"><h4>Marking Setting</h4></span><br>
+	<el-form label-width="150px">
+		<el-form-item label="Marking" :class="{'has-error': errors.has('marking') }">
+			<el-input v-model="markingForm.marking" v-validate="'required|max:255'" name="marking"></el-input>
+			<span class="error-message text-danger" v-if="errors.has('marking')">{{ errors.first('marking') }}<br/></span>
+		</el-form-item>
+		<el-form-item label="Email" :class="{'has-error': errors.has('email') }">
+			<el-input v-model="markingForm.email" v-validate="'required|email|max:255'" name="email"></el-input>
+			<span class="error-message text-danger" v-if="errors.has('email')">{{ errors.first('email') }}<br/></span>
+		</el-form-item>
+	</el-form>
+	<div align="right">
+		<el-button type="primary" icon="el-icon-plus" @click="CreateMarking" :disabled="errors.any() || markingForm.email=='' || markingForm.marking=='' ? true : false">Add New Data</el-button>
+	</div>
+</div>
+</template>
+
+<script>
+	import axios from 'axios'
+
+	export default {
+		data() {
+			return {
+				loading_btn: false,
+				markingForm : {
+					marking : '',
+					email : '',
+				},
+			}
+		},
+		methods: {
+			CreateMarking : function(){
+				axios.post('/api/setting-marking', this.markingForm)
+					.then((response) => {
+	                    this.loading_btn = false
+							this.$message({
+							showClose: true,
+							message: 'Success',
+							type: 'success',
+							duration: 5000
+						});
+						this.ClearMarkingForm();
+					})
+					.catch((error) => {
+	                    this.loading_btn = false
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Update failed, please contact support',
+							type: 'error',
+							duration: 10000
+						});
+						this.ClearMarkingForm();
+					});
+			},
+			ClearMarkingForm : function(){
+				this.markingForm.marking = '';
+				this.markingForm.email = '';
+			},
+		}
+	}
+</script>
+<style type="text/css">
+	.error-message{
+		position: absolute;
+		left: 0;
+	}
+</style>
+
+

resources/assets/js/pages/settings/admin-supplier.vue

@@ -1,98 +1,227 @@
 <template>
 <div>
-  <span align="center"><h4>Supplier Details</h4></span><br>
-    <el-table :data="tableData" border style="width: 100%">
-      <el-table-column prop="comp_name" label="Company Name"></el-table-column>
-      <el-table-column prop="reg_no" label="Registration No"></el-table-column>
-      <el-table-column prop="gst_no" label="GST No"></el-table-column>
-      <el-table-column prop="bank_name" label="Bank Name"></el-table-column>
-      <el-table-column prop="account_no" label="Account No"></el-table-column>
-      <el-table-column label="Action">
-          <template slot-scope="scope">
-              <el-button type="text" size="small" @click="EditSupplierdialogVisible = true">Edit</el-button>
-              <el-button type="text" size="small" @click="DeleteSupplierdialogVisible = true">Delete</el-button>
-          </template>
-      </el-table-column>
-    </el-table><br>
-    <div align="right">
-      <el-button type="primary" icon="el-icon-plus" @click="AddNewSupplierdialogVisible = true">Add New Supplier</el-button>
-    </div>
-    <!-- popup add new supplier -->
-      <el-dialog title="Add New Supplier" align="center" :visible.sync="AddNewSupplierdialogVisible" width="40%">
-          <el-form :label-position="right" label-width="150px">
-            <el-form-item label="Company Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Registration No"><el-input></el-input></el-form-item>
-            <el-form-item label="GST No"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Account No"><el-input></el-input></el-form-item>
-          </el-form>
-        <div align="center">
-            <el-button @click="AddNewSupplierdialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="AddNewSupplierdialogVisible = false; DoneAddSupplierdialogVisible = true">OK</el-button>
-        </div>
-      </el-dialog>
-      <el-dialog align="center" :visible.sync="DoneAddSupplierdialogVisible" width="30%">
-        <span>Supplier Added Successfully</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DoneAddSupplierdialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup add new supplier end -->
-    <!-- popup edit supplier -->
-      <el-dialog title="Edit Supplier" align="center" :visible.sync="EditSupplierdialogVisible" width="40%">
-          <el-form :label-position="right" label-width="150px">
-            <el-form-item label="Company Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Registration No"><el-input></el-input></el-form-item>
-            <el-form-item label="GST No"><el-input></el-input></el-form-item>
-            <el-form-item label="Bank Name"><el-input></el-input></el-form-item>
-            <el-form-item label="Account No"><el-input></el-input></el-form-item>
-          </el-form>
-        <div align="center">
-            <el-button @click="EditSupplierdialogVisible = false">Cancel</el-button>
-            <el-button type="primary" @click="EditSupplierdialogVisible = false; DoneUpdateSupplierdialogVisible = true">OK</el-button>
-        </div>
-      </el-dialog>
-      <el-dialog align="center" :visible.sync="DoneUpdateSupplierdialogVisible" width="30%">
-        <span>Supplier's Details Updated Successfully</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DoneUpdateSupplierdialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup edit supplier end -->
-    <!-- popup delete supplier -->
-      <el-dialog align="center" :visible.sync="DeleteSupplierdialogVisible" width="30%">
-        <span>Supplier's Details Deleted</span><br><br>
-        <div align="center">
-            <el-button type="primary" @click="DeleteSupplierdialogVisible = false">OK</el-button>
-        </div>
-      </el-dialog>
-    <!-- popup delete supplier end -->
+	<span align="center"><h4>Supplier Details</h4></span><br>
+		<el-table :data="tableData" border style="width: 100%">
+			<el-table-column prop="company_name" label="Company Name"></el-table-column>
+			<el-table-column prop="supplier_reg_no" label="Registration No"></el-table-column>
+			<el-table-column prop="gst_no" label="GST No"></el-table-column>
+			<el-table-column prop="bank_name" label="Bank Name"></el-table-column>
+			<el-table-column prop="acc_no" label="Account No"></el-table-column>
+			<el-table-column label="Action">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="PopOutEditSupplier(scope.$index)">Edit</el-button>
+					<el-button type="text" size="small" @click="DeleteSupplier(tableData[scope.$index].id)">Delete</el-button>
+				</template>
+			</el-table-column>
+		</el-table><br>
+		<div align="right">
+			<el-button type="primary" icon="el-icon-plus" @click="PopOutAddSupplier">Add New Supplier</el-button>
+		</div>
+		<!-- popup add new supplier -->
+			<el-dialog title="Add New Supplier" align="center" :visible.sync="AddNewSupplierdialogVisible" width="40%">
+				<el-form  label-width="150px" >
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="supplierForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Registration No" :class="{'has-error': errors.has('supplier_reg_no') }">
+						<el-input v-model="supplierForm.supplier_reg_no" v-validate="'required|max:191'" name="supplier_reg_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('supplier_reg_no')">{{ errors.first('supplier_reg_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="GST No" :class="{'has-error': errors.has('gst_no') }">
+						<el-input v-model="supplierForm.gst_no" v-validate="'required|max:191'" name="gst_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('gst_no')">{{ errors.first('gst_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="supplierForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="supplierForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+						<el-button @click="AddNewSupplierdialogVisible = false">Cancel</el-button>
+						<el-button type="primary" @click="CreateSupplier" :disabled="errors.any() || supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
+				</div>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneAddSupplierdialogVisible" width="30%">
+				<span>Supplier Added Successfully</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DoneAddSupplierdialogVisible = false;">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup add new supplier end -->
+		<!-- popup edit supplier -->
+			<el-dialog title="Edit Supplier" align="center" :visible.sync="EditSupplierdialogVisible" width="40%">
+					<el-form  label-width="150px" >
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="supplierForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Registration No" :class="{'has-error': errors.has('supplier_reg_no') }">
+						<el-input v-model="supplierForm.supplier_reg_no" v-validate="'required|max:191'" name="supplier_reg_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('supplier_reg_no')">{{ errors.first('supplier_reg_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="GST No" :class="{'has-error': errors.has('gst_no') }">
+						<el-input v-model="supplierForm.gst_no" v-validate="'required|max:191'" name="gst_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('gst_no')">{{ errors.first('gst_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="supplierForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="supplierForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+						<el-button @click="EditSupplierdialogVisible = false">Cancel</el-button>
+						<el-button type="primary" @click="EditSupplier" :disabled="errors.any() || supplierForm.company_name=='' || supplierForm.supplier_reg_no=='' || supplierForm.gst_no=='' || supplierForm.bank_name=='' || supplierForm.acc_no =='' ? true : false">OK</el-button>
+				</div>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneUpdateSupplierdialogVisible" width="30%">
+				<span>Supplier's Details Updated Successfully</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DoneUpdateSupplierdialogVisible = false" >OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup edit supplier end -->
+		<!-- popup delete supplier -->
+			<el-dialog align="center" :visible.sync="DeleteSupplierdialogVisible" width="30%">
+				<span>Supplier's Details Deleted</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DeleteSupplierdialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup delete supplier end -->
 </div>
 </template>
 
 <script>
-  export default {
-    data() {
-      return {
-        tableData: [{
-          comp_name: 'CIEF',
-          reg_no: '2134241',
-          gst_no: '214',
-          bank_name: 'myabank', 
-          account_no: '1242521', 
-        }, {
-          comp_name: 'iPhone',
-          reg_no: '123214',
-          gst_no: '3532',
-          bank_name: 'adyabank', 
-          account_no: '21421421', 
-        }],
-        AddNewSupplierdialogVisible: false,
-        EditSupplierdialogVisible: false,
-        DoneAddSupplierdialogVisible: false,
-        DoneUpdateSupplierdialogVisible: false,
-        DeleteSupplierdialogVisible: false
-      }
-    }
-  }
-</script>
+	import axios from 'axios'
+
+	export default {
+		data() {
+			return {
+				tableData: [],
+				supplierForm : {
+					company_name: '',
+					supplier_reg_no: '',
+					gst_no: '',
+					bank_name: '', 
+					acc_no: '', 
+				},
+				AddNewSupplierdialogVisible: false,
+				EditSupplierdialogVisible: false,
+				DoneAddSupplierdialogVisible: false,
+				DoneUpdateSupplierdialogVisible: false,
+				DeleteSupplierdialogVisible: false,
+				currentEdit: -1,
+			}
+		},
+		beforeMount(){
+			this.UpdateTableData();
+		},
+		methods:{
+			CreateSupplier : function(){
+				this.AddNewSupplierdialogVisible = false; 
+				axios.post('/api/setting-supplier', this.supplierForm)
+				.then((response) => {
+					this.DoneAddSupplierdialogVisible = true;
+					this.UpdateTableData();
+				})
+				.catch((error) => {
+					console.log(error);
+					this.$message({
+						showClose: true,
+						message: 'Create Fail',
+						type: 'error',
+						duration: 10000
+					});
+				});
+			},
+			UpdateTableData : function(){
+				axios.get('/api/setting-supplier', this.supplierForm)
+					.then((response) => {
+						console.log(response.data)
+						this.tableData = response.data;
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Fetch data fail',
+							type: 'error',
+							duration: 10000
+						});
+					})
+			},
+			DeleteSupplier : function(supplier_id){
+				this.DeleteSupplierdialogVisible = true;
+				axios.delete('/api/setting-supplier/' + supplier_id)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Delete data fail',
+							type: 'error',
+							duration: 10000
+						});
+					})
+			},
+			EditSupplier : function(){
+				this.EditSupplierdialogVisible = false; 
+				this.DoneUpdateSupplierdialogVisible = true;
+
+				axios.put('/api/setting-supplier/' + this.currentEdit, this.supplierForm)
+				.then((response) => {
+					this.UpdateTableData();
+				})
+				.catch((error) => {
+					console.log(error);
+					this.$message({
+						showClose: true,
+						message: 'Update Fail',
+						type: 'error',
+						duration: 10000
+					});
+				})
+			},
+			PopOutAddSupplier : function(){
+				this.AddNewSupplierdialogVisible = true;
+				this.ClearSupplierForm();
+			},
+			PopOutEditSupplier : function(tableDataRow){
+				this.EditSupplierdialogVisible = true;
+				this.FillupSupplierForm(tableDataRow);
+				this.currentEdit = this.tableData[tableDataRow].id;
+			},
+			ClearSupplierForm : function(){
+				this.supplierForm.company_name = '';
+				this.supplierForm.supplier_reg_no = '';
+				this.supplierForm.gst_no = '';
+				this.supplierForm.bank_name = '';
+				this.supplierForm.acc_no = '';
+			},
+			FillupSupplierForm : function(tableDataRow){
+				this.supplierForm.company_name = this.tableData[tableDataRow].company_name;
+				this.supplierForm.supplier_reg_no = this.tableData[tableDataRow].supplier_reg_no;
+				this.supplierForm.gst_no = this.tableData[tableDataRow].gst_no;
+				this.supplierForm.bank_name = this.tableData[tableDataRow].bank_name;
+				this.supplierForm.acc_no = this.tableData[tableDataRow].acc_no;
+			}
+		}
+	}
+</script>
+<style type="text/css">
+	.error-message{
+		position: absolute;
+		left: 0;
+	}
+</style>

resources/assets/js/pages/settings/index.vue

@@ -62,12 +62,24 @@
             route: 'settings.admin-china-bank',
             role: 'admin'
           },
+          {
+            icon: 'flag',
+            name: this.$t('CIEF Malaysia Bank'),
+            route: 'settings.admin-malaysia-bank',
+            role: 'admin'
+          },
           {
             icon: 'building',
             name: this.$t('Bank Setting'),
             route: 'settings.admin-bank-setting',
             role: 'admin'
           },
+          {
+            icon: 'building',
+            name: this.$t('Marking Setting'),
+            route: 'settings.admin-marking-setting',
+            role: 'admin'
+          },
         ]
       }
     }

resources/assets/js/pages/settings/profile.vue

@@ -1,34 +1,36 @@
 <template>
-  <card :title="$t('your_info')">
-    <form @submit.prevent="update" @keydown="form.onKeydown($event)">
-      <alert-success :form="form" :message="$t('info_updated')"/>
+  <div class="container">
+    <card :title="$t('your_info')">
+      <form @submit.prevent="update" @keydown="form.onKeydown($event)">
+        <alert-success :form="form" :message="$t('info_updated')"/>
 
-      <!-- Name -->
-      <div class="form-group row">
-        <label class="col-md-3 col-form-label text-md-right">{{ $t('name') }}</label>
-        <div class="col-md-7">
-          <input v-model="form.name" :class="{ 'is-invalid': form.errors.has('name') }" class="form-control" type="text" name="name">
-          <has-error :form="form" field="name"/>
+        <!-- Name -->
+        <div class="form-group row">
+          <label class="col-md-3 col-form-label text-md-right">{{ $t('name') }}</label>
+          <div class="col-md-7">
+            <input v-model="form.name" :class="{ 'is-invalid': form.errors.has('name') }" class="form-control" type="text" name="name">
+            <has-error :form="form" field="name"/>
+          </div>
         </div>
-      </div>
 
-      <!-- Email -->
-      <div class="form-group row">
-        <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
-        <div class="col-md-7">
-          <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
-          <has-error :form="form" field="email" />
+        <!-- Email -->
+        <div class="form-group row">
+          <label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
+          <div class="col-md-7">
+            <input v-model="form.email" :class="{ 'is-invalid': form.errors.has('email') }" class="form-control" type="email" name="email">
+            <has-error :form="form" field="email" />
+          </div>
         </div>
-      </div>
 
-      <!-- Submit Button -->
-      <div class="form-group row">
-        <div class="col-md-9 ml-md-auto">
-          <v-button :loading="form.busy" type="success">{{ $t('update') }}</v-button>
+        <!-- Submit Button -->
+        <div class="form-group row">
+          <div class="col-md-9 ml-md-auto">
+            <v-button :loading="form.busy" type="success">{{ $t('update') }}</v-button>
+          </div>
         </div>
-      </div>
-    </form>
-  </card>
+      </form>
+    </card>
+  </div>
 </template>
 
 <script>

resources/assets/js/pages/welcome.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <div class="top-right links">
       <template v-if="authenticated">
         <router-link :to="{ name: 'home' }">
@@ -15,52 +15,38 @@
         </router-link>
       </template>
     </div>
-
-    <div class="text-center">
-      <div class="title mb-4">
-        {{ title }}
-      </div>
-
-      <div class="links">
-        <a href="https://laravel.com/docs">Documentation</a>
-        <a href="https://laracasts.com">Laracasts</a>
-        <a href="https://laravel-news.com">News</a>
-        <a href="https://forge.laravel.com">Forge</a>
-        <a href="https://github.com/laravel/laravel">GitHub</a>
-      </div>
-    </div>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+  import { mapGetters } from 'vuex'
 
-export default {
-  middleware: 'guest',
-  layout: 'basic',
+  export default {
+    middleware: 'guest',
+    layout: 'basic',
 
-  metaInfo () {
-    return { title: this.$t('home') }
-  },
+    metaInfo () {
+      return { title: this.$t('home') }
+    },
 
-  data: () => ({
-    title: window.config.appName
-  }),
+    data: () => ({
+      title: window.config.appName
+    }),
 
-  computed: mapGetters({
-    authenticated: 'auth/check'
-  })
-}
+    computed: mapGetters({
+      authenticated: 'auth/check'
+    })
+  }
 </script>
 
 <style scoped>
-.top-right {
-  position: absolute;
-  right: 10px;
-  top: 18px;
-}
+  .top-right {
+    position: absolute;
+    right: 10px;
+    top: 18px;
+  }
 
-.title {
-  font-size: 85px;
-}
+  .title {
+    font-size: 85px;
+  }
 </style>

resources/assets/js/router/routes.js

@@ -12,7 +12,9 @@ const SettingsPassword = () => import('~/pages/settings/password').then(m => m.d
 const SettingsAdminSupplier = () => import('~/pages/settings/admin-supplier').then(m => m.default || m)
 const SettingsAdminCreditSetting = () => import('~/pages/settings/admin-credit-setting').then(m => m.default || m)
 const SettingsAdminChinaBank = () => import('~/pages/settings/admin-china-bank').then(m => m.default || m)
+const SettingsAdminMalaysiaBank = () => import('~/pages/settings/admin-malaysia-bank').then(m => m.default || m)
 const SettingsAdminBankSetting = () => import('~/pages/settings/admin-bank-setting').then(m => m.default || m)
+const SettingsAdminMarkingSetting = () => import('~/pages/settings/admin-marking-setting').then(m => m.default || m)
 
 // Booking
 const Upload = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m)
@@ -34,7 +36,7 @@ const adminCompleted = () => import('~/pages/admin/booking/completed').then(m =>
 
 // Admin pages
 const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
-const AdminCompleteOrder = () => import('~/pages/admin/complete-order').then(m => m.default || m)
+const AdminCompleteOrder = () => import('~/pages/admin/complete-orders').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)
 
@@ -55,7 +57,9 @@ export default [
       { path: 'admin-supplier', name: 'settings.admin-supplier', component: SettingsAdminSupplier },
       { path: 'admin-credit-setting', name: 'settings.admin-credit-setting', component: SettingsAdminCreditSetting },
       { path: 'admin-china-bank', name: 'settings.admin-china-bank', component: SettingsAdminChinaBank },
-      { path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting }
+      { path: 'admin-malaysia-bank', name: 'settings.admin-malaysia-bank', component: SettingsAdminMalaysiaBank },
+      { path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting },
+      { path: 'admin-marking-setting', name: 'settings.admin-marking-setting', component: SettingsAdminMarkingSetting }
     ] },
 
   // Booking
@@ -77,7 +81,7 @@ export default [
 
   // Admin pages
   { path: '/admin', name: 'admin.home', component: AdminHome },
-  { path: '/admin/complete-order', name: 'admin.complete', component: AdminCompleteOrder },
+  { path: '/admin/complete-orders', name: 'admin.complete', component: AdminCompleteOrder },
   { path: '/admin/transaction-history', name: 'admin.transaction-history', component: TransactionHistory },
   { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-slip', component: UploadSupplierBankSlip },
   { path: '*', name: 'notfound', component: NotFound }

resources/assets/js/store/modules/auth.js

@@ -57,7 +57,6 @@ export const actions = {
   async fetchUser ({ commit }) {
     try {
       const { data } = await axios.get('/api/user')
-
       commit(types.FETCH_USER_SUCCESS, { user: data })
     } catch (e) {
       commit(types.FETCH_USER_FAILURE)

resources/views/index.blade.php

@@ -41,13 +41,13 @@ $polyfills = [
   <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features={{ implode(',', $polyfills) }}"></script>
 
   {{-- Load the application scripts --}}
-  @if (app()->isLocal())
-    <script src="{{ mix('js/app.js') }}"></script>
-  @else
+  @if (env('APP_ENV') == 'production' || env('APP_ENV') == 'staging')
     <script src="{{ mix('js/manifest.js') }}"></script>
     <script src="{{ mix('js/vendor.js') }}"></script>
     <script src="{{ mix('js/app.js') }}"></script>
-    <script src="https://unpkg.com/element-ui/lib/index.js"></script>
+    <script src="https://unpkg.com/element-ui/lib/index.js"></script>  
+  @else
+    <script src="{{ mix('js/app.js') }}"></script>
   @endif
 </body>
 </html>

routes/api.php

@@ -29,27 +29,29 @@ Route::group(['middleware' => 'auth:api'], function () {
     Route::post('logout', 'Auth\LoginController@logout');
     
 	/*Route for the booking */
-	Route::get('/booking/{book_id}', 'BookingController@show');
-	Route::put('/booking/{book_id}', 'BookingController@update');
-	Route::delete('/booking/{book_id}', 'BookingController@delete');
-	Route::post('/booking', 'BookingController@store');
-	Route::post('/booking/calculation', 'BookingController@calculation');
-	Route::post('/booking/{book_id}/cancel', 'BookingController@cancel');
-	Route::post('/booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
-    Route::post('/booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
-    Route::post('/booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder');
-	Route::patch('/booking/{id}/bankslip-amount', 'BookingController@updateBankSlipAmount');
+	Route::get('booking/{book_id}', 'BookingController@show');
+	Route::put('booking/{book_id}', 'BookingController@update');
+	Route::delete('booking/{book_id}', 'BookingController@delete');
+	Route::post('booking', 'BookingController@store');
+	Route::post('booking/calculation', 'BookingController@calculation');
+	Route::post('booking/{book_id}/cancel', 'BookingController@cancel');
+	Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
+    Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
+    Route::post('booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder');
+	Route::patch('booking/{id}/bankslip-amount', 'BookingController@updateBankSlipAmount');
 	Route::post('booking/{book_id}/reject-bank-slip','BookingController@rejectBankSlip');
 	Route::post('booking/{book_id}/approve-bank-slip','BookingController@approveBankSlip');
     Route::post('booking/{book_id}/cancel', 'BookingController@cancel');
    	Route::get('/booking', 'BookingController@index'); 
-	Route::get('/user', 'UserController@show');
+	Route::get('user', 'UserController@show');
 	Route::patch('settings/profile', 'Settings\ProfileController@update');
 	Route::patch('settings/password', 'Settings\PasswordController@update');
+
+	// for both user and admin
+	Route::get('active-bank', 'SettingActiveBankController@index');	
+	Route::get('malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show');
 });
 
-
-
 Route::group(['middleware' => 'guest:api'], function () {
     Route::post('login', 'Auth\LoginController@login')->name('login');
     Route::post('register', 'Auth\RegisterController@create');
@@ -66,14 +68,11 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::put('update-rate/{rate}', 'RateController@update');
 	Route::delete('update-rate/{rate}', 'RateController@delete');
 	Route::get('update-rate', 'RateController@index');
-	
-	
 
 	Route::get('setting-credit', 'SettingCreditController@index');
-	Route::get('setting-credit/{credit}', 'SettingCreditController@show');
-	Route::post('setting-credit', 'SettingCreditController@store');
-	Route::put('setting-credit/{credit}', 'SettingCreditController@update');
-	Route::delete('setting-credit/{credit}', 'SettingCreditController@delete');
+	Route::put('setting-credit', 'SettingCreditController@update');
+
+	Route::put('setting-active-bank', 'SettingActiveBankController@update');
 
 	Route::get('setting-supplier', 'SettingSupplierController@index');
 	Route::get('setting-supplier/{supplier}', 'SettingSupplierController@show');
@@ -87,24 +86,32 @@ Route::group(['middleware' => ['role:admin']], function() {
 	Route::put('setting-beneficiary/{beneficiary}', 'SettingBeneficiaryController@update');
 	Route::delete('setting-beneficiary/{beneficiary}', 'SettingBeneficiaryController@delete');
 
-	Route::get('marking', 'MarkingController@index');
-	Route::post('marking', 'MarkingController@store');
-	Route::get('marking/{beneficiary}', 'MarkingController@show');
-	Route::put('marking/{beneficiary}', 'MarkingController@update');
-	Route::delete('marking/{beneficiary}', 'MarkingController@delete');
+	Route::get('setting-malaysia-bank', 'SettingMalaysiaBankController@index');
+	Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store');
+	Route::put('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@update');
+	Route::delete('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@delete');
+
+	Route::get('setting-marking', 'MarkingController@index');
+	Route::post('setting-marking', 'MarkingController@store');
+	Route::get('setting-marking/{beneficiary}', 'MarkingController@show');
+	Route::put('setting-marking/{beneficiary}', 'MarkingController@update');
+	Route::delete('setting-marking/{beneficiary}', 'MarkingController@delete');
 
 	Route::get('supplier-booking', 'BookingSupplierController@index');
 	Route::get('supplier-booking/{id}', 'BookingSupplierController@show');
 	Route::post('supplier-booking', 'BookingSupplierController@store');
 	Route::put('supplier-booking/{id}', 'BookingSupplierController@update');
-	Route::post('/booking/{id}/confirm-supplier', 'BookingController@confirmSupplier');
+	Route::post('booking/{id}/confirm-supplier', 'BookingController@confirmSupplier');
 
-	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');
+	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');
 	Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice');
 	Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice');	
+
+	Route::get('admin/complete-orders', 'BookingController@adminShowCompletedOrders');
+	// for both user and admin
+	Route::get('setting-active-bank', 'SettingActiveBankController@index');	
+	Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show');	
 	
-});
-
-
+});

tests/Feature/LoginTest.php

@@ -13,8 +13,8 @@ class LoginTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-
         $this->user = factory(User::class)->create();
+        $this->withoutExceptionHandling();
     }
 
     /** @test */
@@ -35,7 +35,7 @@ class LoginTest extends TestCase
         $this->actingAs($this->user)
             ->getJson('/api/user')
             ->assertSuccessful()
-            ->assertJsonStructure(['id', 'name', 'email']);
+            ->assertJsonStructure(['id', 'name', 'email', 'marking']);
     }
 
     /** @test */

tests/Feature/RegisterTest.php

@@ -22,13 +22,12 @@ class RegisterTest extends TestCase
     public function can_register()
     {
         $this->postJson('/api/register', [
-            'name' => 'Test User',
             'email' => $this->marking->email,
             'password' => 'secret',
             'password_confirmation' => 'secret',
             'marking' => $this->marking->marking
         ])
         ->assertSuccessful()
-        ->assertJsonStructure(['id', 'name', 'email']);
+        ->assertJsonStructure(['id','email']);
     }
 }

vendor/composer/autoload_static.php

@@ -7,10 +7,10 @@ namespace Composer\Autoload;
 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',
@@ -19,6 +19,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
         'f0906e6318348a765ffb6eb24e0d0938' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Foundation/helpers.php',
         '58571171fd5812e6e447dce228f52f4d' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Support/helpers.php',
+        '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php',
         '801c31d8ed748cfa537fa45402288c95' => __DIR__ . '/..' . '/psy/psysh/src/functions.php',
         'f18cc91337d49233e5754e93f3ed9ec3' => __DIR__ . '/..' . '/laravelcollective/html/src/helpers.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,
@@ -123,7 +125,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
             'Doctrine\\Instantiator\\' => 22,
             'Doctrine\\Common\\Inflector\\' => 26,
             'Doctrine\\Common\\Cache\\' => 22,
-            'Doctrine\\Common\\Annotations\\' => 28,
             'Doctrine\\Common\\' => 16,
             'DeepCopy\\' => 9,
         ),
@@ -190,6 +191,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',
@@ -350,13 +355,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         array (
             0 => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache',
         ),
-        'Doctrine\\Common\\Annotations\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations',
-        ),
         'Doctrine\\Common\\' => 
         array (
-            0 => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common',
+            0 => __DIR__ . '/..' . '/doctrine/event-manager/lib/Doctrine/Common',
         ),
         'DeepCopy\\' => 
         array (
@@ -420,10 +421,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
             array (
                 0 => __DIR__ . '/..' . '/doctrine/lexer/lib',
             ),
-            'Doctrine\\Common\\Collections\\' => 
-            array (
-                0 => __DIR__ . '/..' . '/doctrine/collections/lib',
-            ),
         ),
     );
 
@@ -445,8 +442,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         '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\\SettingActiveBankController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingActiveBankController.php',
         'App\\Http\\Controllers\\SettingBeneficiaryController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingBeneficiaryController.php',
         'App\\Http\\Controllers\\SettingCreditController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingCreditController.php',
+        'App\\Http\\Controllers\\SettingMalaysiaBankController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingMalaysiaBankController.php',
         'App\\Http\\Controllers\\SettingSupplierController' => __DIR__ . '/../..' . '/app/Http/Controllers/SettingSupplierController.php',
         'App\\Http\\Controllers\\Settings\\PasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Settings/PasswordController.php',
         'App\\Http\\Controllers\\Settings\\ProfileController' => __DIR__ . '/../..' . '/app/Http/Controllers/Settings/ProfileController.php',
@@ -473,8 +472,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'App\\PurchaseOrder' => __DIR__ . '/../..' . '/app/PurchaseOrder.php',
         'App\\Rate' => __DIR__ . '/../..' . '/app/Rate.php',
         'App\\Role' => __DIR__ . '/../..' . '/app/Role.php',
+        'App\\SettingActiveBank' => __DIR__ . '/../..' . '/app/SettingActiveBank.php',
         'App\\SettingBeneficiary' => __DIR__ . '/../..' . '/app/SettingBeneficiary.php',
         'App\\SettingCredit' => __DIR__ . '/../..' . '/app/SettingCredit.php',
+        'App\\SettingMalaysiaBank' => __DIR__ . '/../..' . '/app/SettingMalaysiaBank.php',
         'App\\SettingSupplier' => __DIR__ . '/../..' . '/app/SettingSupplier.php',
         'App\\SupplierBooking' => __DIR__ . '/../..' . '/app/SupplierBooking.php',
         'App\\SupplierBookingItem' => __DIR__ . '/../..' . '/app/SupplierBookingItem.php',
@@ -525,25 +526,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'DeepCopy\\TypeFilter\\Spl\\SplDoublyLinkedListFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/Spl/SplDoublyLinkedListFilter.php',
         'DeepCopy\\TypeFilter\\TypeFilter' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeFilter/TypeFilter.php',
         'DeepCopy\\TypeMatcher\\TypeMatcher' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/TypeMatcher/TypeMatcher.php',
-        'Doctrine\\Common\\Annotations\\Annotation' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation.php',
-        'Doctrine\\Common\\Annotations\\AnnotationException' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationException.php',
-        'Doctrine\\Common\\Annotations\\AnnotationReader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationReader.php',
-        'Doctrine\\Common\\Annotations\\AnnotationRegistry' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/AnnotationRegistry.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\Attribute' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attribute.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\Attributes' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Attributes.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\Enum' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Enum.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\IgnoreAnnotation' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\Required' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Required.php',
-        'Doctrine\\Common\\Annotations\\Annotation\\Target' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Annotation/Target.php',
-        'Doctrine\\Common\\Annotations\\CachedReader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/CachedReader.php',
-        'Doctrine\\Common\\Annotations\\DocLexer' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/DocLexer.php',
-        'Doctrine\\Common\\Annotations\\DocParser' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/DocParser.php',
-        'Doctrine\\Common\\Annotations\\FileCacheReader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/FileCacheReader.php',
-        'Doctrine\\Common\\Annotations\\IndexedReader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/IndexedReader.php',
-        'Doctrine\\Common\\Annotations\\PhpParser' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/PhpParser.php',
-        'Doctrine\\Common\\Annotations\\Reader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/Reader.php',
-        'Doctrine\\Common\\Annotations\\SimpleAnnotationReader' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php',
-        'Doctrine\\Common\\Annotations\\TokenParser' => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations/TokenParser.php',
         'Doctrine\\Common\\Cache\\ApcCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/ApcCache.php',
         'Doctrine\\Common\\Cache\\ApcuCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/ApcuCache.php',
         'Doctrine\\Common\\Cache\\ArrayCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/ArrayCache.php',
@@ -574,80 +556,11 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Doctrine\\Common\\Cache\\WinCacheCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/WinCacheCache.php',
         'Doctrine\\Common\\Cache\\XcacheCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/XcacheCache.php',
         'Doctrine\\Common\\Cache\\ZendDataCache' => __DIR__ . '/..' . '/doctrine/cache/lib/Doctrine/Common/Cache/ZendDataCache.php',
-        'Doctrine\\Common\\ClassLoader' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/ClassLoader.php',
-        'Doctrine\\Common\\Collections\\AbstractLazyCollection' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/AbstractLazyCollection.php',
-        'Doctrine\\Common\\Collections\\ArrayCollection' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/ArrayCollection.php',
-        'Doctrine\\Common\\Collections\\Collection' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Collection.php',
-        'Doctrine\\Common\\Collections\\Criteria' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Criteria.php',
-        'Doctrine\\Common\\Collections\\Expr\\ClosureExpressionVisitor' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ClosureExpressionVisitor.php',
-        'Doctrine\\Common\\Collections\\Expr\\Comparison' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Comparison.php',
-        'Doctrine\\Common\\Collections\\Expr\\CompositeExpression' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/CompositeExpression.php',
-        'Doctrine\\Common\\Collections\\Expr\\Expression' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Expression.php',
-        'Doctrine\\Common\\Collections\\Expr\\ExpressionVisitor' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/ExpressionVisitor.php',
-        'Doctrine\\Common\\Collections\\Expr\\Value' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Expr/Value.php',
-        'Doctrine\\Common\\Collections\\ExpressionBuilder' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/ExpressionBuilder.php',
-        'Doctrine\\Common\\Collections\\Selectable' => __DIR__ . '/..' . '/doctrine/collections/lib/Doctrine/Common/Collections/Selectable.php',
-        'Doctrine\\Common\\CommonException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/CommonException.php',
-        'Doctrine\\Common\\Comparable' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Comparable.php',
-        'Doctrine\\Common\\EventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/EventArgs.php',
-        'Doctrine\\Common\\EventManager' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/EventManager.php',
-        'Doctrine\\Common\\EventSubscriber' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/EventSubscriber.php',
+        'Doctrine\\Common\\EventArgs' => __DIR__ . '/..' . '/doctrine/event-manager/lib/Doctrine/Common/EventArgs.php',
+        'Doctrine\\Common\\EventManager' => __DIR__ . '/..' . '/doctrine/event-manager/lib/Doctrine/Common/EventManager.php',
+        'Doctrine\\Common\\EventSubscriber' => __DIR__ . '/..' . '/doctrine/event-manager/lib/Doctrine/Common/EventSubscriber.php',
         'Doctrine\\Common\\Inflector\\Inflector' => __DIR__ . '/..' . '/doctrine/inflector/lib/Doctrine/Common/Inflector/Inflector.php',
-        'Doctrine\\Common\\Lexer' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Lexer.php',
         'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
-        'Doctrine\\Common\\NotifyPropertyChanged' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/NotifyPropertyChanged.php',
-        'Doctrine\\Common\\Persistence\\AbstractManagerRegistry' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/AbstractManagerRegistry.php',
-        'Doctrine\\Common\\Persistence\\ConnectionRegistry' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ConnectionRegistry.php',
-        'Doctrine\\Common\\Persistence\\Event\\LifecycleEventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Event/LifecycleEventArgs.php',
-        'Doctrine\\Common\\Persistence\\Event\\LoadClassMetadataEventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Event/LoadClassMetadataEventArgs.php',
-        'Doctrine\\Common\\Persistence\\Event\\ManagerEventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Event/ManagerEventArgs.php',
-        'Doctrine\\Common\\Persistence\\Event\\OnClearEventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Event/OnClearEventArgs.php',
-        'Doctrine\\Common\\Persistence\\Event\\PreUpdateEventArgs' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Event/PreUpdateEventArgs.php',
-        'Doctrine\\Common\\Persistence\\ManagerRegistry' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ManagerRegistry.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\AbstractClassMetadataFactory' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/AbstractClassMetadataFactory.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\ClassMetadata' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadata.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\ClassMetadataFactory' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ClassMetadataFactory.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\AnnotationDriver' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/AnnotationDriver.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\DefaultFileLocator' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/DefaultFileLocator.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\FileDriver' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileDriver.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\FileLocator' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/FileLocator.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriver' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriver.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\MappingDriverChain' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/MappingDriverChain.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\PHPDriver' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/PHPDriver.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\StaticPHPDriver' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/StaticPHPDriver.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\Driver\\SymfonyFileLocator' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/Driver/SymfonyFileLocator.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\MappingException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/MappingException.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\ReflectionService' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/ReflectionService.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\RuntimeReflectionService' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/RuntimeReflectionService.php',
-        'Doctrine\\Common\\Persistence\\Mapping\\StaticReflectionService' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Mapping/StaticReflectionService.php',
-        'Doctrine\\Common\\Persistence\\ObjectManager' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManager.php',
-        'Doctrine\\Common\\Persistence\\ObjectManagerAware' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerAware.php',
-        'Doctrine\\Common\\Persistence\\ObjectManagerDecorator' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ObjectManagerDecorator.php',
-        'Doctrine\\Common\\Persistence\\ObjectRepository' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/ObjectRepository.php',
-        'Doctrine\\Common\\Persistence\\PersistentObject' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/PersistentObject.php',
-        'Doctrine\\Common\\Persistence\\Proxy' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Persistence/Proxy.php',
-        'Doctrine\\Common\\PropertyChangedListener' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/PropertyChangedListener.php',
-        'Doctrine\\Common\\Proxy\\AbstractProxyFactory' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/AbstractProxyFactory.php',
-        'Doctrine\\Common\\Proxy\\Autoloader' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Autoloader.php',
-        'Doctrine\\Common\\Proxy\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Exception/InvalidArgumentException.php',
-        'Doctrine\\Common\\Proxy\\Exception\\OutOfBoundsException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Exception/OutOfBoundsException.php',
-        'Doctrine\\Common\\Proxy\\Exception\\ProxyException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Exception/ProxyException.php',
-        'Doctrine\\Common\\Proxy\\Exception\\UnexpectedValueException' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Exception/UnexpectedValueException.php',
-        'Doctrine\\Common\\Proxy\\Proxy' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/Proxy.php',
-        'Doctrine\\Common\\Proxy\\ProxyDefinition' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/ProxyDefinition.php',
-        'Doctrine\\Common\\Proxy\\ProxyGenerator' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Proxy/ProxyGenerator.php',
-        'Doctrine\\Common\\Reflection\\ClassFinderInterface' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/ClassFinderInterface.php',
-        'Doctrine\\Common\\Reflection\\Psr0FindFile' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/Psr0FindFile.php',
-        'Doctrine\\Common\\Reflection\\ReflectionProviderInterface' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/ReflectionProviderInterface.php',
-        'Doctrine\\Common\\Reflection\\RuntimePublicReflectionProperty' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/RuntimePublicReflectionProperty.php',
-        'Doctrine\\Common\\Reflection\\StaticReflectionClass' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionClass.php',
-        'Doctrine\\Common\\Reflection\\StaticReflectionMethod' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionMethod.php',
-        'Doctrine\\Common\\Reflection\\StaticReflectionParser' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionParser.php',
-        'Doctrine\\Common\\Reflection\\StaticReflectionProperty' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Reflection/StaticReflectionProperty.php',
-        'Doctrine\\Common\\Util\\ClassUtils' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Util/ClassUtils.php',
-        'Doctrine\\Common\\Util\\Debug' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Util/Debug.php',
-        'Doctrine\\Common\\Util\\Inflector' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Util/Inflector.php',
-        'Doctrine\\Common\\Version' => __DIR__ . '/..' . '/doctrine/common/lib/Doctrine/Common/Version.php',
         'Doctrine\\DBAL\\Cache\\ArrayStatement' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Cache/ArrayStatement.php',
         'Doctrine\\DBAL\\Cache\\CacheException' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Cache/CacheException.php',
         'Doctrine\\DBAL\\Cache\\QueryCacheProfile' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Cache/QueryCacheProfile.php',
@@ -764,6 +677,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Doctrine\\DBAL\\Platforms\\Keywords\\MariaDb102Keywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MariaDb102Keywords.php',
         'Doctrine\\DBAL\\Platforms\\Keywords\\MsSQLKeywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MsSQLKeywords.php',
         'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL57Keywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL57Keywords.php',
+        'Doctrine\\DBAL\\Platforms\\Keywords\\MySQL80Keywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQL80Keywords.php',
         'Doctrine\\DBAL\\Platforms\\Keywords\\MySQLKeywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/MySQLKeywords.php',
         'Doctrine\\DBAL\\Platforms\\Keywords\\OracleKeywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/OracleKeywords.php',
         'Doctrine\\DBAL\\Platforms\\Keywords\\PostgreSQL100Keywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/PostgreSQL100Keywords.php',
@@ -783,6 +697,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Doctrine\\DBAL\\Platforms\\Keywords\\SQLiteKeywords' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/Keywords/SQLiteKeywords.php',
         'Doctrine\\DBAL\\Platforms\\MariaDb1027Platform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MariaDb1027Platform.php',
         'Doctrine\\DBAL\\Platforms\\MySQL57Platform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL57Platform.php',
+        'Doctrine\\DBAL\\Platforms\\MySQL80Platform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySQL80Platform.php',
         'Doctrine\\DBAL\\Platforms\\MySqlPlatform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/MySqlPlatform.php',
         'Doctrine\\DBAL\\Platforms\\OraclePlatform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/OraclePlatform.php',
         'Doctrine\\DBAL\\Platforms\\PostgreSQL100Platform' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Platforms/PostgreSQL100Platform.php',
@@ -860,6 +775,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Doctrine\\DBAL\\Tools\\Console\\Command\\RunSqlCommand' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php',
         'Doctrine\\DBAL\\Tools\\Console\\ConsoleRunner' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php',
         'Doctrine\\DBAL\\Tools\\Console\\Helper\\ConnectionHelper' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Tools/Console/Helper/ConnectionHelper.php',
+        'Doctrine\\DBAL\\Tools\\Dumper' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Tools/Dumper.php',
         'Doctrine\\DBAL\\TransactionIsolationLevel' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/TransactionIsolationLevel.php',
         'Doctrine\\DBAL\\Types\\ArrayType' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Types/ArrayType.php',
         'Doctrine\\DBAL\\Types\\BigIntType' => __DIR__ . '/..' . '/doctrine/dbal/lib/Doctrine/DBAL/Types/BigIntType.php',
@@ -1101,6 +1017,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Calculator\\Iban' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Iban.php',
         'Faker\\Calculator\\Inn' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Inn.php',
         'Faker\\Calculator\\Luhn' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/Luhn.php',
+        'Faker\\Calculator\\TCNo' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Calculator/TCNo.php',
         'Faker\\DefaultGenerator' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/DefaultGenerator.php',
         'Faker\\Documentor' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Documentor.php',
         'Faker\\Factory' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Factory.php',
@@ -1172,7 +1089,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\cs_CZ\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/cs_CZ/Payment.php',
         'Faker\\Provider\\cs_CZ\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/cs_CZ/Person.php',
         'Faker\\Provider\\cs_CZ\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/cs_CZ/PhoneNumber.php',
-        'Faker\\Provider\\cs_CZ\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/cs_CZ/Text.php',
         'Faker\\Provider\\da_DK\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/da_DK/Address.php',
         'Faker\\Provider\\da_DK\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/da_DK/Company.php',
         'Faker\\Provider\\da_DK\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/da_DK/Internet.php',
@@ -1211,7 +1127,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\el_GR\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/el_GR/Payment.php',
         'Faker\\Provider\\el_GR\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/el_GR/Person.php',
         'Faker\\Provider\\el_GR\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/el_GR/PhoneNumber.php',
-        'Faker\\Provider\\el_GR\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/el_GR/Text.php',
         'Faker\\Provider\\en_AU\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/en_AU/Address.php',
         'Faker\\Provider\\en_AU\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/en_AU/Internet.php',
         'Faker\\Provider\\en_AU\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/en_AU/PhoneNumber.php',
@@ -1265,7 +1180,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\es_ES\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_ES/Payment.php',
         'Faker\\Provider\\es_ES\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_ES/Person.php',
         'Faker\\Provider\\es_ES\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_ES/PhoneNumber.php',
-        'Faker\\Provider\\es_ES\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_ES/Text.php',
         'Faker\\Provider\\es_PE\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_PE/Address.php',
         'Faker\\Provider\\es_PE\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_PE/Company.php',
         'Faker\\Provider\\es_PE\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/es_PE/Person.php',
@@ -1309,7 +1223,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\fr_FR\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/fr_FR/Payment.php',
         'Faker\\Provider\\fr_FR\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/fr_FR/Person.php',
         'Faker\\Provider\\fr_FR\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/fr_FR/PhoneNumber.php',
-        'Faker\\Provider\\fr_FR\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/fr_FR/Text.php',
         'Faker\\Provider\\he_IL\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/he_IL/Address.php',
         'Faker\\Provider\\he_IL\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/he_IL/Company.php',
         'Faker\\Provider\\he_IL\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/he_IL/Payment.php',
@@ -1325,7 +1238,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\hu_HU\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hu_HU/Payment.php',
         'Faker\\Provider\\hu_HU\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hu_HU/Person.php',
         'Faker\\Provider\\hu_HU\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hu_HU/PhoneNumber.php',
-        'Faker\\Provider\\hu_HU\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hu_HU/Text.php',
         'Faker\\Provider\\hy_AM\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hy_AM/Address.php',
         'Faker\\Provider\\hy_AM\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hy_AM/Color.php',
         'Faker\\Provider\\hy_AM\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/hy_AM/Company.php',
@@ -1371,7 +1283,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\ka_GE\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ka_GE/Payment.php',
         'Faker\\Provider\\ka_GE\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ka_GE/Person.php',
         'Faker\\Provider\\ka_GE\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ka_GE/PhoneNumber.php',
-        'Faker\\Provider\\ka_GE\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ka_GE/Text.php',
         'Faker\\Provider\\kk_KZ\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/kk_KZ/Address.php',
         'Faker\\Provider\\kk_KZ\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/kk_KZ/Color.php',
         'Faker\\Provider\\kk_KZ\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/kk_KZ/Company.php',
@@ -1385,7 +1296,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\ko_KR\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ko_KR/Internet.php',
         'Faker\\Provider\\ko_KR\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ko_KR/Person.php',
         'Faker\\Provider\\ko_KR\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ko_KR/PhoneNumber.php',
-        'Faker\\Provider\\ko_KR\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ko_KR/Text.php',
         'Faker\\Provider\\lt_LT\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/lt_LT/Address.php',
         'Faker\\Provider\\lt_LT\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/lt_LT/Company.php',
         'Faker\\Provider\\lt_LT\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/lt_LT/Internet.php',
@@ -1405,6 +1315,12 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\me_ME\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/me_ME/PhoneNumber.php',
         'Faker\\Provider\\mn_MN\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/mn_MN/Person.php',
         'Faker\\Provider\\mn_MN\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/mn_MN/PhoneNumber.php',
+        'Faker\\Provider\\ms_MY\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Address.php',
+        'Faker\\Provider\\ms_MY\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Company.php',
+        'Faker\\Provider\\ms_MY\\Miscellaneous' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Miscellaneous.php',
+        'Faker\\Provider\\ms_MY\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Payment.php',
+        'Faker\\Provider\\ms_MY\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/Person.php',
+        'Faker\\Provider\\ms_MY\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ms_MY/PhoneNumber.php',
         'Faker\\Provider\\nb_NO\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Address.php',
         'Faker\\Provider\\nb_NO\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Company.php',
         'Faker\\Provider\\nb_NO\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/nb_NO/Payment.php',
@@ -1462,7 +1378,6 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\ru_RU\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ru_RU/Payment.php',
         'Faker\\Provider\\ru_RU\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ru_RU/Person.php',
         'Faker\\Provider\\ru_RU\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ru_RU/PhoneNumber.php',
-        'Faker\\Provider\\ru_RU\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/ru_RU/Text.php',
         'Faker\\Provider\\sk_SK\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Address.php',
         'Faker\\Provider\\sk_SK\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Company.php',
         'Faker\\Provider\\sk_SK\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Internet.php',
@@ -1470,6 +1385,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\sk_SK\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/Person.php',
         'Faker\\Provider\\sk_SK\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sk_SK/PhoneNumber.php',
         'Faker\\Provider\\sl_SI\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Address.php',
+        'Faker\\Provider\\sl_SI\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Company.php',
         'Faker\\Provider\\sl_SI\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Internet.php',
         'Faker\\Provider\\sl_SI\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Payment.php',
         'Faker\\Provider\\sl_SI\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sl_SI/Person.php',
@@ -1489,12 +1405,14 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\sv_SE\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sv_SE/Person.php',
         'Faker\\Provider\\sv_SE\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/sv_SE/PhoneNumber.php',
         'Faker\\Provider\\th_TH\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Address.php',
+        'Faker\\Provider\\th_TH\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Color.php',
         'Faker\\Provider\\th_TH\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Company.php',
         'Faker\\Provider\\th_TH\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Internet.php',
         'Faker\\Provider\\th_TH\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/Payment.php',
         'Faker\\Provider\\th_TH\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/th_TH/PhoneNumber.php',
         'Faker\\Provider\\tr_TR\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Address.php',
         'Faker\\Provider\\tr_TR\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Color.php',
+        'Faker\\Provider\\tr_TR\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Company.php',
         'Faker\\Provider\\tr_TR\\DateTime' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/DateTime.php',
         'Faker\\Provider\\tr_TR\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Internet.php',
         'Faker\\Provider\\tr_TR\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/tr_TR/Payment.php',
@@ -1504,10 +1422,9 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Faker\\Provider\\uk_UA\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Color.php',
         'Faker\\Provider\\uk_UA\\Company' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Company.php',
         'Faker\\Provider\\uk_UA\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Internet.php',
+        'Faker\\Provider\\uk_UA\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
         'Faker\\Provider\\uk_UA\\Person' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Person.php',
         'Faker\\Provider\\uk_UA\\PhoneNumber' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/PhoneNumber.php',
-        'Faker\\Provider\\uk_UA\\Text' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Text.php',
-        'Faker\\Provider\\uk_Ua\\Payment' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/uk_UA/Payment.php',
         'Faker\\Provider\\vi_VN\\Address' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Address.php',
         'Faker\\Provider\\vi_VN\\Color' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Color.php',
         'Faker\\Provider\\vi_VN\\Internet' => __DIR__ . '/..' . '/fzaninotto/faker/src/Faker/Provider/vi_VN/Internet.php',
@@ -1534,9 +1451,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',
@@ -1899,6 +1813,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'Illuminate\\Database\\Console\\Migrations\\ResetCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/ResetCommand.php',
         'Illuminate\\Database\\Console\\Migrations\\RollbackCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/RollbackCommand.php',
         'Illuminate\\Database\\Console\\Migrations\\StatusCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/StatusCommand.php',
+        'Illuminate\\Database\\Console\\Migrations\\TableGuesser' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Migrations/TableGuesser.php',
         'Illuminate\\Database\\Console\\Seeds\\SeedCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeedCommand.php',
         'Illuminate\\Database\\Console\\Seeds\\SeederMakeCommand' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/Console/Seeds/SeederMakeCommand.php',
         'Illuminate\\Database\\DatabaseManager' => __DIR__ . '/..' . '/laravel/framework/src/Illuminate/Database/DatabaseManager.php',
@@ -2040,6 +1955,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 +2028,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',
@@ -2729,6 +2646,7 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'League\\OAuth1\\Client\\Signature\\PlainTextSignature' => __DIR__ . '/..' . '/league/oauth1-client/src/Client/Signature/PlainTextSignature.php',
         'League\\OAuth1\\Client\\Signature\\Signature' => __DIR__ . '/..' . '/league/oauth1-client/src/Client/Signature/Signature.php',
         'League\\OAuth1\\Client\\Signature\\SignatureInterface' => __DIR__ . '/..' . '/league/oauth1-client/src/Client/Signature/SignatureInterface.php',
+        'MarkingSeeder' => __DIR__ . '/../..' . '/database/seeds/MarkingSeeder.php',
         'Mockery' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery.php',
         'Mockery\\Adapter\\Phpunit\\MockeryPHPUnitIntegration' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryPHPUnitIntegration.php',
         'Mockery\\Adapter\\Phpunit\\MockeryTestCase' => __DIR__ . '/..' . '/mockery/mockery/library/Mockery/Adapter/Phpunit/MockeryTestCase.php',
@@ -3002,50 +2920,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 +3007,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 +3042,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',
@@ -3346,20 +3265,21 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         'PharIo\\Manifest\\RequiresElement' => __DIR__ . '/..' . '/phar-io/manifest/src/xml/RequiresElement.php',
         'PharIo\\Manifest\\Type' => __DIR__ . '/..' . '/phar-io/manifest/src/values/Type.php',
         'PharIo\\Manifest\\Url' => __DIR__ . '/..' . '/phar-io/manifest/src/values/Url.php',
-        'PharIo\\Version\\AbstractVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/AbstractVersionConstraint.php',
-        'PharIo\\Version\\AndVersionConstraintGroup' => __DIR__ . '/..' . '/phar-io/version/src/AndVersionConstraintGroup.php',
-        'PharIo\\Version\\AnyVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/AnyVersionConstraint.php',
-        'PharIo\\Version\\ExactVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/ExactVersionConstraint.php',
-        'PharIo\\Version\\Exception' => __DIR__ . '/..' . '/phar-io/version/src/Exception.php',
-        'PharIo\\Version\\GreaterThanOrEqualToVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/GreaterThanOrEqualToVersionConstraint.php',
-        'PharIo\\Version\\InvalidVersionException' => __DIR__ . '/..' . '/phar-io/version/src/InvalidVersionException.php',
-        'PharIo\\Version\\OrVersionConstraintGroup' => __DIR__ . '/..' . '/phar-io/version/src/OrVersionConstraintGroup.php',
+        'PharIo\\Version\\AbstractVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/AbstractVersionConstraint.php',
+        'PharIo\\Version\\AndVersionConstraintGroup' => __DIR__ . '/..' . '/phar-io/version/src/constraints/AndVersionConstraintGroup.php',
+        'PharIo\\Version\\AnyVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/AnyVersionConstraint.php',
+        'PharIo\\Version\\ExactVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/ExactVersionConstraint.php',
+        'PharIo\\Version\\Exception' => __DIR__ . '/..' . '/phar-io/version/src/exceptions/Exception.php',
+        'PharIo\\Version\\GreaterThanOrEqualToVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/GreaterThanOrEqualToVersionConstraint.php',
+        'PharIo\\Version\\InvalidPreReleaseSuffixException' => __DIR__ . '/..' . '/phar-io/version/src/exceptions/InvalidPreReleaseSuffixException.php',
+        'PharIo\\Version\\InvalidVersionException' => __DIR__ . '/..' . '/phar-io/version/src/exceptions/InvalidVersionException.php',
+        'PharIo\\Version\\OrVersionConstraintGroup' => __DIR__ . '/..' . '/phar-io/version/src/constraints/OrVersionConstraintGroup.php',
         'PharIo\\Version\\PreReleaseSuffix' => __DIR__ . '/..' . '/phar-io/version/src/PreReleaseSuffix.php',
-        'PharIo\\Version\\SpecificMajorAndMinorVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/SpecificMajorAndMinorVersionConstraint.php',
-        'PharIo\\Version\\SpecificMajorVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/SpecificMajorVersionConstraint.php',
-        'PharIo\\Version\\UnsupportedVersionConstraintException' => __DIR__ . '/..' . '/phar-io/version/src/UnsupportedVersionConstraintException.php',
+        'PharIo\\Version\\SpecificMajorAndMinorVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/SpecificMajorAndMinorVersionConstraint.php',
+        'PharIo\\Version\\SpecificMajorVersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/SpecificMajorVersionConstraint.php',
+        'PharIo\\Version\\UnsupportedVersionConstraintException' => __DIR__ . '/..' . '/phar-io/version/src/exceptions/UnsupportedVersionConstraintException.php',
         'PharIo\\Version\\Version' => __DIR__ . '/..' . '/phar-io/version/src/Version.php',
-        'PharIo\\Version\\VersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraint.php',
+        'PharIo\\Version\\VersionConstraint' => __DIR__ . '/..' . '/phar-io/version/src/constraints/VersionConstraint.php',
         'PharIo\\Version\\VersionConstraintParser' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintParser.php',
         'PharIo\\Version\\VersionConstraintValue' => __DIR__ . '/..' . '/phar-io/version/src/VersionConstraintValue.php',
         'PharIo\\Version\\VersionNumber' => __DIR__ . '/..' . '/phar-io/version/src/VersionNumber.php',
@@ -3701,6 +3621,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 +3663,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 +3683,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 +3706,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 +3869,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',
@@ -3965,7 +3892,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
         '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',
+        'SettingActiveBankSeeder' => __DIR__ . '/../..' . '/database/seeds/SettingActiveBankSeeder.php',
+        'SettingBeneficiarySeeder' => __DIR__ . '/../..' . '/database/seeds/SettingBeneficiarySeeder.php',
         'SettingCreditSeeder' => __DIR__ . '/../..' . '/database/seeds/SettingCreditSeeder.php',
+        'SettingMalaysiaBankSeeder' => __DIR__ . '/../..' . '/database/seeds/SettingMalaysiaBankSeeder.php',
         'SuppliersTableSeeder' => __DIR__ . '/../..' . '/database/seeds/SuppliersTableSeeder.php',
         'Symfony\\Component\\Console\\Application' => __DIR__ . '/..' . '/symfony/console/Application.php',
         'Symfony\\Component\\Console\\CommandLoader\\CommandLoaderInterface' => __DIR__ . '/..' . '/symfony/console/CommandLoader/CommandLoaderInterface.php',
@@ -3994,6 +3924,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',
@@ -4014,6 +3945,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',
@@ -4030,6 +3962,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',
@@ -4043,6 +3976,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',
@@ -4149,8 +4083,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',
@@ -4164,6 +4105,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',
@@ -4187,10 +4129,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',
@@ -4222,6 +4166,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',
@@ -4336,6 +4281,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',
@@ -4382,8 +4328,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',
@@ -4482,6 +4426,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',
@@ -4501,13 +4446,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',