kemaskini pembetulan penebusan tawaruq lejer am

app/Events/NotifikasiAGH.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class NotifikasiAGH implements ShouldBroadcast
+{
+  use Dispatchable, InteractsWithSockets, SerializesModels;
+
+  public $kodcaw,$message,$typeerror,$pc;
+
+  public function __construct($kodcaw,$message,$typeerror,$pc)
+  {
+      $this->kodcaw = $kodcaw;
+      $this->message = $message;
+      $this->typeerror = $typeerror;
+      $this->pc = $pc;
+  }
+
+  public function broadcastOn()
+  {
+    return ['notice-agh'];
+  }
+
+  public function broadcastAs()
+  {
+    return 'my-agh';
+  }
+}

app/Http/Controllers/AliranTunaiController.php

@@ -108,7 +108,7 @@ class AliranTunaiController extends Controller
         $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
 
         $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
-        $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+        $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => Auth::user()->name ])->json();
         
         // dd($advansur);
            //******************* INITIALIZE LEJER AM START HERE****************************//
@@ -1276,6 +1276,38 @@ class AliranTunaiController extends Controller
         
     }
 
+    public function alirantunaiTebusAutoTawarruq(Request $request){
+
+        $auth_user = Auth::user();
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' .$request->norujukan)->json();
+        $gadai_detail = $gadai[0];
+ 
+        $tebus = Http::get(config('api.url') . '/api/listpenebusanhistory/'. $auth_user['cawangan'],['norujukan' => $request->norujukan])->json();
+        $tebus_detail = $tebus[0];
+
+        $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $tebus_detail['teller']])->json();
+
+        $keluar=$getTunai2['keluar'];
+        $baki=$getTunai2['baki'];
+        $masuk=$getTunai2['masuk'];
+        $bakiawal=$getTunai2['bakiawal'];
+        $pendahuluan=$getTunai2['tambah'];
+        $serahan=$getTunai2['kurang'];
+        $totalmasuk = 0;
+        $bakiakhir = $baki;
+        $totalkeluar = 0;
+
+        $bakiakhir = $bakiakhir + $request->totalbayaran;
+
+        $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+            'kodlaluan' => $tebus_detail['teller'],   
+            'keluar'=>$keluar,
+            'masuk'=>$masuk,
+            'bakiakhir'=>$bakiakhir
+        ]);
+    }
+
     public function alirantunaiUpahBknTawarruq(Request $request){
 
         $auth_user = Auth::user();
@@ -1431,7 +1463,7 @@ class AliranTunaiController extends Controller
         $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
         $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $current->toDateString())->json();
         $ansuran = Http::get(config('api.url'). '/api/ansuran/laporan/'. $auth_user['cawangan'],['tarikh' => $current->toDateString()])->json();
-
+        $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();
 
         $totalserahan = 0;
@@ -1455,7 +1487,7 @@ class AliranTunaiController extends Controller
         {
             if($gad['teller'] === Auth::user()->name)
             {
-                if($gad['semakbarcode'] === 'LULUS')
+                if($gad['semakbarcode'] == 'Lulus')
                     $totalgadaibarcodescanned += $gad['pinjaman'];   
             
                 $totalgadai += $gad['pinjaman'];
@@ -1501,11 +1533,26 @@ class AliranTunaiController extends Controller
             $totalupahlama += $upahlama['upahDibayar'];
         }
 
+        $totaltuntutbaki = 0;
+        $bakilelong = 0;
+        $rugilelong = 0;
+        foreach($tuntutbaki as $index1=>$tb)
+        {
+            if($tb['jenis'] == 'T')
+            {
+                $bakilelong += $tb['jumlah'];
+            }else{
+                $rugilelong += -($tb['jumlah']);
+            }
+
+            $totaltuntutbaki += $tb['jumlah'];
+        }
+
         $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
         $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
         $gadaian = floatval($totalgadai);
 
-        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan));
+        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
 
         $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
 
@@ -1528,7 +1575,7 @@ class AliranTunaiController extends Controller
         {
             return response('sama');
         }else{
-            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($totaltebusbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
+            $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
             return response()->json($arraykemaskini);
         }
     }
@@ -1549,8 +1596,8 @@ class AliranTunaiController extends Controller
 
         $updateTunai = Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
                         'kodlaluan' => $auth_user['name'],   
-                        'keluar'=> $keluar,
-                        'masuk'=> $masuk,
+                        'keluar'=> $request->gadaian,
+                        'masuk'=> $request->penebusan,
                         'bakiakhir'=> $request->bakiakhir
         ]);
 

app/Http/Controllers/GadaianController.php

@@ -425,11 +425,55 @@ class GadaianController extends Controller
         return view('print.resittebusseparuh',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
     }
 
+    public function resitautotawarruq($id)
+    {  
+
+        $auth_user = Auth::user();
+
+        $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
+        
+        $totaltransaction = 0;
+
+        $transaction = Http::get(config('api.url') . '/api/transaction/'. $id)->json();
+
+        foreach($transaction as $trans)
+        {
+                $totaltransaction += $trans['duit_masuk'];
+        }
+
+        if(sizeof($gadai) != 0)
+            $gadai = $gadai[0][0];
+
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
+
+        $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json();
+        if(sizeof($customers_info) != 0)
+            $customers_info = $customers_info[0];
+
+           
+        $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json();
+       
+        if(sizeof($penebusan) != 0)
+            $penebusan = $penebusan[0];
+
+        $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();    
+
+        // dd($wakil);
+        if(sizeof($wakil) != 0)
+            $wakil = $wakil[0]; 
+
+        return view('print.resittebusautotawarruq',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction','transaction_keuntungan'));
+    }
+
     public function resittebus($id)
     {  
 
         $auth_user = Auth::user();
 
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+        dd($cawangan_info);
+
         $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json();
         
         $totaltransaction = 0;
@@ -462,7 +506,7 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0]; 
 
-        return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction'));
+        return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction'));
     }
 
     public function resitbelumtebus($id)

app/Http/Controllers/KhazanahController.php

@@ -9,6 +9,7 @@ use App\Events\OperasiNotice;
 use App\Events\PendahuluanSerahan;
 use App\Events\NotifikasiKelulusan;
 use App\Events\NotifikasiUbahHapus;
+use App\Events\NotifikasiAGH;
 
 use App\User;
 use App\Cawangan;
@@ -20,6 +21,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Hash;
 use Carbon\Carbon;
 use PDF;
+use DateTime;
 
 class KhazanahController extends Controller
 {
@@ -36,25 +38,61 @@ class KhazanahController extends Controller
 
         $api_url = config('api.url');
         $auth_user = Auth::user();
+        $idtype = 'nokp';
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $bank = Http::get(config('api.url') . '/api/bank')->json();
-        return view('khazanah.index',compact('search','cawangan_info','bank','api_url'));
+        return view('khazanah.index',compact('search','cawangan_info','bank','api_url','idtype'));
+    }
+
+    public function search(Request $request){
+        $noic = $request->noic;
+        $idtype = $request->customerIDType;
+        Session::put('noic', $noic);
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        $bank = Http::get(config('api.url') . '/api/bank')->json();
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
+
+        if($customers_info){
+            $customer_info = $customers_info[0];
+        }else{
+            $customer_info = $customers_info;
+        }
+        $request->session()->forget('page_reload');
+        $request->session()->forget('norujukan');
+
+        $search = true;
+
+        if($customer_info){
+            Session::put('customer_info_khazanah',$customer_info);
+            return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]);
+        }else{
+            return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype'));
+        }
     }
 
     public function info(Request $request){
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-        $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->noic)->json();
+        $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json();
         if($customers_info){
             $customer_info = $customers_info[0];
         }else{
             $customer_info = $customers_info;
         }
 
+        $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json();
+        $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json();
+
+        $negeri = Http::get(config('api.url') . '/api/negeri/')->json();
+
+        
+        
         $request->session()->forget('page_reload');
         $request->session()->forget('norujukan');
-        return view('khazanah.info',compact('cawangan_info','api_url','customer_info'));
+        return view('khazanah.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','negeri'));
     }
 
     public function menu()
@@ -791,7 +829,6 @@ class KhazanahController extends Controller
                         else
                         {
                             
-                
                             $hariIni_UG=$get_lejerUG[0]['hariini'];
                             $kelmarin_UG=$get_lejerUG[0]['kelmarin'];
                             $jumlah_UG=$get_lejerUG[0]['jumlah'];
@@ -824,13 +861,11 @@ class KhazanahController extends Controller
                   $jumlah_Pinjaman=$get_lejerPinjaman[0]['jumlah'];
                   $kredit_Pinjaman=$get_lejerPinjaman[0]['kredit'];
                   $debit_Pinjaman=$get_lejerPinjaman[0]['debit'];
-                  $recno_Pinjaman=$get_lejerPinjaman[0]['recno'];  
-                 
+                  $recno_Pinjaman=$get_lejerPinjaman[0]['recno'];   
             
                    $kredit_Pinjaman=$kredit_Pinjaman+$pinjaman;
-                  
-
-                   
+                
+            
                    $hariIni_Pinjaman=$debit_Pinjaman-$kredit_Pinjaman;
                    $kelmarin_Pinjaman=$jumlah_Pinjaman-$hariIni_Pinjaman;
      
@@ -843,8 +878,6 @@ class KhazanahController extends Controller
           
                    ]); 
 
-
-
                    $get_latest_bayarUntung=Http::get(config('api.url').'/api/latest_transaksi_untung/'.$request->norujukan_barcode)->json();
                    $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
                    $bayaran_rebate=$get_latest_bayarUntung[0]['keuntungan_rebet'];
@@ -857,7 +890,6 @@ class KhazanahController extends Controller
                          $recno_untung=$get_lejer_Untung [0]['recno'];
                          $kredit_untung=$get_lejer_Untung [0]['kredit']; 
 
-
                          $kredit_untung=$kredit_untung+$bayaran_latest_untung;
                          $hariini_untung=$debit_untung-$kredit_untung;
                          $kelmarin_untung=$jumlah_untung-$hariini_untung;
@@ -872,8 +904,6 @@ class KhazanahController extends Controller
               ]);
 
 
-
-            
                 $get_latest_bayarRebate=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
                  $latest_rebate=$get_latest_bayarRebate[0]['keuntungan_rebet'];
 
@@ -905,7 +935,6 @@ class KhazanahController extends Controller
 
          $get_latest_bayarRebate=Http::get(config('api.url').'/api/latest_transaksi_untung/data/'.$request->norujukan_barcode)->json();
          $latest_rebate=$get_latest_bayarRebate[0]['keuntungan_rebet'];
-
         $get_GLCode_RebateB=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$Rebet_B])->json();
         $keterangan_RebateB=$get_GLCode_Tunai[0]['descpt'];
         $acctype_RebateB=$get_GLCode_Tunai[0]['acttype'];
@@ -936,9 +965,6 @@ class KhazanahController extends Controller
  
                  $totalmasuk = $tebus_detail['bakipjm'] + $masuk;
 
-
-
-
                  $get_GLCode_Tunai=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$KOD_tunai])->json();
                  $keterangan_Tunai=$get_GLCode_Tunai[0]['descpt'];
                  $acctype_Tunai=$get_GLCode_Tunai[0]['acttype'];
@@ -957,8 +983,6 @@ class KhazanahController extends Controller
                     $hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
                     $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
 
-
-                     
                 $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
                 'recno'=>$recno_Tunai,
                 'debit'=>$debit_Tunai,
@@ -1496,7 +1520,6 @@ class KhazanahController extends Controller
 
         $bakiperubatan = 0;
 
-       
         switch ($request->jenismodal) {
             case "selenggara":
                 $kategori = "Baiki dan Selenggara";
@@ -1576,6 +1599,9 @@ class KhazanahController extends Controller
             'jumlahkeping' => "0"
           ]);
 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $request->tarikhbil);
+        $tarikhbil = $myDateTime->format('dmY');
+
         $panjar = Http::post(config('api.url') . '/api/CreatePanjar/'. $auth_user['cawangan'],[
 
             'deskripsi' => $request->deskripsi,
@@ -1585,7 +1611,7 @@ class KhazanahController extends Controller
             'id' => $auth_user['name'],
             'bakiperubatan' => $bakiperubatan,
             'nobaucer' => $request->baucer,
-            'nobil' => "3213231",
+            'nobil' => $tarikhbil,
             'tuntutoleh' => $request->tuntutan    
             
         ])->json();
@@ -1608,9 +1634,9 @@ class KhazanahController extends Controller
                 $keterangan=$get_glCode_Details[0]['descpt'];  //keterangan glcode
                 $actype=$get_glCode_Details[0]['acttype'];     //keterangan acctype 
  
-           $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
-            if(sizeof($get_Panjar_AM)==0)
-            {
+                $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
+                if(sizeof($get_Panjar_AM)==0)
+                {
                     $jumlah=0.0;
                     $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
                       if(sizeof($getGLedjer_Semalam)==0)
@@ -1720,28 +1746,28 @@ class KhazanahController extends Controller
                         'kelmarin'=>$kelmarin_panjar,
 
                     
-                                   ]);   
+                    ]);   
 
-                                   $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
-                                   $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-                                   $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-                                   $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-                                   $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-                                   $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-                                   $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-                               
-                                   $kredit_Tunai=$kredit_Tunai+$request->bayaran;
-                                   $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-                                   $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+                    $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
+                    $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+                    $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+                    $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+                    $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+                    $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+                    $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+                
+                    $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+                    $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+                    $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
 
-                                   $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno_Tunai,
-                                    'debit'=>$debit_Tunai,
-                                    'kredit'=>$kredit_Tunai,
-                                    'hariini'=>$hariini_Tunai,
-                                   'kelmarin'=>$kelmarin_Tunai,
-                                  
-                                 ]);
+                    $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                    'recno'=>$recno_Tunai,
+                    'debit'=>$debit_Tunai,
+                    'kredit'=>$kredit_Tunai,
+                    'hariini'=>$hariini_Tunai,
+                    'kelmarin'=>$kelmarin_Tunai,
+                    
+                    ]);
 
 
             }
@@ -1758,62 +1784,62 @@ class KhazanahController extends Controller
            $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
             if(sizeof($get_Panjar_AM)==0)
             {
-                    $jumlah=0.0;
-                    $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                      if(sizeof($getGLedjer_Semalam)==0)
-                      {
-                              $jumlah=0.0;
-                      } 
-                      else
-                      {
+                $jumlah=0.0;
+                $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                    if(sizeof($getGLedjer_Semalam)==0)
+                    {
+                            $jumlah=0.0;
+                    } 
+                    else
+                    {
 
-                      $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
-                      $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
-                      $jumlah=$jumlah_semalam+$hariIniSemalam;
-                      }    
-                      $jumlahBulan_ini=0.0;
-                      $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                 
-                       if( sizeof($get_GlejerBulan_Tahun)==0)
-                       {
-                           $jumlahBulan_ini=0.0;
-                       }
-                      else
-                      {
-                         $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
-                         $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-         
-                      }//end bulan tahun
-                      $Jumlah_TahunIni=0.0;
-                      $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                      if(sizeof($get_Glejer_Tahun)==0)
-                      {
-                           $Jumlah_TahunIni=0.0;
-                      }
-                      else
-                      {
+                    $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+                    $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+                    $jumlah=$jumlah_semalam+$hariIniSemalam;
+                    }    
+                    $jumlahBulan_ini=0.0;
+                    $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                
+                    if( sizeof($get_GlejerBulan_Tahun)==0)
+                    {
+                        $jumlahBulan_ini=0.0;
+                    }
+                    else
+                    {
+                        $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+                        $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+        
+                    }//end bulan tahun
+                    $Jumlah_TahunIni=0.0;
+                    $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                    if(sizeof($get_Glejer_Tahun)==0)
+                    {
+                        $Jumlah_TahunIni=0.0;
+                    }
+                    else
+                    {
+        
+                    $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
+                    $Jumlah_TahunIni=$jumlah-$JumTahunIni;
             
-                      $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
-                      $Jumlah_TahunIni=$jumlah-$JumTahunIni;
-              
-                      }
+                    }
 
-                      $HariIni=0.00-$request->bayaran;
-                      $kelmarin=$jumlah-$HariIni;
-                    
-                      //insert glejer untuk current date /hari ini
-                   $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
-                    'kodcaw'=>$auth_user['cawangan'],
-                    'glcode'=>$KERAIAN,
-                    'descpt'=>$keterangan,
-                    'debit'=>$request->bayaran,
-                    'kredit'=>0.0,
-                    'hariini'=>$HariIni,
-                    'kelmarin'=>$kelmarin,
-                    'jumlah'=>$jumlah,
-                    'bulanini'=>$jumlahBulan_ini,
-                    'tahunini'=>$Jumlah_TahunIni,
-                    'acttype'=> $actype
+                    $HariIni=0.00-$request->bayaran;
+                    $kelmarin=$jumlah-$HariIni;
+                
+                    //insert glejer untuk current date /hari ini
+                $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
+                'kodcaw'=>$auth_user['cawangan'],
+                'glcode'=>$KERAIAN,
+                'descpt'=>$keterangan,
+                'debit'=>$request->bayaran,
+                'kredit'=>0.0,
+                'hariini'=>$HariIni,
+                'kelmarin'=>$kelmarin,
+                'jumlah'=>$jumlah,
+                'bulanini'=>$jumlahBulan_ini,
+                'tahunini'=>$Jumlah_TahunIni,
+                'acttype'=> $actype
 
                 ]);
 
@@ -1838,54 +1864,50 @@ class KhazanahController extends Controller
                
               ]);
 
-
-
             }
             else
             {
 
-                    $hariini_panjar= $get_Panjar_AM[0]['hariini'];
-                    $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
-                    $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
-                    $debit_panjar= $get_Panjar_AM[0]['debit'];
-                    $recno_panjar= $get_Panjar_AM[0]['recno'];
-                    $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
+                $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+                $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+                $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+                $debit_panjar= $get_Panjar_AM[0]['debit'];
+                $recno_panjar= $get_Panjar_AM[0]['recno'];
+                $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
 
 
-                    $debit_panjar=$debit_panjar+$request->bayaran;
-                    $harini_panjar=$debit_panjar-$kredit_panjar;
-                    $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+                $debit_panjar=$debit_panjar+$request->bayaran;
+                $harini_panjar=$debit_panjar-$kredit_panjar;
+                $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
 
-                      $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                        'recno'=>$recno_panjar,
-                        'debit'=>$debit_panjar,
-                        'kredit'=>$kredit_panjar,
-                        'hariini'=>$hariini_panjar,
-                        'kelmarin'=>$kelmarin_panjar,
+                    $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                    'recno'=>$recno_panjar,
+                    'debit'=>$debit_panjar,
+                    'kredit'=>$kredit_panjar,
+                    'hariini'=>$hariini_panjar,
+                    'kelmarin'=>$kelmarin_panjar,
+                ]);   
 
-                    
-                                   ]);   
+                $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
+                $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+                $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+                $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+                $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+                $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+                $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+            
+                $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+                $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+                $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
 
-                                   $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
-                                   $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-                                   $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-                                   $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-                                   $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-                                   $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-                                   $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-                               
-                                   $kredit_Tunai=$kredit_Tunai+$request->bayaran;
-                                   $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-                                   $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
-
-                                   $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno_Tunai,
-                                    'debit'=>$debit_Tunai,
-                                    'kredit'=>$kredit_Tunai,
-                                    'hariini'=>$hariini_Tunai,
-                                   'kelmarin'=>$kelmarin_Tunai,
-                                  
-                                 ]);
+                $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                'recno'=>$recno_Tunai,
+                'debit'=>$debit_Tunai,
+                'kredit'=>$kredit_Tunai,
+                'hariini'=>$hariini_Tunai,
+                'kelmarin'=>$kelmarin_Tunai,
+                
+                ]);
 
 
             }
@@ -1899,51 +1921,52 @@ class KhazanahController extends Controller
             $keterangan=$get_glCode_Details[0]['descpt'];  //keterangan glcode
             $actype=$get_glCode_Details[0]['acttype'];     //keterangan acctype 
 
-       $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+        $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+
         if(sizeof($get_Panjar_AM)==0)
         {
-                $jumlah=0.0;
-                $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-                  if(sizeof($getGLedjer_Semalam)==0)
-                  {
-                          $jumlah=0.0;
-                  } 
-                  else
-                  {
+            $jumlah=0.0;
+            $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+                if(sizeof($getGLedjer_Semalam)==0)
+                {
+                        $jumlah=0.0;
+                } 
+                else
+                {
 
-                  $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
-                  $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
-                  $jumlah=$jumlah_semalam+$hariIniSemalam;
-                  }    
-                  $jumlahBulan_ini=0.0;
-                  $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-             
-                   if( sizeof($get_GlejerBulan_Tahun)==0)
-                   {
-                       $jumlahBulan_ini=0.0;
-                   }
-                  else
-                  {
-                     $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
-                     $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-     
-                  }//end bulan tahun
-                  $Jumlah_TahunIni=0.0;
-                  $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-                  if(sizeof($get_Glejer_Tahun)==0)
-                  {
-                       $Jumlah_TahunIni=0.0;
-                  }
-                  else
-                  {
+                $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+                $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+                $jumlah=$jumlah_semalam+$hariIniSemalam;
+                }    
+                $jumlahBulan_ini=0.0;
+                $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+            
+                if( sizeof($get_GlejerBulan_Tahun)==0)
+                {
+                    $jumlahBulan_ini=0.0;
+                }
+                else
+                {
+                    $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+                    $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+    
+                }//end bulan tahun
+                $Jumlah_TahunIni=0.0;
+                $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+                if(sizeof($get_Glejer_Tahun)==0)
+                {
+                    $Jumlah_TahunIni=0.0;
+                }
+                else
+                {
+    
+                $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
+                $Jumlah_TahunIni=$jumlah-$JumTahunIni;
         
-                  $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];
-                  $Jumlah_TahunIni=$jumlah-$JumTahunIni;
-          
-                  }
+                }
 
-                  $HariIni=0.0-$request->bayaran;
-                  $kelmarin=$jumlah-$HariIni;
+                $HariIni=0.0-$request->bayaran;
+                $kelmarin=$jumlah-$HariIni;
                 
                   //insert glejer untuk current date /hari ini
                $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
@@ -1991,45 +2014,45 @@ class KhazanahController extends Controller
         else
         {
 
-                            $hariini_panjar= $get_Panjar_AM[0]['hariini'];
-                            $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
-                            $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
-                            $debit_panjar= $get_Panjar_AM[0]['debit'];
-                            $recno_panjar= $get_Panjar_AM[0]['recno'];
-                            $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
-                              $debit_panjar=$debit_panjar+$request->bayaran;
-                              $harini_panjar=$debit_panjar-$kredit_panjar;
-                              $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
-                              $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                            'recno'=>$recno_panjar,
-                            'debit'=>$debit_panjar,
-                            'kredit'=>$kredit_panjar,
-                            'hariini'=>$hariini_panjar,
-                            'kelmarin'=>$kelmarin_panjar,
+            $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+            $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+            $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+            $debit_panjar= $get_Panjar_AM[0]['debit'];
+            $recno_panjar= $get_Panjar_AM[0]['recno'];
+            $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
+            $debit_panjar=$debit_panjar+$request->bayaran;
+            $harini_panjar=$debit_panjar-$kredit_panjar;
+            $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+            $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+            'recno'=>$recno_panjar,
+            'debit'=>$debit_panjar,
+            'kredit'=>$kredit_panjar,
+            'hariini'=>$hariini_panjar,
+            'kelmarin'=>$kelmarin_panjar,
 
-                        
-                               ]);   
+        
+                ]);   
 
-                               $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
-                               $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-                               $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-                               $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-                               $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-                               $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-                               $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-                           
-                               $kredit_Tunai=$kredit_Tunai+$request->bayaran;
-                               $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-                               $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+            $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
+            $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+            $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+            $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+            $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+            $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+            $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+        
+            $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+            $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+            $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
 
-                               $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
-                                'recno'=>$recno_Tunai,
-                                'debit'=>$debit_Tunai,
-                                'kredit'=>$kredit_Tunai,
-                                'hariini'=>$hariini_Tunai,
-                               'kelmarin'=>$kelmarin_Tunai,
-                              
-                             ]);
+            $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
+            'recno'=>$recno_Tunai,
+            'debit'=>$debit_Tunai,
+            'kredit'=>$kredit_Tunai,
+            'hariini'=>$hariini_Tunai,
+            'kelmarin'=>$kelmarin_Tunai,
+            
+            ]);
         }
            }//end perbelanjaan Selanggara
 
@@ -2047,9 +2070,22 @@ class KhazanahController extends Controller
 
         if($upVault == 200 && empty($panjar) == false && $upDeno == 200)
         {
+            if($request->jenismodal === 'perubatan')
+            {
+                $listUser=User::where('name','=',$request->tuntutan)->get();
+
+                $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran);
+
+                $overrideuser = User::where('cawangan','=',$auth_user['cawangan'])
+                ->where('name','=',$request->tuntutan)
+                ->update(array(
+                    'perubatan' => $totalsebenar
+                ));
+            }
+
             return redirect('/panjar')->with('messageinformation','Panjar Berjaya Disimpan.');
         }else{
-            return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah UntukDisimpan.');
+            return redirect('/panjar')->with('messageinformation','Panjar Mengalami Masalah Untuk Disimpan.');
         }
 
         return response($updateVault);
@@ -3157,7 +3193,7 @@ class KhazanahController extends Controller
     }
 
     public function cetakLaporanRingkasanHarian(Request $request){
-        // dd($request);
+    
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -3223,13 +3259,13 @@ class KhazanahController extends Controller
 
         $totalbilhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['bil'] + $kawalanstok[3]['hapuskira2'][0]['bil'] + $kawalanstok[3]['hapuskira3'][0]['bil'];
         $totalbilhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['bil'] + $kawalanstok[3]['hapuskiraini2'][0]['bil'] + $kawalanstok[3]['hapuskiraini3'][0]['bil'];
-        $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; echo number_format($totalbilhapuskira); 
+        $totalbilhapuskira = $totalbilhapuskirakeseluruhan + $totalbilhapuskirasehari; 
     
         $totalpinjhapuskirakeseluruhan = $kawalanstok[3]['hapuskira1'][0]['pinj'] + $kawalanstok[3]['hapuskira2'][0]['pinj'] + $kawalanstok[3]['hapuskira3'][0]['pinj'];
         $totalpinjhapuskirasehari = $kawalanstok[3]['hapuskiraini1'][0]['pinj'] + $kawalanstok[3]['hapuskiraini2'][0]['pinj'] + $kawalanstok[3]['hapuskiraini3'][0]['pinj'];
-        $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari; echo number_format($totalpinjhapuskira,2); 
+        $totalpinjhapuskira = $totalpinjhapuskirakeseluruhan + $totalpinjhapuskirasehari;
 
-        $totalbilkawalanstok = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira;
+        $totalbilkawalanstok = $totalbilgadai-$totalbiltebus/*-$totalbilans*/-$totalbillelong-$totalbilhapuskira;
         $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira;
 
         return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
@@ -3248,7 +3284,7 @@ class KhazanahController extends Controller
             $split_date = explode('-',$request->datetimepicker1);
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
-        $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
+        $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
         $marhun = $marhun[0];
 
         $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
@@ -4003,6 +4039,7 @@ class KhazanahController extends Controller
         $cajlelong = Http::get(config('api.url').'/api/cajlelong/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpul/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
+        $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         
         //TunaiDitangan Sementara Upah
         if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
@@ -4013,24 +4050,40 @@ class KhazanahController extends Controller
             $totaltunaiditangan = $tunaiditangan;
         }
 
+        $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
+        //1Stop Special Case
+        if($auth_user['cawangan'] === '1STOP')
+        {
+            $jualan1stop = floatval(129857.00);
+            $belian1stop = floatval(122446.50);
+            $utgterkumpulxtra = floatval(6727.10);
+            $rugilelongxtra = floatval(10079.30);
+            $bakilelongxtra = floatval(123.20);
+            $cajlelongxtra = floatval(25.50);
+            $upahsimpanxtra = floatval(4894.40);
+            
+        }
+
         //Terkumpul
         $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpul/'. $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
         $hartasemasa = [];
         // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
         
-        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]);
-        array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
-        array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
-        array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
-        array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
-        array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
-        array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
-        array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
-        array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
-        array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
-        array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+        if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); 
+        if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
+        if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
+        //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
+        if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
+        if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
+        if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+        if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
+        if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
+        if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
+        if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+        if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
 
+        
         $totalhartasemasa = 0;
         foreach($hartasemasa as $index => $hs)
         {
@@ -4041,19 +4094,27 @@ class KhazanahController extends Controller
 
         // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
 
-        array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
-        array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
-        array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
-        array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
-        array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
-        array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
-        array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
-        array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
-        array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
-        array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
-        array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
-        array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
-        array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+        if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
+        if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
+        if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
+        if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+        if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
+        if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
+        if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
+        if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
+        if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
+        if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
+        if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
+        if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
+        if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
+        if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
+        if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
+        if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
+        if($rugilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
+        if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
+        if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
+        if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
+
         
         $totaltanggungansemasa = 0;
         foreach($tanggungansemasa as $index => $ts)
@@ -4269,6 +4330,40 @@ class KhazanahController extends Controller
 
     }
 
+    public function laporan_tuntutbaki(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+
+        return view('khazanah.laporan.tuntutbaki', compact('cawangan_info','api_url'));
+    }
+
+    public function cetaklaporan_tuntutbaki(Request $request){
+      
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datetimepicker1 == null){
+            $gadai_date = $current->toDateString();
+        }else{
+            $split_date = explode('-',$request->datetimepicker1);
+            $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        $tuntutbaki = Http::get(config('api.url'). '/api/TuntutBaki/'. $auth_user['cawangan'] ,['tarikh' => $gadai_date])->json();
+
+        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+        
+        return view('print.laporan_tuntutbaki', compact('tuntutbaki','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
+    }
+
+
 
     public function laporan_Perbelanjaan(Request $request)
     {
@@ -4326,6 +4421,8 @@ class KhazanahController extends Controller
         return view('print.laporan_perbelanjaan_baucer', compact('perbelanjaan','cawangan_detail','tarikh_cetak','api_url'));
     }
 
+
+
     
     public function RequestPembatalan(Request $request)
     {
@@ -4333,7 +4430,7 @@ class KhazanahController extends Controller
        $nombor = $request->no;
        $kodlaluan = $request->kodlaluan;
 
-       $updatebatal=Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[
+       $updatebatal = Http::put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[
         'no'=>$nombor,
         'kodlaluan'=>$kodlaluan
         ]);
@@ -4343,4 +4440,73 @@ class KhazanahController extends Controller
         return response('Berjaya');
     }
 
-}
+    public function SuratAkuanGadaian(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        $gadai = Http::get(config('api.url').'/api/gadai/norujukan/'.$request->norujukanhidden)->json();
+        
+        foreach($gadai as $index1=>$gad)
+            $customers = Http::get(config('api.url').'/api/customers/'.$gad[0]['nokp'])->json();
+
+        $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
+
+        $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+
+        $daftar = 0;
+        if(sizeof($polis) > 0)
+        {
+            event(new NotifikasiAGH($auth_user['cawangan'],'Tak boleh generate dah kerana sudah digenerate dah.','error',$auth_user['name']));
+            $daftar = 400;
+        }else{
+            $daftarpolis = Http::post(config('api.url').'/api/polis/create/',[
+
+                'kodcaw' =>$auth_user['cawangan'],
+                'norujukan' => $request->norujukanhidden,
+                'komen1' => $request->alasan,
+                'komen2' => $kodnegeridandaerah,
+                'tebus' => 0,
+                'teller' => $auth_user['name'],
+                'caj' => 0.00
+    
+            ]);
+
+            $daftar = $daftarpolis->getStatusCode();
+        }
+       
+        if($daftar == 200)
+        {
+            $polis = Http::get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
+
+            event(new NotifikasiAGH($auth_user['cawangan'],'Surat Akuan Gadaian Hilang berjaya dijana.','success',$auth_user['name']));
+            // return redirect()->route('khazanah.customer_info')->with('aghinformation','Surat Akuan Gadaian Hilang berjaya dijana.|success');
+            return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
+
+        }else{
+
+            event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
+            // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
+        }
+
+        return response($daftarpolis);
+    }
+
+    public function cetakSuratAkuanGadaianHilang(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+
+
+
+        return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
+    }
+
+}

app/Http/Controllers/LelongController.php

@@ -91,8 +91,13 @@ class LelongController extends Controller
 
         $bakiakhir = $baki;
     
-        $bakiakhir -= $request->jumlah;
-
+        if($request->jenis == 'T'){
+            $bakiakhir -= $request->jumlah;
+        }
+        else
+        {
+            $bakiakhir += -($request->jumlah);
+        }
 
         //masuk dalam tunai aliran
         $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [

app/Http/Controllers/PenebusanController.php

@@ -38,6 +38,36 @@ class PenebusanController extends Controller
         return view('penebusan.index',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
     }
 
+    public function tebuspenuh(Request $request)
+    {
+        $api_url = config('api.url');
+
+        $updatetebus = Http::put(config('api.url').'/api/updatetebus/'. $request->kodcaw .'/' . $request->norujukan,[
+            "nopelanggan" => $request->nopelanggan,
+            "jenistebus" => $request->jenistebus,
+            "jbg" => $request->jbg,
+            "kadarupah" => $request->kadarupah,
+            "nilai_marhun" => $request->nilai_marhun,
+            "pinjaman" => $request->pinjaman,
+            "ansuran" => $request->ansuran,
+            "addpinjaman" => $request->addpinjaman,
+            "bakipinjaman" => $request->bakipinjaman,
+            "bakiupah" => $request->bakiupah,
+            "historygadaian" => $request->historygadaian,
+            "marhun" => $request->marhun,
+            "nowakil" => $request->nowakil,
+            "jenisbayarantebus" => $request->jenisbayarantebus,
+            "teller" => $request->teller
+        ])->json();
+
+        if($updatetebus)
+        {
+            return response('success');
+        }else{
+            return response('fail');
+        }
+    }
+
     public function bayaransuransTawarruq(Request $request)
     {
         $api_url = config('api.url');
@@ -548,6 +578,145 @@ class PenebusanController extends Controller
 
     }
 
+    public function tebusautotawarruq(Request $request)
+    {
+        $api_url = config('api.url');
+        $current = Carbon::now();
+        $current = new Carbon();
+        $curent_year = substr($current->year,2,2);
+        $curent_month = sprintf("%02d", $current->month);
+        $current_day = sprintf("%02d", $current->day);
+
+        $auth_user = Auth::user();
+
+        ////////////////////////
+       /// UPDATE TEBUS API////
+       ///////////////////////
+        $updatetebus = Http::put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[
+            'nopelanggan' => $request->nopelanggan,
+            'jenistebus' => $request->jenistebus,
+            'jbg' => $request->jbg,
+            'kadarupah' => $request->kadarupah,
+            'nilai_marhun' => $request->nilai_marhun,
+            'pinjaman' => $request->pinjaman_lama,
+            'ansuran' => $request->ansuran,
+            'addpinjaman'=> $request->addpinjaman,
+            'bakipinjaman' => $request->bakipinjaman,
+            'bakiupah' => $request->bakiupah,
+            'nowakil' => $request->nowakil,
+            'historygadaian' => $request->historygadaian,
+            'marhun' => $request->marhun,
+            'jenisbayarantebus' => $request->jenisbayarantebus,
+            'teller' => $request->teller,
+
+            'totalbayaran' => $request->totalbayaran,
+        ])->json();
+
+
+        //////////////////////
+       /// MAKING NEW SAG////
+       /////////////////////
+        $gadai_transaction = Http::get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json();
+        if($gadai_transaction){
+            $new_sirig = $gadai_transaction['sirig'] + 1;
+            
+        }else{
+            $new_sirig = 1;
+        }
+
+        $new_transaction = sprintf("%04d",$new_sirig);
+        $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction;
+
+        $gadai = Http::post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[
+            'norujukan' => $norujukanbaru,
+            'nopelanggan' => $request->nopelanggan,
+            'nokp' => $request->noic,
+            'sirig' => $new_sirig
+        ]);
+
+            
+        //////////////////////
+       ////Update SAG BARU///
+       /////////////////////
+        $keuntungan_sebln = $request->keuntungan_sebulan;
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
+
+        $total_nilai_marhun = $request->total_nilai_marhun;
+        $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
+        $kadarupah = $request->kadarkeuntungan * 100;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
+        $hargajualan = $request->pinjaman + $keuntungan12bulan;
+
+
+        $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'kodcaw' => $auth_user['cawangan'],
+            'nilaimarhun' => round($total_nilai_marhun, 2),
+            'berat' => round($request->total_berat, 2),
+            'pinjaman' => round($request->pinjaman, 2),
+            'kadarupah' => round($kadarupah, 2),
+            'marhun' => $request->marhun_detail,
+            'percentpinj' => $margin_pinjaman,
+            'teller'=> $auth_user['name'],
+            'upah6' => $keuntungan6bulan,
+            'upah12' => $keuntungan12bulan,
+            'hargajualan' => $hargajualan,
+            'kuantiti_marhun' => $request->kuantiti_marhun
+        ])->json();
+
+        $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $norujukanbaru,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
+        ////////////////////////////
+       ////Update History Gadaian///
+       ////////////////////////////
+
+        $updatehistorygadaian = Http::put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[
+            'historygadaian' => $request->norujukan
+        ])->json();
+    
+        ///////////////////////////
+       /// MARHUN UPDATE TABLE////
+       //////////////////////////
+
+
+       $arraymarhunbaru = [];
+
+        $marhunsediada = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json();
+
+        $marhunyangdiambil = $marhunsediada[0];
+        foreach($marhunyangdiambil as $index=>$marhunloop)
+        {
+            $karatbaru = str_replace('.','-',$marhunloop['karat']);
+            $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
+            
+            $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
+
+            array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
+        }
+
+        foreach($arraymarhunbaru as $array1){
+            $updatemarhun = Http::post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[
+                'norujukan' => $norujukanbaru,
+                'marhun' => $array1['marhun'],
+                'nota' => $array1['nota'],
+                'karat' => $array1['karat'],
+                'berat_emas' => $array1['berat'],
+                'harga' => $array1['harga'],
+                'nilai_marhun' => $array1['n_marhun']
+            ])->json();
+        }
+
+        $this->AliranTunaiController->alirantunaiTebusAutoTawarruq($request);
+
+
+        return response()->json($updatemarhun,200);
+
+    }
 
     public function tebusseparuh(Request $request)
     {
@@ -765,4 +934,24 @@ class PenebusanController extends Controller
        return $totalnilaimarhun;
     }
 
+    public function PenebusanKhazanah($norujukan){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+
+        $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json();
+        $noic = $gadaidetail[0][0]['nokp'];
+        $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json();
+        $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json();
+
+        $marhun = $marhundetail[0];
+        $nama = $customerdetail[0]['nama'];
+
+        $gadai = $gadaidetail[0][0];
+
+        $nilaihargasemasa = $this->tukaranhargaemas($norujukan);
+
+        return view('penebusan.index-khazanah',compact('cawangan_info','api_url','gadai','marhun','nama','nilaihargasemasa'));
+    }
+
 }

composer.json

@@ -20,6 +20,7 @@
         "milon/barcode": "^7.0",
         "predis/predis": "^1.1",
         "pusher/pusher-php-server": "~4.0",
+        "rap2hpoutre/laravel-log-viewer": "^1.7",
         "simplesoftwareio/simple-qrcode": "^4.1",
         "spatie/laravel-medialibrary": "^7.19",
         "twilio/sdk": "^6.16",

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": "79aad5a75460ed20426a86ab992dab8e",
+    "content-hash": "4f26944f77caea167bb120f5fe970820",
     "packages": [
         {
             "name": "almasaeed2010/adminlte",
@@ -3337,6 +3337,69 @@
             ],
             "time": "2020-08-18T17:17:46+00:00"
         },
+        {
+            "name": "rap2hpoutre/laravel-log-viewer",
+            "version": "v1.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/rap2hpoutre/laravel-log-viewer.git",
+                "reference": "27392d29234b6ff38a456454558f4bcc40cc837a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/rap2hpoutre/laravel-log-viewer/zipball/27392d29234b6ff38a456454558f4bcc40cc837a",
+                "reference": "27392d29234b6ff38a456454558f4bcc40cc837a",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "4.2.*|5.*|^6.0|^7.0|^8.0",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "3.7.*",
+                "phpunit/phpunit": "^7"
+            },
+            "type": "laravel-package",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Rap2hpoutre\\LaravelLogViewer\\LaravelLogViewerServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/controllers"
+                ],
+                "psr-0": {
+                    "Rap2hpoutre\\LaravelLogViewer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "rap2hpoutre",
+                    "email": "raphaelht@gmail.com"
+                }
+            ],
+            "description": "A Laravel log reader",
+            "keywords": [
+                "laravel",
+                "log",
+                "log-reader",
+                "log-viewer",
+                "logging",
+                "lumen"
+            ],
+            "support": {
+                "issues": "https://github.com/rap2hpoutre/laravel-log-viewer/issues",
+                "source": "https://github.com/rap2hpoutre/laravel-log-viewer/tree/master"
+            },
+            "time": "2020-09-08T12:21:27+00:00"
+        },
         {
             "name": "sabberworm/php-css-parser",
             "version": "8.3.1",

config/app.php

@@ -177,6 +177,7 @@ return [
         Yajra\DataTables\DataTablesServiceProvider::class,
         Barryvdh\DomPDF\ServiceProvider::class,
         Milon\Barcode\BarcodeServiceProvider::class,
+        Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider::class,
 
     ],
 

config/logviewer.php

@@ -0,0 +1,15 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Pattern and storage path settings
+    |--------------------------------------------------------------------------
+    |
+    | The env key for pattern and storage path with a default value
+    |
+    */
+    'max_file_size' => 52428800, // size in Byte
+    'pattern'       => env('LOGVIEWER_PATTERN', '*.log'),
+    'storage_path'  => env('LOGVIEWER_STORAGE_PATH', storage_path('logs')),
+];

public/js/main.js

@@ -135,7 +135,6 @@ function totalkeyserahan(datakeyin)
     $.each(arrayambilan, function( index, arr ){
         if(arr[0] == idkey)
         {
-
             arrayambilan[index][1] = totalamount(idkey,valkey);
         }
             
@@ -267,6 +266,114 @@ function kiraan(datakeyin)
       
 }
 
+function kiraanpanjar(datakeyin)
+{
+    var idkey = $(datakeyin).attr('id');
+    var valkey = $(datakeyin).val();
+    var amount = 0;
+    let amountkiraan = 0;
+
+    var validate = parseFloat($(datakeyin).data('amaun'));
+    
+    $.each(arrayambilan, function( index, arr ){
+        if(arr[0] == idkey)
+        {
+
+            arrayambilan[index][1] = totalamount(idkey,valkey);
+        }
+            
+        amount += arr[1];
+      });
+
+      if(Number(valkey) > Number(validate))
+      {
+        Swal.fire({
+            icon: 'error',
+            title: 'Amaran',
+            text: 'Jumlah denominasi melebihi kadar'
+          });
+          $(datakeyin).val('');
+      }
+      else
+      {
+        
+        $('#amaunkiraan').val(amount);
+
+      }
+
+      switch(idkey) {
+        case 'bundle1': 
+            amountkiraan += (valkey * 100);
+            $('#totalb1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle20': 
+            amountkiraan += (valkey * 1000);
+            $('#totalb20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle5': 
+            amountkiraan += (valkey * 500);
+            $('#totalb5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'bundle50': 
+            amountkiraan += (valkey * 5000);
+            $('#totalb50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle10': 
+            amountkiraan += (valkey * 1000);
+            $('#totalb10').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'bundle100': 
+            amountkiraan += (valkey * 5000);
+            $('#totalb100').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen1': 
+            amountkiraan += (valkey * 0.01);
+            $('#totalsen1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen5': 
+            amountkiraan += (valkey * 0.05);
+            $('#totalsen5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'sen10': 
+            amountkiraan += (valkey * 0.05);
+            $('#totalsen10').val(formatter.format(amountkiraan.toFixed(2)));
+        break;
+        case 'sen20': 
+            amountkiraan += (valkey * 0.20);
+            $('#totalsen20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'sen50': 
+            amountkiraan += (valkey * 0.50);
+            $('#totalsen50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit1': 
+            amountkiraan += (valkey * 1);
+            $('#totalring1').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit5': 
+            amountkiraan += (valkey * 5);
+            $('#totalring5').val(formatter.format(amountkiraan.toFixed(2)));
+            break;      
+        case 'ringgit10': 
+            amountkiraan += (valkey * 10);
+            $('#totalring10').val(formatter.format(amountkiraan.toFixed(2)));
+            break;		
+        case 'ringgit20': 
+            amountkiraan += (valkey * 20);
+            $('#totalring20').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit50': 
+            amountkiraan += (valkey * 50);
+            $('#totalring50').val(formatter.format(amountkiraan.toFixed(2)));
+            break;
+        case 'ringgit100': 
+            amountkiraan += (valkey * 100);
+            $('#totalring100').val(formatter.format(amountkiraan.toFixed(2)));
+            break;         
+      }
+      
+}
+
 async function openuptambahdanserah(e)
 {
     var id = $(e).attr('id');

resources/views/aliran_tunai/index.blade.php

@@ -197,7 +197,7 @@
                             </div>
                             <div class="tab-pane fade" id="nav-contact" role="tabpanel" aria-labelledby="nav-contact-tab">
 
-                                <table class="table table-striped table-hover  text-center" id="tabletuntutbaki">
+                                <table class="table table-striped table-hover text-center" id="tabletuntutbaki">
                                     <thead class="thead-dark">
                                         <tr>
                                             <th>Bil</th>
@@ -209,7 +209,9 @@
                                     </thead>
                                     <tbody>
                                         @if(is_object($tuntutbaki) || is_array($tuntutbaki))
+                                        @php  $totaltuntutbaki = 0; $totalcajlelong = 0; @endphp
                                         @foreach($tuntutbaki as $tb)
+                                        @php $totaltuntutbaki += $tb['jumlah'];$totalcajlelong += $tb['cajlelong']; @endphp
                                         <tr>
                                         <td> {{ $loop->iteration }} </td>
                                         <td> {{ $tb['tarikh'] }} </td>
@@ -224,6 +226,13 @@
                                         </tr>
                                         @endforeach
                                         @endif
+                                        <tfoot class="table-dark">
+                                            <td colspan='2' class=" font-weight-bold">JUMLAH</td>
+                                            <td>{{ number_format($totalcajlelong,2)}}</td>
+                                            <td>{{ number_format($totaltuntutbaki,2)}}</td>
+                                            <td></td>
+                                            
+                                        </tfoot>
                                     </tbody>
                                 </table>
 
@@ -336,9 +345,7 @@
                         });
                     }
                 }
-            }
         });
-
     }
 
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";

resources/views/customers/info.blade.php

@@ -477,26 +477,192 @@
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
         var norujukan = $(data).data("norujukan");
+
         $.ajax({
             method:'get',
-            url: api_url + '/api/check/serah/gadai',
+            url: api_url + '/api/polis/get/',
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
                 'norujukan': norujukan
             },
             success:function(data){
-                if(data == 'true'){
-                    window.location = urlpenebusan;
-                }else if(data == 'false'){
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Amaran',
-                        text: 'Gadaian Belum Scan Barcode'
-                    });
+
+                var count = Object.keys(data).length;
+
+                if(count > 0)
+                {
+                    if(data[0].tebus === 0)
+                    {
+                        const swalWithBootstrapButtons = Swal.mixin({
+                            customClass: {
+                                confirmButton: 'btn btn-success',
+                                cancelButton: 'btn btn-danger mr-1'
+                            },
+                            buttonsStyling: false
+                        });
+
+                        swalWithBootstrapButtons.fire({
+                            title: 'Dapatkan Pengesahan Khazanah',
+                            text: "Surat Akuan Gadaian Hilang!",
+                            icon: 'info',
+                            showCancelButton: true,
+                            confirmButtonText: 'Hantar',
+                            cancelButtonText: 'Batal',
+                            reverseButtons: true
+                        }).then((result) => {
+                            if (result.isConfirmed) {
+
+                                let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' +  "|" + '-' + "| Tambah Pinjaman";
+                                let teller = "{{ Auth::user()->name }}";
+
+                                Swal.fire({
+                                    title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                    icon: 'info',
+                                    width: 600,
+                                    padding: '3em',
+                                    background: '#fffff',
+                                    showCancelButton: false,
+                                    showConfirmButton: false,
+                                    allowOutsideClick: false,
+                                    allowEscapeKey: false,
+                                    allowEnterKey: false
+                                })
+                                let siricreated = 0;
+                                $.ajax({
+                                    method:'post',
+                                    url: "{{ route('khazanah.createkelulusan') }}",
+                                    data: {
+                                        "_token": "{{ csrf_token() }}",
+                                        "norujukan" : norujukan,
+                                        "komen" : komen,
+                                        "jumpinjam" : '0.00',
+                                        "teller" : teller
+                                    },
+                                    success:function(data){
+                                        siricreated = data;
+                                    },
+                                    error: function(xhr, status, error) {
+                                        var err = eval("(" + xhr.responseText + ")");
+                                        alert(xhr.responseText);
+                                    }
+                                });    
+
+                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                    cluster: 'ap1',
+                                                    encrypted: true
+                                                });
+
+                                var channel = pusher.subscribe('notice-kelulusan');
+                                channel.bind('my-kelulusan', function(data) {
+                                
+
+                                    if(data.norujukan == norujukan && data.siri == siricreated)
+                                    {
+                                        if(data.kelulusan == 'lulus')
+                                        {
+                                            Swal.fire({
+                                                icon: 'success',
+                                                title: 'Telah Disahkan'
+                                            }).then(function(){
+                                                $.ajax({
+                                                    method:'put',
+                                                    url: api_url + '/api/polis/put/',
+                                                    data: {
+                                                        'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                                        'norujukan': norujukan,
+                                                        'tebus' : 1
+                                                    },
+                                                    success:function(data){
+                                                        location.reload();
+
+                                                    },
+                                                    error: function(xhr, status, error) {
+                                                        var err = eval("(" + xhr.responseText + ")");
+                                                        alert(xhr.responseText);
+                                                    }
+                                                });    
+                                            });
+
+                                        }
+                                        else if(data.kelulusan == 'batal')
+                                        {
+                                            Swal.fire({
+                                                icon: 'warning',
+                                                title: 'Telah Dibatalkan',
+                                                text: `Komen : ${data.komen}`
+                                            }).then(function(){
+                                                return false;
+                                            });
+                                        }
+                                    }
+
+                                });
+
+
+                            } 
+                            else if (result.dismiss === Swal.DismissReason.cancel) {
+                                swalWithBootstrapButtons.fire(
+                                    'Gagal',
+                                    'Gagal mendapatkan kelulusan khazanah',
+                                    'error'
+                                )
+                            }
+                        });
+                    }
+                    else
+                    {
+                        $.ajax({
+                            method:'get',
+                            url: api_url + '/api/check/serah/gadai',
+                            datatype:'json',
+                            data:{
+                                'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                'norujukan': norujukan
+                            },
+                            success:function(data){
+                                if(data == 'true'){
+                                    window.location = urlpenebusan;
+                                }else if(data == 'false'){
+                                    Swal.fire({
+                                        icon: 'error',
+                                        title: 'Amaran',
+                                        text: 'Gadaian Belum Scan Barcode'
+                                    });
+                                }
+                            }
+                        }); 
+                    }
+
+
+
+                }else{
+                    $.ajax({
+                        method:'get',
+                        url: api_url + '/api/check/serah/gadai',
+                        datatype:'json',
+                        data:{
+                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                            'norujukan': norujukan
+                        },
+                        success:function(data){
+                            if(data == 'true'){
+                                window.location = urlpenebusan;
+                            }else if(data == 'false'){
+                                Swal.fire({
+                                    icon: 'error',
+                                    title: 'Amaran',
+                                    text: 'Gadaian Belum Scan Barcode'
+                                });
+                            }
+                        }
+                    });  
                 }
             }
         });
+
+
+       
     }
 
     function gadaiTable(data,jenistebus){
@@ -522,7 +688,7 @@
                                 gadai_detail['t_matang'],
                                 'RM '+formatter.format(gadai_detail['pinjaman']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                                gadai_detail['jbg']
+                                gadai_detail['tempoh']
                             ]).draw();
                         }else{
                             tablegadai.row.add([
@@ -545,7 +711,7 @@
                             gadai_detail['t_update'],
                             'RM '+formatter.format(gadai_detail['bakipjm']),
                             (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                            gadai_detail['jbg']
+                            gadai_detail['tempoh']
                         ]).draw();
                     }else if(jenistebus == "lelong"){
                         var urlroute = '{{ route("lelongan", ":id") }}';

resources/views/homepage/khazanah/home.blade.php

@@ -174,7 +174,7 @@
 
                 <div class="col-3 mx-1">
                 <div class="row">
-                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Pelanggan</a>
+                <a href="{{ route('khazanah.pelanggan') }}" class="btn btn-info btn-lg btn-block mb-3">Pelanggan</a>
             </div>
             <div class="row">
                 <a href="{{ route('laporan') }}" class="btn btn-info btn-lg btn-block mb-3">Laporan</a>

resources/views/khazanah/dashboard.blade.php

@@ -150,11 +150,11 @@
                               <div class="card-body mx-auto">
                                 <div class="row text-justify">
                                   <h5 class="card-title font-weight-bold">Keuntungan : </h5>
-                                  <p class="card-text font-weight-bold">RM {{ number_format($keuntungan) }}</p>
+                                  <p class="card-text font-weight-bold">RM {{ number_format($keuntungan,2) }}</p>
                                 </div>
                                 <div class="row text-justify">
                                   <h5 class="card-title font-weight-bold">Upah Simpan : </h5>
-                                  <p class="card-text font-weight-bold">RM {{ number_format($upahsimpan) }}</p>
+                                  <p class="card-text font-weight-bold">RM {{ number_format($upahsimpan,2) }}</p>
                                 </div>
                               </div>
                             </div>

resources/views/khazanah/index.blade.php

@@ -10,17 +10,31 @@
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
+
+            <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">Pengenalan Diri</li>
+                </ol>
+              </nav>
+
             <div class="card">
                 <div class="card-body">
                     <div class="text-center">
                         <h5 class="text-uppercase">masukkan nombor kad pengenalan</h5>
-                        <form action="{{ route('khazanah.customer_info') }}" method="GET">
+                        <form name="frmsearch" onsubmit="verifynokp()" action="{{ route('khazanah.searchpelanggan') }}" method="GET">
                             <div class="row justify-content-center">
-                                <div class="col-md-7">
+                                <div class="col-md-9">
                                     <div class="input-group my-3">
-                                        <input type="text" class="form-control" name="noic" placeholder="No Kad Pengenalan Pelanggan" aria-label="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}" aria-describedby="button-addon2">
+                                        <input type="text" class="form-control" id="noic" name="noic" placeholder="No Kad Pengenalan Pelanggan" aria-label="No Kad Pengenalan Pelanggan" autocomplete="off" value="{{$search == false ? '' : $noic ?? ''}}" aria-describedby="button-addon2">
                                         <div class="input-group-append">
-                                            <button class="btn btn-outline-primary" type="submit" id="button-addon2">Sahkan</button>
+                                            <select class="form-select" id="customerIDType" name="customerIDType" class="form-control">
+                                                <option value="nokp" {{ $idtype == 'nokp' ? 'selected' : ''}}>Kad Pengenalan</option>
+                                                <option value="passport" {{ $idtype == 'passport' ? 'selected' : ''}}>Passport</option>
+                                            </select>
+                                        </div>
+                                        <div class="input-group-append">
+                                            <button class="btn btn-outline-primary" type="submit" id="button-addon2">Cari</button>
                                         </div>
                                     </div>
                                 </div>
@@ -29,14 +43,14 @@
                     </div>
                     @if($search == true )
                     <div class="text-center mt-3">
-                        <button type="button" style="margin:auto" class="btn btn-primary" data-toggle="modal" data-target="#daftar_pelanggan">
+                        <button type="button" style="margin:auto" class="btn btn-primary" onclick="newcustomer()">
                             Daftar Pelanggan
                         </button>
                     </div>
                     @endif
                 </div>
             </div>
-            <!-- Modal -->
+            <!-- Modal No KP -->
             <div class="modal fade" id="daftar_pelanggan" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
                 <div class="modal-dialog modal-lg">
                     <div class="modal-content">
@@ -44,13 +58,13 @@
                             <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
                         </div>
                         <div class="modal-body">
-                            <form action="{{ route('customer.store') }}" method="POST">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomer()" method="POST">
                                 @csrf
                                 <div class="row form-group">
                                     <div class="col-md-6">
                                         <div class="row form-group">
                                             <div class="col-md-4">Nama</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="name" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="name" autocomplete="off" placeholder="Nama"></div>
                                             <div class="col-md-4">No KP</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="noic" id="noic" value="{{$noic ?? ''}}" readonly></div>
                                             <div class="col-md-4">Tarikh Lahir</div>
@@ -59,26 +73,18 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="negeri_lahir" id="negeri_lahir" readonly></div>
                                             <div class="col-md-4">Jantina</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="jantina" id="jantina" readonly></div>
-                                            <div class="col-md-4">Alamat</div>
-                                            <div class="col-md-8"><textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3"></textarea></div>
-                                            <div class="col-md-4">Poskod</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off"></div>
-                                            <div class="col-md-4">Daerah</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
-                                            <div class="col-md-4">Negeri</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">No Telefon 1</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-4">No Telefon 2</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="alternate_phone" autocomplete="off"></div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="alternate_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-12 ml-4">
                                                 <div class="form-group row">
                                                     <div class="form-check form-check-inline">
-                                                        <input class="form-check-input" type="checkbox" id="warganegara" name="warganegara" value="warganegara">
+                                                        <input checked class="form-check-input" type="checkbox" id="warganegara" name="warganegara" value="warganegara">
                                                         <label class="form-check-label" for="warganegara">Warganegara</label>
                                                     </div>
                                                     <div class="form-check form-check-inline">
-                                                        <input class="form-check-input" type="checkbox" id="bumiputera" name="bumiputera" value="bumiputera">
+                                                        <input checked class="form-check-input" type="checkbox" id="bumiputera" name="bumiputera" value="bumiputera">
                                                         <label class="form-check-label" for="bumiputera">Bumiputera</label>
                                                     </div>
                                                 </div>
@@ -86,12 +92,11 @@
                                             <div class="col-md-4">Agama</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="agama" id="agama">
-                                                    <option disabled selected value> -- Pilih Agama -- </option>
-                                                    <option value="islam">Islam</option>
-                                                    <option value="hindu">Hindu</option>
-                                                    <option value="buddha">Buddha</option>
-                                                    <option value="kristian">Kristian</option>
-                                                    <option value="lain">Lain-lain</option>
+                                                    <option selected value="01">Islam</option>
+                                                    <option value="02">Hindu</option>
+                                                    <option value="03">Buddha</option>
+                                                    <option value="04">Kristian</option>
+                                                    <option value="05">Lain-lain</option>
                                                 </select>
                                             </div>
                                             <div class="col-md-4">Ahli</div>
@@ -106,26 +111,20 @@
                                     </div>
                                     <div class="col-md-6">
                                         <div class="row form-group">
-                                            <div class="col-md-12" style="margin-left:auto;margin-right:auto">
-                                                <img src="" id="preview" style="width:250px;height:250px" class="img-thumbnail">
-                                            </div>
-                                            <div class="col-md-12">
-                                                <input type="file" name="customer_image" id="customer_image" accept="image/*">
-                                                <!-- <input type="file" name="customer_image" id="customer_image" class="file" accept="image/*">
-                                                <div class="input-group my-3">
-                                                    <input type="text" class="form-control" readonly placeholder="Upload File" id="file" name="file">
-                                                    <div class="input-group-append">
-                                                        <button type="button" class="browse btn btn-primary">Browse...</button>
-                                                    </div>
-                                                </div> -->
-                                            </div>
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="bangsa" id="bangsa">
-                                                    <option disabled selected value> -- Pilih Bangsa -- </option>
-                                                    <option value="M">Melayu</option>
+                                                    <option selected value="M">Melayu</option>
                                                     <option value="C">Cina</option>
                                                     <option value="I">India</option>
                                                     <option value="L">Lain-lain</option>
@@ -140,14 +139,162 @@
                                                     @endforeach
                                                 </select>
                                             </div>
-                                            <div class="col-md-4">No Akaun Bank</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun"></div>
+                                            <div class="col-md-4">No Akaun</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="no_akaun" placeholder="No Akaun Bank"></div>
+                                            <div class="col-md-4">Tujuan Gadai</div>
+                                            @php
+                                                $tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="tujuan_gadai">
+                                                    <option disabled selected value> -- Pilih Tujuan Gadai -- </option>
+                                                    @foreach($tujuangadai as $tujuan)    
+                                                        <option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Pekerjaan</div>
+                                            @php
+                                                $pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="pekerjaan">
+                                                    <option disabled selected value> -- Pilih Pekerjaan -- </option>
+                                                    @foreach($pekerjaan as $kerja)    
+                                                        <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Nota</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="nota" id="nota" placeholder="Nota"></div>
                                         </div>
                                     </div>
                                 </div>
                             
                         </div>
                         <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">
+                        </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+            <!-- Modal Passport -->
+            <div class="modal fade" id="passport_pelanggan" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
+                <div class="modal-dialog modal-lg">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="ModalLabel">Daftar Pelanggan</h5>
+                        </div>
+                        <div class="modal-body">
+                            <form action="{{ route('customer.store') }}" onsubmit="verifycustomerpassport()" method="POST">
+                                @csrf
+                                <div class="row form-group">
+                                    <div class="col-md-6">
+                                        <div class="row form-group">
+                                            <div class="col-md-4">Nama</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="name" id="passport_name" autocomplete="off" placeholder="Nama"></div>
+                                            <div class="col-md-4">No Passport</div>
+                                            <div class="col-md-8"><input class="form-control" readonly type="text" name="noic" id="passport_noic" value="{{$noic ?? ''}}"></div>
+                                            <div class="col-md-4">Tarikh Lahir</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" placeholder="Tarikh Lahir" onchange="calculatePassportAge()" name="tarikh_lahir" id="passport_tarikh_lahir"></div>
+                                            <div class="col-md-4">Jantina</div>
+                                            <div class="col-md-8">
+                                                <select name="jantina" id="jantina_passport" class="form-control">
+                                                    <option value="Lelaki" selected>Lelaki</option>
+                                                    <option value="Perempuan">Perempuan</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">No Telefon 1</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="passport_main_phone" autocomplete="off" placeholder="No Telefon"></div>
+                                            <div class="col-md-4">No Telefon 2</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="alternate_phone" id="passport_alternate_phone" autocomplete="off" placeholder="No Telefon"></div>
+                                            <div class="col-md-4">Agama</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="agama" id="passport_agama">
+                                                    <option selected value="01">Islam</option>
+                                                    <option value="02">Hindu</option>
+                                                    <option value="03">Buddha</option>
+                                                    <option value="04">Kristian</option>
+                                                    <option value="05">Lain-lain</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Ahli</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="kumpulan_sahabat" id="passport_kumpulan_sahabat">
+                                                    <option value="0">Tidak</option>
+                                                    <option value="1">Kumpulan PKINK</option>
+                                                    <option value="2">Sahabat</option>
+                                                </select>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-md-6">
+                                        <div class="row form-group">
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="passport_alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="passport_poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="passport_daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="passport_negeri" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Umur</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="age" id="passport_age" readonly></div>
+                                            <div class="col-md-4">Bangsa</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="bangsa" id="passport_bangsa">
+                                                    <option selected value="M">Melayu</option>
+                                                    <option value="C">Cina</option>
+                                                    <option value="I">India</option>
+                                                    <option value="L">Lain-lain</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Bank</div>
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="bank_name" data-placeholder="Pilih Bank" id="passport_bank_name">
+                                                    <option disabled selected value> -- Pilih Bank -- </option>
+                                                    @foreach($bank as $banks)    
+                                                        <option value="{{ $banks['abbreviation'] }}">{{ $banks['name'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">No Akaun</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="passport_no_akaun" placeholder="No Akaun Bank"></div>
+                                            <div class="col-md-4">Tujuan Gadai</div>
+                                            @php
+                                                $tujuangadai = Http::get($api_url . '/api/tujuangadai')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="tujuan_gadai" data-placeholder="Pilih Tujuan Gadai" id="passport_tujuan_gadai">
+                                                    <option disabled selected value> -- Pilih Tujuan Gadai -- </option>
+                                                    @foreach($tujuangadai as $tujuan)    
+                                                        <option value="{{ $tujuan['keterangan'] }}">{{ $tujuan['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Pekerjaan</div>
+                                            @php
+                                                $pekerjaan = Http::get($api_url . '/api/pekerjaan')->json();
+                                            @endphp
+                                            <div class="col-md-8">
+                                                <select class="form-control" name="pekerjaan" data-placeholder="Pilih Pekerjaan" id="passport_pekerjaan">
+                                                    <option disabled selected value> -- Pilih Pekerjaan -- </option>
+                                                    @foreach($pekerjaan as $kerja)    
+                                                        <option value="{{ $kerja['kodkerja'] }}">{{ $kerja['keterangan'] }}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="col-md-4">Nota</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="nota" id="passport_nota" placeholder="Nota"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                        </div>
+                        <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">
                         </div>
@@ -160,12 +307,62 @@
 </div>
 <script>
     var api_url = "<?php echo $api_url ?>";
-    
+    var search = "<?php echo $search ?>";
+    var type_id = "<?php echo $idtype ?>";
     $(document).ready(function(){
+        $('#passport_tarikh_lahir').datepicker({
+            format: 'dd/mm/yyyy',
+            endDate: new Date()
+        });
         var noic = $('#noic').val();
         identifyIC(noic);
+
+        if(search == true){
+            Swal.fire({
+                icon: 'info',
+                title: 'Pelanggan Tiada Dalam Rekod!',
+                text: 'Sila Daftar Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
         
     });
+
+    function calculatePassportAge(){
+        var passport_lahir = $('#passport_tarikh_lahir').val();        
+        var split_date = passport_lahir.split('/');
+        var count_leap_year = countLeapYears(split_date[2],split_date[1],split_date[0]) - 1;
+            
+        var start = new Date(split_date[2] + '-' + split_date[1] + '-' + split_date[0]),  
+            end   = new Date(),  
+            diff  = new Date(end - start),  
+            days  = ((diff/1000/60/60/24)- count_leap_year)/365;
+            
+        var age = parseInt(days);
+        $('#passport_age').val(age);
+    }
+
+    function newcustomer(){
+        var id_type = $('#customerIDType').val();
+        if(id_type=='nokp'){
+            $('#daftar_pelanggan').modal('show');
+        }else if(id_type=='passport'){
+            $('#passport_pelanggan').modal('show');
+        }
+    }
+
+    $('#warganegara').on('click',function(){
+        if(this.checked == false) {
+            $('#bumiputera').prop('checked',false);
+        }
+    });
+
+    $('#bumiputera').on('click',function(){
+        if(this.checked) {
+            $('#warganegara').prop('checked',true);
+        }
+    });
     
     $(document).on("click", ".browse", function() {
         var file = $(this).parents().find(".file");
@@ -210,8 +407,277 @@
             }
         });
     });
-    
 
+    $('#passport_poskod').change(function(){
+        var poskod = this.value;
+
+        $.ajax({
+            method:'GET',
+            url:api_url+'/api/poskod/'+poskod,
+            success:function(poskod_detail){
+                var koddaerah = poskod_detail['koddaerah'];
+                var kodnegeri = poskod_detail['kodnegeri'];
+                $.ajax({
+                    url:api_url+'/api/negeri/'+kodnegeri,
+                    method:'GET',
+                    success:function(negeri){
+                        $('#passport_negeri').val(negeri['negeri']);
+                    }
+                });
+                $.ajax({
+                    url:api_url+'/api/daerah/'+koddaerah,
+                    method:'GET',
+                    success:function(daerah){
+                        $('#passport_daerah').val(daerah['namadaerah']);
+                    }
+                });
+            }
+        });
+    });
+
+    function verifycustomer(){
+        var customername = $('#name').val();
+        var customeralamat = $('#alamat').val();
+        var customerposkod = $('#poskod').val();
+        var customerphone = $('#main_phone').val();
+        var customerphone_alternate = $('#alternate_phone').val();
+        var age = $('#age').val();
+        if(age < 18){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Umur Pelanggan Tidak Mencukupi 18 Tahun'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customername == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Nama Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customeralamat == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Alamat Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customerposkod == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Poskod'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerposkod.length != 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Poskod'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerposkod) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Periksa Poskod'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan No Telefon Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if((customerphone.length < 9 || customerphone.length >= 12)){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone_alternate != ''){
+            if(customerphone_alternate.length < 8 && customerphone_alternate.length > 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone_alternate) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    function verifycustomerpassport(){
+        var customername = $('#passport_name').val();
+        var customeralamat = $('#passport_alamat').val();
+        var customerposkod = $('#passport_poskod').val();
+        var customerphone = $('#passport_main_phone').val();
+        var customerphone_alternate = $('#passport_alternate_phone').val();
+        var tarikh_lahir = $('#passport_tarikh_lahir').val();
+        var age = $('#passport_age').val();
+
+        if(age < 18){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Umur Pelanggan Tidak Mencukupi 18 Tahun'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customername == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Nama Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(tarikh_lahir == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Tarikh Lahir Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customeralamat == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Alamat Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }
+        if(customerposkod == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan Poskod'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerposkod.length != 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Poskod'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerposkod) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Periksa Poskod'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone == ''){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran!',
+                text: 'Sila Masukkan No Telefon Pelanggan'
+            });
+            event.preventDefault();
+            return false;
+        }else{
+            if(customerphone.length <= 9 || customerphone.length >= 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        if(customerphone_alternate != ''){
+            if(customerphone_alternate.length <= 8 && customerphone_alternate.length >= 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No Telefon Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }else{
+                if($.isNumeric(customerphone_alternate) == false){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran!',
+                        text: 'Sila Masukkan Nombor Sahaja Pada No Telefon Pelanggan'
+                    });
+                    event.preventDefault();
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+    
     function identifyIC(noic){
         if(noic.match(/^(\d{2})(\d{2})(\d{2})-?\d{2}-?\d{4}$/)) {
             var year = noic.slice(0,2);
@@ -287,9 +753,17 @@
             }else if(unknown_ic.indexOf(nl)>=0){
                 var negeri_lahir = 'Negeri Tidak Diketahui';
             }
-
             var date = new Date(year, (month - 1), day, 0, 0, 0, 0);
-            var age = parseInt(now,10) - date.getFullYear();
+            var tarikh_lahir_test = date.getFullYear() + '-' + month + '-' + day;
+
+            var count_leap_year = countLeapYears(date.getFullYear(),month,day) - 1;
+            
+            var start = new Date(tarikh_lahir_test),  
+                end   = new Date(),  
+                diff  = new Date(end - start),  
+                days  = ((diff/1000/60/60/24)- count_leap_year)/365;
+            
+            var age = parseInt(days);
             $('#age').val(age);
             var tarikh_lahir = day + '/' + month + '/' + date.getFullYear();
             $('#jantina').val(jantina);
@@ -297,5 +771,90 @@
             $('#negeri_lahir').val(negeri_lahir);
         }
     }
+
+    var countLeapYears = function(y,m,d){
+        var yearNow = new Date().getFullYear(),
+            yearThen = y,
+            beginYear = 0,
+            endYear = 0,
+            leapYearCount = 0;
+
+        var isLeapYear = function(year){
+            return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0);
+        }
+
+        if(yearNow < y){
+            beginYear = yearNow;
+            endYear = y;
+        }else if(yearNow > y){
+            beginYear = y;
+            endYear = yearNow;
+        }else if(yearNow == y){
+            beginYear = y;
+            endYear = y;
+        }
+
+        for(i = beginYear; i <= endYear; i++){
+            if(isLeapYear(i)){
+                leapYearCount++;
+            }
+        }
+
+        return leapYearCount;
+    }
+    var regex = /^[a-zA-Z0-9]+$/g;
+    
+    function verifynokp(){
+        var id_type = $('#customerIDType').val();
+        var nokp = $('#noic').val();
+        if(id_type=='nokp'){
+            if($.isNumeric(nokp) == false){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(nokp.length != 12){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa No KP Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }else if(id_type=='passport'){
+            if(nokp.length < 5){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Passport Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(nokp.indexOf(' ') > 0){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Masukkan Passport Tanpa Ruang \'Kosong\' \n e.g(AP1111111)'
+                });
+                event.preventDefault();
+                return false;
+            }
+            if(regex.test(nokp) == false){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Periksa Passport Pelanggan'
+                });
+                event.preventDefault();
+                return false;
+            }
+        }
+    }
 </script>
 @endsection

resources/views/khazanah/laporan/index.blade.php

@@ -63,6 +63,10 @@
                             <div class="row">
                                 <a href="{{route('laporan.datalejer_am')}}" class="btn btn-danger btn-lg btn-block mb-3">Lejer Am</a>
                             </div>
+                            <div class="row">
+                                <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>
+                                
+                            </div>
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">

resources/views/khazanah/laporan/tuntutbaki.blade.php

@@ -0,0 +1,156 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Tuntut Baki</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-5">
+                            <form action="{{ route('tuntutbaki.cetaklaporan') }}" target="_blank" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
+                                    </div>
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
+                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table class="table table-striped table-hover" id="myTable">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Nama</th>
+                                        <th>No K/P</th>
+                                        <th>No Rujukan</th>
+                                        <th>Nama Teller</th>
+                                        <th>Caj Lelong (RM)</th>
+                                        <th>Jumlah Baki (RM)</th>
+                                    </tr>
+                                </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="3">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th id="upah12total"></th>
+                                    <th id="nmtotal"></th>
+                                    <th id="berattotal"></th>
+                                </tfoot>
+                            </table>
+                        </div>
+                    </div>
+                    {{-- <div class="row">
+                        <div class="col-md-12 text-right">
+                            Bilangan Surat : <span id="bilangan_surat">3</span>
+                            Jumlah Pinjaman : <span id="jumlah_pinjaman">RM 3,000.00</span>
+                        </div>
+                    </div> --}}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    var tabletuntutbaki = $('#myTable').DataTable({
+        "ordering": false
+    });
+    $(document).ready( function () {
+        $('#datetimepicker1').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+        var current = new Date();
+        var current_date = current.getDate();
+        var current_month = current.getMonth()+1;
+        var current_year = current.getFullYear();
+        var today_date = current_year + '-' +current_month+'-'+current_date;
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/TuntutBaki/'+kodcaw,
+            data:{'tarikh' : today_date },
+            success: function(tuntutbaki){
+                console.log(tuntutbaki);
+                gadaitable(tuntutbaki);
+            }
+        });
+    });
+
+    $('#datetimepicker1').change(function(){
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/TuntutBaki/'+kodcaw,
+            data:{'tarikh' : today_date },
+            success: function(tuntutbaki){
+                gadaitable(tuntutbaki);
+            }
+        });
+    });
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+    
+    function gadaitable(data){
+        var counter = 1;
+        var total_pinjaman = 0;
+        var total_upah12 = 0;
+        var total_nm = 0;
+        var total_berat = 0;
+
+        tabletuntutbaki.clear().draw();
+
+        $.each(data,function(index,tb){
+
+            $.ajax({
+                method:'get',
+                url: api_url + '/api/gadai/norujukan/' + tb['norujukan'],
+                success: function(gadai){
+                    $.ajax({
+                        method:'get',
+                        url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
+                        success:function(customer){
+
+                            tabletuntutbaki.row.add([
+                                counter,
+                                customer[0]['nama'],
+                                gadai[0][0]['nokp'],
+                                tb['norujukan'],
+                                tb['teller'],
+                                tb['cajlelong'],
+                                tb['jumlah']
+                            ]).draw();
+
+                        }
+                    });
+                }
+            });
+        });
+        
+    }
+</script>
+@endsection
+

resources/views/khazanah/panjar.blade.php

@@ -59,6 +59,8 @@
                                 <button class="btn btn-primary btn-lg btn-block"  data-toggle="modal" data-target="#PerubatanModal" data-backdrop="static" data-keyboard="false">Perubatan</button>
                                 <button class="btn btn-primary btn-lg btn-block"  data-toggle="modal" data-target="#DapurModal" data-backdrop="static" data-keyboard="false">Dapur</button>
                                 <button class="btn btn-primary btn-lg btn-block"  data-toggle="modal" data-target="#PosModal" data-backdrop="static" data-keyboard="false">Pos</button>
+
+                                <button class="btn btn-primary btn-lg btn-block mt-5"  data-toggle="modal" data-target="#BakiPerubatanModal" data-backdrop="static" data-keyboard="false">Baki Perubatan</button>
                             </div>
                             <div class="col-9">
                                 <table class='table table-striped table-hover' id='table-panjar' style="width:100%;">
@@ -113,7 +115,11 @@
 
     var tablepanjar = $('#table-panjar').DataTable({
           "scrollX": true
-        });
+    });
+        
+    var tablebakiperubatan = $('#table-bakiperubatan').DataTable({
+        //   "scrollX": true
+    });
 
     $(document).ready( function () {
     
@@ -134,7 +140,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
-                    text: 'Tambah Marhun Tidak Berjaya'
+                    text: 'Panjar Tak Berjaya'
                 });
                 console.log(xhRequest);
             }
@@ -196,7 +202,7 @@
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
-                        text: 'Tambah Marhun Tidak Berjaya'
+                        text: 'Panjar Tidak Berjaya'
                     });
                     console.log(xhRequest);
                 }
@@ -208,52 +214,104 @@
 
     function checkformpanjar(formdata)
     {
+       
+        // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
 
-        // let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan;
-
-        // //Variable Initialize
-        // let baucer = $(formdata).find("[name='baucer']").val();
-        // let tarikh = $(formdata).find("[name='tarikh']").val();
+        let baucer = $(formdata).find("[name='baucer']").val();
+        let tarikh = $(formdata).find("[name='tarikh']").val();
         // let tuntutan = $(formdata).find("[name='tuntutan']").val();
-        // let tarikhbil = $(formdata).find("[name='tarikhbil']").val();
-        // let deskripsi = $(formdata).find("[name='deskripsi']").val();
-        // let bayaran = $(formdata).find("[name='bayaran']").val();
+        let tarikhbil = $(formdata).find("[name='tarikhbil']").val();
+        let deskripsi = $(formdata).find("[name='deskripsi']").val();
+        let bayaran = $(formdata).find("[name='bayaran']").val();
 
-        // var validation = Array.prototype.filter.call(formdata, function(form) {
-        //     if (form.checkValidity() === false) {
-        //         event.preventDefault();
-        //         event.stopPropagation();
-        //     }
-        //         form.classList.add('is-invalid');
-        // });
 
-        // if(!tarikh)
-        // {
-        //     console.log('tarikh xleh');
-        // }
+        let booltarikh = true; let booltarikhbil = true; let booldeskripsi = true; let boolbayaran = true;
 
-        // if(!tarikhbil)
-        // {
-        //     console.log('tarikh xde');
-        // }
+        if(!tarikh)
+        {
+            $(formdata).find("[name='errortarikh']").show();
+            $(formdata).find("[name='errortarikh']").text("*Isikan tarikh dalam input!");
+            $(formdata).find("[name='tarikh']").addClass('is-invalid');
+            $(formdata).find("[name='tarikh']").parent().removeClass("mb-4");
 
-        // if(dapur === false)
-        // {  
-        //     if(!tuntutan)
-        //         console.log('tututan xde');
-        // }
+            booltarikh = false;
+        }else{
+            $(formdata).find("[name='errortarikh']").hide();
+            $(formdata).find("[name='tarikh']").removeClass('is-invalid');
+            $(formdata).find("[name='tarikh']").parent().addClass("mb-4");
 
-        // if(deskripsi === '' || deskripsi === null)
-        // {
-        //     console.log('deskripsi xde');
-        // }
+            booltarikh = true;
+        }
 
-        // if(bayaran === null || bayaran === '')
-        // {
-        //     console.log('bayaran xde');
-        // }
-        
-        // return false;
+        if(!tarikhbil)
+        {
+            $(formdata).find("[name='errorbil']").show();
+            $(formdata).find("[name='errorbil']").text("*Isikan tarikh bil dalam input!");
+            $(formdata).find("[name='tarikhbil']").addClass('is-invalid');
+            $(formdata).find("[name='tarikhbil']").parent().removeClass("mb-4");
+
+            booltarikhbil = false;
+
+        }else{
+            $(formdata).find("[name='errorbil']").hide();
+            $(formdata).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(formdata).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            booltarikhbil = true;
+        }
+
+        if(!$.trim(deskripsi))
+        {
+            $(formdata).find("[name='errordeskripsi']").show();
+            $(formdata).find("[name='errordeskripsi']").text("*Isikan tarikh deskripsi dalam input!");
+            $(formdata).find("[name='deskripsi']").addClass('is-invalid');
+            $(formdata).find("[name='deskripsi']").parent().removeClass("mb-4");
+
+            booldeskripsi = false;
+        }else{
+            $(formdata).find("[name='errordeskripsi']").hide();
+            $(formdata).find("[name='deskripsi']").removeClass('is-invalid');
+            $(formdata).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            booldeskripsi = true;
+        }
+
+        if(!bayaran)
+        {
+            $(formdata).find("[name='errorbayaran']").show();
+            $(formdata).find("[name='errorbayaran']").text("*Isikan bayaran dalam input!");
+            $(formdata).find("[name='bayaran']").addClass('is-invalid');
+            $(formdata).find("[name='bayaran']").parent().removeClass("mb-4");
+
+            boolbayaran = false;
+        }else{
+            $(formdata).find("[name='errorbayaran']").hide();
+            $(formdata).find("[name='bayaran']").removeClass('is-invalid');
+            $(formdata).find("[name='bayaran']").parent().addClass("mb-4");
+
+            boolbayaran = true;
+        }
+
+        let errorbaucer = $(formdata).find("[name='errorbaucer']").text();
+        let errortarikh = $(formdata).find("[name='errortarikh']").text();
+        let errortuntutan = $(formdata).find("[name='errortuntutan']").text();
+        let errortarikhbil = $(formdata).find("[name='errorbil']").text();
+        let errordeskripsi = $(formdata).find("[name='errordeskripsi']").text();
+        let errorbayaran = $(formdata).find("[name='errorbayaran']").text();
+       
+        if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
+        {
+            return true;
+        }else{
+            
+            event.preventDefault();
+            return;
+        }
+
+            event.preventDefault();
+            return;
+
+     
     }
 
     function openupdeno()
@@ -314,6 +372,27 @@
             .find("input[type=checkbox], input[type=radio]")
             .prop("checked", "")
             .end();
+
+            $(this).find("[name='errortarikh']").hide();
+            $(this).find("[name='tarikh']").removeClass('is-invalid');
+            $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errortuntutan']").hide();
+            $(this).find("[name='tuntutan']").removeClass('is-invalid');
+            $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbil']").hide();
+            $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            $(this).find("[name='errordeskripsi']").hide();
+            $(this).find("[name='deskripsi']").removeClass('is-invalid');
+            $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbayaran']").hide();
+            $(this).find("[name='bayaran']").removeClass('is-invalid');
+            $(this).find("[name='bayaran']").parent().addClass("mb-4");
+        
     });
 
     $('#SelenggaraModal').on('hidden.bs.modal', function (e) {
@@ -324,6 +403,26 @@
             .find("input[type=checkbox], input[type=radio]")
             .prop("checked", "")
             .end();
+
+            $(this).find("[name='errortarikh']").hide();
+            $(this).find("[name='tarikh']").removeClass('is-invalid');
+            $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errortuntutan']").hide();
+            $(this).find("[name='tuntutan']").removeClass('is-invalid');
+            $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbil']").hide();
+            $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            $(this).find("[name='errordeskripsi']").hide();
+            $(this).find("[name='deskripsi']").removeClass('is-invalid');
+            $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbayaran']").hide();
+            $(this).find("[name='bayaran']").removeClass('is-invalid');
+            $(this).find("[name='bayaran']").parent().addClass("mb-4");
     });
 
     $('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -334,6 +433,26 @@
             .find("input[type=checkbox], input[type=radio]")
             .prop("checked", "")
             .end();
+
+            $(this).find("[name='errortarikh']").hide();
+            $(this).find("[name='tarikh']").removeClass('is-invalid');
+            $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errortuntutan']").hide();
+            $(this).find("[name='tuntutan']").removeClass('is-invalid');
+            $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbil']").hide();
+            $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            $(this).find("[name='errordeskripsi']").hide();
+            $(this).find("[name='deskripsi']").removeClass('is-invalid');
+            $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbayaran']").hide();
+            $(this).find("[name='bayaran']").removeClass('is-invalid');
+            $(this).find("[name='bayaran']").parent().addClass("mb-4");
     });
 
     $('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -344,6 +463,26 @@
             .find("input[type=checkbox], input[type=radio]")
             .prop("checked", "")
             .end();
+
+            $(this).find("[name='errortarikh']").hide();
+            $(this).find("[name='tarikh']").removeClass('is-invalid');
+            $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errortuntutan']").hide();
+            $(this).find("[name='tuntutan']").removeClass('is-invalid');
+            $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbil']").hide();
+            $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            $(this).find("[name='errordeskripsi']").hide();
+            $(this).find("[name='deskripsi']").removeClass('is-invalid');
+            $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbayaran']").hide();
+            $(this).find("[name='bayaran']").removeClass('is-invalid');
+            $(this).find("[name='bayaran']").parent().addClass("mb-4");
     });
 
 
@@ -355,6 +494,26 @@
             .find("input[type=checkbox], input[type=radio]")
             .prop("checked", "")
             .end();
+
+            $(this).find("[name='errortarikh']").hide();
+            $(this).find("[name='tarikh']").removeClass('is-invalid');
+            $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errortuntutan']").hide();
+            $(this).find("[name='tuntutan']").removeClass('is-invalid');
+            $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbil']").hide();
+            $(this).find("[name='tarikhbil']").removeClass('is-invalid');
+            $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+
+            $(this).find("[name='errordeskripsi']").hide();
+            $(this).find("[name='deskripsi']").removeClass('is-invalid');
+            $(this).find("[name='deskripsi']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorbayaran']").hide();
+            $(this).find("[name='bayaran']").removeClass('is-invalid');
+            $(this).find("[name='bayaran']").parent().addClass("mb-4");
     });
 
     // $('#denominasipanjar').on('hidden.bs.modal', function (e) {

resources/views/khazanah/pendahuluanserahanmain.blade.php

@@ -150,12 +150,77 @@
             let dtacct = $('#dtacct').val();
             let ktacct = $('#ktacct').val();
 
-            $('#amaundiminta').val(amaun);
+            let boolamaun = false;let boolketerangan = false;let booljenis = false;
+            if(!amaun)
+            {
+                $("[name='erroramaun']").show();
+                $("[name='erroramaun']").text("*Isikan amaun dalam input!");
+                $("[name='amaun']").addClass('is-invalid');
 
-            $('#denominasiHQModal').modal('show');
-            $('#pendahuluanserahanModal').modal('hide');
+                boolamaun = true;
+            }else{
+                $("[name='erroramaun']").hide();
+                $("[name='amaun']").removeClass('is-invalid');
+
+                boolamaun = false;
+            }
+
+            if(!keterangan)
+            {
+                $("[name='errorketerangan']").show();
+                $("[name='errorketerangan']").text("*Isikan keterangan dalam input!");
+                $("[name='keterangan']").addClass('is-invalid');
+
+                boolketerangan = true;
+            }else{
+                $("[name='errorketerangan']").hide();
+                $("[name='keterangan']").removeClass('is-invalid');
+
+                boolketerangan = false;
+            }
+
+            if(!jenis)
+            {
+                $(".invalid-feedback").show();
+
+                booljenis = true;
+            }else{
+                $(".invalid-feedback").hide();
+
+                booljenis = false;
+            }
+
+            if(boolamaun === false && boolketerangan === false && booljenis === false)
+            {
+                console.log('masuk');
+                $('#amaundiminta').val(amaun);
+                $('#denominasiHQModal').modal('show');
+                $('#pendahuluanserahanModal').modal('hide');
+                return true;
+            }else{
+                event.preventDefault();
+                return false;
+            }
+
+            
         }
 
+        $('#pendahuluanserahanModal').on('hidden.bs.modal', function (e) {
+
+            $(this).find("[name='erroramaun']").hide();
+            $(this).find("[name='amaun']").removeClass('is-invalid');
+            // $(this).find("[name='tarikh']").parent().addClass("mb-4");
+
+            $(this).find("[name='errorketerangan']").hide();
+            $(this).find("[name='keterangan']").removeClass('is-invalid');
+            // $(this).find("[name='tuntutan']").parent().addClass("mb-4");
+
+            $(this).find(".invalid-feedback").hide();
+            // $(this).find("[name='errorradio']").removeClass('is-invalid');
+            // $(this).find("[name='tarikhbil']").parent().addClass("mb-4");
+        
+        });
+
         function funcbatal()
         {
             $('#denominasiHQModal').modal('hide');

resources/views/khazanah/tebus.blade.php

@@ -106,9 +106,9 @@
                                     
                                     <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-norujukan="{{$ls['norujukan']}}" data-kodcaw="{{ $ls['kodcaw'] }}" 
                                                 data-target="#marhunModal">  {{$ls['norujukan']}} </a></td>
-                                    <td></td>
+                                    <td>{{ $ls['penilai'] }}</td>
                                     <td>{{ $ls['jenistebus'] }}</td>
-                                        <td>{{ $ls['nilaimarhun'] }}</td>
+                                    <td>{{ $ls['nilaimarhun'] }}</td>
                                     </tr>
                                     @endforeach
                                 </tbody>

resources/views/layouts/app_operasi.blade.php

@@ -131,9 +131,22 @@
                                 $('#linkz').text(data.namateller + " Pohon Kelulusan");
                                 $("#linkz").attr("href", "{{ url('kelulusan') }}");
 
-                                audio.play();
-                                audio.muted = false;
-
+                                if(window.location.pathname === '/operasi/kelulusan')
+                                {
+                                    location.reload();
+                                }else{
+                                    audio.play();
+                                    audio.muted = false;
+                                    var countlagu = 1;
+                                    audio.onended = function() {
+                                        if(countlagu <= 3){
+                                            countlagu++;
+                                            console.log(countlagu);
+                                            this.play();
+                                        }
+                                    }
+                                }
+                               
                                 const Toast = Swal.mixin({
                                 toast: true,
                                 position: 'top-end',

resources/views/lelongan/index.blade.php

@@ -207,6 +207,8 @@
             buttonsStyling: false
         });
 
+        let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+
         swalWithBootstrapButtons.fire({
             title: 'Dapatkan Pengesahan Khazanah',
             text: "Tuntutan Baki Pelanggan!",
@@ -230,7 +232,7 @@
                     allowEnterKey: false
                     })
 
-                    let mohon = "Tuntut Baki Lelongan";
+                    
 
                     
                     let norujukan = $('#norujukan').val();
@@ -241,14 +243,16 @@
                     if($("input[name='radlelong']:checked").val() == 'baki')
                     {
                         jenis = 'T';
+                        let mohon = "Tuntut Baki Lelongan";
                     }else{
                         jenis = 'B';
+                        let mohon = "Bayar Baki Lelongan";
                     }
 
                     
-                    let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val();let bakiupah = $('#keuntungan').val();
+                    let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val();
                     let cajlain = 0.00; let cajlelong = $('#cajlelong').val();
-                    let jumlah = $('#jumlah').val();let hargajual = $('#hargajual').val();
+                    let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");
 
                         $.ajax({
                             method:'post',
@@ -273,8 +277,6 @@
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
-                            console.log(data);
-
 
                             if(data.norujukan == norujukan)
                             {

resources/views/modal/agh.blade.php

@@ -0,0 +1,66 @@
+  <!-- Modal HistoryBayaran -->
+  <div class="modal fade" id="AGHModal" tabindex="-1" role="dialog" aria-labelledby="ModalCenterTitle" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title text-center" id="ModalTitle">Surat Akuan Gadaian Hilang</h5>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+        <div class="modal-body">  
+          
+          <div class="container">
+            <form name="frmagh" target="_blank" action="{{ route('agh.create') }}" onsubmit="return checkAGH();" method="POST">
+              @csrf
+              <input type="hidden" name="norujukanhidden" id="norujukanhidden"/>
+            <div class="col-12 row">
+              <div class="col-5"><label class="mt-1">Jenis Alasan :</label></div>
+              <div class="col-7">
+                <select name="alasan" id="alasan" class="form-control">
+                  <option value="Simpanan">Simpanan</option>
+                  <option value="Bencana alam">Bencana alam</option>
+                  <option value="Kecurian">Kecurian</option>
+                  <option value="Di Ragut">Di Ragut</option>
+                  <option value="Kes Polis">Kes Polis</option>
+                  <option value="Hilang">Hilang</option>
+                </select>
+              </div>
+            </div>
+
+            <div class="col-12 row mt-2">
+              <div class="col-5"><label class="mt-1">Negeri :</label></div>
+              <div class="col-7">
+                <select name="negeriagh" id="negeriagh" class="form-control">
+                  @foreach($negeri as $neg)
+                  <option value="{{ $neg['kodnegeri'] }}">{{ $neg['negeri'] }}</option>
+                  @endforeach
+                </select>
+              </div>
+            </div>
+
+
+            <div class="col-12 row mt-2">
+              <div class="col-5"><label class="mt-1">Daerah :</label></div>
+              <div class="col-7">
+                <select name="daerahagh" id="daerahagh" class="form-control" disabled>
+                  <option value="No Data">Sila Pilih Negeri *</option>
+                </select>
+              </div>
+            </div>
+          </div>
+
+          
+        </div>
+
+        <div class="modal-footer">
+            <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+            <button type="submit" class="btn btn-success">Hantar</button>
+        </div>
+      </form>
+      </div>
+    </div>
+  </div>
+
+
+

resources/views/modal/denominasimodalpendahuluanserahan.blade.php

@@ -118,6 +118,7 @@
                   <td></td>
                   <td></td>
                   <td></td>
+                  <td td style="display:none;" name="denominasi" class="denominasi"></td>
                   <td>RM100 </td> 
                   <td style="display:none;" name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
                   <td><input type="text" name="ambilanring100" class="form-control" id="ringgit100" onkeyup="kiraan(this)"/> </td>

resources/views/modal/denopanjar.blade.php

@@ -35,51 +35,51 @@
                   <tr>
                     <td>RM0.01</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen1'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen1" class="form-control kosong" id="sen1" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen1" class="form-control kosong" id="sen1" data-amaun="{{ $denominasi['txtsen1'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen1" id="totalsen1" class="form-control kosong" value="0.00" readonly/> </td>
                     <td>RM1</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring1'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring1" class="form-control kosong" id="ringgit1" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring1" class="form-control kosong" id="ringgit1" data-amaun="{{ $denominasi['txtring1'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring1" id="totalring1" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM0.05</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen5'] }}" readonly/></td>
-                      <td><input type="text" name="ambilsen5" class="form-control kosong" id="sen5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilsen5" class="form-control kosong" id="sen5" data-amaun="{{ $denominasi['txtsen5'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalsen5" id="totalsen5" class="form-control kosong" value="0.00" readonly/> </td>
                       <td>RM5</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring5'] }}" readonly/></td>
-                      <td><input type="text" name="ambilring5" class="form-control kosong" id="ringgit5" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilring5" class="form-control kosong" id="ringgit5" data-amaun="{{ $denominasi['txtring5'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalring5" id="totalring5" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                       <td>RM0.10</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen10'] }}" readonly/></td>
-                      <td><input type="text" name="ambilsen10" class="form-control kosong" id="sen10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilsen10" class="form-control kosong" id="sen10" data-amaun="{{ $denominasi['txtsen10'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalsen10" id="totalsen10" class="form-control kosong" value="0.00" readonly/> </td>
                       <td>RM10</td>
                       <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring10'] }}" readonly/></td>
-                      <td><input type="text" name="ambilring10" class="form-control kosong" id="ringgit10" onkeyup="kiraan(this)"/> </td>
+                      <td><input type="text" name="ambilring10" class="form-control kosong" id="ringgit10" data-amaun="{{ $denominasi['txtring10'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                       <td><input type="text" name="totalring10" id="totalring10" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                     <td>RM0.20</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen20'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen20" class="form-control kosong" id="sen20" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen20" class="form-control kosong" id="sen20" data-amaun="{{ $denominasi['txtsen20'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen20" id="totalsen20" class="form-control kosong" value="0.00" readonly/> </td>
                     <td> RM20</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring20'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring20" class="form-control kosong" id="ringgit20" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring20" class="form-control kosong" id="ringgit20" data-amaun="{{ $denominasi['txtring20'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring20" id="totalring20" class="form-control kosong" value="0.00" readonly/> </td>
                   </tr>
                   <tr>
                     <td>RM0.50</td>
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtsen50'] }}" readonly/></td>
-                    <td><input type="text" name="ambilsen50" class="form-control kosong" id="sen50" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilsen50" class="form-control kosong" id="sen50" data-amaun="{{ $denominasi['txtsen50'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalsen50" id="totalsen50" class="form-control kosong" value="0.00" readonly/> </td>
                     <td>RM50</td> 
                     <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring50'] }}" readonly/></td>
-                    <td><input type="text" name="ambilring50" class="form-control kosong" id="ringgit50" onkeyup="kiraan(this)"/> </td>
+                    <td><input type="text" name="ambilring50" class="form-control kosong" id="ringgit50" data-amaun="{{ $denominasi['txtring50'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                     <td><input type="text" name="totalring50" id="totalring50" class="form-control kosong" value="0.00" readonly/> </td>
                 </tr>
                 <tr>
@@ -89,7 +89,7 @@
                   <td></td>
                   <td>RM100</td> 
                   <td name="denominasi" class="denominasi"><input type="text" class="form-control" value="{{ $denominasi['txtring100'] }}" readonly/></td>
-                  <td><input type="text" name="ambilring100" class="form-control kosong" id="ringgit100" onkeyup="kiraan(this)"/> </td>
+                  <td><input type="text" name="ambilring100" class="form-control kosong" id="ringgit100" data-amaun="{{ $denominasi['txtring100'] }}" onkeyup="kiraanpanjar(this)"/> </td>
                   <td><input type="text" name="totalring100" id="totalring100" class="form-control kosong" value="0.00" readonly/> </td>
                 </tr>
               </table>

resources/views/modal/panjar.blade.php

@@ -8,7 +8,7 @@
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
-        <form name="frmmodal" method="post" action="{{ route('khazanah.createpanjar') }}" novalidate onsubmit="return checkformpanjar(this);">
+        <form name="KeraianForm" method="post" action="{{ route('khazanah.createpanjar') }}" novalidate onsubmit="return checkformpanjar(this);">
           @csrf
         <div class="modal-body text-center">
                 <input type="hidden" name="jenismodal" value="keraian"/>
@@ -31,60 +31,50 @@
                   <div class="col-4">
                     <label>Baucer No: </label>
                   </div>
-                  <div class="col-8">
-                    <input type="text" name="baucer" class="form-control-plaintext mb-4 baucer" readonly/>
+                  <div class="col-8 mb-4 flex-wrap">
+                    <input type="text" name="baucer" class="form-control-plaintext baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tarikh: </label>
                   </div>
-                  <div class="col-8"> 
-                    <input type="date" class="form-control mb-4" name="tarikh" required/>
-                    <div class="invalid-feedback mb-4">
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
+                  <div class="col-8 mb-4 flex-wrap"> 
+                    <input type="date" class="form-control" name="tarikh" required/>
+                    <span name="errortarikh" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tuntutan Oleh: </label> 
                   </div>
-                  <div class="col-8">
-                    <select name="tuntutan" class="form-control mb-4" required>
+                  <div class="col-8 mb-4">
+                    <select name="tuntutan" class="form-control" required>
                       @foreach($usercawangan as $user)
                       <option value="{{ $user->name }}">{{ $user->name }}</option>
                       @endforeach
                     </select>
-                    <div class="invalid-feedback">
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
-                    {{-- <input type="text" class="form-control mb-4" name="tuntutan"/> --}}
+                    <span name="errortuntutan" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tarikh Bil: </label> 
                   </div>
-                  <div class="col-8">
-                    <input type="date" class="form-control was-validated mb-4" name="tarikhbil" required/>
-                    <div class="invalid-feedback">
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
+                  <div class="col-8 mb-4 flex-wrap">
+                    <input type="date" class="form-control" name="tarikhbil" required/>
+                    <span name="errorbil" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Deskripsi:</label>
                   </div>
-                  <div class="col-8">
-                    <textarea row="3" name="deskripsi" class="form-control mb-4" minlength='6' maxlength='25' required> </textarea>
-                    <div class="invalid-feedback">
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
+                  <div class="col-8 mb-4">
+                    <textarea row="3" name="deskripsi" class="form-control" minlength='6' maxlength='25' required> </textarea>
+                    <span name="errordeskripsi" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Bayaran (RM): </label> 
                   </div>
                   <div class="col-8">
                     <div class="row pl-3">
-                      <input type="text" class="form-control-plaintext col-8" name="bayaran" required readonly/>
+                      <input type="text" class="form-control col-8" name="bayaran" required readonly/>
                       <button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
-                      <div class="invalid-feedback">
-                        tarikh haruslah dimasukkan ke dalam ni!
-                    </div>
+                      <span name="errorbayaran" style="color:red;"></span>
                     </div>
                   </div>
                 </div>
@@ -132,35 +122,40 @@
                     </div>
                     <div class="col-8">
                     <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tarikh:
                     </div>
-                    <div class="col-8">
-                    <input type="date" name="tarikh" class="form-control mb-4"/>
+                    <div class="col-8 mb-4">
+                    <input type="date" name="tarikh" class="form-control"/>
+                    <span name="errortarikh" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tuntutan Oleh:</label>
                     </div>
-                    <div class="col-8">
-                    <select name="tuntutan" class="form-control mb-4">
+                    <div class="col-8 mb-4">
+                    <select name="tuntutan" class="form-control">
                       @foreach($usercawangan as $user)
                         <option value="{{ $user->name }}">{{ $user->name }}</option>
                       @endforeach
                     </select>
+                    <span name="errortuntutan" style="color:red;"></span>
                     {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
                   </div>
                   <div class="col-4">
                     <label>Tarikh Bil:</label>
                   </div>
-                  <div class="col-8">
-                    <input type="date" name="tarikhbil" class="form-control mb-4"/>
+                  <div class="col-8 mb-4">
+                    <input type="date" name="tarikhbil" class="form-control"/>
+                    <span name="errorbil" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Deskripsi:</label>
                   </div>
-                  <div class="col-8">
-                    <textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
+                  <div class="col-8 mb-4">
+                    <textarea row="3" name="deskripsi" class="form-control"> </textarea>
+                    <span name="errordeskripsi" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Bayaran (RM):</label>
@@ -169,6 +164,7 @@
                     <div class="row pl-3">
                       <input type="text" name="bayaran" readonly class="form-control col-8"/>
                       <button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
+                      <span name="errorbayaran" style="color:red;"></span>
                     </div>
                   </div>
                 </div>
@@ -216,35 +212,40 @@
                 </div>
                 <div class="col-8">
                   <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Tarikh:</label>
                 </div>
-                <div class="col-8">
-                  <input type="date" name="tarikh" class="form-control mb-4"/>
+                <div class="col-8 mb-4">
+                  <input type="date" name="tarikh" class="form-control"/>
+                  <span name="errortarikh" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Tuntutan Oleh:</label>
                 </div>
-                <div class="col-8">
-                  <select name="tuntutan" class="form-control mb-4">
+                <div class="col-8 mb-4">
+                  <select name="tuntutan" class="form-control">
                     @foreach($usercawangan as $user)
                       <option value="{{ $user->name }}">{{ $user->name }}</option>
                     @endforeach
                   </select>
+                  <span name="errortuntutan" style="color:red;"></span>
                   {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
                 </div>
                 <div class="col-4">
                   <label>Tarikh Bil:</label>
                 </div>
-                <div class="col-8">
-                  <input type="date" name="tarikhbil" class="form-control mb-4"/>
+                <div class="col-8 mb-4">
+                  <input type="date" name="tarikhbil" class="form-control"/>
+                  <span name="errorbil" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Deskripsi:</label>
                 </div>
-                <div class="col-8">
-                  <textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
+                <div class="col-8 mb-4">
+                  <textarea row="3" name="deskripsi" class="form-control"> </textarea>
+                  <span name="errordeskripsi" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Bayaran (RM):</label>
@@ -253,6 +254,7 @@
                   <div class="row pl-3">
                     <input type="text" name="bayaran" readonly class="form-control col-8"/>
                     <button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
+                    <span name="errorbayaran" style="color:red;"></span>
                   </div>
                 </div>
               </div>
@@ -302,35 +304,40 @@
                 </div>
                 <div class="col-8">
                   <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Tarikh:</label>
                 </div>
-                <div class="col-8">
-                  <input type="date" name="tarikh" class="form-control mb-4"/>
+                <div class="col-8 mb-4">
+                  <input type="date" name="tarikh" class="form-control"/>
+                  <span name="errortarikh" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Tuntutan Oleh:</label>
                 </div>
-                <div class="col-8">
-                  <select name="tuntutan" class="form-control mb-4">
+                <div class="col-8 mb-4">
+                  <select name="tuntutan" class="form-control">
                     @foreach($usercawangan as $user)
                       <option value="{{ $user->name }}">{{ $user->name }}</option>
                     @endforeach
                   </select>
+                  <span name="errortuntutan" style="color:red;"></span>
                   {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
                 </div>
                 <div class="col-4">
                   <label>Tarikh Bil:</label>
                 </div>
-                <div class="col-8">
-                  <input type="date" name="tarikhbil" class="form-control mb-4"/>
+                <div class="col-8 mb-4">
+                  <input type="date" name="tarikhbil" class="form-control"/>
+                  <span name="errorbil" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Deskripsi:</label>
                 </div>
-                <div class="col-8">
-                  <textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
+                <div class="col-8 mb-4">
+                  <textarea row="3" name="deskripsi" class="form-control"> </textarea>
+                  <span name="errordeskripsi" style="color:red;"></span>
                 </div>
                 <div class="col-4">
                   <label>Bayaran (RM):</label>
@@ -339,6 +346,7 @@
                   <div class="row pl-3">
                     <input type="text" name="bayaran" readonly class="form-control col-8"/>
                     <button type="button" class="btn btn-primary ml-1 col-3" onclick="openupdeno();">Deno</button>
+                    <span name="errorbayaran" style="color:red;"></span>
                   </div>
                 </div>
               </div>
@@ -387,36 +395,41 @@
                   </div>
                   <div class="col-8">
                     <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                   </div>
 
                   <div class="col-4">
                     <label>Tarikh:</label>
                   </div>
-                  <div class="col-8">
-                    <input type="date" name="tarikh" class="form-control mb-4"/>
+                  <div class="col-8 mb-4">
+                    <input type="date" name="tarikh" class="form-control"/>
+                    <span name="errortarikh" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tuntutan Oleh:</label>
                   </div>
-                  <div class="col-8">
-                    <select name="tuntutan" class="form-control mb-4">
+                  <div class="col-8 mb-4">
+                    <select name="tuntutan" class="form-control">
                       @foreach($usercawangan as $user)
                         <option value="{{ $user->name }}">{{ $user->name }}</option>
                       @endforeach
                     </select>
+                    <span name="errortuntutan" style="color:red;"></span>
                     {{-- <input type="text" name="tuntutan" class="form-control mb-4"/> --}}
                   </div>
                   <div class="col-4">
                     <label>Tarikh Bil:</label>
                   </div>
-                  <div class="col-8">
-                    <input type="date" name="tarikhbil" class="form-control mb-4"/>
+                  <div class="col-8 mb-4">
+                    <input type="date" name="tarikhbil" class="form-control"/>
+                    <span name="errorbil" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Deskripsi:</label>
                   </div>
-                  <div class="col-8">
-                    <textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
+                  <div class="col-8 mb-4">
+                    <textarea row="3" name="deskripsi" class="form-control"> </textarea>
+                    <span name="errordeskripsi" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Bayaran (RM):</label>
@@ -472,25 +485,29 @@
                   </div>
                   <div class="col-8">
                     <input type="text" name="baucer" class="form-control mb-4 baucer" readonly/>
+                    <span name="errorbaucer" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tarikh:</label>
                   </div>
-                  <div class="col-8">
-                    <input type="date" name="tarikh" class="form-control mb-4"/>
+                  <div class="col-8 mb-4">
+                    <input type="date" name="tarikh" class="form-control"/>
+                    <span name="errortarikh" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Tarikh Bil:</label>
                   </div>
-                  <div class="col-8">
-                    <input type="date" name="tarikhbil" class="form-control mb-4"/>
+                  <div class="col-8 mb-4">
+                    <input type="date" name="tarikhbil" class="form-control"/>
+                    <span name="errorbil" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Deskripsi:</label>
                   </div>
-                  <div class="col-8">
+                  <div class="col-8 mb-4">
                     {{-- <input type="text" name="deskripsi" class="form-control mb-4"/> --}}
-                    <textarea row="3" name="deskripsi" class="form-control mb-4"> </textarea>
+                    <textarea row="3" name="deskripsi" class="form-control"> </textarea>
+                    <span name="errordeskripsi" style="color:red;"></span>
                   </div>
                   <div class="col-4">
                     <label>Bayaran (RM):</label>
@@ -512,6 +529,47 @@
           </div>
         </div>
       </div>
+
+
+       <!-- Modal Baki Perubatan -->
+       <div class="modal fade" id="BakiPerubatanModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered modal-lg" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLongTitle">Perbelanjaan Pos</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            
+            <div class="modal-body text-center">
+                
+              <table class='table table-striped table-hover' id='table-bakiperubatan' style="width:100%;">
+                <thead class="thead-dark">
+                    <tr>
+                        <th>bil</th>
+                        <th>Nama Staff</th>
+                        <th>Baki Perubatan(RM)</th>
+                    </tr>
+                </thead>
+                <tbody>
+                  @foreach($usercawangan as $index1=>$usercaw)
+                  <tr>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $usercaw->name }}</td>
+                    <td>{{ number_format($usercaw->perubatan,2) }}</td>
+                  </tr>
+                  @endforeach
+                </tbody>
+              </table>
+
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
+            </div>
+          </div>
+        </div>
+      </div>
   
 
       

resources/views/modal/pendahuluanserahan.blade.php

@@ -12,7 +12,8 @@
 
           <div class="text-center mx-auto">
             <input type="radio" name="radwang" id="radiopendahuluanserahan" value="pendahuluan"/><label class="ml-2">Wang Pendahuluan Daripada HQ</label>
-            <input type="radio" name="radwang" id="radiopendahuluanserahan" value="serahan" class="ml-3"/><label class="ml-2">Wang Serahan Daripada HQ</label>
+            <input type="radio" name="radwang" id="radiopendahuluanserahan" value="serahan" class="ml-3"/><label class="ml-2">Wang Serahan Kepada HQ</label>
+            <div class="invalid-feedback">Pilih Jenis Pendahuluan-Serahan</div>
           </div>
 
           <div class="text-center mx-auto mt-4">
@@ -31,10 +32,12 @@
             <div class="row">
               <label class="col-2 mt-2">Keterangan</label>
               <input type="text" class="form-control col-8 mt-2" name="keterangan" id="keterangan"/>
+              <span name="errorketerangan" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
             </div>
             <div class="row"> 
               <label class="col-2 mt-2">Amaun (RM)</label>
               <input type="text" class="form-control col-4 mt-2" name="amaun" id="amaun" onkeypress="return validateformat(event)"/>
+              <span name="erroramaun" style="color:red;margin-left:130px;" class="col-12 text-left"></span>
             </div>
           </div>
 

resources/views/operasi/kelulusan.blade.php

@@ -159,6 +159,23 @@
         minimumFractionDigits: 2
     });
 
+    var audio = new Audio("{{ asset('sound/3.wav') }}");
+    // audio.muted = true;
+
+    if (tablekelulusan.data().any()) {
+        audio.play();
+        audio.addEventListener('ended', function() {
+            this.currentTime = 0;
+            this.play();
+        }, false);
+        console.log('betul');
+
+    }else{
+        audio.loop = false;
+        audio.muted = true;
+    }
+
+
     $('#kelulusanmodal').on('show.bs.modal', function(event) {
         let button = $(event.relatedTarget);
         let norujukan = $(button).data('norujukan');

resources/views/penebusan/index.blade.php

@@ -73,6 +73,7 @@
                                     <option value="P">P = Tambah Pembiayaan</option>
                                 @endif
                                 @if($gadai['hargajualan'] == null)
+                                    <option value="AT">A = Auto Tawarruq</option>
                                     <option value="U">U = Bayaran Upah</option>
                                 @endif
                               </select>
@@ -165,9 +166,7 @@
                 <div class="card-body">
                     <form action="">
                         <div class="col-12 form-group row">
-                            {{-- <div class="col-4"></div> --}}
                             <div class="col-6" id="divbakihargajualan">
-                                
                                 <div class="form-group row">
                                     <div class="col-4">
                                         BAKI HARGA JUALAN(RM)
@@ -176,7 +175,6 @@
                                         <input type="text" id="bakihargajualan" value="{{ number_format($gadai['bakihargajualan'],2) }}" class="form-control" readonly/>
                                     </div>
                                 </div>
-
                                 <div class="form-group row">
                                     <div class="col-4">
                                         BAKI PEMBIAYAAN(RM)
@@ -188,7 +186,6 @@
                             </div>
 
                             <div class="col-6" id="divpembiayaanasal">
-                                
                                 <div class="form-group row">
                                     <div class="col-4">
                                         PEMBIAYAAN ASAL(RM)
@@ -196,7 +193,15 @@
                                     <div class="col-8">
                                         <input type="text" id="pinjamanasal" value="{{ number_format($gadai['pinjaman'],2) }}" class="form-control" readonly/>
                                     </div>
-                                </div>  
+                                </div>
+                                <div class="form-group row" id="divbayarantawarruq">
+                                    <div class="col-4">
+                                       BAYARAN PEMBIAYAAN(RM)
+                                    </div>
+                                    <div class="col-8">
+                                        <input type="text" id="bayarantawarruq"  onkeyup="bayartawarruq(this)"  placeholder="0.00" class="form-control"/>
+                                    </div>
+                                </div> 
                             </div>
 
                             <div class="col-6">
@@ -214,10 +219,15 @@
                                         PEMBIAYAAN H. ASAL (RM)
                                     </div>
                                     @php
-                                        $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
+                                        if($gadai['bakipjm'] != 0){
+                                            $bakipjm = $gadai['bakipjm'];
+                                        }else{
+                                            $bakipjm = $gadai['pinjaman'];
+                                        }
+                                        $percent_asal = ($bakipjm / $gadai['nilaimarhun']) * 100;
                                     @endphp
                                     <div class="col-8 input-group mb-2">
-                                        <input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($gadai['bakipjm'],2) }}" aria-describedby="basic-hargaemas" readonly/>
+                                        <input type="text" id="hargapembiayaansemasa" class="form-control" value="{{ number_format($bakipjm,2) }}" aria-describedby="basic-hargaemas" readonly/>
                                         <div class="input-group-append">
                                             <span class="input-group-text" id="basic-hargaemas">{{ number_format($percent_asal,2) }}</span>
                                         </div>
@@ -253,7 +263,14 @@
                                         <input type="text" id="tambahpinjamsebenar" placeholder="0.00" class="form-control" disabled/>
                                     </div>
                                 </diV>
-                                
+                                <div class="form-group row" id="divperludibayartawarruq">
+                                    <div class="col-4">
+                                        PERLU DIBAYAR(RM)
+                                    </div>
+                                    <div class="col-8">
+                                        <input type="text" id="perludibayartawarruq" class="form-control" readonly/>
+                                    </div>
+                                </div>
                             </div>
 
                             <div class="col-6" id="divbakipinjaman">
@@ -289,10 +306,15 @@
                                         PEMBIAYAAN BARU(RM)
                                     </div>
                                     @php
-                                        $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100;
+                                        if($gadai['bakipjm'] != 0){
+                                            $bakipjm = $gadai['bakipjm'];
+                                        }else{
+                                            $bakipjm = $gadai['pinjaman'];
+                                        }
+                                        $percent_hargaemassemasa = ($bakipjm / $nilaihargasemasa) * 100;
                                     @endphp
                                     <div class="col-8 input-group mb-3">
-                                        <input type="text" id="pinjamanbaru" value="{{ number_format($gadai['bakipjm'],2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
+                                        <input type="text" id="pinjamanbaru" value="{{ number_format($bakipjm ,2) }}" class="form-control" aria-describedby="basic-addon2" readonly/>
                                         <div class="input-group-append">
                                         <span class="input-group-text" id="basic-addon2">{{ number_format($percent_hargaemassemasa,2) }}</span>
                                           </div>
@@ -312,7 +334,7 @@
 
                            
                             <div class="col-12">
-                                <input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{  route('customer_info') }}')">
+                                <input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="pembatalanbalik();">
                                 <input type="button" id="terima_transaksi" class="float-right btn btn-primary mr-2" value="TERIMA" onclick="bayaransemua()">
                             </div>
                         </div>
@@ -349,6 +371,8 @@
     $('#divbayaranditerima').hide();
     $('#divbakipinjaman').hide();
     $('#divhargaemassemasa').hide();
+    $('#divperludibayartawarruq').hide();
+    $('#divbayarantawarruq').hide();
 
 
     var array_recno = [];
@@ -568,8 +592,6 @@
                     success:function(success){
                         let bayarz = $('#bayaran').val(formatter.format(success));
 
-                  
-
                         bayaranseparuhasal = Number(success);
 
                         let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,"");
@@ -686,8 +708,8 @@
                 $('#divbayaranditerima').hide();
                 $('#divbakipinjaman').hide();
                 $('#divhargaemassemasa').hide();
-
-
+                $('#divperludibayartawarruq').hide();
+                $('#divbayarantawarruq').hide();
 
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
@@ -709,8 +731,8 @@
                 $('#divbayaranditerima').hide();
                 $('#divbakipinjaman').hide();
                 $('#divhargaemassemasa').hide();
-
-
+                $('#divperludibayartawarruq').hide();
+                $('#divbayarantawarruq').hide();
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
                 $('#divperludibayar').show();
@@ -731,15 +753,13 @@
                 $('#divpinjamanbaru').hide();
                 $('#divbayaranditerima').hide();
                 $('#divhargaemassemasa').hide();
-
-
+                $('#divperludibayartawarruq').hide();
+                $('#divbayarantawarruq').hide();
                 $('#divbakipinjaman').show();
                 $('#divtelahdibayar').show();
                 $('#divbayaran').show();
                 $('#divperludibayar').show();
 
-                
-
                 $('#perludibayar').val(formatter.format(jumupah));
                 break;
 
@@ -751,12 +771,12 @@
                 $('#divpinjamanbaru').show();
                 $('#divbayaranditerima').show();
                 $('#divhargaemassemasa').show();
-
+                $('#divperludibayartawarruq').hide();
                 $('#divtelahdibayar').hide();
                 $('#divbakipinjaman').hide();
                 $('#divbayaran').hide();
                 $('#divperludibayar').hide();
-
+                $('#divbayarantawarruq').hide();
 
                 $("#bayaran").prop("disabled", false);
                 $("#bayaran").val(0);
@@ -774,14 +794,38 @@
                 $('#divbayaranditerima').hide();
                 $('#divbakipinjaman').hide();
                 $('#divhargaemassemasa').hide();
-
-
+                $('#divperludibayartawarruq').hide();
+                $('#divbayarantawarruq').hide();
                 $('#divtelahdibayar').hide();
                 $('#divbayaran').hide();
                 $('#divperludibayar').show();
 
                 $('#perludibayar').val(formatter.format(jumupah));
                 break;
+            case "AT":
+                $('input[type="checkbox"]').hide();
+                $('span.spannar').show();
+                $('#divpinjaman').show();
+                $('#divtambahpinjaman').hide();
+                $('#divpinjamanbaru').show();
+                $('#divbayaranditerima').hide();
+                $('#divhargaemassemasa').show();
+                $('#divbayarantawarruq').show();
+                $("#bayaran").prop("disabled", true);
+                $("#perludibayartawarruq").prop("readonly", true);
+                $("#bayarantawarruq").prop("readonly", false);
+                $("#bayaran").val(0);
+                $('#divperludibayartawarruq').show();
+
+                $('#divbakipinjaman').hide();
+                $('#divtelahdibayar').hide();
+                $('#divbayaran').hide();
+                $('#divperludibayar').hide();
+
+                $('#perludibayartawarruq').val(formatter.format(jumupah));
+
+                break;
+
         }      
 
     });
@@ -830,6 +874,40 @@
         }
     }
 
+    function bayartawarruq(e){
+        var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+        var bayaran = parseFloat(e.value);
+        var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,""));
+        
+
+        var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+
+        // console.log(nm+' '+nmsemasa);
+
+        const percentpinj = parseFloat("{{ $percent_asal }}");
+        const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru
+        
+        if(e.value != ''){
+            var bayaran = parseFloat(e.value);
+        }else{
+            var bayaran = 0;
+        }
+
+        var totalbayaran = keuntungan + bayaran;
+
+        var pinjaman_baru = pinjamasal - bayaran;
+
+        var totalsemasa = pinjaman_baru/nmsemasa * 100;
+        var total= pinjaman_baru/nm * 100;
+
+        $('#perludibayartawarruq').val(totalbayaran.toFixed(2));
+        $('#hargapembiayaansemasa').val(pinjaman_baru.toFixed(2));
+        $('#pinjamanbaru').val(pinjaman_baru.toFixed(2));
+        $('#basic-addon2').text(totalsemasa.toFixed(2));
+        $('#basic-hargaemas').text(total.toFixed(2));
+    }
+
     function bayartambahan(e){
         if($('#sltjenistebus').find(":selected").val() == 'A'){
             if(hargajualan == ''){
@@ -869,8 +947,6 @@
 
         totalpinjbaru = pinjam + parseFloat(e.value);
 
-        console.log(totalpinjbaru);
-
         var maxpinjaman = nmsemasa * 0.7;
 
         var bakimaxpinjaman = maxpinjaman - totalpinjbaru;
@@ -896,6 +972,34 @@
     {
         $("#terima_transaksi").prop('disabled', true);
         if($('#sltjenistebus').find(":selected").val() == 'T'){
+        
+            var adadah = false;
+
+            $.ajax({
+            method:'get',
+            datatype: 'json',
+            url: api + '/api/listpenebusanhistory/' + kodcaw,
+            async:false,
+            data: { 'norujukan' : norujukan },
+            success:function(success_data){
+                var count = Object.keys(success_data).length;
+
+                if(count > 0)
+                {
+                    console.log(count);
+                    Swal.fire('Amaran!','Tebus sudah dibuat sila tekan butang batal!','error');
+                    $("#terima_transaksi").prop('disabled', false);
+                    adadah = true;
+                }
+            }
+            });
+
+            if(adadah === true)
+            {
+                return false;
+                event.preventDefault();
+            }
+
             let jenisbayarantebus = '';
             if(hargajualan == '')
             {
@@ -926,10 +1030,12 @@
             var nowakil = nw;
 
             $.ajax({
-                method:'put',
+                method:'get',
                 datatype: 'json',
-                url: api + '/api/updatetebus/' + kodcaw + '/' + norujukan,
+                url: "{{ route('tebus.penuh') }}",
                 data:{
+                    "kodcaw" : kodcaw,
+                    "norujukan" : norujukan,
                     "nopelanggan" : nopelanggan,
                     "jenistebus" : jenistebus,
                     "jbg" : jbg,
@@ -949,7 +1055,7 @@
                 success:function(success_data){
 
                 
-                    if(success_data == 1)
+                    if(success_data == 'success')
                     {  
                         $.ajax({
                             method: 'put',
@@ -980,7 +1086,7 @@
                         Swal.fire({
                             icon: 'error',
                             title: 'Amaran!',
-                            text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!',
+                            text: 'norujukan Sudah ditebus di dalam table gadai!',
                         });
                     }
                 }
@@ -995,152 +1101,43 @@
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
-            if(hargajualan == ''){
-                jenisbayarantebus = "nottawarruq";
-            }else if (hargajualan != ''){
-                jenisbayarantebus = "tawarruq";
+            var bayar = $('#bayaran').val();
+            var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
+
+            if(bayar >  bakipinjam){   
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire(
+                    'Amaran!',
+                    'Bayaran tidak boleh melebihi 10% nilai marhun!',
+                    'error'
+                )
+                return false;
             }
 
-            if(hargajualan != ''){
-                var bayar = $('#bayaran').val();
-                var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
+            $.ajax({
+                method:'get',
+                url: "{{ route('bayaran.ansuranstawarruq') }}",
+                data:{
+                    "bayaran" : bayar,
+                    "kodcaw" : kodcaw,
+                    "norujukan" : norujukan,
+                    "teller" : teller
+                },
+                success:function(success_data){
+
+                    var urlroute = '{{ route("resit.ansurans", ":id") }}';
+                    urlroute = urlroute.replace(':id', norujukan);
 
-                if(bayar >  bakipinjam){   
-                    $("#terima_transaksi").prop('disabled', false);
                     Swal.fire(
-                        'Amaran!',
-                        'Bayaran tidak boleh melebihi 10% nilai marhun!',
-                        'error'
-                    )
-                    return false;
+                        'Berjaya!',
+                        'Bayaran Ansuran Berjaya',
+                        'success'
+                    ).then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
                 }
-
-                $.ajax({
-                    method:'get',
-                    url: "{{ route('bayaran.ansuranstawarruq') }}",
-                    data:{
-                        "bayaran" : bayar,
-                        "kodcaw" : kodcaw,
-                        "norujukan" : norujukan,
-                        "teller" : teller
-                    },
-                    success:function(success_data){
-
-                        var urlroute = '{{ route("resit.ansurans", ":id") }}';
-                        urlroute = urlroute.replace(':id', norujukan);
-
-                        Swal.fire(
-                            'Berjaya!',
-                            'Bayaran Ansuran Berjaya',
-                            'success'
-                        ).then(function() {
-                            window.open(urlroute, '_blank');
-                            window.location.replace("{{  route('customer_info') }}");
-                        })
-                    }
-                });
-
-            }
-            else if(hargajualan == ''){
-                // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){
-                //     Swal.fire(
-                //         'Amaran!',
-                //         'Masukkan jumlah melebihi jumlah upah!',
-                //         'error'
-                //     )
-                //     return false;
-                // }
-
-                var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
-
-                var bayar = $('#bayaran').val();
-                
-                if(bayar >  bakpin){
-                    $("#terima_transaksi").prop('disabled', false);
-                    Swal.fire(
-                        'Amaran!',
-                        'Bayaran tidak boleh melebihi 10% nilai marhun!',
-                        'error'
-                    )
-                    return false;
-                }
-
-                var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
-    
-                var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-                var jenistebus = $('#sltjenistebus').find(":selected").val();
-                var jbg = "{{ $gadai['tempoh'] }}";
-                var kadarupah = "{{ $gadai['kadarupah'] }} ";
-                var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
-                var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
-                var ansuran = $('#bayaran').val();
-                var addpinjaman = $('#bayaran').val();
-                var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
-                var bakiupah = 0;
-                var historygadaian = norujukan;
-                var marhun = "{{ $gadai['marhun'] }}";
-                var noic = "{{ $gadai['nokp'] }}";
-                var total_berat = parseFloat("{{ $gadai['berat'] }}");
-                var kuantiti_marhun = Number("{{ sizeof($marhun) }}");
-
-                var kadarupahbaru = 0;
-
-                if(nilai_marhun > 0 && nilai_marhun < 401.99){
-                    kadarupahbaru = 1.2/100;
-                }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
-                    kadarupahbaru = 1.50/100;
-                }else if(nilai_marhun >= 2002 ){
-                    kadarupahbaru = 1.70/100;
-                }
-
-                var keuntungan_sebulan = pinjaman * kadarupahbaru;
-                var keuntungan_6bln = keuntungan_sebulan * 6;
-
-
-                $.ajax({
-                    method:'get',
-                    url: "{{ route('bayaran.ansurans') }}",
-                    data:{
-                        "nopelanggan" : nopelanggan,
-                        "jenistebus" : jenistebus,
-                        "jbg" : jbg,
-                        "kadarupah" : kadarupah,
-                        "nilai_marhun" : nilai_marhun,
-                        "pinjaman" : pinjaman,
-                        "ansuran" : ansuran,
-                        "addpinjaman" : addpinjaman,
-                        "bakipinjaman" : bakipinjaman,
-                        "bakiupah" : bakiupah,
-                        "historygadaian" : historygadaian,
-                        "marhun" : marhun,
-                        "norujukan" : norujukan,
-                        "noic" : noic,
-                        "kadarkeuntungan" : kadarupahbaru,
-                        "keuntungan_6bln" : keuntungan_6bln,
-                        "keuntungan_sebulan" : keuntungan_sebulan,
-                        "kuantiti_marhun" : kuantiti_marhun,
-                        "lebihan" : lebihan,
-                        "jenisbayarantebus" : jenisbayarantebus,
-                        "teller" : teller
-                        
-                    },
-                    success:function(success_data){
-                        Swal.fire(
-                            'Berjaya!',
-                            'Bayaran Ansuran Berjaya',
-                            'success'
-                        ).then(function() {
-                            window.location.replace("{{ url('customer_info') }}");
-                        })
-                    },error: function (request, status, error) {
-                        console.log(request.responseText);
-                    }
-                });
-
-            }
-            /////////////
-            //End File//
-            ////////////
+            });
 
         }else if($('#sltjenistebus').find(":selected").val() == 'S'){
 
@@ -1787,11 +1784,382 @@
                 }
             })
 
+        }else if($('#sltjenistebus').find(":selected").val() == 'AT'){
+
+            var keuntungan = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+            var pinjamasal = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,""));
+
+            var nm = parseFloat("{{ $gadai['nilaimarhun'] }}");
+            var nmsemasa = parseFloat("{{ $nilaihargasemasa }}");
+
+            var pinjaman_baru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,""));
+
+            var marginsemasa = pinjaman_baru/nmsemasa * 100;
+
+            if(marginsemasa < 10)
+            {
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error');
+                return false;
+            }
+
+            if(marginsemasa > 80)
+            {
+                $("#terima_transaksi").prop('disabled', false);
+                Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error');
+                return false;
+            }
+
+            if(marginsemasa > 70 && marginsemasa <= 75){
+
+                const swalWithBootstrapButtons = Swal.mixin({
+                    customClass: {
+                        confirmButton: 'btn btn-success',
+                        cancelButton: 'btn btn-danger'
+                    },
+                    buttonsStyling: false
+                });
+
+                swalWithBootstrapButtons.fire({
+                    title: 'Dapatkan Pengesahan Khazanah',
+                    text: "Tetapan margin melebihi 70% untuk Khazanah!",
+                    icon: 'info',
+                    showCancelButton: true,
+                    confirmButtonText: 'Hantar',
+                    cancelButtonText: 'Batal',
+                    reverseButtons: true
+                }).then((result) => {
+                    if (result.isConfirmed) {
+                        
+                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
+                        let komen = "Pembiayaan Melebihi Margin 70%|" + nmsemasa + "|" + ber +  "|" + marg + "| Auto Tawarruq";
+                        let teller = "{{ Auth::user()->name }}";
+
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Khazanah.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
+                        })
+                        let siricreated = 0;
+                        $.ajax({
+                            method:'post',
+                            url: "{{ route('khazanah.createkelulusan') }}",
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan,
+                                "komen" : komen,
+                                "jumpinjam" : pinjaman_baru,
+                                "teller" : teller
+                            },
+                            success:function(data){
+                                siricreated = data;
+                            },
+                            error: function(xhr, status, error) {
+                                var err = eval("(" + xhr.responseText + ")");
+                                alert(xhr.responseText);
+                            }
+                        });    
+
+                        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                        var channel = pusher.subscribe('notice-kelulusan');
+                        channel.bind('my-kelulusan', function(data) {
+                        
+
+                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            {
+                                if(data.kelulusan == 'lulus')
+                                {
+                                    Swal.fire({
+                                        icon: 'success',
+                                        title: 'Telah Disahkan',
+                                        text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        gadaiautotawarruq();
+                                    });
+
+                                }
+                                else if(data.kelulusan == 'batal')
+                                {
+                                    Swal.fire({
+                                        icon: 'warning',
+                                        title: 'Telah Dibatalkan',
+                                        text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        return false;
+                                    });
+                                }
+                            }
+
+
+
+                        });
+
+
+                    } else if (result.dismiss === Swal.DismissReason.cancel) {
+                        $("#terima_transaksi").prop('disabled', false);
+                        swalWithBootstrapButtons.fire(
+                            'Gagal',
+                            'Gagal mendapatkan kelulusan khazanah',
+                            'error'
+                        )
+                    }
+                });
+                event.preventDefault();
+                return false;  
+
+            }else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){
+
+                    const swalWithBootstrapButtons = Swal.mixin({
+                    customClass: {
+                        confirmButton: 'btn btn-success',
+                        cancelButton: 'btn btn-danger'
+                    },
+                    buttonsStyling: false
+                    });
+
+                    let text = '';
+                    if(marginsemasa > 75 && marginsemasa <= 80)
+                    {
+                        text  = 'Tetapan margin melebihi 75% untuk Operasi!';
+                    }else if(pinjaman_baru >= 10000)
+                    {
+                        text  = 'Pembiayaan melebihi RM 10,000!';
+                    }
+
+
+                    swalWithBootstrapButtons.fire({
+                    title: 'Dapatkan Pengesahan Operasi',
+                    text: text,
+                    icon: 'info',
+                    showCancelButton: true,
+                    confirmButtonText: 'Hantar',
+                    cancelButtonText: 'Batal',
+                    reverseButtons: true
+                    }).then((result) => {
+                    if (result.isConfirmed) {
+
+                        let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
+                        let komen = '';
+                        if(marginsemasa > 75 && marginsemasa <= 80)
+                        {
+                            komen = "Pembiayaan Melebihi Margin 75%|" + nmsemasa + "|" + ber +  "|" + marg + "| Auto Tawarruq";
+                        }else if(pinjamanbaru >= 10000)
+                        {
+                            komen = "Pembiayaan Melebihi RM 10,000|" + nmsemasa + "|" + ber +  "|" + marg + "| Auto Tawarruq";
+                        }
+
+                        let jumpinjam = $('#bakipinjaman').val();
+                        let teller = "{{ Auth::user()->name }}";
+
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Khazanah-Operasi.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
+                        })
+                        let siricreated = 0;
+                        $.ajax({
+                            method:'post',
+                            url: "{{ route('operasi.createkelulusan') }}",
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan,
+                                "komen" : komen,
+                                "jumpinjam" : pinjaman_baru,
+                                "teller" : teller
+                            },
+                            success:function(data){
+                                siricreated = data;
+                            },
+                            error: function(xhr, status, error) {
+                                var err = eval("(" + xhr.responseText + ")");
+                                alert(xhr.responseText);
+                            }
+                        });    
+
+
+                        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                        cluster: 'ap1',
+                        encrypted: true
+                        });
+
+                        var channel = pusher.subscribe('notice-kelulusan');
+                        channel.bind('my-kelulusan', function(data) {
+                        
+
+                            if(data.norujukan == norujukan && data.siri == siricreated)
+                            {
+                                if(data.kelulusan == 'lulus')
+                                {
+                                    Swal.fire({
+                                                icon: 'success',
+                                                title: 'Telah Disahkan',
+                                                text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        gadaiautotawarruq();
+                                        return true;
+                                    });
+
+                                }
+                                else if(data.kelulusan == 'batal')
+                                {
+                                    Swal.fire({
+                                        icon: 'warning',
+                                        title: 'Telah Dibatalkan',
+                                        text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        $("#terima_gadai").prop('disabled', false);
+                                        return false;
+                                    });
+                                }
+                            }
+
+
+
+                        });
+
+                        
+                    }else if (result.dismiss === Swal.DismissReason.cancel){
+                        $("#terima_transaksi").prop('disabled', false);
+                        swalWithBootstrapButtons.fire(
+                            'Gagal',
+                            'Gagal mendapatkan kelulusan operasi',
+                            'error'
+                        )
+                    }
+                    });
+                    event.preventDefault();
+                    return false;
+
+                }else if(marginsemasa > 80){
+                    $("#terima_transaksi").prop('disabled', false);
+                    Swal.fire(
+                        'Amaran!',
+                        'Pinjaman Haruslah Dalam Lingkungan 80%!',
+                        'error'
+                    )
+                    return false;
+                }
+
+
+                gadaiautotawarruq();
+
+            /////////////
+            //End File//
+            ///////////
         }
 
         //Bayaran Semua function end file
     }
 
+    function gadaiautotawarruq()
+    {
+
+        var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+        var jenistebus = 'T';
+        var jbg = "{{ $gadai['tempoh'] }}";
+        var kadarupah = "{{ $gadai['kadarupah'] }}";
+        var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
+        var nilai_marhun = parseFloat("{{ $nilaihargasemasa }}");
+        var pinjamanbaru = $('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"");
+        var ansuran = 0;
+        var addpinjaman = 0;
+        var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
+        var bakipinjaman = parseFloat($('#pinjamanasal').val().replace(/[^0-9.-]+/g,"")) - bakiupah;
+        
+        var historygadaian = "{{ $gadai['norujukan'] }}";
+        var marhun = "{{ $gadai['marhun'] }}";
+        var noic = "{{ $gadai['nokp'] }}";
+        var total_berat = parseFloat("{{ $gadai['berat'] }}");
+        var pinjaman = parseFloat("{{ $gadai['pinjaman']}}");
+        var kuantiti_marhun = Number("{{sizeof($marhun)}}");
+        var nowakil = nw;
+        var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,""));
+        
+        var kadarupahbaru = 0;
+        if(nilai_marhun > 0 && nilai_marhun < 400.99){
+            kadarupahbaru = 1.20/100;
+        }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
+            kadarupahbaru = 1.50/100;
+        }else if(nilai_marhun >= 2001 ){
+            kadarupahbaru = 1.70/100;
+        }
+        
+        var keuntungan_sebulan = pinjamanbaru * kadarupahbaru;
+        var keuntungan_6bln = keuntungan_sebulan * 6;
+
+        $.ajax({
+            method:"GET",
+            url: "{{ route('tebus.autotawarruq') }}",
+            data:{
+                //yang lama
+                "norujukan" : norujukan,
+                "nopelanggan" : nopelanggan,
+                "jenistebus" : jenistebus,
+                "jbg" : jbg,
+                "kadarupah" : kadarupah,
+                "nilai_marhun" : nilai_marhun_lama,
+                "pinjaman_lama" : pinjaman,
+                "ansuran" : ansuran,
+                "addpinjaman" : addpinjaman,
+                "bakipinjaman" : bakipinjaman,
+                "bakiupah" : bakiupah,
+                "historygadaian" : historygadaian,
+                "marhun" : marhun,
+                "nowakil" : nowakil,
+                "jenisbayarantebus" : "nottawarruq",
+                "teller" : teller,
+
+
+                //yang baru
+                "noic" : noic,
+                "total_nilai_marhun" : nilai_marhun,
+                "pinjaman" : pinjamanbaru,
+                "kadarkeuntungan" : kadarupahbaru,
+                "keuntungan_6bln" : keuntungan_6bln,
+                "keuntungan_sebulan" : keuntungan_sebulan,
+                "total_berat" : total_berat,
+                "marhun_detail" : marhun,
+                "kuantiti_marhun" : kuantiti_marhun,
+
+                "totalbayaran" : perludibayar,
+    
+            },
+            success:function(success_data){
+
+                var urlroute = '{{ route("resit.autotawarruq", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
+                    'Berjaya!',
+                    'Tebus Auto Tawarruq Berjaya',
+                    'success'
+                ) .then(function() {
+                    window.open(urlroute, '_blank');
+                    window.location.replace("{{  route('customer_info') }}");
+                })
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+        });
+    }
+
     function gadaiseparuhfunc()
     {
 
@@ -1841,7 +2209,6 @@
         });
 
         var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-        var jenistebus = $('#sltjenistebus').find(":selected").val();
         var jbg = "{{ $gadai['tempoh'] }}";
         var kadarupah = "{{ $gadai['kadarupah'] }}";
         var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}");
@@ -1862,11 +2229,11 @@
         
         var kadarupahbaru = 0;
 
-        if(nilai_marhun > 0 && nilai_marhun < 401.99){
+        if(nilai_marhun > 0 && nilai_marhun < 400.99){
             kadarupahbaru = 1.2/100;
-        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+        }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
             kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2002 ){
+        }else if(nilai_marhun >= 2001 ){
             kadarupahbaru = 1.70/100;
         }
         
@@ -1957,11 +2324,11 @@
         
         var kadarupahbaru = 0;
 
-        if(nilai_marhun > 0 && nilai_marhun < 401.99){
+        if(nilai_marhun > 0 && nilai_marhun < 400.99){
             kadarupahbaru = 1.20/100;
-        }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+        }else if(nilai_marhun >= 401 && nilai_marhun < 2000.99){
             kadarupahbaru = 1.50/100;
-        }else if(nilai_marhun >= 2002 ){
+        }else if(nilai_marhun >= 2001 ){
             kadarupahbaru = 1.70/100;
         }
 
@@ -2183,6 +2550,47 @@ function ubahwakil(e)
     $(e).attr( "onclick", "wakilfunction(this)");
 }
 
+function pembatalanbalik()
+{
+    $.ajax({
+            method:'get',
+            url: api + '/api/polis/get/',
+            datatype:'json',
+            data:{
+                'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                'norujukan': norujukan
+            },
+            success:function(data){
+
+                var count = Object.keys(data).length;
+
+                if(count > 0 && data[0].tebus === 1)
+                {
+                    $.ajax({
+                        method:'put',
+                        url: api + '/api/polis/put/',
+                        data: {
+                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                            'norujukan': norujukan,
+                            'tebus' : 0
+                        },
+                        success:function(data){
+                            window.location.replace("{{  route('customer_info') }}");
+
+                        },
+                        error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                        }
+                    });   
+                }else{
+                    window.location.replace("{{  route('customer_info') }}");
+                }
+
+            }
+    });
+}
+
 
  // Restricts input for the set of matched elements to the given inputFilter function.
  (function($) {

resources/views/print/laporan_gadaian.blade.php

@@ -261,7 +261,7 @@
                 <td><b>{{ number_format($totalupah12,2) }} </b></td>
 
             </tr>
-            @php $counter = 1; @endphp
+            @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
         @endif
     @else
         <tr>
@@ -298,6 +298,22 @@
 </table>
 
 
+<h4>Laporan Transaksi Gadaian</h4>
+<br>
+
+<table id="details">
+  <thead>
+    <th>Bil</th>
+    <th>Jenis</th>
+    <th>Penebusan(RM)</th>
+  </thead>
+  <tr>
+    <td> 0 </td>
+    <td>Rugi Lelong</td>
+    <td> 0.00 </td>
+  </tr>
+</table>
+
 
 
 

resources/views/print/laporan_kawalanstok.blade.php

@@ -494,7 +494,7 @@
         
       </td>
       <td>
-        @php $totalbil = $totalbilgadai-$totalbiltebus-$totalbilans-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
+        @php $totalbil = $totalbilgadai-$totalbiltebus/*-$totalbilans*/-$totalbillelong-$totalbilhapuskira; echo number_format($totalbil);@endphp
         
       </td>
       <td>

resources/views/print/laporan_marhunterkumpul.blade.php

@@ -222,30 +222,34 @@
     <th class="stylela">N.Marhun</th>
     <th class="stylela">Catatan</th>
   </tr>
-  @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;@endphp
+  @php $counter = 1;$totalberat = 0;$totalnm = 0;$masuk = false;$pertama = true;$totalkeseluruhanmarhun = 0;$totalkeseluruhanpinjaman = 0;$totalkeseluruhanberat = 0;@endphp
 
   @foreach($marhun as $index=>$item)
+  @php $totalkeseluruhanmarhun += floatval($item['n_marhun']);$totalkeseluruhanberat += floatval($item['berat']);  @endphp 
     <tr>
       @if($index == 0)
+        {{-- <td>masuk mula</td> --}}
          <td>{{ $counter }}</td>
         <td>{{ $item['norujukan'] }}</td>
         <td>{{ $item['nokp'] }}</td>
         <td>{{ $item['nama'] }}</td>
-        <td>{{ $item['pinjaman'] }}</td>
+        <td>{{ number_format($item['pinjaman'],2) }}</td>
         <td style="border-top:1px solid black;">{{ $item['marhun'] }}</td>
         <td style="border-top:1px solid black;">{{ $item['karat'] }}</td>
         <td style="border-top:1px solid black;">{{ $item['berat'] }}</td>
-        <td style="border-right:1px solid black;border-top:1px solid black;">{{ $item['n_marhun'] }}</td>
+        <td style="border-right:1px solid black;border-top:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
         <td></td>
         <td></td>
         <td></td>
         <td></td>
         <td></td>
         @if($index != sizeof($marhun) - 1)
+          {{-- <td>kedua</td> --}}
             @if($item['norujukan'] != $marhun[$index+1]['norujukan'])
                 <tr>
+                  {{-- <td>ketiga</td> --}}
                   <td class="stylela" colspan="6"></td>
-                  <td class="stylela"> JUMLAH</td>
+                  <td class="stylela" style="font-weight: bold;"> JUMLAH</td>
                   <td class="stylela"> {{ number_format($item['berat'],2) }}</td>
                   <td class="stylela" style="border-right:1px solid black;"> {{ number_format($item['n_marhun'],2) }}</td>
                   <td></td>
@@ -256,7 +260,7 @@
                 </tr>
             @endif
         @endif
-        @php $counter++; @endphp
+        @php $counter++; $masuk = true;$totalnm += floatval($item['n_marhun']);$totalberat += floatval($item['berat']); @endphp
       @else
         @if($item['norujukan'] == $marhun[$index-1]['norujukan'])
                 {{-- <td>masuk 1</td> --}}
@@ -267,8 +271,8 @@
                 <td></td>
                 <td>{{ $item['marhun'] }}</td>
                 <td>{{ $item['karat'] }}</td>
-                <td>{{ $item['berat'] }}</td>
-                <td style="border-right:1px solid black;">{{ $item['n_marhun'] }}</td>
+                <td>{{ number_format($item['berat'],2) }}</td>
+                <td style="border-right:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
                 <td></td>
                 <td></td>
                 <td></td>
@@ -280,21 +284,21 @@
                   @endphp
         @else
         
-        @php  
-        $totalberat += floatval($item['berat']);
-        $totalnm += floatval($item['n_marhun']); 
-        @endphp
+          @php  
+          $totalberat += floatval($item['berat']);
+          $totalnm += floatval($item['n_marhun']); 
+          @endphp
 
           {{-- <td>masuk2</td> --}}
           <td style="border-top:1px solid black;">{{ $counter }}</td>
           <td style="border-top:1px solid black;">{{ $item['norujukan'] }}</td>
           <td style="border-top:1px solid black;">{{ $item['nokp'] }}</td>
           <td style="border-top:1px solid black;">{{ $item['nama'] }}</td>
-          <td style="border-top:1px solid black;">{{ $item['pinjaman'] }}</td>
+          <td style="border-top:1px solid black;">{{ number_format($item['pinjaman'],2) }}</td>
           <td style="border-top:1px solid black;">{{ $item['marhun'] }}</td>
           <td style="border-top:1px solid black;">{{ $item['karat'] }}</td>
-          <td style="border-top:1px solid black;">{{ $item['berat'] }}</td>
-          <td style="border-right:1px solid black;border-top:1px solid black;">{{ $item['n_marhun'] }}</td>
+          <td style="border-top:1px solid black;">{{ number_format($item['berat'],2) }}</td>
+          <td style="border-right:1px solid black;border-top:1px solid black;">{{ number_format($item['n_marhun'],2) }}</td>
           <td></td>
           <td></td>
           <td></td>
@@ -324,7 +328,7 @@
       @endif
 
       @if(($index == sizeof($marhun) - 1))
-      {{-- <td>kucen</td> --}}
+      {{-- <td>kucen2</td> --}}
           <tr>
             <td class="stylela" colspan="6"></td>
             <td class="stylela"> JUMLAH</td>
@@ -342,6 +346,19 @@
      
     </tr>    
   @endforeach
+  <tr>
+    <td colspan="4"></td>
+    <td></td>
+    <td></td>
+    <td><b>JUMLAH</b></td>
+    <td>{{ number_format($totalkeseluruhanberat,2) }}</td>
+    <td style="border-right:1px solid black;">{{ number_format($totalkeseluruhanmarhun,2) }}</td>
+    <td style="border-top:1px solid black;">
+    <td style="border-top:1px solid black;">
+    <td style="border-top:1px solid black;">
+    <td style="border-top:1px solid black;">
+    <td style="border-top:1px solid black;">
+  </tr>
 </table>
 
 <br>

resources/views/print/laporan_penebusan.blade.php

@@ -213,13 +213,15 @@
     <th>T Gadai</th>
     <th>T Tebus</th>
     <th>JBG</th>
+    <th>J Tebus</th>
     <th width="6%;">Pembiayaan(RM)</th>
     <th width="6%;">Upah/Keuntungan(RM)</th>
     <th width="6%;">Bayaran(RM)</th>
+    <th width="6%;">Jumlah(RM)</th>
   </tr>
   @php $counter = 1; $totalbayaran = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalbayaran += $item['bakipjm'] @endphp
+  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
@@ -231,7 +233,7 @@
         <tr>
             <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
+        @php $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
     @endif
     <tr>
       <td>{{ $counter }}</td>
@@ -249,33 +251,46 @@
         @php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
+          echo($formattedweddingdate);
         @endphp
       </td>
-      <td>{{$item['t_tebus']}}</td>
-      <td>{{$item['jbg']}}</td>
-      <td>{{$item['pinjaman']}}</td>
-      <td>{{$item['bakiupah']}}</td>
-      <td>{{$item['bakipjm']}}</td>
+      <td>
+        @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate);
+        @endphp
+      </td>
+      <td>{{ $item['jbg'] }}</td>
+      <td>{{$item['jenistebus']}}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['bakiupah'],2) }}</td>
+      <td>{{ number_format($item['bakipjm'],2) }}</td>
+      <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 $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($totalpinjamanteller,2) }} </b></td>
                 <td><b>{{ number_format($totalupahteller,2) }} </b></td>
                 <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+                <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
             </tr>
-            @php $counter = 0; @endphp
+            @php $counter = 1;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp
         @endif
     @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($totalpinjamanteller,2) }} </b></td>
             <td><b>{{ number_format($totalupahteller,2) }} </b></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+            <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
         </tr>
     @endif
   @endforeach
@@ -334,6 +349,13 @@
     <td>{{ number_format($upahlama['total'],2) }}</td>
     <td> Not Applicable </td>
   </tr>
+  <tr>
+    <td> 0 </td>
+    <td>Baki Lelong</td>
+    <td> 0.00 </td>
+    <td> Not Applicable </td>
+    <td> Not Applicable </td>
+  </tr>
 </table>
 
 

resources/views/print/laporan_stokaudit.blade copy.php

@@ -0,0 +1,258 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr>
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>Laporan Stok Audit</b></th>
+    <th> </th>
+    <th> </th>
+    <th><b> Tarikh Cetak:</b>
+        @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate)
+        @endphp
+    </th>
+    <th></th>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>TARIKH</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate)
+        @endphp</td>
+    <td style="width:50px">   
+    </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <thead>
+    <th>Bil</th>
+    <th>Norujukan</th>
+    <th>JBG</th>
+    <th>No. KP</th>
+    <th>Berat</th>
+    <th>Nilai Marhun (RM)</th>
+    <th>Pembiayaan</th>
+    <th>Lanjutan</th>
+  </thead>
+  @php $counter = 1;$totalpinjaman = 0; @endphp
+  @foreach($stokaudit['rekod'] as $index=>$item)
+  @php if($item['hargajualan'] == null) $totalpinjaman += $item['pinjaman']; else $totalpinjaman += $item['bakipjm']; @endphp
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{$item['norujukan']}}</td>
+      <td>{{ $item['jbg'] }}</td>
+      <td>{{$item['nokp']}}</td>
+      <td>{{ number_format($item['berat'],2) }}</td>
+      <td>{{ number_format($item['nilaimarhun'],2) }}</td>
+      <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
+      <td>{{$item['lelong_tawarruq']}}</td>
+    </tr>
+    @php $counter++; @endphp
+  @endforeach
+  <tfoot>
+    <th colspan='4'>Jumlah</th>
+    <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
+    <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    <th>{{ number_format($stokaudit['total'],2) }}</th>
+    <th></th>
+  </tfoot>
+</table>
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td> </td>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+

resources/views/print/laporan_stokaudit.blade.php

@@ -219,6 +219,7 @@
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
       <td>@php if($item['hargajualan'] == null) echo number_format($item['pinjaman'],2); else echo number_format($item['bakipjm'],2); @endphp</td>
+      {{-- <td>{{ number_format($item['pinjaman'],2) }}</td>  --}}
       <td>{{$item['lelong_tawarruq']}}</td>
     </tr>
     @php $counter++; @endphp
@@ -227,6 +228,7 @@
     <th colspan='4'>Jumlah</th>
     <th>{{ number_format($stokaudit['totalberat'],2) }}</th>
     <th>{{ number_format($stokaudit['totalnilaimarhun'],2) }}</th>
+    {{-- <th>{{ number_format($stokaudit['total'],2) }}</th> --}}
     <th>{{ number_format($totalpinjaman,2) }}</th>
     <th></th>
   </tfoot>

resources/views/print/laporan_tuntutbaki.blade.php

@@ -0,0 +1,292 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:8px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
+  </tr>
+  <tr>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  {{-- <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr> --}}
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>LAPORAN TUNTUT BAKI</b></th>
+    <th> </th>
+    <th> </th>
+    <th>
+    </th>
+    <th></th>
+  </tr>
+  <tr>
+    <td><b> Tarikh:</b></td>
+    <td style="text-align:left;"> @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp</td>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>Tarikh Cetak</b></td>
+    <td style="text-align:left;">@php 
+      $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+      $formattedweddingdate = $myDateTime->format('d-m-Y');
+      echo($formattedweddingdate)
+    @endphp</td>
+    <td style="width:50px">   
+    </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Bil</th>
+    <th>Nama</th>
+    <th>No K/P</th>
+    <th>No Rujukan</th>
+    <th>Caj Lelong (RM)</th>
+    <th>Jumlah Baki (RM)</th>
+  </tr>
+  @php $counter = 1; $totaljumlah = 0; @endphp
+  @foreach($tuntutbaki as $index=>$item)
+  @php $totaljumlah += $item['jumlah'] @endphp
+    @if($index > 0)
+        @if($item['teller'] != $tuntutbaki[$index - 1]['teller'])
+            <tr>
+                <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+            </tr>
+           @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+        @endif
+    @else
+        <tr>
+            <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+        </tr>
+        @php $totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+
+    @endif
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>
+        @php
+            
+            $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();
+            $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json();
+            echo $customer_detail[0]['nama'];
+        @endphp
+      </td>
+      <td style="width:100px">{{$gadaidetail[0][0]['nokp']}}</td>
+      <td style="width:100px">{{$item['norujukan']}}</td>
+      <td>{{ $item['cajlelong'] }}</td>
+      <td>{{ $item['jumlah'] }}</td>
+    </tr>
+    @php $counter++; @endphp
+    @php $totalpinjamanteller += $item['jumlah'];$totalcajlelong += $item['cajlelong']; @endphp
+    @if($index+1 < sizeof($tuntutbaki))
+        @if($item['teller'] != $tuntutbaki[$index + 1]['teller'])
+            <tr>
+                <td colspan="4"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
+                <td><b>{{ number_format($totalcajlelong,2) }} </b></td>
+                <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+
+            </tr>
+            @php $counter = 1;$totalpinjamanteller = 0;$totalcajlelong = 0; @endphp
+        @endif
+    @else
+        <tr>
+            <td colspan="4"><b>{{ $counter-1 }}</b> Jumlah surat bagi teller : <b>{{ $item['teller'] }}</b></td>
+            <td><b>{{ number_format($totalcajlelong,2) }} </b></td>
+            <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+
+        </tr>
+    @endif
+  @endforeach
+</table>
+
+<h5 style="float:right;">JUMLAH KESELURUHAN : RM {{ number_format($totaljumlah,2) }}</h5>
+
+<br>
+<br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td> </td>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+

resources/views/print/resitadvansur.blade.php

@@ -410,7 +410,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<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($advansur['tarikh']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -432,7 +432,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($advansur['tarikh']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pinjaman</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>

resources/views/print/resitansuran.blade.php

@@ -379,12 +379,9 @@ hr.new5 {
 
   <table>
 
-      <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
-      <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
-
-
-
-
+    <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
+    <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
+    
   </table>
 
   <table id="cust">
@@ -405,7 +402,7 @@ hr.new5 {
 <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>
  </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>
+<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>
  </tr>
 
  <tr>
@@ -427,7 +424,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>

resources/views/print/resitansuransebelum.blade.php

@@ -405,7 +405,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $penebusan['norujukan'] }} </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($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -427,7 +427,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>

resources/views/print/resittambahpinjam.blade.php

@@ -405,7 +405,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td>: No SAG</td><td> {{ $gadai['norujukan'] }} </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($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -427,7 +427,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($gadai['bakipjm'],2) }} </td>

resources/views/print/resittebus.blade.php

@@ -381,6 +381,7 @@ hr.new5 {
 
       <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
       <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
+      <td></td>
 
 
 
@@ -406,7 +407,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -428,7 +429,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Harga Jualan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['hargajualan']),2) }} </td>

resources/views/print/resittebusautotawarruq.blade.php

@@ -0,0 +1,565 @@
+
+
+<!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>
+/* Red border */
+hr.new1 {
+  border-top: 1px solid red;
+}
+
+/* Dashed red border */
+hr.new2 {
+  border-top: 1px dashed red;
+}
+
+/* Dotted red border */
+hr.new3 {
+  border-top: 1px dotted red;
+}
+
+/* Thick red border */
+hr.new4 {
+  border: 1px solid red;
+}
+
+/* Large rounded green border */
+hr.new5 {
+  border: 10px solid green;
+  border-radius: 5px;
+}
+</style>
+
+<style>
+
+#cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:20%;
+    font-size:10px;
+    border: 1px solid black;
+
+  }
+
+  #cust td, #cust th {
+    border: 0px solid;
+    padding: 3px;
+    font-size:10px;
+    text-align:right;
+
+  }
+
+  #cust tr:nth-child(even){background-color: #ffffff;}
+
+  #cust tr:hover {background-color: #ddd;}
+
+  #cust th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align:right;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #cust {
+  margin-left: auto;
+  margin-right: 0;
+}
+
+  hr.new1 {
+    border-top: 1px dotted black;
+  }
+  .khazanah{
+    border:1px solid black;
+    margin-left:20px;
+    padding:10px;
+    width : 250px;
+    transform: rotate(-90deg);
+    font-size:12px;
+  }
+
+  #inside {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    font-size:15px;
+  }
+
+  #inside td, #inside th {
+    border: none;
+    padding: 2px;
+  }
+
+  #inside tr:nth-child(even){background-color: #ffffff;}
+
+  #inside tr:hover {background-color: #ddd;}
+
+  #inside th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: left;
+    background-color: #4CAF50;
+    color: white;
+  }
+
+
+
+
+  #semakan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    margin-top:40px;
+    font-size:12px;
+  }
+
+  #semakan td, #semakan th {
+    border: none;
+    padding: 2px;
+    text-align: center;
+  }
+
+  #semakan tr:nth-child(even){background-color: #ffffff;}
+
+  #semakan tr:hover {background-color: #ddd;}
+
+  #semakan th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: left;
+    background-color: #4CAF50;
+    color: white;
+  }
+
+  #salinan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:100%;
+    font-size:12px;
+  }
+
+  #salinan td, #salinan th {
+    padding: 2px;
+  }
+
+
+  #salinan tr:nth-child(even){background-color: #ffffff;}
+
+  #salinan tr:hover {background-color: #ffffff;}
+
+  #salinan th {
+    padding-top: 12px;
+    padding-bottom: 10px;
+    text-align: right;
+    background-color: #ffffff;
+    color: black;
+    padding:2px;
+  }
+  #perjanjian {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 100%;
+    font-size:12px;
+
+  }
+
+  #perjanjian td, #perjanjian th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:10px;
+  }
+
+  #perjanjian tr:nth-child(even){background-color:#ffffff}
+
+  #perjanjian tr:hover {background-color: #ddd;}
+
+  #perjanjian th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:5px;
+  }
+  #keuntungan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 100%;
+    font-size:12px;
+
+  }
+
+  #keuntungan td, #keuntungan th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:10px;
+  }
+
+  #keuntungan tr:nth-child(even){background-color: #ffffff;}
+
+  #keuntungan tr:hover {background-color: #ddd;}
+
+  #keuntungan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #payment {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 45%;
+    font-size:13px;
+    border: 1px solid black;
+
+  }
+
+  #payment td, #payment th {
+    border: 0px solid;
+    padding: 3px;
+    font-size:10px;
+    text-align: left;
+
+  }
+
+  #payment tr:nth-child(even){background-color: #ffffff;}
+
+  #payment tr:hover {background-color: #ddd;}
+
+  #payment th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align:left;
+    background-color: #d9deda;
+    color: black;
+    padding:2px;
+  }
+
+  #payment {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+  #akuan td, #akuan th {
+    padding: 7px;
+    font-size:10px;
+    padding:4px;
+  }
+
+  #akuan tr:nth-child(even){background-color:#ffffff;}
+
+  #akuan tr:hover {background-color: #ddd;}
+
+  #akuan th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:3px;
+  }
+  .page-break{
+    page-break-before:always;
+  }
+  
+  .formula{
+    font-family: Arial, Helvetica, sans-serif;
+    font-size:12px;
+  }
+  
+  #copy_cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width:10%;
+    font-size:12px;
+
+  }
+
+
+
+  #copy_cust tr:nth-child(even){background-color: #ffffff;}
+
+  #copy_cust tr:hover {background-color:#ffffff}
+
+  #copy_cust th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:4px;
+  }
+
+
+  #copy_cust {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse:collapse;
+    width: 50%;
+    font-size:12px;
+
+
+  }
+
+  #copy_cust td, #copy_cust th {
+    border: 1px solid #ddd;
+    padding: 2px;
+    font-size:10px;
+    text-align:right;
+    width: 10%;
+
+  }
+
+  #copy_cust {
+    margin-right:0px;margin-left:auto
+}
+
+  #inside tr:nth-child(even){background-color: #ffffff;}
+
+  #inside tr:hover {background-color: #ddd;}
+
+  #inside th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: center;
+    background-color: #d9deda;
+    color: black;
+    padding:4px;
+  }
+ 
+</style>
+
+
+
+
+
+
+
+  <table>
+
+      <td rowspan="4" style="width:50px;"> <img src="{{ asset('img/ARRAHN1.png') }}" style="width:50px" alt="User Image" class="center" >  </td>
+      <td rowspan="4"  style="width:50px;"><img src="{{ asset('img/pkb.png') }}" style="width:50px" alt="User Image" class="center" > </td>   
+
+
+
+
+  </table>
+
+  <table id="cust">
+<tr>
+ <th style="width:5px;"> Salinan Pelanggan</th>
+</tr>
+<tr>
+<td  style="width:5px;"> RESIT BAYARAN  </td>
+
+</tr>
+
+  </table>
+
+<br>
+
+  <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>: {{ $gadai['norujukan'] }} </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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+ </tr>
+
+ <tr>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+ </tr>
+
+ <tr>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+ </tr>
+
+ <tr>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp </td> <td colspan="3"> </td>  <td> </td><td> </td><td> </td><td> </td>
+ </tr>
+  </table>
+  <br>
+
+<h1 style="float:left;position:absolute;margin-left:100px;">AT</h1>
+
+
+<table id="payment">
+  <tr>
+    <td style="width:10px">Pinjaman</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px">(-) Bayaran Pinjaman</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
+  </tr>
+  <tr>
+    <td style="width:10px"><b>Bayaran Upah</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px">Pembiyaan Baru</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px"><b>Jumlah Bayaran</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</td>
+  </tr>
+</table>
+
+<br>
+
+
+
+
+
+  <table id="semakan">
+      <tr>
+      <td colspan="3">.................................................... </td> 
+      <td></td>    
+      <td colspan="3">.................................................... </td>
+      <td></td> 
+      <td colspan="3">.................................................... </td>
+      <td></td> 
+      <td colspan="3">.................................................... </td>
+</tr>
+<tr>
+
+<td colspan="3">DiSemak </td> 
+      <td></td>    
+      <td colspan="3"> Cagaran Di Keluarkan</td>
+      <td></td> 
+      <td colspan="3">Cagaran Diterima </td>
+      <td></td> 
+      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+
+
+</tr>
+  </table>
+  <br>
+  <br>
+  <hr class="new2"></hr>
+
+<br>
+<br>
+
+</table>
+
+
+<table id="cust">
+<tr>
+<th style="width:5px;"> Salinan Pejabat</th>
+</tr>
+<tr>
+<td  style="width:5px;"> RESIT BAYARAN  </td>
+
+</tr>
+
+</table>
+
+<br>
+<table id="inside">
+
+<tr>
+<td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </td>
+</tr>
+<tr>
+<td colspan="3">Nama</td> <td>: {{ $customers_info['nama'] }} </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> Tarikh Bayar</td><td>: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp </td>
+</tr>
+
+<tr>
+<td colspan="3">No K/P </td> <td>: @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td><b> Tempoh Simpan</b></td><td>:<b> {{ $gadai['tempoh'] }} </b></td>
+</tr>
+
+
+
+<tr>
+<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp </td> <td colspan="3"> <t/d>  <td> </td><td> </td><td> </td><td> </td>
+</tr>
+
+
+<tr>
+<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> <td>  </td><td> </td><td> </td><td> </td>
+</tr>
+</table>
+<br>
+
+<h1 style="float:left;position:absolute;margin-left:100px;">AT</h1>
+
+
+<table id="payment">
+  <tr>
+    <td style="width:10px">Pinjaman</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($gadai['pinjaman'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px">(-) Bayaran Pinjaman</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}</td>
+  </tr>
+  <tr>
+    <td style="width:10px"><b>Bayaran Upah</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px">Pembiyaan Baru</td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($gadai['pinjaman']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} </td>
+  </tr>
+  <tr>
+    <td style="width:10px"><b>Jumlah Bayaran</b></td>
+    <td style="width:5px"> </td>
+    <td style="width:10px">: RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}</td>
+  </tr>
+</table>
+
+<br>
+
+
+
+
+
+<table id="semakan">
+    <tr>
+    <td colspan="3">.................................................... </td> 
+    <td></td>    
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+    <td></td> 
+    <td colspan="3">.................................................... </td>
+</tr>
+<tr>
+
+<td colspan="3">DiSemak </td> 
+    <td></td>    
+    <td colspan="3"> Cagaran Di Keluarkan</td>
+    <td></td> 
+    <td colspan="3">Cagaran Diterima </td>
+    <td></td> 
+    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+
+
+</tr>
+</table>
+<br>

resources/views/print/resittebusseparuhbelum.blade.php

@@ -398,7 +398,7 @@ hr.new5 {
 <td colspan="3">Marhun</td> <td>: {{ $gadai['marhun'] }} </td> <td colspan="3"> </td>  <td> </td><td> </td><td> No SAG</td><td>: {{ $gadai['norujukan'] }} </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($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<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($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
  </tr>
 
  <tr>
@@ -421,7 +421,7 @@ hr.new5 {
 <table id="payment">
 
 <tr>
-<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/y'); echo $date; @endphp</td>
+<td style="width:10px"> Tarikh Bayaran</td><td style="width:5px"> </td><td style="width:10px">: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
 </tr>
 <tr>
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>

resources/views/print/suratgadaianhilang.blade.php

@@ -0,0 +1,115 @@
+<html>
+    <head>
+        <title>Surat Akuan Gadaian</title>
+        <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>
+            table #details,
+            th,
+            td {
+              padding: 2px 10px 2px 10px;
+              /* border: 1px solid black; */
+              border-collapse: collapse;
+            }
+
+            .tableright{
+                text-align:right;
+            }
+          </style>
+    </head>
+    <body>
+        <br>
+        <p style="text-align: center;margin: 0;"><strong><u>AKUAN BERKANUN</u></strong></p>
+        <br>
+
+        @php 
+        $poskod = Http::get($api_url . '/api/poskod/' . $customers[0]['poskod'])->json(); 
+        $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json(); 
+        $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json();
+        
+        @endphp
+        <p style=" text-align: justify;text-justify: inter-word;line-height: 1.6;">Saya, <b style="color:#bdc3c7;">{{ $customers[0]['nama'] }}</b>, No. K/P : <b style="color:#bdc3c7;">@php $satu = substr($gadai[0][0]['nokp'],0,6); $dua = substr($gadai[0][0]['nokp'],6,2);$ketiga = substr($gadai[0][0]['nokp'],8); echo $satu . '-' . $dua . '-' . $ketiga; @endphp</b> yang beralamat di <b style="color:#bdc3c7;">{{ strtoupper($customers[0]['alamat1']) . ', ' . $customers[0]['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) }}</b> dengan sesungguhnya dan sebenarnya mengaku bahawa: -</p>
+        
+        <ol>
+        <li style=" text-align: justify;text-justify: inter-word;line-height: 1.6;"><b>Surat Gadaian Ar-Rahn Cawangan <span style="color:#bdc3c7;">@php $namacawangan = substr($cawangan_detail['namacaw'],7); $rendoh = strtolower($namacawangan);echo ucwords($rendoh);  @endphp</span></b>  kepunyaan saya telah hilang dalam simpanan @php if(strtoupper($polis[0]['komen1']) == 'SIMPANAN') { echo '.'; }else{ echo 'kerana <b style="color:#bdc3c7;">' . $polis[0]['komen1'] . '</b>.'; } @endphp  Saya telah sedaya upaya berusaha mencari surat tersebut tetapi gagal menemuinya. Saya juga mengaku bahawa tidak pernah menjual atau menggadai surat tersebut kepada mana-mana institusi kewangan.</li>
+        </ol>
+        <ol start="2">
+        <li>Butir-butir mengenai kehilangan surat gadaian tersebut adalah seperti berikut: -</li>
+        </ol>
+        <table style="margin-left: auto;margin-right: auto;" width="60%">
+          <tr>
+            <td style="text-align: left;" width="40%;">No. Rujukan</td>
+            <td style="text-align: center;" width="20%;">:</td>
+            <td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">{{ $polis[0]['norujukan'] }}</td>
+          </tr>
+          <tr>
+            <td style="text-align: left;">Berat</td>
+            <td style="text-align: center;" width="20%;">:</td>
+            <td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">{{ $gadai[0][0]['berat'] }} gm</td>
+          </tr>
+          <tr>
+            <td style="text-align: left;">Pembiayaan</td>
+            <td style="text-align: center;" width="20%;">:</td>
+            <td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">RM {{ $gadai[0][0]['pinjaman'] }}</td>
+        </tr>
+        <tr>
+            <td style="text-align: left;">Tarikh Gadaian</td>
+            <td style="text-align: center;" width="20%;">:</td>
+            <td style="text-align: left;color:#bdc3c7;font-weight:bold;" width="50%;">@php $time = new DateTime($gadai[0][0]['t_gadai']); $date = $time->format('d/m/Y'); echo $date; @endphp</td>
+        </tr>
+      </table>
+        <p style=" text-align: justify;text-justify: inter-word;">dan saya membuat akuan ini dengan kepercayaan bahwa akuan ini adalah benar, dan menurut kuasa peruntukan Akta Akuan Berkanun 1960.</p>
+        <p>&nbsp;</p>
+        <table>
+            <tr>
+                <td width="50%;">Diperbuat dan dengan sesungguhnya diakui</td>
+                <td class="tableright" width="10%;">)</td>
+                <td width="40%;"></td>
+            </tr>
+            <tr>
+                <td>oleh yang tersebut namanya di atas-</td>
+                <td class="tableright">)</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td style="font-weight: bold;color:#bdc3c7;">{{ $customers[0]['nama'] }}</td>
+                <td class="tableright">)</td>
+                <td style="text-align: right;">........................................................</td>
+            </tr>
+            @php 
+            list($negeriagh, $daerahagh) = explode('|', $polis[0]['komen2']); 
+            $negeri = Http::get($api_url . '/api/negeri/' . $negeriagh)->json(); 
+            $daerah = Http::get($api_url . '/api/daerah/' . $daerahagh)->json();
+            
+            @endphp
+            <tr>
+                <td>di <b style="color:#bdc3c7;">{{ strtoupper($daerah['namadaerah']) }} </b> </td>
+                <td class="tableright">)</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>di dalam Negeri <b style="color:#bdc3c7;">{{ $negeri['negeri'] }}</b></td>
+                <td class="tableright">)</td>
+                <td></td>
+            </tr>
+            <tr>
+                <td>pada</td>
+                <td class="tableright">)</td>
+                <td></td>
+            </tr>
+        </table>
+        <br><br><br>
+        <p style="text-align: center;margin: 0;">Di Hadapan Saya,</p>
+        <br><br><br>
+        <p style="text-align: center;margin: 0;">..................................................</p>
+        <p style="text-align: center;margin: 0;">( Tandatangan Hakim</p>
+        <p style="text-align: center;margin: 0;"> Mahkamah Seksyen, Majistret,</p>
+        <p style="text-align: center;margin: 0;">Pesuruhjaya Sumpah</p>
+        <p style="text-align: center;margin: 0;">atau Notari Awam )</p>
+    </body>
+</html>

resources/views/vendor/laravel-log-viewer/log.blade.php

@@ -0,0 +1,336 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta name="robots" content="noindex, nofollow">
+  <title>Laravel log viewer</title>
+  <link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
+  <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css">
+  <style>
+    body {
+      padding: 25px;
+    }
+
+    h1 {
+      font-size: 1.5em;
+      margin-top: 0;
+    }
+
+    #table-log {
+        font-size: 0.85rem;
+    }
+
+    .sidebar {
+        font-size: 0.85rem;
+        line-height: 1;
+    }
+
+    .btn {
+        font-size: 0.7rem;
+    }
+
+    .stack {
+      font-size: 0.85em;
+    }
+
+    .date {
+      min-width: 75px;
+    }
+
+    .text {
+      word-break: break-all;
+    }
+
+    a.llv-active {
+      z-index: 2;
+      background-color: #f5f5f5;
+      border-color: #777;
+    }
+
+    .list-group-item {
+      word-break: break-word;
+    }
+
+    .folder {
+      padding-top: 15px;
+    }
+
+    .div-scroll {
+      height: 80vh;
+      overflow: hidden auto;
+    }
+    .nowrap {
+      white-space: nowrap;
+    }
+
+
+
+    /**
+    * DARK MODE CSS
+    */
+
+    body[data-theme="dark"] {
+      background-color: #151515;
+      color: #cccccc;
+    }
+
+    [data-theme="dark"] a {
+      color: #4da3ff;
+    }
+
+    [data-theme="dark"] a:hover {
+      color: #a8d2ff;
+    }
+
+    [data-theme="dark"] .list-group-item {
+      background-color: #1d1d1d;
+      border-color: #444;
+    }
+
+    [data-theme="dark"] a.llv-active {
+        background-color: #0468d2;
+        border-color: rgba(255, 255, 255, 0.125);
+        color: #ffffff;
+    }
+
+    [data-theme="dark"] a.list-group-item:focus, [data-theme="dark"] a.list-group-item:hover {
+      background-color: #273a4e;
+      border-color: rgba(255, 255, 255, 0.125);
+      color: #ffffff;
+    }
+
+    [data-theme="dark"] .table td, [data-theme="dark"] .table th,[data-theme="dark"] .table thead th {
+      border-color:#616161;
+    }
+
+    [data-theme="dark"] .page-item.disabled .page-link {
+      color: #8a8a8a;
+      background-color: #151515;
+      border-color: #5a5a5a;
+    }
+
+    [data-theme="dark"] .page-link {
+      background-color: #151515;
+      border-color: #5a5a5a;
+    }
+
+    [data-theme="dark"] .page-item.active .page-link {
+      color: #fff;
+      background-color: #0568d2;
+      border-color: #007bff;
+    }
+
+    [data-theme="dark"] .page-link:hover {
+      color: #ffffff;
+      background-color: #0051a9;
+      border-color: #0568d2;
+    }
+
+    [data-theme="dark"] .form-control {
+      border: 1px solid #464646;
+      background-color: #151515;
+      color: #bfbfbf;
+    }
+
+    [data-theme="dark"] .form-control:focus {
+      color: #bfbfbf;
+      background-color: #212121;
+      border-color: #4a4a4a;
+  }
+
+  </style>
+
+  <script>
+    function initTheme() {
+      const darkThemeSelected =
+        localStorage.getItem('darkSwitch') !== null &&
+        localStorage.getItem('darkSwitch') === 'dark';
+      darkSwitch.checked = darkThemeSelected;
+      darkThemeSelected ? document.body.setAttribute('data-theme', 'dark') :
+        document.body.removeAttribute('data-theme');
+    }
+
+    function resetTheme() {
+      if (darkSwitch.checked) {
+        document.body.setAttribute('data-theme', 'dark');
+        localStorage.setItem('darkSwitch', 'dark');
+      } else {
+        document.body.removeAttribute('data-theme');
+        localStorage.removeItem('darkSwitch');
+      }
+    }
+  </script>
+</head>
+<body>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col sidebar mb-3">
+      <h1><i class="fa fa-calendar" aria-hidden="true"></i> Laravel Log Viewer</h1>
+      <p class="text-muted"><i>by Rap2h</i></p>
+
+      <div class="custom-control custom-switch" style="padding-bottom:20px;">
+        <input type="checkbox" class="custom-control-input" id="darkSwitch">
+        <label class="custom-control-label" for="darkSwitch" style="margin-top: 6px;">Dark Mode</label>
+      </div>
+
+      <div class="list-group div-scroll">
+        @foreach($folders as $folder)
+          <div class="list-group-item">
+            <a href="?f={{ \Illuminate\Support\Facades\Crypt::encrypt($folder) }}">
+              <span class="fa fa-folder"></span> {{$folder}}
+            </a>
+            @if ($current_folder == $folder)
+              <div class="list-group folder">
+                @foreach($folder_files as $file)
+                  <a href="?l={{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}&f={{ \Illuminate\Support\Facades\Crypt::encrypt($folder) }}"
+                    class="list-group-item @if ($current_file == $file) llv-active @endif">
+                    {{$file}}
+                  </a>
+                @endforeach
+              </div>
+            @endif
+          </div>
+        @endforeach
+        @foreach($files as $file)
+          <a href="?l={{ \Illuminate\Support\Facades\Crypt::encrypt($file) }}"
+             class="list-group-item @if ($current_file == $file) llv-active @endif">
+            {{$file}}
+          </a>
+        @endforeach
+      </div>
+    </div>
+    <div class="col-10 table-container">
+      @if ($logs === null)
+        <div>
+          Log file >50M, please download it.
+        </div>
+      @else
+        <table id="table-log" class="table table-striped" data-ordering-index="{{ $standardFormat ? 2 : 0 }}">
+          <thead>
+          <tr>
+            @if ($standardFormat)
+              <th>Level</th>
+              <th>Context</th>
+              <th>Date</th>
+            @else
+              <th>Line number</th>
+            @endif
+            <th>Content</th>
+          </tr>
+          </thead>
+          <tbody>
+
+          @foreach($logs as $key => $log)
+            <tr data-display="stack{{{$key}}}">
+              @if ($standardFormat)
+                <td class="nowrap text-{{{$log['level_class']}}}">
+                  <span class="fa fa-{{{$log['level_img']}}}" aria-hidden="true"></span>&nbsp;&nbsp;{{$log['level']}}
+                </td>
+                <td class="text">{{$log['context']}}</td>
+              @endif
+              <td class="date">{{{$log['date']}}}</td>
+              <td class="text">
+                @if ($log['stack'])
+                  <button type="button"
+                          class="float-right expand btn btn-outline-dark btn-sm mb-2 ml-2"
+                          data-display="stack{{{$key}}}">
+                    <span class="fa fa-search"></span>
+                  </button>
+                @endif
+                {{{$log['text']}}}
+                @if (isset($log['in_file']))
+                  <br/>{{{$log['in_file']}}}
+                @endif
+                @if ($log['stack'])
+                  <div class="stack" id="stack{{{$key}}}"
+                       style="display: none; white-space: pre-wrap;">{{{ trim($log['stack']) }}}
+                  </div>
+                @endif
+              </td>
+            </tr>
+          @endforeach
+
+          </tbody>
+        </table>
+      @endif
+      <div class="p-3">
+        @if($current_file)
+          <a href="?dl={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ ($current_folder) ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}">
+            <span class="fa fa-download"></span> Download file
+          </a>
+          -
+          <a id="clean-log" href="?clean={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ ($current_folder) ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}">
+            <span class="fa fa-sync"></span> Clean file
+          </a>
+          -
+          <a id="delete-log" href="?del={{ \Illuminate\Support\Facades\Crypt::encrypt($current_file) }}{{ ($current_folder) ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}">
+            <span class="fa fa-trash"></span> Delete file
+          </a>
+          @if(count($files) > 1)
+            -
+            <a id="delete-all-log" href="?delall=true{{ ($current_folder) ? '&f=' . \Illuminate\Support\Facades\Crypt::encrypt($current_folder) : '' }}">
+              <span class="fa fa-trash-alt"></span> Delete all files
+            </a>
+          @endif
+        @endif
+      </div>
+    </div>
+  </div>
+</div>
+<!-- jQuery for Bootstrap -->
+<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"
+        integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
+        crossorigin="anonymous"></script>
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
+        integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
+        crossorigin="anonymous"></script>
+<!-- FontAwesome -->
+<script defer src="https://use.fontawesome.com/releases/v5.0.6/js/all.js"></script>
+<!-- Datatables -->
+<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"></script>
+<script type="text/javascript" src="https://cdn.datatables.net/1.10.16/js/dataTables.bootstrap4.min.js"></script>
+
+<script>
+
+  // dark mode by https://github.com/coliff/dark-mode-switch
+  const darkSwitch = document.getElementById('darkSwitch');
+
+  // this is here so we can get the body dark mode before the page displays
+  // otherwise the page will be white for a second... 
+  initTheme();
+
+  window.addEventListener('load', () => {
+    if (darkSwitch) {
+      initTheme();
+      darkSwitch.addEventListener('change', () => {
+        resetTheme();
+      });
+    }
+  });
+
+  // end darkmode js
+        
+  $(document).ready(function () {
+    $('.table-container tr').on('click', function () {
+      $('#' + $(this).data('display')).toggle();
+    });
+    $('#table-log').DataTable({
+      "order": [$('#table-log').data('orderingIndex'), 'desc'],
+      "stateSave": true,
+      "stateSaveCallback": function (settings, data) {
+        window.localStorage.setItem("datatable", JSON.stringify(data));
+      },
+      "stateLoadCallback": function (settings) {
+        var data = JSON.parse(window.localStorage.getItem("datatable"));
+        if (data) data.start = 0;
+        return data;
+      }
+    });
+    $('#delete-log, #clean-log, #delete-all-log').click(function () {
+      return confirm('Are you sure?');
+    });
+  });
+</script>
+</body>
+</html>

routes/web.php

@@ -41,11 +41,16 @@ Route::get('test', function () {
     
 // });
 
-
+Route::get('logs', '\Rap2hpoutre\LaravelLogViewer\LogViewerController@index');
 
 Route::get('/welcome',function(){
 
-    return view('print.resittebus');
+    $auth_user = Auth::user();
+    $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+    $cawangan_detail=$cawangan[0];
+
+    return view('print.suratgadaihilang', compact('cawangan_detail'));
+
 });
 
 
@@ -96,6 +101,8 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira
 
 
 //MAINTENANCE
+Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->middleware('auth','teller');
+Route::get('/tebusautotawarruq',['as'=>'tebus.autotawarruq','uses'=>'PenebusanController@tebusautotawarruq'])->middleware('auth','teller');
 Route::get('/tebusseparuh',['as'=>'tebus.separuh','uses'=>'PenebusanController@tebusseparuh'])->middleware('auth','teller');
 Route::get('/tambahpinjaman',['as'=>'tambah.pinjaman','uses'=>'PenebusanController@tambahpinjaman'])->middleware('auth','teller');
 Route::get('/bayaransurans',['as'=>'bayaran.ansurans','uses'=>'PenebusanController@bayaransurans'])->middleware('auth','teller');
@@ -124,7 +131,9 @@ Route::get('/laporan/tebus',['as'=>'laporan.tebus','uses'=>'KhazanahController@l
 Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahController@cetakLaporanPenebusan'])->middleware('auth','khazanah');
 Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah');
 Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
+Route::get('/khazanah/searchpelanggan',['as'=>'khazanah.searchpelanggan','uses'=>'KhazanahController@search'])->middleware('auth','khazanah');
 Route::post('/khazanah/pendahuluanserahanHQ',['as'=>'khazanah.pendahuluanserahanHQ','uses'=>'KhazanahController@pendahuluanserahanHQ'])->middleware('auth','khazanah');
+Route::get('/penebusankhazanah/{norujukan}',['as'=>'penebusan.khazanah','uses' => 'PenebusanController@PenebusanKhazanah'])->middleware('auth','khazanah');
 
 Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
 Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);
@@ -142,7 +151,7 @@ Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahControlle
 Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah');
 Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capaian'])->middleware('auth','khazanah');
 Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah');
-Route::get('/pelangganan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
+Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
 Route::get('/unjuran',['as'=>'khazanah.unjuran','uses'=>'KhazanahController@unjuran'])->middleware('auth','khazanah');
 Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah');
 Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller');
@@ -195,6 +204,8 @@ Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'us
 Route::get('/laporan/perbelanjaan', [ 'as'=>'laporan.perbelanjaan', 'uses'=>'KhazanahController@laporan_Perbelanjaan'])->middleware('auth','khazanah');
 Route::post('/laporan/perbelanjaan/cetak', ['as'=>'perbelanjaan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan'])->middleware('auth','khazanah');
 Route::get('/laporan/perbelanjaan/cetak/{baucer}', ['as'=>'perbelanjaan.cetaklaporanbaucer', 'uses'=>'KhazanahController@cetaklaporan_Perbelanjaan_Baucer'])->middleware('auth','khazanah');
+Route::get('/laporan/tuntutbaki', [ 'as'=>'laporan.tuntutbaki', 'uses'=>'KhazanahController@laporan_tuntutbaki'])->middleware('auth','khazanah');
+Route::post('/laporan/tuntutbaki/cetak', ['as'=>'tuntutbaki.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporan_tuntutbaki'])->middleware('auth','khazanah');
 // Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 // Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');
 
@@ -211,6 +222,7 @@ Route::get('/resit/tebusseparuh/{id}',['as'=>'resit.tebusseparuh','uses'=>'Gadai
 Route::get('/resit/belumtebus/{id}',['as'=>'resit.belumtebus','uses'=>'GadaianController@resitbelumtebus'])->middleware('auth','teller');
 Route::get('/resit/tambahpinjam/{id}',['as'=>'resit.tambahpinjam','uses'=>'GadaianController@resittambahpinjam'])->middleware('auth','teller');
 Route::get('/resit/tuntutbaki/{id}',['as'=>'resit.tuntutbaki','uses'=>'LelongController@resittuntutbaki'])->middleware('auth','teller');
+Route::get('/resit/tebusautotawarruq/{id}',['as'=>'resit.autotawarruq','uses'=>'GadaianController@resitautotawarruq'])->middleware('auth','teller');
 
 
 Route::post('/barcodescanned',['as'=>'barcode.scanned','uses'=>'KhazanahController@barcodescanned'])->middleware('auth','khazanah');
@@ -231,9 +243,7 @@ Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
 Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
 Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
 
-
-
-
+Route::post('/khazanah/suratakuangadaian',['as'=>'agh.create','uses'=>'KhazanahController@SuratAkuanGadaian'])->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');