diff --git a/app/Console/Commands/ResetRoleAsal.php b/app/Console/Commands/ResetRoleAsal.php
new file mode 100644
index 0000000..c655d20
--- /dev/null
+++ b/app/Console/Commands/ResetRoleAsal.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\User;
+use Illuminate\Console\Command;
+
+class ResetRoleAsal extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'reset:roleasal';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Reset Role';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $all_user = User::all();
+        foreach($all_user as $index=>$user_kaunter){
+            $user = User::find($user_kaunter->id);
+            if($user->cawangan != 'operasi'){
+                $user->roles = $user->role_asal;
+                $user->save();
+            }
+        }
+    }
+}
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 878ce50..f3bc79a 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
         Commands\resetRoleDaily::class,
         Commands\updateJbg::class,
         Commands\updateOnline::class,
+        Commands\ResetRoleAsal::class,
     ];
 
     /**
@@ -28,6 +29,7 @@ class Kernel extends ConsoleKernel
     {
         $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
         $schedule->command('update:jbg')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
+        $schedule->command('reset:roleasal')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01');
         $schedule->command('update:online')->daily()->timezone('Asia/Kuala_Lumpur')->everyFifteenMinutes();
     }
 
diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 441e690..0459e14 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -349,6 +349,16 @@ class AliranTunaiController extends Controller
         $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] . '/teller/',['teller' => Auth::user()->name])->json();
         $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
 
+        $lelong = Http::get(config('api.url').'/api/lelong/harini/'.$auth_user['cawangan'])->json();
+
+        $lelongan = 0;
+        if(strtoupper($Auth::user()->name) === 'LELONG')
+        {
+            $lelongan = floatval($lelong);
+        }else{
+            $lelongan = 0;
+        }
+
         $totalserahan = 0;
         $totalpendahuluan = 0;
         foreach($addtunai as $index1=>$at)
@@ -435,7 +445,11 @@ class AliranTunaiController extends Controller
         $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
         $gadaian = floatval($totalgadai);
 
-        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
+        if(strtoupper($Auth::user()->name) === 'LELONG'){
+            $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
+        }else{
+            $bakisemasa = $lelongan;
+        }
 
         $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
 
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 520fe74..b54f825 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -65,21 +65,27 @@ class LoginController extends Controller
             if($auth_user['roles'] == 'teller'){
                 if($auth_user['role_harian'] == 'teller'){
                     $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                    return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
+                    // return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','api_url'));
+                    return redirect()->route('home');
                 }elseif($auth_user['role_harian'] == 'penilai'){
                     $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
                     $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json();
                     $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
-                    return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
+                    // return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
+                    return redirect()->route('home');
+                }else{
+                    return view('not_assign');
                 }
             }
             elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
+                // return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
+                return redirect()->route('home');
             }
-            elseif($auth_user['roles'] == 'operasi'){
+            else{
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-                return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
+                // return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
+                return redirect()->route('home');
             }
         }
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 6fd996c..4bf15b1 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -39,12 +39,15 @@ class HomeController extends Controller
                 $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json();
                 return view('homepage.'.$auth_user['role_harian'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah','api_url'));
             }
+            else{
+                return view('not_assign');
+            }
         }
         elseif($auth_user['roles'] == 'pc' || $auth_user['roles'] == 'ppc'){
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
             return view('homepage.khazanah.home',compact('cawangan_info','api_url'));
         }
-        elseif($auth_user['roles'] == 'operasi'){
+        else{
             $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
             return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url'));
         }
diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php
index de1c0f1..59781ed 100644
--- a/app/Http/Controllers/KakitanganController.php
+++ b/app/Http/Controllers/KakitanganController.php
@@ -22,7 +22,8 @@ class KakitanganController extends Controller
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $role = Role::get();
-        return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role'));
+        $kakitangan = User::all();
+        return view('operasi.daftar_kakitangan',compact('cawangan_info','api_url','role','kakitangan'));
     }
 
     public function registerStaff(Request $request){
@@ -91,4 +92,50 @@ class KakitanganController extends Controller
 
         return redirect()->route('home');
     }
+
+    public function tukartaraf(Request $request){
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $user = User::find($request->id);
+        $role = Role::get();
+        return view('operasi.tukar_taraf',compact('cawangan_info','api_url','role','user'));
+    }
+
+    public function tukartarafUpdate(Request $request){
+        $user = User::find($request->user_id);
+        if($user->role_harian == null){
+            if($user->role_asal == 'pc'){
+                $user->roles = $request->role;
+                $user->save();
+            }
+        }else{
+            if($user->role_asal == 'pc'){
+                $user->roles = $request->role;
+                $user->role_harian = $request->role;
+                $user->save();
+            }
+        }
+
+        return redirect()->route('daftar.kakitangan');
+    }
+
+    public function tukarcawangan(Request $request){
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $user = User::find($request->id);
+        $role = Role::get();
+        return view('operasi.tukar_cawangan',compact('cawangan_info','api_url','role','user'));
+    }
+
+    public function tukarcawanganUpdate(Request $request){
+        $user = User::find($request->user_id);
+        $user->cawangan = $request->cawangan;
+        $user->roles = $request->role;
+        $user->role_harian = $request->role;
+        $user->save();
+
+        return redirect()->route('daftar.kakitangan');
+    }
 }
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 1c17191..138ee2a 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -2668,9 +2668,8 @@ class KhazanahController extends Controller
         $TotalTunaiDebit = 0;
         $TotalTunaiKredit = 0;
 
-        $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
-        $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
-        
+      	$TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
+      	$TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
 
         array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
         array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index cf84319..c5ad46f 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -187,4 +187,12 @@ class OperasiController extends Controller
         
         return view('operasi.hargaemas',compact('cawangan_info','api_url','harga_emas'));
     }
+
+    public function margin(){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $margin_pembiayaan = Http::get(config('api.url') . '/api/maxpinjaman')->json();
+        return view('operasi.margin_pembiayaan',compact('cawangan_info','api_url','margin_pembiayaan'));
+    }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 639d36a..4d12ad2 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -18,6 +18,10 @@ class UserController extends Controller
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        return view('user.index',compact('cawangan_info','api_url'));
+        if($auth_user->roles == 'teller' || $auth_user->roles == 'ppc' || $auth_user->roles == 'pc'){
+            return view('user.index',compact('cawangan_info','api_url','auth_user'));
+        }else{
+            return view('user.index_operasi',compact('cawangan_info','api_url','auth_user'));
+        }
     }
 }
diff --git a/composer.json b/composer.json
index fbedd0b..b89b9d7 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
         "yajra/laravel-datatables-oracle": "^9.11"
     },
     "require-dev": {
+        "barryvdh/laravel-debugbar": "^3.6",
         "facade/ignition": "^2.0",
         "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
diff --git a/composer.lock b/composer.lock
index 020bb29..5ab0018 100644
--- a/composer.lock
+++ b/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": "4f26944f77caea167bb120f5fe970820",
+    "content-hash": "bfd66ab0246126c4f2cc7bbeeacca4ec",
     "packages": [
         {
             "name": "almasaeed2010/adminlte",
@@ -43,10 +43,6 @@
                 "theme",
                 "web"
             ],
-            "support": {
-                "issues": "https://github.com/ColorlibHQ/AdminLTE/issues",
-                "source": "https://github.com/ColorlibHQ/AdminLTE/tree/v3.0.5"
-            },
             "time": "2020-05-19T20:41:11+00:00"
         },
         {
@@ -216,12 +212,6 @@
                 "issues": "https://github.com/barryvdh/laravel-dompdf/issues",
                 "source": "https://github.com/barryvdh/laravel-dompdf/tree/master"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-07T11:50:18+00:00"
         },
         {
@@ -268,16 +258,6 @@
                 "brick",
                 "math"
             ],
-            "support": {
-                "issues": "https://github.com/brick/math/issues",
-                "source": "https://github.com/brick/math/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-08-18T23:57:15+00:00"
         },
         {
@@ -358,10 +338,6 @@
                 "MIT"
             ],
             "description": "implementation of xdg base directory specification for php",
-            "support": {
-                "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues",
-                "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1"
-            },
             "time": "2019-12-04T15:06:13+00:00"
         },
         {
@@ -439,24 +415,6 @@
                 "uppercase",
                 "words"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.x"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-29T15:13:26+00:00"
         },
         {
@@ -519,24 +477,6 @@
                 "parser",
                 "php"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/lexer/issues",
-                "source": "https://github.com/doctrine/lexer/tree/1.2.1"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-05-25T17:44:05+00:00"
         },
         {
@@ -667,12 +607,6 @@
                 "issues": "https://github.com/dragonmantank/cron-expression/issues",
                 "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/dragonmantank",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-13T00:52:37+00:00"
         },
         {
@@ -735,12 +669,6 @@
                 "issues": "https://github.com/egulias/EmailValidator/issues",
                 "source": "https://github.com/egulias/EmailValidator/tree/2.1.24"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/egulias",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-14T15:56:27+00:00"
         },
         {
@@ -870,12 +798,6 @@
                 "issues": "https://github.com/fruitcake/laravel-cors/issues",
                 "source": "https://github.com/fruitcake/laravel-cors/tree/v2.0.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-22T13:57:20+00:00"
         },
         {
@@ -943,10 +865,6 @@
                 "rest",
                 "web service"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5"
-            },
             "time": "2020-06-16T21:01:06+00:00"
         },
         {
@@ -998,10 +916,6 @@
             "keywords": [
                 "promise"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.4.0"
-            },
             "time": "2020-09-30T07:37:28+00:00"
         },
         {
@@ -1073,10 +987,6 @@
                 "uri",
                 "url"
             ],
-            "support": {
-                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.7.0"
-            },
             "time": "2020-09-30T07:37:11+00:00"
         },
         {
@@ -1147,10 +1057,6 @@
                 "thumbnail",
                 "watermark"
             ],
-            "support": {
-                "issues": "https://github.com/Intervention/image/issues",
-                "source": "https://github.com/Intervention/image/tree/master"
-            },
             "time": "2019-11-02T09:15:47+00:00"
         },
         {
@@ -1206,10 +1112,6 @@
                 "administrator",
                 "laravel"
             ],
-            "support": {
-                "issues": "https://github.com/jeroennoten/Laravel-AdminLTE/issues",
-                "source": "https://github.com/jeroennoten/Laravel-AdminLTE/tree/v3.5.0"
-            },
             "time": "2020-09-26T21:28:24+00:00"
         },
         {
@@ -1570,32 +1472,6 @@
                 "rss": "https://github.com/thephpleague/commonmark/releases.atom",
                 "source": "https://github.com/thephpleague/commonmark"
             },
-            "funding": [
-                {
-                    "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.colinodell.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.paypal.me/colinpodell/10.00",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/colinodell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/colinodell",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-31T13:49:32+00:00"
         },
         {
@@ -1681,16 +1557,6 @@
                 "sftp",
                 "storage"
             ],
-            "support": {
-                "issues": "https://github.com/thephpleague/flysystem/issues",
-                "source": "https://github.com/thephpleague/flysystem/tree/1.x"
-            },
-            "funding": [
-                {
-                    "url": "https://offset.earth/frankdejonge",
-                    "type": "other"
-                }
-            ],
             "time": "2020-08-23T07:39:11+00:00"
         },
         {
@@ -1801,16 +1667,6 @@
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
                 "source": "https://github.com/thephpleague/mime-type-detection/tree/1.5.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/frankdejonge",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/league/flysystem",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-18T11:50:25+00:00"
         },
         {
@@ -1872,16 +1728,6 @@
                 "stream",
                 "zip"
             ],
-            "support": {
-                "issues": "https://github.com/maennchen/ZipStream-PHP/issues",
-                "source": "https://github.com/maennchen/ZipStream-PHP/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/zipstream",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-05-30T13:11:16+00:00"
         },
         {
@@ -1946,15 +1792,6 @@
                 "issues": "https://github.com/milon/barcode/issues",
                 "source": "https://github.com/milon/barcode/tree/7.0.1"
             },
-            "funding": [
-                {
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/milon",
-                    "type": "github"
-                }
-            ],
             "time": "2020-08-26T18:58:46+00:00"
         },
         {
@@ -2036,20 +1873,6 @@
                 "logging",
                 "psr-3"
             ],
-            "support": {
-                "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-23T08:41:23+00:00"
         },
         {
@@ -2100,16 +1923,6 @@
                 "issues": "https://github.com/myclabs/php-enum/issues",
                 "source": "https://github.com/myclabs/php-enum/tree/1.7.7"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-14T18:14:52+00:00"
         },
         {
@@ -2193,16 +2006,6 @@
                 "issues": "https://github.com/briannesbitt/Carbon/issues",
                 "source": "https://github.com/briannesbitt/Carbon"
             },
-            "funding": [
-                {
-                    "url": "https://opencollective.com/Carbon",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-28T14:25:28+00:00"
         },
         {
@@ -2362,10 +2165,6 @@
                 }
             ],
             "description": "A PHP-Wrapper around the Ghostscript-CLI",
-            "support": {
-                "issues": "https://github.com/heiglandreas/Org_Heigl_Ghostscript/issues",
-                "source": "https://github.com/heiglandreas/Org_Heigl_Ghostscript/tree/2.3.2"
-            },
             "time": "2020-09-23T05:00:00+00:00"
         },
         {
@@ -2642,20 +2441,6 @@
                 "php",
                 "type"
             ],
-            "support": {
-                "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.7.5"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-20T17:29:33+00:00"
         },
         {
@@ -2729,12 +2514,6 @@
                 "issues": "https://github.com/predis/predis/issues",
                 "source": "https://github.com/predis/predis/tree/v1.1.6"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sponsors/tillkruss",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-11T19:18:05+00:00"
         },
         {
@@ -2784,10 +2563,6 @@
                 "container-interop",
                 "psr"
             ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/master"
-            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -2834,10 +2609,6 @@
                 "psr",
                 "psr-14"
             ],
-            "support": {
-                "issues": "https://github.com/php-fig/event-dispatcher/issues",
-                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
-            },
             "time": "2019-01-08T18:20:26+00:00"
         },
         {
@@ -2888,9 +2659,6 @@
                 "request",
                 "response"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
-            },
             "time": "2016-08-06T14:39:51+00:00"
         },
         {
@@ -2938,9 +2706,6 @@
                 "psr",
                 "psr-3"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
-            },
             "time": "2020-03-23T09:12:05+00:00"
         },
         {
@@ -2989,9 +2754,6 @@
                 "psr-16",
                 "simple-cache"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/simple-cache/tree/master"
-            },
             "time": "2017-10-23T01:57:42+00:00"
         },
         {
@@ -3166,10 +2928,6 @@
                 }
             ],
             "description": "A polyfill for getallheaders.",
-            "support": {
-                "issues": "https://github.com/ralouphie/getallheaders/issues",
-                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
-            },
             "time": "2019-03-08T08:55:37+00:00"
         },
         {
@@ -3233,16 +2991,6 @@
                 "queue",
                 "set"
             ],
-            "support": {
-                "issues": "https://github.com/ramsey/collection/issues",
-                "source": "https://github.com/ramsey/collection/tree/1.1.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                }
-            ],
             "time": "2020-09-10T20:58:17+00:00"
         },
         {
@@ -3324,17 +3072,6 @@
                 "identifier",
                 "uuid"
             ],
-            "support": {
-                "issues": "https://github.com/ramsey/uuid/issues",
-                "rss": "https://github.com/ramsey/uuid/releases.atom",
-                "source": "https://github.com/ramsey/uuid"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                }
-            ],
             "time": "2020-08-18T17:17:46+00:00"
         },
         {
@@ -3572,16 +3309,6 @@
                 "issues": "https://github.com/spatie/image/issues",
                 "source": "https://github.com/spatie/image/tree/1.10.1"
             },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
             "time": "2020-12-01T20:42:11+00:00"
         },
         {
@@ -3726,16 +3453,6 @@
                 "issues": "https://github.com/spatie/laravel-medialibrary/issues",
                 "source": "https://github.com/spatie/laravel-medialibrary/tree/7.19.5"
             },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-04T21:08:45+00:00"
         },
         {
@@ -3787,10 +3504,6 @@
                 "pdf-to-image",
                 "spatie"
             ],
-            "support": {
-                "issues": "https://github.com/spatie/pdf-to-image/issues",
-                "source": "https://github.com/spatie/pdf-to-image/tree/v2"
-            },
             "time": "2017-06-20T05:58:45+00:00"
         },
         {
@@ -3907,16 +3620,6 @@
                 "issues": "https://github.com/swiftmailer/swiftmailer/issues",
                 "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.4"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-12-08T18:02:06+00:00"
         },
         {
@@ -4000,20 +3703,6 @@
             "support": {
                 "source": "https://github.com/symfony/console/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-28T11:24:18+00:00"
         },
         {
@@ -4065,20 +3754,6 @@
             "support": {
                 "source": "https://github.com/symfony/css-selector/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-28T21:31:18+00:00"
         },
         {
@@ -4129,23 +3804,6 @@
             ],
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4201,20 +3859,6 @@
             "support": {
                 "source": "https://github.com/symfony/error-handler/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-28T21:46:03+00:00"
         },
         {
@@ -4286,20 +3930,6 @@
             "support": {
                 "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-01T16:14:45+00:00"
         },
         {
@@ -4362,23 +3992,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -4426,20 +4039,6 @@
             "support": {
                 "source": "https://github.com/symfony/finder/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-18T09:42:36+00:00"
         },
         {
@@ -4505,20 +4104,6 @@
             "support": {
                 "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-14T17:08:19+00:00"
         },
         {
@@ -4578,20 +4163,6 @@
             "support": {
                 "source": "https://github.com/symfony/http-foundation/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-27T06:13:25+00:00"
         },
         {
@@ -4690,20 +4261,6 @@
             "support": {
                 "source": "https://github.com/symfony/http-kernel/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-30T05:54:18+00:00"
         },
         {
@@ -4770,20 +4327,6 @@
             "support": {
                 "source": "https://github.com/symfony/mime/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-30T14:55:39+00:00"
         },
         {
@@ -4849,20 +4392,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -4929,20 +4458,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-iconv/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5010,20 +4525,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5097,20 +4598,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5181,20 +4668,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5261,20 +4734,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5337,20 +4796,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5416,20 +4861,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5499,20 +4930,6 @@
             "support": {
                 "source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-23T14:02:19+00:00"
         },
         {
@@ -5561,20 +4978,6 @@
             "support": {
                 "source": "https://github.com/symfony/process/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-02T15:47:15+00:00"
         },
         {
@@ -5651,20 +5054,6 @@
             "support": {
                 "source": "https://github.com/symfony/routing/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-27T00:39:34+00:00"
         },
         {
@@ -5727,23 +5116,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-07T11:33:47+00:00"
         },
         {
@@ -5813,20 +5185,6 @@
             "support": {
                 "source": "https://github.com/symfony/string/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-10-24T12:08:07+00:00"
         },
         {
@@ -5906,20 +5264,6 @@
             "support": {
                 "source": "https://github.com/symfony/translation/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-28T11:24:18+00:00"
         },
         {
@@ -5981,23 +5325,6 @@
                 "interoperability",
                 "standards"
             ],
-            "support": {
-                "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-09-28T13:05:58+00:00"
         },
         {
@@ -6072,20 +5399,6 @@
             "support": {
                 "source": "https://github.com/symfony/var-dumper/tree/v5.2.0"
             },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-27T00:39:34+00:00"
         },
         {
@@ -6135,10 +5448,6 @@
             ],
             "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
             "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
-            "support": {
-                "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues",
-                "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3"
-            },
             "time": "2020-07-13T06:12:54+00:00"
         },
         {
@@ -6257,20 +5566,6 @@
                 "env",
                 "environment"
             ],
-            "support": {
-                "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/4.1"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/GrahamCampbell",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-07-14T19:22:52+00:00"
         },
         {
@@ -6323,28 +5618,6 @@
                 "issues": "https://github.com/voku/portable-ascii/issues",
                 "source": "https://github.com/voku/portable-ascii/tree/1.5.6"
             },
-            "funding": [
-                {
-                    "url": "https://www.paypal.me/moelleken",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/voku",
-                    "type": "github"
-                },
-                {
-                    "url": "https://opencollective.com/portable-ascii",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://www.patreon.com/voku",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-12T00:07:28+00:00"
         },
         {
@@ -6420,20 +5693,81 @@
                 "issues": "https://github.com/yajra/laravel-datatables/issues",
                 "source": "https://github.com/yajra/laravel-datatables/tree/v9.15.2"
             },
-            "funding": [
-                {
-                    "url": "https://www.paypal.me/yajra",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/yajra",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-12-09T15:42:04+00:00"
         }
     ],
     "packages-dev": [
+        {
+            "name": "barryvdh/laravel-debugbar",
+            "version": "v3.6.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/barryvdh/laravel-debugbar.git",
+                "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/70b89754913fd89fef16d0170a91dbc2a5cd633a",
+                "reference": "70b89754913fd89fef16d0170a91dbc2a5cd633a",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/routing": "^6|^7|^8",
+                "illuminate/session": "^6|^7|^8",
+                "illuminate/support": "^6|^7|^8",
+                "maximebf/debugbar": "^1.16.3",
+                "php": ">=7.2",
+                "symfony/debug": "^4.3|^5",
+                "symfony/finder": "^4.3|^5"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.3.3",
+                "orchestra/testbench-dusk": "^4|^5|^6",
+                "phpunit/phpunit": "^8.5|^9.0",
+                "squizlabs/php_codesniffer": "^3.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.5-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "Barryvdh\\Debugbar\\ServiceProvider"
+                    ],
+                    "aliases": {
+                        "Debugbar": "Barryvdh\\Debugbar\\Facade"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Barryvdh\\Debugbar\\": "src/"
+                },
+                "files": [
+                    "src/helpers.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "PHP Debugbar integration for Laravel",
+            "keywords": [
+                "debug",
+                "debugbar",
+                "laravel",
+                "profiler",
+                "webprofiler"
+            ],
+            "time": "2021-06-14T14:29:26+00:00"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.4.0",
@@ -6487,20 +5821,6 @@
                 "issues": "https://github.com/doctrine/instantiator/issues",
                 "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
             },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-10T18:47:58+00:00"
         },
         {
@@ -6560,12 +5880,6 @@
                 "issues": "https://github.com/facade/flare-client-php/issues",
                 "source": "https://github.com/facade/flare-client-php/tree/1.3.7"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
             "time": "2020-10-21T16:02:39+00:00"
         },
         {
@@ -6693,10 +6007,6 @@
                 "flare",
                 "ignition"
             ],
-            "support": {
-                "issues": "https://github.com/facade/ignition-contracts/issues",
-                "source": "https://github.com/facade/ignition-contracts/tree/1.0.1"
-            },
             "time": "2020-07-14T10:10:28+00:00"
         },
         {
@@ -6864,12 +6174,69 @@
             "keywords": [
                 "test"
             ],
-            "support": {
-                "issues": "https://github.com/hamcrest/hamcrest-php/issues",
-                "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1"
-            },
             "time": "2020-07-09T08:09:16+00:00"
         },
+        {
+            "name": "maximebf/debugbar",
+            "version": "v1.16.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/maximebf/php-debugbar.git",
+                "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6d51ee9e94cff14412783785e79a4e7ef97b9d62",
+                "reference": "6d51ee9e94cff14412783785e79a4e7ef97b9d62",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1|^8",
+                "psr/log": "^1.0",
+                "symfony/var-dumper": "^2.6|^3|^4|^5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7.5.20 || ^9.4.2"
+            },
+            "suggest": {
+                "kriswallsmith/assetic": "The best way to manage assets",
+                "monolog/monolog": "Log using Monolog",
+                "predis/predis": "Redis storage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.16-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "DebugBar\\": "src/DebugBar/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Maxime Bouroumeau-Fuseau",
+                    "email": "maxime.bouroumeau@gmail.com",
+                    "homepage": "http://maximebf.com"
+                },
+                {
+                    "name": "Barry vd. Heuvel",
+                    "email": "barryvdh@gmail.com"
+                }
+            ],
+            "description": "Debug bar in the browser for php application",
+            "homepage": "https://github.com/maximebf/php-debugbar",
+            "keywords": [
+                "debug",
+                "debugbar"
+            ],
+            "time": "2020-12-07T11:07:24+00:00"
+        },
         {
             "name": "mockery/mockery",
             "version": "1.3.3",
@@ -6933,10 +6300,6 @@
                 "test double",
                 "testing"
             ],
-            "support": {
-                "issues": "https://github.com/mockery/mockery/issues",
-                "source": "https://github.com/mockery/mockery/tree/1.3.3"
-            },
             "time": "2020-08-11T18:10:21+00:00"
         },
         {
@@ -6989,12 +6352,6 @@
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
                 "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2"
             },
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-11-13T09:40:50+00:00"
         },
         {
@@ -7069,20 +6426,6 @@
                 "issues": "https://github.com/nunomaduro/collision/issues",
                 "source": "https://github.com/nunomaduro/collision"
             },
-            "funding": [
-                {
-                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/nunomaduro",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-10-29T15:12:23+00:00"
         },
         {
@@ -7243,10 +6586,6 @@
                 "reflection",
                 "static analysis"
             ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
             "time": "2020-06-27T09:03:43+00:00"
         },
         {
@@ -7299,10 +6638,6 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
-            },
             "time": "2020-09-03T19:13:55+00:00"
         },
         {
@@ -7348,10 +6683,6 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
-            },
             "time": "2020-09-17T18:55:26+00:00"
         },
         {
@@ -7415,10 +6746,6 @@
                 "spy",
                 "stub"
             ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/1.12.1"
-            },
             "time": "2020-09-29T09:10:42+00:00"
         },
         {
@@ -7486,12 +6813,6 @@
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-12-02T13:39:03+00:00"
         },
         {
@@ -7546,12 +6867,6 @@
                 "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
                 "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:25:21+00:00"
         },
         {
@@ -7593,10 +6908,6 @@
             "keywords": [
                 "template"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
-            },
             "time": "2015-06-21T13:50:34+00:00"
         },
         {
@@ -7650,12 +6961,6 @@
                 "issues": "https://github.com/sebastianbergmann/php-timer/issues",
                 "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:20:02+00:00"
         },
         {
@@ -7709,12 +7014,6 @@
                 "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
                 "source": "https://github.com/sebastianbergmann/php-token-stream/tree/3.1.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "abandoned": true,
             "time": "2020-11-30T08:38:46+00:00"
         },
@@ -7803,16 +7102,6 @@
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.13"
             },
-            "funding": [
-                {
-                    "url": "https://phpunit.de/donate.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-12-01T04:53:52+00:00"
         },
         {
@@ -7886,12 +7175,6 @@
                 "issues": "https://github.com/scrivo/highlight.php/issues",
                 "source": "https://github.com/scrivo/highlight.php"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/allejo",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-22T06:07:40+00:00"
         },
         {
@@ -7941,12 +7224,6 @@
                 "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
                 "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:15:22+00:00"
         },
         {
@@ -8015,12 +7292,6 @@
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T08:04:30+00:00"
         },
         {
@@ -8081,12 +7352,6 @@
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
                 "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:59:04+00:00"
         },
         {
@@ -8144,12 +7409,6 @@
                 "issues": "https://github.com/sebastianbergmann/environment/issues",
                 "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:53:42+00:00"
         },
         {
@@ -8221,12 +7480,6 @@
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
                 "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:47:53+00:00"
         },
         {
@@ -8285,12 +7538,6 @@
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
                 "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:43:24+00:00"
         },
         {
@@ -8342,12 +7589,6 @@
                 "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
                 "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:40:27+00:00"
         },
         {
@@ -8397,12 +7638,6 @@
                 "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
                 "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:37:18+00:00"
         },
         {
@@ -8460,12 +7695,6 @@
                 "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
                 "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:34:24+00:00"
         },
         {
@@ -8512,12 +7741,6 @@
                 "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
                 "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:30:19+00:00"
         },
         {
@@ -8568,12 +7791,6 @@
                 "issues": "https://github.com/sebastianbergmann/type/issues",
                 "source": "https://github.com/sebastianbergmann/type/tree/1.1.4"
             },
-            "funding": [
-                {
-                    "url": "https://github.com/sebastianbergmann",
-                    "type": "github"
-                }
-            ],
             "time": "2020-11-30T07:25:11+00:00"
         },
         {
@@ -8617,12 +7834,60 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/master"
-            },
             "time": "2016-10-03T07:35:21+00:00"
         },
+        {
+            "name": "symfony/debug",
+            "version": "v4.4.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug.git",
+                "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/a8d2d5c94438548bff9f998ca874e202bb29d07f",
+                "reference": "a8d2d5c94438548bff9f998ca874e202bb29d07f",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.3",
+                "psr/log": "~1.0",
+                "symfony/polyfill-php80": "^1.15"
+            },
+            "conflict": {
+                "symfony/http-kernel": "<3.4"
+            },
+            "require-dev": {
+                "symfony/http-kernel": "^3.4|^4.0|^5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Debug\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools to ease debugging PHP code",
+            "homepage": "https://symfony.com",
+            "time": "2021-05-26T17:39:37+00:00"
+        },
         {
             "name": "theseer/tokenizer",
             "version": "1.2.0",
@@ -8661,16 +7926,6 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/master"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/theseer",
-                    "type": "github"
-                }
-            ],
             "time": "2020-07-12T23:59:07+00:00"
         },
         {
@@ -8720,10 +7975,6 @@
                 "check",
                 "validate"
             ],
-            "support": {
-                "issues": "https://github.com/webmozart/assert/issues",
-                "source": "https://github.com/webmozart/assert/tree/master"
-            },
             "time": "2020-07-08T17:02:28+00:00"
         }
     ],
@@ -8735,6 +7986,5 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
+    "platform-dev": []
 }
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 4c0a31c..b4cb26e 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -175,7 +175,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype"  value="nokp">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_ic" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -296,7 +296,7 @@
                         <div class="modal-footer">
                             <input type="text" hidden name="idtype" value="passport">
                             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-                            <input type="submit" name="submit" class="btn btn-primary" value="Terima">
+                            <input type="submit" name="submit" class="btn btn-primary" id="terima_passport" value="Terima">
                         </div>
                         </form>
                     </div>
@@ -436,6 +436,7 @@
     });
 
     function verifycustomer(){
+        $("#terima_ic").prop('disabled', true);
         var customername = $('#name').val();
         var customeralamat = $('#alamat').val();
         var customerposkod = $('#poskod').val();
@@ -443,6 +444,7 @@
         var customerphone_alternate = $('#alternate_phone').val();
         var age = $('#age').val();
         if(age < 18){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -452,6 +454,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -461,6 +464,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -470,6 +474,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -479,6 +484,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -488,6 +494,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -499,6 +506,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_ic").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -508,6 +516,7 @@
             return false;
         }else{
             if((customerphone.length < 9 || customerphone.length >= 12)){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -517,6 +526,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -529,6 +539,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length < 8 && customerphone_alternate.length > 12){
+                $("#terima_ic").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -538,6 +549,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_ic").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -552,6 +564,7 @@
     }
 
     function verifycustomerpassport(){
+        $("#terima_passport").prop('disabled', true);
         var customername = $('#passport_name').val();
         var customeralamat = $('#passport_alamat').val();
         var customerposkod = $('#passport_poskod').val();
@@ -561,6 +574,7 @@
         var age = $('#passport_age').val();
 
         if(age < 18){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -570,6 +584,7 @@
             return false;
         }
         if(customername == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -579,6 +594,7 @@
             return false;
         }
         if(tarikh_lahir == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -588,6 +604,7 @@
             return false;
         }
         if(customeralamat == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -597,6 +614,7 @@
             return false;
         }
         if(customerposkod == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -606,6 +624,7 @@
             return false;
         }else{
             if(customerposkod.length != 5){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -615,6 +634,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerposkod) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -626,6 +646,7 @@
             }
         }
         if(customerphone == ''){
+            $("#terima_passport").prop('disabled', false);
             Swal.fire({
                 icon: 'error',
                 title: 'Amaran!',
@@ -635,6 +656,7 @@
             return false;
         }else{
             if(customerphone.length <= 9 || customerphone.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -644,6 +666,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
@@ -656,6 +679,7 @@
         }
         if(customerphone_alternate != ''){
             if(customerphone_alternate.length <= 8 && customerphone_alternate.length >= 12){
+                $("#terima_passport").prop('disabled', false);
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
@@ -665,6 +689,7 @@
                 return false;
             }else{
                 if($.isNumeric(customerphone_alternate) == false){
+                    $("#terima_passport").prop('disabled', false);
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index c7a01d7..e8aaece 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -92,7 +92,7 @@
                             <b>No Telefon</b>
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] }}">
+                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}">
                         </div>
                     </div>
 
@@ -248,7 +248,7 @@
                                     No KP
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] }}" class='form-control'>
+                                    <input type="text" readonly name='icno' id='icno' value="{{ $customer_info['kpbaru'] ? $customer_info['kpbaru'] : $customer_info['kplama'] }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -264,7 +264,7 @@
                                     No Telefon 1
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] }}" class='form-control'>
+                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon" style="color:red;"></span>
                                 </div>
                             </div>
@@ -273,7 +273,7 @@
                                     No Telefon 2
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] }}" class='form-control'>
+                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : 'NIL' }}" class='form-control'>
                                     <span id="errortelefon2" style="color:red;"></span>
                                 </div>
                             </div>
@@ -310,7 +310,7 @@
                                     Alamat
                                 </div>
                                 <div class='col-md-8'>
-                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] }}</textarea>
+                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] ? $customer_info['alamat1'] : 'NIL' }}</textarea>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -318,7 +318,7 @@
                                     Poskod
                                 </div>
                                 <div class='col-md-8'>
-                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] }}" class='form-control'>
+                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] ? $customer_info['poskod'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -328,9 +328,12 @@
                                 <div class='col-md-8'>
                                     @php
                                         $poskod = Http::get($api_url . '/api/poskod/'. $customer_info['poskod'])->json();
+                                        if(empty($poskod)){
+                                            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+                                        }
                                         $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
                                     @endphp
-                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah['namadaerah'] }}" class='form-control'>
+                                    <input type="text" readonly name='koddaerah' id='koddaerah' value="{{ $daerah ? $daerah['namadaerah'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -341,7 +344,7 @@
                                     @php
                                         $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json();
                                     @endphp
-                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri['negeri'] }}" class='form-control'>
+                                    <input type="text" readonly name='kodnegeri' id='kodnegeri' value="{{ $negeri ? $negeri['negeri'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -699,7 +702,7 @@
                                 '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                                 '<a href="#" onclick="checkserah(this)" data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
-                                gadai_detail['t_matang1'],
+                                gadai_detail['t_matang'],
                                 'RM '+ formatter.format(gadai_detail['bakihargajualan']),
                                 'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 822b40e..8e0091a 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -553,11 +553,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }
@@ -647,11 +642,6 @@
                                     'nilai_marhun' : nilai_marhun
                                 },
                                 success:function(data){
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -748,11 +738,6 @@
                                 'nilai_marhun' : nilai_marhun
                             },
                             success:function(data){
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 614d2dc..08eea38 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -509,11 +509,6 @@
                                 success:function(data){
                                     $("#tambah_marhun").prop('disabled', false);
                                     $("#terima_marhun").prop('disabled', false);
-                                    Swal.fire({
-                                        icon: 'success',
-                                        title: 'Berjaya!',
-                                        text: 'Tambah Marhun Berjaya'
-                                    });
                                     $('#nota').val('').trigger("change");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
@@ -625,11 +620,6 @@
                             success:function(data){
                                 $("#tambah_marhun").prop('disabled', false);
                                 $("#terima_marhun").prop('disabled', false);
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Berjaya!',
-                                    text: 'Tambah Marhun Berjaya'
-                                });
                                 $('#nota').val('').trigger("change");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
@@ -1128,11 +1118,6 @@
                     'nota' : nota
                 },
                 success:function(data){
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Ubah Marhun Berjaya'
-                    });
                     getMarhun(norujukedit);
                     $('#editMarhunModal').modal('hide');
                 }
diff --git a/resources/views/homepage/admin/home.blade.php b/resources/views/homepage/admin/home.blade.php
new file mode 100644
index 0000000..fcb7551
--- /dev/null
+++ b/resources/views/homepage/admin/home.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Admin</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/homepage/akaun/home.blade.php b/resources/views/homepage/akaun/home.blade.php
new file mode 100644
index 0000000..80820f3
--- /dev/null
+++ b/resources/views/homepage/akaun/home.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Akaun</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <h1>AKAUN</h1>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/homepage/audit/home.blade.php b/resources/views/homepage/audit/home.blade.php
new file mode 100644
index 0000000..090ce5d
--- /dev/null
+++ b/resources/views/homepage/audit/home.blade.php
@@ -0,0 +1,23 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center  mt-5">
+        <div class="col-md-8">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="#">Home</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Audit</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <h1>AUDIT</h1>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php
index 3fb8134..a4135e9 100644
--- a/resources/views/homepage/operasi/home.blade.php
+++ b/resources/views/homepage/operasi/home.blade.php
@@ -15,7 +15,7 @@
 
                 <div class="card-body text-center">
                     <a href="{{ route('operasi.kelulusan') }}" class="btn btn-info btn-lg">Kelulusan</a>
-                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Daftar Kakitangan</a>
+                    <a href="{{ route('daftar.kakitangan') }}" class="btn btn-info btn-lg">Kakitangan</a>
                     <a href="{{ route('parameter') }}" class="btn btn-info btn-lg">Parameter</a>
                     <a href="{{ route('komuditi') }}" class="btn btn-info btn-lg">Komoditi</a>
                 </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index a5fb0ab..8247f3e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -28,7 +28,7 @@
     <link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
     <link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
     <link rel="stylesheet" href="{{ asset('vendor/datepicker/css/bootstrap-datepicker.min.css') }}"/>
-    
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
     <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
     <script src="{{ asset('js/select2.min.js') }}"></script>
diff --git a/resources/views/layouts/app_operasi.blade.php b/resources/views/layouts/app_operasi.blade.php
index 200b721..8b5a7b3 100644
--- a/resources/views/layouts/app_operasi.blade.php
+++ b/resources/views/layouts/app_operasi.blade.php
@@ -28,7 +28,7 @@
     <link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
     <link href="{{ asset('css/select2.min.css') }}" rel="stylesheet" />
     <link rel="stylesheet" href="{{ asset('vendor/datepicker/css/bootstrap-datepicker.min.css') }}"/>
-    
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <script src="{{ asset('js/jquery.min.js') }}"></script>
     <script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
     <script src="{{ asset('js/select2.min.js') }}"></script>
diff --git a/resources/views/not_assign.blade.php b/resources/views/not_assign.blade.php
new file mode 100644
index 0000000..b6be251
--- /dev/null
+++ b/resources/views/not_assign.blade.php
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+        <title>Laravel</title>
+
+        <!-- Fonts -->
+        <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;600&display=swap" rel="stylesheet">
+
+        <!-- Styles -->
+        <style>
+            html, body {
+                background-color: #fff;
+                color: #636b6f;
+                font-family: 'Nunito', sans-serif;
+                font-weight: 200;
+                height: 100vh;
+                margin: 0;
+            }
+
+            .full-height {
+                height: 100vh;
+            }
+
+            .flex-center {
+                align-items: center;
+                display: flex;
+                justify-content: center;
+            }
+
+            .position-ref {
+                position: relative;
+            }
+
+            .top-right {
+                position: absolute;
+                right: 10px;
+                top: 18px;
+            }
+
+            .content {
+                text-align: center;
+            }
+
+            .title {
+                font-size: 84px;
+            }
+
+            .links > a {
+                color: #636b6f;
+                padding: 0 25px;
+                font-size: 13px;
+                font-weight: 600;
+                letter-spacing: .1rem;
+                text-decoration: none;
+                text-transform: uppercase;
+            }
+
+            .m-b-md {
+                margin-bottom: 30px;
+            }
+        </style>
+    </head>
+    <body>
+        <div class="flex-center position-ref full-height">
+        
+            @if (Route::has('login'))
+                <div class="top-right links">
+                    @auth
+                        <a href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a>
+                    @else
+                        <a href="{{ route('login') }}">Login</a>
+
+                        @if (Route::has('register'))
+                            <a href="{{ route('register') }}">Register</a>
+                        @endif
+                    @endauth
+                </div>
+            @endif
+            <form id="logout-form" action="{{ route('logout') }}" method="POST" class="d-none">
+                @csrf
+            </form>
+            <div class="content">
+                <div class="title m-b-md">
+                    Kakitangan Belum Disahkan Lagi
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
diff --git a/resources/views/operasi/daftar_kakitangan.blade.php b/resources/views/operasi/daftar_kakitangan.blade.php
index 2ca8665..dea8faa 100644
--- a/resources/views/operasi/daftar_kakitangan.blade.php
+++ b/resources/views/operasi/daftar_kakitangan.blade.php
@@ -94,8 +94,58 @@
             </div>
         </div>
     </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">{{ __('Senarai Kakitangan') }}</div>
+                <div class="card-body text-center">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table id="rekod_kakitangan" class="table table-striped table-hover">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Nama Staff</th>
+                                        <th>Jawatan</th>
+                                        <th>Cawangan</th>
+                                        <th>Action</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach($kakitangan as $index=>$staff)
+                                        <tr>
+                                            <td>{{ $loop->iteration }}</td>
+                                            <td>{{ $staff->name }}</td>
+                                            <td>{{ strtoupper($staff->roles) }}</td>
+                                            <td>
+                                                @if($staff->cawangan == 'operasi')
+                                                    {{ ucwords($staff->cawangan) }}
+                                                @else
+                                                    @php 
+                                                    $cawangan_staff = Http::get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json();
+                                                    echo  ucwords($cawangan_staff['details_caw']);
+                                                    @endphp
+                                                @endif
+                                            </td>
+                                            <td>
+                                                <a href="{{ route('kakitangan.tukartaraf',['id'=>$staff->id]) }}" class="btn btn-warning" title="Tukar Taraf"><i class="material-icons">edit</i></a>
+                                                <a href="{{ route('kakitangan.tukarcawangan',['id'=>$staff->id]) }}" class="btn btn-info" title="Tukar Cawangan"><i class="material-icons">work</i></a>
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 <script>
+
+    var tablerekod = $('#rekod_kakitangan').DataTable();
+
     function verifyregister(){
         var cawangan = $('#cawangan').val();
         var role = $('#role').val();
diff --git a/resources/views/operasi/margin_pembiayaan.blade.php b/resources/views/operasi/margin_pembiayaan.blade.php
new file mode 100644
index 0000000..5203f41
--- /dev/null
+++ b/resources/views/operasi/margin_pembiayaan.blade.php
@@ -0,0 +1,61 @@
+@extends('layouts.app_operasi')
+@section('content')
+@include('modal.hargaemas')
+
+
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+               
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ url('operasi/parameter') }}">Parameter</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Margin Pembiayaan</li>
+                    </ol>
+                </nav>
+                <div class="card-body text-center">
+                    
+                    <div class="mt-3">
+                        
+                        <table class='table table-striped table-hover' id='table-margin' style="width:100%;">
+                            <thead class="thead-dark">
+                                <tr>
+                                    <th>Bil</th>
+                                    <th>Taraf</th>
+                                    <th>Margin</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                @foreach($margin_pembiayaan as $index=>$mp)
+                                    <tr>
+                                        <td>{{ $loop->iteration }}</td>
+                                        <td>{{ strtoupper($mp['user_type']) }}</td>
+                                        <td>{{ $mp['max'] . '%' }}</td>
+                                        <td></td>
+                                    </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    var table_margin = $('#table-margin').DataTable();
+
+    $.ajax({
+        method:'GET',
+        url: api_url + '/api/maxpinjaman',
+        success:function(data){
+            
+        }
+    });
+</script>
+
+@endsection
diff --git a/resources/views/operasi/parameter.blade.php b/resources/views/operasi/parameter.blade.php
index 2783400..110e2ca 100644
--- a/resources/views/operasi/parameter.blade.php
+++ b/resources/views/operasi/parameter.blade.php
@@ -15,7 +15,7 @@
 
                 <div class="card-body text-center">
                     <a href="{{ route('operasi.hargaemas') }}" class="btn btn-info btn-lg">Harga Emas</a>
-                    <a href="#" class="btn btn-info btn-lg">Contoh 1</a>
+                    <a href="{{ route('operasi.margin') }}" class="btn btn-info btn-lg">Margin Pembiayaan</a>
                     <a href="#" class="btn btn-info btn-lg">Contoh 2</a>
                 </div>
             </div>
diff --git a/resources/views/operasi/tukar_cawangan.blade.php b/resources/views/operasi/tukar_cawangan.blade.php
new file mode 100644
index 0000000..2390b35
--- /dev/null
+++ b/resources/views/operasi/tukar_cawangan.blade.php
@@ -0,0 +1,101 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
+                    </ol>
+                </nav>
+
+                <div class="card-body text-center">
+                    <form action="{{ route('kakitangan.tukarcawangan.update') }}" method="post">
+                        @csrf
+                        <input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
+                        <div class='row form-group'>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Nama</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nama' id='nama' readonly value="{{ $user->name }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Email</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='email' id='email' readonly value="{{ $user->email }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Cawangan</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        @php
+                                            $cawangan_all = Http::get($api_url . '/api/cawangan')->json();
+                                        @endphp
+                                        <select class="form-control" name="cawangan" data-placeholder="Pilih Cawangan" id="cawangan">
+                                            <option disabled selected value> -- Pilih Cawangan -- </option>
+                                            <option value="operasi" {{ $user->roles == 'operasi' ? 'selected' : '' }}>Operasi</option>
+                                            @foreach($cawangan_all as $cawangan)    
+                                                <option value="{{ $cawangan['kodcaw'] }}" {{ $user->cawangan == $cawangan['kodcaw'] ? 'selected' : '' }}>{{ $cawangan['details_caw'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No KP</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nokp' id='nokp' readonly value="{{ $user->no_kp }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No Telefon</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='telefon' id='telefon' readonly value="{{ $user->no_telefon }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Jawatan</b>
+                                    </div>
+
+                                    <div class='col-md-7'>
+                                        <select class="form-control" name="role" data-placeholder="Pilih Jawatan" id="role">
+                                            <option disabled selected> -- Pilih Jawatan -- </option>
+                                            @foreach($role as $roles)    
+                                                <option value="{{ $roles['role_code'] }}" {{ $user->roles == $roles['role_code'] ? 'selected' : '' }}>{{ $roles['keterangan'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class='row justify-content-end'>
+                            <div class='col-md-12'>
+                                <input type="submit" class='btn btn-info float-right mr-5' value='Tukar Cawangan'>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/operasi/tukar_taraf.blade.php b/resources/views/operasi/tukar_taraf.blade.php
new file mode 100644
index 0000000..0941e27
--- /dev/null
+++ b/resources/views/operasi/tukar_taraf.blade.php
@@ -0,0 +1,84 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+                      <li class="breadcrumb-item" aria-current="page"><a href="{{ route('daftar.kakitangan') }}">Kakitangan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Tukar Taraf</li>
+                    </ol>
+                </nav>
+
+                <div class="card-body text-center">
+                    <form action="{{ route('kakitangan.tukartaraf.update') }}" method="post">
+                        @csrf
+                        <input type="hidden" name='user_id' id='user_id' readonly value="{{ $user->id }}" class='form-control'>
+                        <div class='row form-group'>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Nama</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nama' id='nama' readonly value="{{ $user->name }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Email</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='email' id='email' readonly value="{{ $user->email }}" class='form-control'>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class='col-md-6'>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No KP</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='nokp' id='nokp' readonly value="{{ $user->no_kp }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>No Telefon</b>
+                                    </div>
+                                    <div class='col-md-7'>
+                                        <input type="text" name='telefon' id='telefon' readonly value="{{ $user->no_telefon }}" class='form-control'>
+                                    </div>
+                                </div>
+                                <div class='form-group row col-md-12'>
+                                    <div class='col-md-5'>
+                                        <b>Jawatan</b>
+                                    </div>
+
+                                    <div class='col-md-7'>
+                                        <select class="form-control" name="role" data-placeholder="Pilih Jawatan" id="role">
+                                            <option disabled selected> -- Pilih Jawatan -- </option>
+                                            @foreach($role as $roles)    
+                                                <option value="{{ $roles['role_code'] }}" {{ $user->roles == $roles['role_code'] ? 'selected' : '' }}>{{ $roles['keterangan'] }}</option>
+                                            @endforeach
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class='row justify-content-end'>
+                            <div class='col-md-12'>
+                                <input type="submit" class='btn btn-info float-right mr-5' value='Tukar Taraf'>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 572acd3..5b733ed 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -246,7 +246,7 @@
                             <div class="col-6">
                                 <div class="form-group row" id="divbayaran">
                                     <div class="col-4">
-                                       BAYARAN PEMBIAYAAN(RM)
+                                       BAYARAN PELANGGAN(RM)
                                     </div>
                                     <div class="col-8">
                                         <input type="text" id="bayaran" onkeyup="bayartambahan(this)" placeholder="0.00" class="form-control" disabled/>
@@ -373,6 +373,7 @@
     $('#divhargaemassemasa').hide();
     $('#divperludibayartawarruq').hide();
     $('#divbayarantawarruq').hide();
+    $('#divbayaran').hide();
 
 
     var array_recno = [];
@@ -721,9 +722,9 @@
                 $('#divhargaemassemasa').hide();
                 $('#divperludibayartawarruq').hide();
                 $('#divbayarantawarruq').hide();
+                $('#divbayaran').hide();
 
                 $('#divtelahdibayar').show();
-                $('#divbayaran').show();
                 $('#divperludibayar').show();
 
                 tebusan();
@@ -748,9 +749,9 @@
                 $('#divbayarantawarruq').hide();
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
-                $('#divperludibayar').show();
+                $('#divperludibayar').hide();
 
-                $('#perludibayar').val(formatter.format(jumupah));
+                $('#bayaran').val(formatter.format(jumupah));
 
                 break;
 
@@ -992,6 +993,7 @@
     function bayaransemua()
     {
         $("#terima_transaksi").prop('disabled', true);
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
         if($('#sltjenistebus').find(":selected").val() == 'T'){
         
             var adadah = false;
@@ -1128,7 +1130,17 @@
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
             var bayar = $('#bayaran').val();
-            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
+            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;
+
+            if(bayar < jumupah){
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire(
+                    'Amaran!',
+                    'Bayaran tidak boleh kurang dari kos keuntungan semasa',
+                    'error'
+                )
+                return false;
+            }
 
             if(bayar >  bakipinjam){   
                 $("#terima_transaksi").prop('disabled', false);
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index 22233e7..353d33a 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -207,21 +207,21 @@
     <th width="6%;">Bayaran(RM)</th>
     <th width="6%;">Jumlah(RM)</th>
   </tr>
-  @php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
+  @php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
+  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
                 <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
-            @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
+            @php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
         @endif
     @else
         <tr>
             <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
+        @php $totalnmteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
     @endif
     <tr>
       <td>{{ $counter }}</td>
@@ -246,13 +246,13 @@
       <td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
     </tr>
     @php $counter++; @endphp
-    @php $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
+    @php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
     @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr class="new-page">
                 <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-                <td></td>
+                <td><b>{{ number_format($totalnmteller,2) }} </b></td>
                 <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
                 <td><b>{{ number_format($totalupahteller,2) }} </b></td>
                 <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -263,7 +263,7 @@
     @else
         <tr class="new-page">
             <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-            <td></td>
+            <td><b>{{ number_format($totalnmteller,2) }}</b></td>
             <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
             <td><b>{{ number_format($totalupahteller,2) }} </b></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
@@ -277,12 +277,14 @@
 <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
   <tr>
     <th colspan="9"></th>
+    <th style="text-align:center;">Nilai Marhun (RM)</th>
     <th style="text-align:center;">Pembiayaan (RM)</th>
     <th style="text-align:center;">Upah/Keuntungan (RM)</th>
     <th style="text-align:center;">Jumlah (RM)</th>
   </tr>
   <tr>
     <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalnm,2) }}</td>
     <td>{{ number_format($totalpinjaman,2) }}</td>
     <td>{{ number_format($totalupah,2) }}</td>
     <td>{{ number_format($totalbayaran,2) }}</td>
diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php
index 390b21a..c0a5bd7 100644
--- a/resources/views/print/resit_tuntutbaki.blade.php
+++ b/resources/views/print/resit_tuntutbaki.blade.php
@@ -1,3 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+    $(document).ready(function () {
+      window.print();
+      window.onfocus=function(){ window.close();}
+    });
+</script>
 <style>
 #header {
   font-family: Arial, Helvetica, sans-serif;
diff --git a/resources/views/print/resitadvansur.blade.php b/resources/views/print/resitadvansur.blade.php
index 2167d75..6a5659a 100644
--- a/resources/views/print/resitadvansur.blade.php
+++ b/resources/views/print/resitadvansur.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:10px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:9px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 941a371..6bda936 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -77,22 +77,6 @@ hr.new5 {
   margin-right: 0;
 }
 
-
-
-
-</style>
-
-
-
-
-
-
-
-
-
-
-
-<style>
   hr.new1 {
     border-top: 1px dotted black;
   }
@@ -247,7 +231,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +240,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
@@ -399,7 +383,7 @@ hr.new5 {
   <table id="inside">
 
  <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
  </tr>
  <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
@@ -493,7 +477,7 @@ hr.new5 {
 <table id="inside">
 
 <tr>
-<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $transaction['norujukan'] }} </td>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> No SAG</b></td><td>: <b style="font-size:15px">{{ $transaction['norujukan'] }}</b> </td>
 </tr>
 <tr>
 <td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp </td>
@@ -563,4 +547,4 @@ hr.new5 {
 
 </tr>
 </table>
-<br>
\ No newline at end of file
+<br>
diff --git a/resources/views/print/resittambahpinjam.blade.php b/resources/views/print/resittambahpinjam.blade.php
index 00d15af..5f3ffa4 100644
--- a/resources/views/print/resittambahpinjam.blade.php
+++ b/resources/views/print/resittambahpinjam.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index f6c5ea4..6b2e8cf 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php
index 24930d5..03dce05 100644
--- a/resources/views/print/resittebusautotawarruq.blade.php
+++ b/resources/views/print/resittebusautotawarruq.blade.php
@@ -8,8 +8,8 @@
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
     $(document).ready(function () {
-      // window.print();
-      // window.onfocus=function(){ window.close();}
+      window.print();
+      window.onfocus=function(){ window.close();}
     });
 </script>
 <style>
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 737529e..451287e 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:12px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:13px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/resittebusseparuh.blade.php b/resources/views/print/resittebusseparuh.blade.php
index c88c4de..bbfa8fb 100644
--- a/resources/views/print/resittebusseparuh.blade.php
+++ b/resources/views/print/resittebusseparuh.blade.php
@@ -247,7 +247,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 45%;
+    width: 60%;
     font-size:13px;
     border: 1px solid black;
 
@@ -256,7 +256,7 @@ hr.new5 {
   #payment td, #payment th {
     border: 0px solid;
     padding: 3px;
-    font-size:10px;
+    font-size:15px;
     text-align: left;
 
   }
diff --git a/resources/views/print/sag.blade.php b/resources/views/print/sag.blade.php
index fa6d84f..610e3cf 100644
--- a/resources/views/print/sag.blade.php
+++ b/resources/views/print/sag.blade.php
@@ -8,7 +8,7 @@
 <script>
     $(document).ready(function () {
       window.print();
-      // window.onfocus=function(){ window.close();}
+      window.onfocus=function(){ window.close();}
     });
 </script>
 
@@ -26,6 +26,14 @@
     margin-top: -70px;
   }
 
+  .khazanah-copy{
+    border:1px solid black;
+    padding:10px;
+    width : 250px;
+    font-size:11px;
+    margin-left: 200px;
+  }
+
   #customers {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
@@ -68,7 +76,7 @@
   .grid-container {
     display: grid;
     grid: 80px / 33% 33% 33%;
-    padding: 10px;
+    padding: 10px 10px 0px 10px;
   }
 
   #customers td, #customers th {
@@ -392,6 +400,16 @@
     border-top: 1px dashed black;
   }
 
+  #detail-kaki{
+    width: 100%;
+   border-collapse: collapse !important;
+  }
+
+  .cell-breakWord {
+    word-wrap: break-word;
+    max-width: 1px;
+  }
+
 </style>
 </head>
 
@@ -414,7 +432,6 @@
       {!! QrCode::size(60)->generate($pembayaran_segera); !!}
       <p class="bottomright"><b>SALINAN PELANGGAN</b></p>
     </div>
-
   </div>
   
   <table style="margin-bottom:10px;" id="perjanjian">
@@ -424,8 +441,8 @@
     <tr>
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
-      <td>NO SAG </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td><b>NO SAG</b> </td>
+      <td style="font-size:12px"><b>{{$gadai_detail['norujukan']}}</b></td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -450,14 +467,26 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(empty($poskod)){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+          if($negeri){
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
-      <td>NILAI PEMBIAYAAN</td>
-      <td>RM {{ number_format($gadai_detail['pinjaman'],2) }} </td>
+      <td><b>NILAI PEMBIAYAAN</b></td>
+      <td><b>RM {{ number_format($gadai_detail['pinjaman'],2) }}</b> </td>
     </tr>
     <tr>
       <td>NO TELEFON</td>
@@ -465,11 +494,23 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td><b>KOS KEUNTUNGAN SEBULAN</b></td>
+      <td><b>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </b></td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="transaksi_twq">
     <tr>
-      <th  colspan="4"> TRANSAKSI TAWARRUQ</th>
+      <th  colspan="3"> TRANSAKSI TAWARRUQ</th>
+      <th>Setuju</th>
     </tr>
     <tr>
       <td rowspan="2"> 1</td>
@@ -477,7 +518,7 @@
       <td rowspan="2">
         Saya bersetuju dan dengan ini membeli komoditi daripada PKB pada Harga Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana yang dinyatakan di dalam sijil pembekal komoditi mengikut kadar jumlah pembiayaan yang diberikan kepada saya.
       </td>
-      <td rowspan="2"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="2"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
     <tr></tr>
     <tr>
@@ -486,7 +527,7 @@
       <td rowspan="1">
         Saya bersetuju untuk menggadaikan Marhun sebagai cagaran kepada harga komoditi.
       </td>
-      <td rowspan="1"> Setuju <table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
+      <td rowspan="1"><table style="margin-left:5px;" border="1"><tr><td> </td> </tr></table></td>
     </tr>
   </table>
 
@@ -498,33 +539,29 @@
 
   <table style="margin-bottom:10px;" id="keuntungan">
     <tr>
-      <th colspan="3">MAKLUMAT SIJIL KOMODITI </th>
+      <th colspan="6">MAKLUMAT SIJIL KOMODITI </th>
     </tr>
     <tr>
       <td>1</td>
       <td>Nombor Sijil</td>
       <td>{{ $komuditi['no_sijil'] }}</td>
-    </tr>
-    <tr>
-      <td>2</td>
-      <td>Kod Produk / Diskripsi</td>
-      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
-    </tr>
-    <tr>
-      <td>3</td>
-      <td>Unit</td>
-      <td>{{ $product['unit'] }}</td>
-    </tr>
-    <tr>
       <td>4</td>
       <td>Kuantiti</td>
       <td>{{ $kuantiti }}</td>
     </tr>
     <tr>
+      <td>2</td>
+      <td>Kod Produk / Diskripsi</td>
+      <td>{{ $product['kodproduk'] . ' / ' . $product['description'] }}</td>
       <td>5</td>
       <td>Nilai</td>
       <td>{{ 'RM ' . number_format($gadai_detail['pinjaman'],2) }}</td>
     </tr>
+    <tr>
+      <td>3</td>
+      <td>Unit</td>
+      <td colspan ="4">{{ $product['unit'] }}</td>
+    </tr>
   </table>
 
   <table style="margin-bottom:10px;" id="keuntungan">
@@ -538,7 +575,7 @@
     </tr>
     <tr>
       <td>TARIKH AKHIR BAYARAN</td>
-      <td style="text-align: center;"> 
+      <td style="text-align: center; font-weight: bold;"> 
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail['t_matang']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -555,7 +592,7 @@
     </tr>
     <tr>
       <td>JUMLAH KEUNTUNGAN YANG PERLU DIBAYAR</td>
-      <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
+      <td style="text-align: center; font-weight: bold;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
       <td style="text-align: center;">RM {{ number_format($gadai_detail['bakiupah'],2) }}</td>
     </tr>
     <tr>
@@ -651,9 +688,9 @@
       <th colspan="2">TANDATANGAN SAKSI</th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -709,7 +746,7 @@
     </tr>
     <tr>
       <td> 1.</td>
-      <td colspan="6"> Sesrorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
+      <td colspan="6"> Seorang Pelanggan hendaklah mendapat satu salinan Surat Akuan Gadai (SAG).Sekiranya SAG hilang, Pelanggan hendaklah memberitahu Permodalan Kelantan Berhad (PKB) dengan serta-merta dan mendapatkan pengesahan Surat Akuan Sumpah sebelum diberikan salinan SAG baru.</td>
     </tr>
     <tr>
       <td> 2.</td>
@@ -848,7 +885,7 @@
       <td> NAMA</td>
       <td> {{$customer_detail['nama']}}</td>
       <td>NO SAG </td>
-      <td>{{$gadai_detail['norujukan']}}</td>
+      <td style="font-size:12px">{{$gadai_detail['norujukan']}}</td>
     </tr>
     <tr>
       <td> NO MYKAD</td>
@@ -873,10 +910,22 @@
       <td>
         @php
           $poskod = Http::get($api_url . '/api/poskod/'.$customer_detail['poskod'])->json();
+          if(empty($poskod)){
+            $poskod = array('koddaerah'=>'NIL','kodnegeri' => 'NIL');
+          }
           $daerah = Http::get($api_url . '/api/daerah/'.$poskod['koddaerah'])->json();
+          if($daerah){
+            $namadaerah = $daerah['namadaerah'];
+          }else{
+            $namadaerah = 'NIL';
+          }
           $negeri = Http::get($api_url . '/api/negeri/'.$poskod['kodnegeri'])->json();
-
-          echo ($customer_detail['poskod']. ', ' .$daerah['namadaerah'].', '.$negeri['negeri']);
+          if($negeri){
+            $negeri = $negeri['negeri'];
+          }else{
+            $negeri = 'NIL';
+          }
+          echo ($customer_detail['poskod']. ', ' .$namadaerah.', '.$negeri);
         @endphp
       </td>
       <td>NILAI PEMBIAYAAN</td>
@@ -888,6 +937,17 @@
       <td>HARGA JUALAN</td>
       <td>RM {{ number_format($gadai_detail['hargajualan'],2) }}</td>
     </tr>
+    <tr>
+      <td></td>
+      <td></td>
+      <td>KOS KEUNTUNGAN SEBULAN</td>
+      <td>
+          @php
+            $upah_sbln = ($gadai_detail['kadarupah']/100) * $gadai_detail['pinjaman'];
+            echo 'RM ' . number_format($upah_sbln,2);
+          @endphp
+      </td>
+    </tr>
   </table>
   <br>
 
@@ -994,9 +1054,9 @@
       <th colspan="2">TANDATANGAN SAKSI </th>
     </tr>
     <tr>
-      <td rowspan="3" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
-      <td rowspan="3" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="padding:4px; width:33%; height:50px;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
+      <td rowspan="2" colspan="2" style="width:33%;"></td>
     </tr>
     <tr></tr>
     <tr></tr>
@@ -1050,10 +1110,10 @@
       @endphp
     </div>
     <br>
-    <table>
+    <table id="detail-kaki">
       <tr>
         <td>No SAG</td>
-        <td>{{ $gadai_detail['norujukan'] }}</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
       </tr>
       <tr>
         <td>Nama</td>
@@ -1077,7 +1137,13 @@
       </tr>
       <tr>
         <td>Marhun</td>
-        <td>{{ $gadai_detail['marhun'] }}</td>
+        <td class="cell-breakWord">
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
       </tr>
     </table>
     <br>
@@ -1149,7 +1215,105 @@
       </table>
     </div>
   </div>
-  <div class='page-break'>  </div>
+  <div class="khazanah-copy">
+    <div style="text-align:center;">
+      @php
+        echo '<img src="data:image/png;base64,' . DNS1D::getBarcodePNG($gadai_detail['norujukan'], 'C128',1,40) . '" alt="barcode"   />';
+      @endphp
+    </div>
+    <br>
+    <table id="detail-kaki">
+      <tr>
+        <td>No SAG</td>
+        <td style="font-size:16px">{{ $gadai_detail['norujukan'] }}</td>
+      </tr>
+      <tr>
+        <td>Nama</td>
+        <td>{{ $customer_detail['nama'] }}</td>
+      </tr>
+      <tr>
+        <td>No K/P</td>
+        <td>{{ $gadai_detail['nokp'] }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Marhun</td>
+        <td>RM {{ number_format($gadai_detail['nilaimarhun'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Nilai Pembiayaan</td>
+        <td>RM {{ number_format($gadai_detail['pinjaman'],2) }}</td>
+      </tr>
+      <tr>
+        <td>Berat (g)</td>
+        <td>{{ $gadai_detail['berat'] }}</td>
+      </tr>
+      <tr>
+        <td>Marhun</td>
+        <td class="cell-breakWord">
+        @php
+          foreach($marhun_detail as $index=>$marhun_customer){
+            echo '1'.$marhun_customer['marhun']. '(' .$marhun_customer['karat'].'),';
+          }
+        @endphp
+        </td>
+      </tr>
+    </table>
+    <br>
+    <div id="khazanahtable">
+      <table class="table_table" style="border: 1px solid black;">
+        <thead>
+          <tr>
+            <th class="table_th" colspan="3">Ujian</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td class="table_td" colspan="2">Mutu</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Ketumpatan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Peratus (%)</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Kunci/Emas</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Batu Hitam/Asid</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Digital Caliper</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Precious Metel Verifier</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Magnet</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td" colspan="2">Saya sahkan telah menyemak fizikal saiz, berat dengan teliti mengikut SOP penilai</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+          <tr>
+            <td class="table_td">
+                {{ $gadai_detail['teller'] }}
+            </td>
+            <td class="table_td">Tandatangan</td>
+            <td class="table_td" style="width:50px"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
   <div class='page-break'>  </div>
   <div class="grid-container">
     <div id="header_surat1">
@@ -1224,4 +1388,4 @@
     <p><b>(Tandatangan pelanggan)</b></p>
   </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index 2c82218..f81933b 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -4,25 +4,30 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12">
-            <h3 class="text-center text-uppercase">maklumat pengguna</h3>
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Maklumat Pengguna</li>
+                </ol>
+            </nav>
             <div class="card">
                 <div class="card-body text-center">
                     <div class="col-md-12" style="margin-right:auto;margin-left:auto">
                         <div class="row form-group">
-                            <div class="col-md-6">
+                            <div class="col-md-12">
                                 <div class="row form-group">
                                     <div class="col-md-6">NAMA</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->name }}"></div>
                                     <div class="col-md-6">NO TELEFON</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_telefon }}"></div>
                                 </div>
                             </div>
-                            <div class="col-md-6">
+                            <div class="col-md-12">
                                 <div class="row form-group">
                                     <div class="col-md-6">NO KP</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
                                     <div class="col-md-6">JAWATAN</div>
-                                    <div class="col-md-6"><input type="text" class="form-control"></div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->role_harian }}"></div>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/user/index_operasi.blade.php b/resources/views/user/index_operasi.blade.php
new file mode 100644
index 0000000..cf6d494
--- /dev/null
+++ b/resources/views/user/index_operasi.blade.php
@@ -0,0 +1,40 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb pb-3">
+                    <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Maklumat Pengguna</li>
+                </ol>
+            </nav>
+            <div class="card">
+                <div class="card-body text-center">
+                    <div class="col-md-12" style="margin-right:auto;margin-left:auto">
+                        <div class="row form-group">
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NAMA</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->name }}"></div>
+                                    <div class="col-md-6">NO TELEFON</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_telefon }}"></div>
+                                </div>
+                            </div>
+                            <div class="col-md-12">
+                                <div class="row form-group">
+                                    <div class="col-md-6">NO KP</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->no_kp }}"></div>
+                                    <div class="col-md-6">JAWATAN</div>
+                                    <div class="col-md-6"><input type="text" class="form-control" readonly value="{{ $auth_user->roles }}"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index bbcada0..8b82ecb 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -34,13 +34,6 @@ Route::get('test', function () {
     return "event test je";
 });
 
-// Route::get('resitbiasa', function () {
-    
-
-
-    
-// });
-
 Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
 
 Route::get('/welcome',function(){
@@ -244,6 +237,12 @@ Route::get('/operasi/parameter','OperasiController@parameter')->name('parameter'
 Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiController@hargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');
+Route::get('kakitangan/tukar_taraf',['as'=>'kakitangan.tukartaraf','uses'=>'KakitanganController@tukartaraf'])->middleware('auth','operasi');
+Route::post('kakitangan/tukar_taraf/update',['as'=>'kakitangan.tukartaraf.update','uses'=>'KakitanganController@tukartarafUpdate'])->middleware('auth','operasi');
+Route::get('kakitangan/tukar_cawangan',['as'=>'kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','operasi');
+Route::post('kakitangan/tukar_cawangan/update',['as'=>'kakitangan.tukarcawangan.update','uses'=>'KakitanganController@tukarcawanganUpdate'])->middleware('auth','operasi');
+
+Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi');
 
 Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
 Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
@@ -253,21 +252,12 @@ Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahC
 Route::post('/khazanah/suratakuangadaianedit',['as'=>'agh.update','uses'=>'KhazanahController@SuratAkuanGadaianUpdate'])->middleware('auth','khazanah');
 Route::get('/khazanah/ulangcetakagh/{norujukan}',['as'=>'agh.ulangcetak','uses'=>'KhazanahController@ulangcetakSuratAkuanGadaianHilang'])->middleware('auth','khazanah');
 
-
 Route::get('/laporan/stokauditbersih', ['as'=>'laporan.stokauditbersih', 'uses'=>'KhazanahController@stokAuditBersih'])->middleware('auth','khazanah');
 Route::post('/laporan/stokauditbersih_cetak',['as' =>'stokauditbersih.cetakstokauditbersih', 'uses'=>'KhazanahController@cetakStok_AuditBersih'])->middleware('auth','khazanah');
 
-
 Route::get('/laporan/stokauditdetails', ['as'=>'laporan.stokauditdetails','uses'=>'KhazanahController@stokAuditDetails'])->middleware('auth','khazanah');
 Route::post('laporan/stokauditdetails_cetak',['as'=>'stokauditdetails.stokauditdetails_cetak', 'uses'=>'KhazanahController@cetak_stokAuditDetails'])->middleware('auth', 'khazanah');
 
-
-
-
-
-
-
-
 Route::get('/laporan/datalejeram',['as' =>'laporan.datalejer_am', 'uses'=>'KhazanahController@data_lejer_am'])->middleware('auth', 'khazanah');
 route::post('/cetaklejer_am',['as'=>'cetak.lejer_am', 'uses'=>'KhazanahController@cetak_lejer_am'])->middleware('auth', 'khazanah');
 
diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/storage/debugbar/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore