Merge branch 'new-master' of https://gitlab.com/online-sistem1/kaunter into auto-tawarruq

app/Http/Controllers/AliranTunaiController.php

@@ -1431,7 +1431,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;
@@ -1501,11 +1501,26 @@ class AliranTunaiController extends Controller
             $totalupahlama += $upahlama['upahDibayar'];
         }
 
-        $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
+        $totaltuntutbaki = 0;
-        $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama);
+        $bakilelong = 0;
-        $gadaian = floatval($totalgadai);
+        $rugilelong = 0;
+        foreach($tuntutbaki as $index1=>$tb)
+        {
+            if($tb['jenis'] == 'T')
+            {
+                $bakilelong += $tb['jumlah'];
+            }else{
+                $rugilelong += -($tb['jumlah']);
+            }
 
-        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan));
+            $totaltuntutbaki += $tb['jumlah'];
+        }
+
+        $penebusan = floatval($totaltebus) + floatval($totalansuran) + floatval($totalupahlama);
+        $penebusanbarcodescanned = floatval($totaltebusbarcodescanned) + floatval($totalansuran) + floatval($totalupahlama) + $rugilelong;
+        $gadaian = floatval($totalgadai) + $bakilelong;
+
+        $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
 
         $errorpendahuluan = false; $errorserahan = false; $errorpenebusan = false; $errorgadaian = false; $errorbaki = false;
 

app/Http/Controllers/KhazanahController.php

@@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Hash;
 use Carbon\Carbon;
 use PDF;
+use DateTime;
 
 class KhazanahController extends Controller
 {
@@ -36,25 +37,57 @@ 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();
+        
         $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'));
     }
 
     public function menu()
@@ -1177,7 +1210,6 @@ class KhazanahController extends Controller
 
         $bakiperubatan = 0;
 
-       
         switch ($request->jenismodal) {
             case "selenggara":
                 $kategori = "Baiki dan Selenggara";
@@ -1257,6 +1289,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,
@@ -1266,7 +1301,7 @@ class KhazanahController extends Controller
             'id' => $auth_user['name'],
             'bakiperubatan' => $bakiperubatan,
             'nobaucer' => $request->baucer,
-            'nobil' => "3213231",
+            'nobil' => $tarikhbil,
             'tuntutoleh' => $request->tuntutan    
             
         ])->json();
@@ -1289,9 +1324,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();
+                $get_Panjar_AM=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$PANJAR_AM])->json();
-            if(sizeof($get_Panjar_AM)==0)
+                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)
@@ -1401,28 +1436,28 @@ class KhazanahController extends Controller
                         'kelmarin'=>$kelmarin_panjar,
 
                     
-                                   ]);   
+                    ]);   
 
-                                   $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
+                    $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
-                                   $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+                    $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-                                   $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+                    $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-                                   $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+                    $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-                                   $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+                    $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-                                   $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+                    $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-                                   $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+                    $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-                               
+                
-                                   $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+                    $kredit_Tunai=$kredit_Tunai+$request->bayaran;
-                                   $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+                    $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-                                   $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+                    $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
 
-                                   $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                    $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno_Tunai,
+                    'recno'=>$recno_Tunai,
-                                    'debit'=>$debit_Tunai,
+                    'debit'=>$debit_Tunai,
-                                    'kredit'=>$kredit_Tunai,
+                    'kredit'=>$kredit_Tunai,
-                                    'hariini'=>$hariini_Tunai,
+                    'hariini'=>$hariini_Tunai,
-                                   'kelmarin'=>$kelmarin_Tunai,
+                    'kelmarin'=>$kelmarin_Tunai,
-                                  
+                    
-                                 ]);
+                    ]);
 
 
             }
@@ -1439,62 +1474,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;
+                $jumlah=0.0;
-                    $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                      if(sizeof($getGLedjer_Semalam)==0)
+                    if(sizeof($getGLedjer_Semalam)==0)
-                      {
+                    {
-                              $jumlah=0.0;
+                            $jumlah=0.0;
-                      } 
+                    } 
-                      else
+                    else
-                      {
+                    {
 
-                      $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+                    $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
-                      $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+                    $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
-                      $jumlah=$jumlah_semalam+$hariIniSemalam;
+                    $jumlah=$jumlah_semalam+$hariIniSemalam;
-                      }    
+                    }    
-                      $jumlahBulan_ini=0.0;
+                    $jumlahBulan_ini=0.0;
-                      $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                    $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                 
+                
-                       if( sizeof($get_GlejerBulan_Tahun)==0)
+                    if( sizeof($get_GlejerBulan_Tahun)==0)
-                       {
+                    {
-                           $jumlahBulan_ini=0.0;
+                        $jumlahBulan_ini=0.0;
-                       }
+                    }
-                      else
+                    else
-                      {
+                    {
-                         $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+                        $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
-                         $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+                        $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-         
+        
-                      }//end bulan tahun
+                    }//end bulan tahun
-                      $Jumlah_TahunIni=0.0;
+                    $Jumlah_TahunIni=0.0;
-                      $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
+                    $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$KERAIAN])->json();
-                      if(sizeof($get_Glejer_Tahun)==0)
+                    if(sizeof($get_Glejer_Tahun)==0)
-                      {
+                    {
-                           $Jumlah_TahunIni=0.0;
+                        $Jumlah_TahunIni=0.0;
-                      }
+                    }
-                      else
+                    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;
+                    $HariIni=0.00-$request->bayaran;
-                      $kelmarin=$jumlah-$HariIni;
+                    $kelmarin=$jumlah-$HariIni;
-                    
+                
-                      //insert glejer untuk current date /hari ini
+                    //insert glejer untuk current date /hari ini
-                   $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
+                $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
-                    'kodcaw'=>$auth_user['cawangan'],
+                'kodcaw'=>$auth_user['cawangan'],
-                    'glcode'=>$KERAIAN,
+                'glcode'=>$KERAIAN,
-                    'descpt'=>$keterangan,
+                'descpt'=>$keterangan,
-                    'debit'=>$request->bayaran,
+                'debit'=>$request->bayaran,
-                    'kredit'=>0.0,
+                'kredit'=>0.0,
-                    'hariini'=>$HariIni,
+                'hariini'=>$HariIni,
-                    'kelmarin'=>$kelmarin,
+                'kelmarin'=>$kelmarin,
-                    'jumlah'=>$jumlah,
+                'jumlah'=>$jumlah,
-                    'bulanini'=>$jumlahBulan_ini,
+                'bulanini'=>$jumlahBulan_ini,
-                    'tahunini'=>$Jumlah_TahunIni,
+                'tahunini'=>$Jumlah_TahunIni,
-                    'acttype'=> $actype
+                'acttype'=> $actype
 
                 ]);
 
@@ -1519,54 +1554,50 @@ class KhazanahController extends Controller
                
               ]);
 
-
-
             }
             else
             {
 
-                    $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+                $hariini_panjar= $get_Panjar_AM[0]['hariini'];
-                    $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+                $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
-                    $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+                $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
-                    $debit_panjar= $get_Panjar_AM[0]['debit'];
+                $debit_panjar= $get_Panjar_AM[0]['debit'];
-                    $recno_panjar= $get_Panjar_AM[0]['recno'];
+                $recno_panjar= $get_Panjar_AM[0]['recno'];
-                    $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
+                $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
 
 
-                    $debit_panjar=$debit_panjar+$request->bayaran;
+                $debit_panjar=$debit_panjar+$request->bayaran;
-                    $harini_panjar=$debit_panjar-$kredit_panjar;
+                $harini_panjar=$debit_panjar-$kredit_panjar;
-                    $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+                $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
 
-                      $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                    $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                        'recno'=>$recno_panjar,
+                    'recno'=>$recno_panjar,
-                        'debit'=>$debit_panjar,
+                    'debit'=>$debit_panjar,
-                        'kredit'=>$kredit_panjar,
+                    'kredit'=>$kredit_panjar,
-                        'hariini'=>$hariini_panjar,
+                    'hariini'=>$hariini_panjar,
-                        'kelmarin'=>$kelmarin_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();   
+                $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                   $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+                'recno'=>$recno_Tunai,
-                                   $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+                'debit'=>$debit_Tunai,
-                                   $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+                'kredit'=>$kredit_Tunai,
-                                   $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+                'hariini'=>$hariini_Tunai,
-                                   $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+                'kelmarin'=>$kelmarin_Tunai,
-                                   $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,
-                                  
-                                 ]);
 
 
             }
@@ -1580,51 +1611,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;
+            $jumlah=0.0;
-                $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+            $getGLedjer_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-                  if(sizeof($getGLedjer_Semalam)==0)
+                if(sizeof($getGLedjer_Semalam)==0)
-                  {
+                {
-                          $jumlah=0.0;
+                        $jumlah=0.0;
-                  } 
+                } 
-                  else
+                else
-                  {
+                {
 
-                  $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
+                $jumlah_semalam=$getGLedjer_Semalam[0]['jumlah'];
-                  $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
+                $hariIniSemalam=$getGLedjer_Semalam[0]['hariini'];
-                  $jumlah=$jumlah_semalam+$hariIniSemalam;
+                $jumlah=$jumlah_semalam+$hariIniSemalam;
-                  }    
+                }    
-                  $jumlahBulan_ini=0.0;
+                $jumlahBulan_ini=0.0;
-                  $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+                $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-             
+            
-                   if( sizeof($get_GlejerBulan_Tahun)==0)
+                if( sizeof($get_GlejerBulan_Tahun)==0)
-                   {
+                {
-                       $jumlahBulan_ini=0.0;
+                    $jumlahBulan_ini=0.0;
-                   }
+                }
-                  else
+                else
-                  {
+                {
-                     $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
+                    $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
-                     $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
+                    $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-     
+    
-                  }//end bulan tahun
+                }//end bulan tahun
-                  $Jumlah_TahunIni=0.0;
+                $Jumlah_TahunIni=0.0;
-                  $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
+                $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$SELENGGARA])->json();
-                  if(sizeof($get_Glejer_Tahun)==0)
+                if(sizeof($get_Glejer_Tahun)==0)
-                  {
+                {
-                       $Jumlah_TahunIni=0.0;
+                    $Jumlah_TahunIni=0.0;
-                  }
+                }
-                  else
+                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;
+                $HariIni=0.0-$request->bayaran;
-                  $kelmarin=$jumlah-$HariIni;
+                $kelmarin=$jumlah-$HariIni;
                 
                   //insert glejer untuk current date /hari ini
                $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
@@ -1672,45 +1704,45 @@ class KhazanahController extends Controller
         else
         {
 
-                            $hariini_panjar= $get_Panjar_AM[0]['hariini'];
+            $hariini_panjar= $get_Panjar_AM[0]['hariini'];
-                            $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
+            $kelmarin_panjar= $get_Panjar_AM[0]['kelmarin'];
-                            $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
+            $jumlah_panjar= $get_Panjar_AM[0]['jumlah'];
-                            $debit_panjar= $get_Panjar_AM[0]['debit'];
+            $debit_panjar= $get_Panjar_AM[0]['debit'];
-                            $recno_panjar= $get_Panjar_AM[0]['recno'];
+            $recno_panjar= $get_Panjar_AM[0]['recno'];
-                            $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
+            $kredit_panjar= $get_Panjar_AM[0]['kredit']; 
-                              $debit_panjar=$debit_panjar+$request->bayaran;
+                $debit_panjar=$debit_panjar+$request->bayaran;
-                              $harini_panjar=$debit_panjar-$kredit_panjar;
+                $harini_panjar=$debit_panjar-$kredit_panjar;
-                              $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
+                $kelmarin_panjar=$jumlah_panjar-$harini_panjar;
-                              $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                $update_PanjarAM=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                            'recno'=>$recno_panjar,
+            'recno'=>$recno_panjar,
-                            'debit'=>$debit_panjar,
+            'debit'=>$debit_panjar,
-                            'kredit'=>$kredit_panjar,
+            'kredit'=>$kredit_panjar,
-                            'hariini'=>$hariini_panjar,
+            'hariini'=>$hariini_panjar,
-                            'kelmarin'=>$kelmarin_panjar,
+            'kelmarin'=>$kelmarin_panjar,
 
-                        
+        
-                               ]);   
+                ]);   
 
-                               $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
+            $LejerTunaiDitangan=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();   
-                               $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
+            $hariini_Tunai=$LejerTunaiDitangan[0]['hariini'];
-                               $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
+            $kelmarin_Tunai=$LejerTunaiDitangan[0]['kelmarin'];
-                               $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
+            $jumlah_Tunai=$LejerTunaiDitangan[0]['jumlah'];
-                               $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
+            $debit_Tunai=$LejerTunaiDitangan[0]['debit'];
-                               $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
+            $recno_Tunai=$LejerTunaiDitangan[0]['recno'];
-                               $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
+            $kredit_Tunai=$LejerTunaiDitangan[0]['kredit'];
-                           
+        
-                               $kredit_Tunai=$kredit_Tunai+$request->bayaran;
+            $kredit_Tunai=$kredit_Tunai+$request->bayaran;
-                               $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
+            $hariini_Tunai=$debit_Tunai-$kredit_Tunai;
-                               $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
+            $kelmarin_Tunai=$jumlah_Tunai-$hariini_Tunai;
 
-                               $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
+            $update_TunaiDiTangan=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user->kodcaw,[
-                                'recno'=>$recno_Tunai,
+            'recno'=>$recno_Tunai,
-                                'debit'=>$debit_Tunai,
+            'debit'=>$debit_Tunai,
-                                'kredit'=>$kredit_Tunai,
+            'kredit'=>$kredit_Tunai,
-                                'hariini'=>$hariini_Tunai,
+            'hariini'=>$hariini_Tunai,
-                               'kelmarin'=>$kelmarin_Tunai,
+            'kelmarin'=>$kelmarin_Tunai,
-                              
+            
-                             ]);
+            ]);
         }
            }//end perbelanjaan Selanggara
 
@@ -1730,7 +1762,7 @@ class KhazanahController extends Controller
         {
             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);
@@ -2838,7 +2870,7 @@ class KhazanahController extends Controller
     }
 
     public function cetakLaporanRingkasanHarian(Request $request){
-        // dd($request);
+    
         $api_url = config('api.url');
         $auth_user = Auth::user();
         $current = Carbon::now();
@@ -2904,11 +2936,11 @@ 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;
         $totalpinjkawalanstok = $totalpinjgadai-$totalpinjtebus-$totalpinjans-$totalpinjlelong-$totalpinjhapuskira;
@@ -3427,6 +3459,7 @@ class KhazanahController extends Controller
         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]);

app/Http/Controllers/LelongController.php

@@ -91,8 +91,15 @@ class LelongController extends Controller
 
         $bakiakhir = $baki;
     
-        $bakiakhir -= $request->jumlah;
+        if($request->jenis == 'T'){
-
+            $bakiakhir -= $request->jumlah;
+            $keluar += $request->jumlah;
+        }
+        else
+        {
+            $bakiakhir += -($request->jumlah);
+            $masuk += -($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');
@@ -884,4 +914,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'));
+    }
+
 }

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/customers/info.blade.php

@@ -522,7 +522,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 +545,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 selected value="01">Islam</option>
-                                                    <option value="islam">Islam</option>
+                                                    <option value="02">Hindu</option>
-                                                    <option value="hindu">Hindu</option>
+                                                    <option value="03">Buddha</option>
-                                                    <option value="buddha">Buddha</option>
+                                                    <option value="04">Kristian</option>
-                                                    <option value="kristian">Kristian</option>
+                                                    <option value="05">Lain-lain</option>
-                                                    <option value="lain">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">
+                                            <div class="col-md-4">Alamat</div>
-                                                <img src="" id="preview" style="width:250px;height:250px" class="img-thumbnail">
+                                            <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>
+                                            <div class="col-md-4">Poskod</div>
-                                            <div class="col-md-12">
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off" placeholder="Poskod"></div>
-                                                <input type="file" name="customer_image" id="customer_image" accept="image/*">
+                                            <div class="col-md-4">Daerah</div>
-                                                <!-- <input type="file" name="customer_image" id="customer_image" class="file" accept="image/*">
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
-                                                <div class="input-group my-3">
+                                            <div class="col-md-4">Negeri</div>
-                                                    <input type="text" class="form-control" readonly placeholder="Upload File" id="file" name="file">
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
-                                                    <div class="input-group-append">
-                                                        <button type="button" class="browse btn btn-primary">Browse...</button>
-                                                    </div>
-                                                </div> -->
-                                            </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 selected value="M">Melayu</option>
-                                                    <option 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-4">No Akaun</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="no_akaun" id="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/panjar.blade.php

@@ -134,7 +134,7 @@
                 Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
-                    text: 'Tambah Marhun Tidak Berjaya'
+                    text: 'Panjar Tak Berjaya'
                 });
                 console.log(xhRequest);
             }
@@ -196,7 +196,7 @@
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran!',
-                        text: 'Tambah Marhun Tidak Berjaya'
+                        text: 'Panjar Tidak Berjaya'
                     });
                     console.log(xhRequest);
                 }
@@ -208,52 +208,81 @@
 
     function checkformpanjar(formdata)
     {
+       
+        // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
 
-        // let dapur = $('#DapurModal').hasClass('in'); //-- check dapur only for tuntutan;
+        let baucer = $(formdata).find("[name='baucer']").val();
-
+        let tarikh = $(formdata).find("[name='tarikh']").val();
-        // //Variable Initialize
-        // 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 tarikhbil = $(formdata).find("[name='bil']").val();
-        // let deskripsi = $(formdata).find("[name='deskripsi']").val();
+        let deskripsi = $(formdata).find("[name='deskripsi']").val();
-        // let bayaran = $(formdata).find("[name='bayaran']").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)
+        let booltarikh = false;let booltuntutan = false; let booltarikhbil = false; let booldeskripsi = false; let boolbayaran = false;
-        // {
-        //     console.log('tarikh xleh');
-        // }
 
-        // if(!tarikhbil)
+        if(!tarikh)
-        // {
+        {
-        //     console.log('tarikh xde');
+            $(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)
+            booltarikh = true;
-        // {  
+        }
-        //     if(!tuntutan)
-        //         console.log('tututan xde');
-        // }
 
-        // if(deskripsi === '' || deskripsi === null)
+        if(!tarikhbil)
-        // {
+        {
-        //     console.log('deskripsi xde');
+            $(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 = 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 = 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 = 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(bayaran === null || bayaran === '')
-        // {
-        //     console.log('bayaran xde');
-        // }
         
-        // return false;
+        if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
+        {
+            event.preventDefault();
+            return;
+        }else{
+            return true;
+        }
+
+            event.preventDefault();
+            return;
+
+     
     }
 
     function openupdeno()
@@ -314,6 +343,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 +374,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 +404,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 +434,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 +465,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');
+                boolamaun = true;
-            $('#pendahuluanserahanModal').modal('hide');
+            }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/layouts/app_operasi.blade.php

@@ -131,9 +131,23 @@
                                 $('#linkz').text(data.namateller + " Pohon Kelulusan");
                                 $("#linkz").attr("href", "{{ url('kelulusan') }}");
 
-                                audio.play();
+                                if(window.location.pathname === '/operasi/kelulusan')
-                                audio.muted = false;
+                                {
-
+                                    location.reload();
+                                }else{
+                                    console.log('luar kelulusan');
+                                    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!",
@@ -246,9 +248,9 @@
                     }
 
                     
-                    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 +275,6 @@
                         var channel = pusher.subscribe('notice-ubahhapus');
                         channel.bind('my-ubahhapus', function(data) {
 
-                            console.log(data);
-
 
                             if(data.norujukan == norujukan)
                             {

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">
+                  <div class="col-8 mb-4 flex-wrap">
-                    <input type="text" name="baucer" class="form-control-plaintext mb-4 baucer" readonly/>
+                    <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"> 
+                  <div class="col-8 mb-4 flex-wrap"> 
-                    <input type="date" class="form-control mb-4" name="tarikh" required/>
+                    <input type="date" class="form-control" name="tarikh" required/>
-                    <div class="invalid-feedback mb-4">
+                    <span name="errortarikh" style="color:red;"></span>
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
                   </div>
                   <div class="col-4">
                     <label>Tuntutan Oleh: </label> 
                   </div>
-                  <div class="col-8">
+                  <div class="col-8 mb-4">
-                    <select name="tuntutan" class="form-control mb-4" required>
+                    <select name="tuntutan" class="form-control" required>
                       @foreach($usercawangan as $user)
                       <option value="{{ $user->name }}">{{ $user->name }}</option>
                       @endforeach
                     </select>
-                    <div class="invalid-feedback">
+                    <span name="errortuntutan" style="color:red;"></span>
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
-                    {{-- <input type="text" class="form-control mb-4" name="tuntutan"/> --}}
                   </div>
                   <div class="col-4">
                     <label>Tarikh Bil: </label> 
                   </div>
-                  <div class="col-8">
+                  <div class="col-8 mb-4 flex-wrap">
-                    <input type="date" class="form-control was-validated mb-4" name="tarikhbil" required/>
+                    <input type="date" class="form-control" name="tarikhbil" required/>
-                    <div class="invalid-feedback">
+                    <span name="errorbil" style="color:red;"></span>
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
                   </div>
                   <div class="col-4">
                     <label>Deskripsi:</label>
                   </div>
-                  <div class="col-8">
+                  <div class="col-8 mb-4">
-                    <textarea row="3" name="deskripsi" class="form-control mb-4" minlength='6' maxlength='25' required> </textarea>
+                    <textarea row="3" name="deskripsi" class="form-control" minlength='6' maxlength='25' required> </textarea>
-                    <div class="invalid-feedback">
+                    <span name="errordeskripsi" style="color:red;"></span>
-                      tarikh haruslah dimasukkan ke dalam ni!
-                  </div>
                   </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">
+                      <span name="errorbayaran" style="color:red;"></span>
-                        tarikh haruslah dimasukkan ke dalam ni!
-                    </div>
                     </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">
+                    <div class="col-8 mb-4">
-                    <input type="date" name="tarikh" class="form-control 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">
+                    <div class="col-8 mb-4">
-                    <select name="tuntutan" class="form-control 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">
+                  <div class="col-8 mb-4">
-                    <input type="date" name="tarikhbil" class="form-control 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">
-                    <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>
@@ -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">
+                <div class="col-8 mb-4">
-                  <input type="date" name="tarikh" class="form-control 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">
+                <div class="col-8 mb-4">
-                  <select name="tuntutan" class="form-control 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">
+                <div class="col-8 mb-4">
-                  <input type="date" name="tarikhbil" class="form-control 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">
-                  <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>
@@ -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">
+                <div class="col-8 mb-4">
-                  <input type="date" name="tarikh" class="form-control 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">
+                <div class="col-8 mb-4">
-                  <select name="tuntutan" class="form-control 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">
+                <div class="col-8 mb-4">
-                  <input type="date" name="tarikhbil" class="form-control 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">
-                  <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>
@@ -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">
+                  <div class="col-8 mb-4">
-                    <input type="date" name="tarikh" class="form-control 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">
+                  <div class="col-8 mb-4">
-                    <select name="tuntutan" class="form-control 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">
+                  <div class="col-8 mb-4">
-                    <input type="date" name="tarikhbil" class="form-control 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">
-                    <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>
@@ -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">
+                  <div class="col-8 mb-4">
-                    <input type="date" name="tarikh" class="form-control 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">
+                  <div class="col-8 mb-4">
-                    <input type="date" name="tarikhbil" class="form-control 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>

resources/views/modal/pendahuluanserahan.blade.php

@@ -13,6 +13,7 @@
           <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 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

@@ -1002,10 +1002,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,
@@ -1025,7 +1027,7 @@
                 success:function(success_data){
 
                 
-                    if(success_data == 1)
+                    if(success_data == 'success')
                     {  
                         $.ajax({
                             method: 'put',
@@ -1056,7 +1058,7 @@
                         Swal.fire({
                             icon: 'error',
                             title: 'Amaran!',
-                            text: 'norujukan Sudah Ditebus Di Dalam Table Gadai!',
+                            text: 'norujukan Sudah ditebus di dalam table gadai!',
                         });
                     }
                 }

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_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>{{ number_format($item['berat'],2) }}</td>
-                <td style="border-right:1px solid black;">{{ $item['n_marhun'] }}</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  
+          @php  
-        $totalberat += floatval($item['berat']);
+          $totalberat += floatval($item['berat']);
-        $totalnm += floatval($item['n_marhun']); 
+          $totalnm += floatval($item['n_marhun']); 
-        @endphp
+          @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-top:1px solid black;">{{ number_format($item['berat'],2) }}</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>
@@ -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>
-      <td>{{$item['jbg']}}</td>
+        @php 
-      <td>{{$item['pinjaman']}}</td>
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
-      <td>{{$item['bakiupah']}}</td>
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
-      <td>{{$item['bakipjm']}}</td>
+          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>
 
 

routes/web.php

@@ -96,6 +96,7 @@ Route::get('/kemaskinialirantunai',['as'=>'kemaskini.alirantunai','uses'=>'Alira
 
 
 //MAINTENANCE
+Route::get('/tebuspenuh',['as'=>'tebus.penuh','uses'=>'PenebusanController@tebuspenuh'])->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 +125,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 +145,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');