merge dalam serve semuanya

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();
+            }
+        }
+    }
+}

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();
     }
 

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;
 

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');
             }
         }
 

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'));
         }

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');
+    }
 }

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']]);

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'));
+    }
 }

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'));
+        }
     }
 }

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",

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!',

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") + '%',

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);

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');
                 }

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

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

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

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>

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>

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>

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>

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();

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

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>

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

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

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);

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>

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;

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;
 
   }

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>
+<br>

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;
 
   }

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;
 
   }

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>

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;
 
   }

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;
 
   }

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>
+</html>

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>

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

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');
 

storage/debugbar/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore