Merge branch 'pipiv2' into 'new-master'

Pipiv2

See merge request online-sistem1/kaunter!141

app/Http/Controllers/KhazanahController.php

@@ -193,6 +193,53 @@ class KhazanahController extends Controller
         return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
     }
 
+    public function changedatedashboard(Request $request)
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        //Hari Ini
+        $ringkasanharian = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
+        $ringkasanharian = $ringkasanharian[0];
+
+        $keseluruhanupahharian = $ringkasanharian['lelongupahsimpan'] + $ringkasanharian['tebus'][0]['upahsimpan'] + $ringkasanharian['advansur'][0]['upahsimpan'];
+
+        //Upah Terkumpul
+        $upahsimpan = Http::get(config('api.url'). '/api/KeuntunganSebenar/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
+        $keuntungan = Http::get(config('api.url'). '/api/UntungRugiCalculation/'. $auth_user['cawangan'],['tarikh' => $request->tarikh])->json();
+
+        //Peti Besi Cawangan
+        $getVault=Http::get( config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
+
+        if(sizeof($getVault) == 0)
+        {
+            $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
+            $getVault = $peti_besi_terkini['bakiakhir'];
+
+        }else{
+            $getVault = $getVault[0]['bakiakhir'];
+        }
+
+        //Check Komuditi
+        $komuditicheck = Http::get( config('api.url').'/api/komuditi/checkdate',['tarikh' => $request->tarikh])->json();
+
+        //Dashboardall
+        $dashboard=Http::get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json();
+
+        //Marhun Terkumpul
+        $marhun = Http::get(config('api.url'). '/api/marhunterkumpul/laporan/'. $auth_user['cawangan'] .'/'. $request->tarikh)->json();
+
+        $totalmarhun = 0;
+
+        foreach($marhun as $index=>$m)
+        {
+            $totalmarhun += $m['n_marhun']; 
+        }
+
+        dd($totalmarhun,$dashboard);
+        //return view('khazanah.dashboard',compact('komuditicheck','cawangan_info','api_url','dashboard','totalmarhun','ringkasanharian','getVault','keseluruhanupahharian','upahsimpan','keuntungan'));
+    }
+
     public function alirantunai()
     {
         $auth_user = Auth::user();
@@ -2770,16 +2817,16 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+        if($request->datetarikh == null){
             $gadai_date = $current->toDateString();
         }else{
-            $split_date = explode('-',$request->datetimepicker1);
+            $split_date = explode('-',$request->datetarikh);
             $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
-        // dd($gadai);
+     
         return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
     }
 
@@ -2791,26 +2838,27 @@ class KhazanahController extends Controller
     }
 
     public function cetakLaporanPenebusan(Request $request){
-        // dd($request);
+          // dd($request);
-        $api_url = config('api.url');
+          $api_url = config('api.url');
-        $auth_user = Auth::user();
+          $auth_user = Auth::user();
-        $current = Carbon::now();
+          $current = Carbon::now();
-        $current = new Carbon();
+          $current = new Carbon();
-        $tarikh_cetak = $current->toDateString();
+          $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+          if($request->datetarikh == null){
-            $tebus_date = $current->toDateString();
+              $tebus_date = $current->toDateString();
-        }else{
+          }else{
-            $split_date = explode('-',$request->datetimepicker1);
+              $split_date = explode('-',$request->datetarikh);
-            $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+              $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
-        }
+          }
-        $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
+          $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
-        $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+          $tebuspengasingan = Http::get(config('api.url'). '/api/tebus/laporanjenistawarruq/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
-        $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+          $upahlama = Http::get(config('api.url'). '/api/advansurdetails/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+  
+          $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+          $cawangan_detail=$cawangan[0];
+          // dd($gadai);
+          return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
   
-        $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-        $cawangan_detail=$cawangan[0];
-        // dd($gadai);
-        return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
     }
 
     public function laporanLelongan(){
@@ -3192,6 +3240,15 @@ class KhazanahController extends Controller
         return view('khazanah.laporan.ringkasanharian',compact('cawangan_info','api_url'));
     }
 
+    public function laporanRingkasanTerkumpul(){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+       
+        return view('khazanah.laporan.ringkasanterkumpul',compact('cawangan_info','api_url'));
+    }
+
     public function cetakLaporanRingkasanHarian(Request $request){
     
         $api_url = config('api.url');
@@ -3271,6 +3328,30 @@ class KhazanahController extends Controller
         return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','ringkasan_date','api_url','laporan','totalbilkawalanstok','totalpinjkawalanstok'));
     }
 
+    // public function cetakLaporanRingkasanTerkumpul(Request $request){
+    //     // dd($request);
+    //     $api_url = config('api.url');
+    //     $auth_user = Auth::user();
+    //     $current = Carbon::now();
+    //     $current = new Carbon();
+    //     $tarikh_cetak = $current->toDateString();
+    //     if($request->datetimepicker1 == null){
+    //         $tebus_date = $current->toDateString();
+    //     }else{
+    //         $split_date = explode('-',$request->datetimepicker1);
+    //         $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+    //     }
+    //     $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
+    //     $marhun = $marhun[0];
+
+    //     $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
+
+    //     $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+    //     $cawangan_detail=$cawangan[0];
+    //     // dd($gadai);
+    //     return view('print.laporan_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+    // }
+
     public function cetakLaporanRingkasanTerkumpul(Request $request){
         // dd($request);
         $api_url = config('api.url');
@@ -3278,21 +3359,33 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
-            $tebus_date = $current->toDateString();
-        }else{
-            $split_date = explode('-',$request->datetimepicker1);
-            $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
-        }
-        $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasan/'. $auth_user['cawangan'],['tarikh' => $tebus_date])->json();
-        $marhun = $marhun[0];
 
-        $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan'];
+        if($request->datemula == null){
+            $mula_date = '2017-01-01';
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        if($request->datehingga == null){
+            $hingga_date = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/terkumpul',[
+            'kodcaw' => $auth_user['cawangan'],
+            'mula' => $mula_date,
+            'akhir' => $hingga_date
+        ])->json();
+
+        $laporan_ringkasan = $laporan_ringkasan[0];
 
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
-        // dd($gadai);
+        
-        return view('print.laporan_ringkasanterkumpul', compact('keseluruhanupahsimpan','marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url'));
+        return view('print.laporan_ringkasanterkumpulv2', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
     }
 
     public function laporanKawalanStok(){
@@ -4067,7 +4160,7 @@ class KhazanahController extends Controller
             $upahsimpanxtra = $xtra['upahsimpan'];
             $bakilelongxtra = $xtra['bakilelong'];
             $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
-	    $rugilelongxtra = -($xtra['kerugianlelong']);
+	        $rugilelongxtra = -($xtra['kerugianlelong']);
         }
 
         //Terkumpul
@@ -4191,134 +4284,7 @@ class KhazanahController extends Controller
 
             //KIRAAN UNTUK LEJER_AM  BAYARAN ONLINE & TRANSAKSI BAYARAN UPAH
 
-            $getProduct=Http::get(config('api.url').'/api/getProduct/'.$auth_user['cawangan'])->json();
-            $glcode=$getProduct[0]['glcode'];
-            $kodGL=$getProduct[0]['kodgl'];
-            $glcode_UP=$getProduct[0]['glcode_up'];
               
-            $get_GLCode=Http::get(config('api.url').'/api/getGlCode/'.$auth_user['cawangan'],['glcode'=>$kodGL])->json();
-
-            $keterangan=$get_GLCode[0]['descpt'];
-            $acctype=$get_GLCode[0]['acttype'];
-
-            $total_bayaranOnline=0.0;
-
-
-            // $getTotalBayaranOnline=Http::get(config('api.url').'/api/ansuranByrOnline/'.$auth_user['cawangan'])->json();
-            // if(sizeof($getTotalBayaranOnline)!=0)
-            // {
-
-            // $total_bayaranOnline=$getTotalBayaranOnline[0]['cash_in'];
-
-            // }
-            // else
-            // {
-
-            // }
-
-            //START UNTUK GLEJER
-
-            //carian_GLejer untuk Bayaran Online  (Update Bayaran)
-            $getBayarOnline_GL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json();    
-            $keteranganBayaranOnlie=$getBayarOnline_GL[0]['descpt'];  //keterangan glcode
-            $actypeBayaranOnline=$getBayarOnline_GL[0]['acttype'];     //keterangan acctype 
-
-            $get_current_GLejer_Details_BayaranOnline=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json(); 
-            if(sizeof($get_current_GLejer_Details_BayaranOnline)==0)
-            {  //start kalau xdak data
-            $jumlah=0.0;
-
-            $getGLedjer=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json();
-
-            if(sizeof($getGLedjer)==0)
-            {
-                $jumlah=0.0;
-            }
-            else
-            {
-
-                //$glejer=$getGLedjer[0];
-                $jumlahSemalam=$getGLedjer[0]['jumlah'];
-
-                $hariIniSemalam=$getGLedjer[0]['hariini'];
-                $jumlah=$jumlahSemalam+$hariIniSemalam;
-
-
-            }
-
-
-
-            $jumlahBulan_ini=0.0;
-            $get_GlejerBulan_Tahun=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json();
-
-            if( sizeof($get_GlejerBulan_Tahun)==0)
-            {
-                $jumlahBulan_ini=0.0;
-            }
-            else
-            {
-                $jumlahBulan_ini=$get_GlejerBulan_Tahun[0]['jumlah'];
-                $jumlahBulan_ini=$jumlah-$jumlahBulan_ini;
-            }//end bulan tahun
-            $Jumlah_TahunIni=0.0;
-            $get_Glejer_Tahun=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$GL_Code_BayaranOnline])->json();
-            if(sizeof($get_Glejer_Tahun)==0)
-            {
-                $Jumlah_TahunIni=0.0;
-            }
-            else
-            {
-
-
-                $JumTahunIni=$get_Glejer_Tahun[0]['jumlah'];        
-                $Jumlah_TahunIni=$jumlah-$JumTahunIni;
-
-            }
-
-            $HariIni=0.0;
-            $kelmarin=$jumlah-$HariIni;
-            //insert glejer untuk current date /hari ini
-            $daftarGlejer=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
-
-                'kodcaw' =>$auth_user['cawangan'],
-                'glcode' =>$GL_Code_BayaranOnline,
-                'descpt' =>$keteranganBayaranOnlie,
-                'debit'=>0.0,
-                'kredit'=>0.0,
-                'hariini'=>$HariIni,
-                'kelmarin'=>$kelmarin,
-                'jumlah'=>$jumlah,
-                'bulanini'=>$jumlahBulan_ini,
-                'tahunini'=>$Jumlah_TahunIni,
-                'acttype'=> $actypeBayaranOnline
-
-            ]);
-
-            }
-            else
-            {
-
-                $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$glcode])->json();
-                
-                if(sizeof($get_lejer)>0)
-                {
-                    $hariIni=$get_lejer[0]['hariini'];
-                    $jumlah=$get_lejer[0]['kelmarin'];
-                    $kredit=$get_lejer[0]['kredit'];
-                    $debit=$get_lejer[0]['debit'];
-                    $recno=$get_lejer[0]['recno'];
-                    $kredit=$kredit+ $total_bayaranOnline;
-                    $Hari_Ini=$debit-$kredit;
-                    $Kelmarin=$jumlah-$Hari_Ini;       
-                    $updateGlejer=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                    'recno'=>$recno,
-                    'debit'=>$debit,
-                    'kredit'=>$kredit,
-                    'hariini'=>$Hari_Ini,
-                    'kelmarin'=>$Kelmarin,
-                    ]);
-
-                }
 
                 $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
                 $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
@@ -4326,7 +4292,7 @@ class KhazanahController extends Controller
                 $debit=Http::get(config('api.url').'/api/glejer/sumDebit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
                 $kredit=Http::get(config('api.url').'/api/glejer/sumKredit/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
                 $data=Http::get(config('api.url').'/api/glejer/getdata/'.$tarikh_mula.'/'.$tarikh_akhir.'/'.$auth_user['cawangan'])->json();
-            }
+        
 
             //return view('print.laporan_imbanduga',compact('tarikh_imbangan','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'));
             return view( 'print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','data','debit','kredit'));
@@ -4518,4 +4484,56 @@ class KhazanahController extends Controller
         return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
     }
 
+    public function PemilihanAnsUpah()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        
+
+        return view('khazanah.laporan.ansuranupah', compact('cawangan_info','api_url'));
+    }
+
+    public function LaporanUpah()
+    {
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+
+        $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
+        
+
+        return view('khazanah.laporan.upah', compact('cawangan_info','api_url'));
+    }
+
+    public function cetaklaporan_Upah(Request $request)
+    {
+        $api_url = config('api.url');
+        $auth_user = Auth::user();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $tarikh_cetak = $current->toDateString();
+
+        if($request->datemula == null){
+            $mula_date = '2017-01-01';
+        }else{
+            $split_date = explode('-', $request->datemula);
+            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        if($request->datehingga == null){
+            $hingga_date = $current->toDateString();
+        }else{
+            $split_date = explode('-', $request->datehingga);
+            $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+        }
+
+        $advansur = Http::get(config('api.url'). '/api/AnsuranByRangeTarikh/' . $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
+
+        $cawangan = Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
+        $cawangan_detail=$cawangan[0];
+
+        return view('print.laporan_upah', compact('advansur','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+    }
+
 }

app/Http/Controllers/LelongController.php

@@ -60,6 +60,61 @@ class LelongController extends Controller
 
     }
 
+    // public function transaksituntutbaki(Request $request){
+
+    //     $auth_user = Auth::user();
+
+    //     $tuntutbaki = Http::post(config('api.url') . '/api/Tuntutbakisimpan/' . $auth_user['cawangan'], [
+    //         'batchno' => $request->batchno,
+    //         'jenis' => $request->jenis,
+    //         'norujukan' => $request->norujukan,
+    //         'teller' => $request->teller,
+    //         'bakipjm' => $request->bakipjm,
+    //         'bakiupah' => $request->bakiupah,
+    //         'cajlain' => $request->cajlain,
+    //         'cajlelong' => $request->cajlelong,
+    //         'jumlah' => $request->jumlah,
+    //         'nowakil' => $request->nowakil,
+    //         'hargajual' => $request->hargajual
+    //     ])->json();
+
+    //     $updatetuntutbaki = Http::put( config('api.url').'/api/tuntutbakiupdate/' . $auth_user['cawangan'] . '/' . $request->norujukan);
+
+    //     $getTunai2=Http::get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $request->teller])->json();
+
+    //     $keluar = $getTunai2['keluar'];
+    //     $baki = $getTunai2['baki'];
+    //     $masuk = $getTunai2['masuk'];
+    //     $bakiawal = $getTunai2['bakiawal'];
+    //     $pendahuluan = $getTunai2['tambah'];
+    //     $serahan = $getTunai2['kurang'];
+
+    //     $bakiakhir = $baki;
+    
+    //     if($request->jenis == 'T'){
+    //         $bakiakhir -= $request->jumlah;
+    //     }
+    //     else
+    //     {
+    //         $bakiakhir += -($request->jumlah);
+    //     }
+
+    //     //masuk dalam tunai aliran
+    //     $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+    //         'kodlaluan' => $request->teller,
+    //         'keluar' => $keluar,
+    //         'masuk' => $masuk,
+    //         'bakiakhir' => $bakiakhir
+    //     ]);
+
+    //     if($updatetuntutbaki)
+    //     {
+    //         return response('Berjaya');
+    //     }else{
+    //         return response('Gagal');
+    //     }
+    // }
+
     public function transaksituntutbaki(Request $request){
 
         $auth_user = Auth::user();
@@ -90,15 +145,280 @@ class LelongController extends Controller
         $serahan = $getTunai2['kurang'];
 
         $bakiakhir = $baki;
+        $jumlah_byr=$request->jumlah;
     
-        if($request->jenis == 'T'){
+        if($request->jenis == 'T')
+        {
             $bakiakhir -= $request->jumlah;
+
+
+
+            $KOD_TUNAI='1000/010';
+            $BAKI_LELONG='7000/090';
+
+            $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json();
+            $hariIni_Tunai=$get_lejerTunai[0]['hariini'];
+            $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin'];
+            $jumlah_Tunai=$get_lejerTunai[0]['jumlah'];
+            $kredit_Tunai=$get_lejerTunai[0]['kredit'];
+            $debit_Tunai=$get_lejerTunai[0]['debit'];
+            $recno_Tunai=$get_lejerTunai[0]['recno'];  
+
+
+            $kredit_Tunai=$kredit_Tunai+$jumlah_byr;
+            $hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
+            $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
+            $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                'recno'=>$recno_Tunai,
+                'debit'=>$debit_Tunai,
+                'kredit'=>$kredit_Tunai,
+                'hariini'=>$hariIni_Tunai,
+                'kelmarin' =>$kelmarin_Tunai,
+            
+                ]);
+
+
+                $get_KOD_BL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
+              
+                $gl_cdetails_bl= $get_KOD_BL[0];
+                $keterangan_bl= $get_KOD_BL[0]['descpt'];  //keterangan glcode
+                $actype_bl= $get_KOD_BL[0]['acttype'];   
+
+
+                $get_current_GLejer_Baki_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
+
+                if(sizeof($get_current_GLejer_Baki_Lelong)==0)
+                {
+                    $jumlah_bl=0.0;
+               
+                    $getGLedjer_bl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
+                    if(sizeof($getGLedjer_bl_Semalam)==0)
+                    {
+                       $jumlah_bl=0.0;
+                    }
+                    else
+                    {
+    
+                        $jumlahSemalam_bl=$getGLedjer_bl_Semalam[0]['jumlah'];
+                  
+                        $hariIniSemalam_bl=$getGLedjer_bl_Semalam[0]['hariini'];
+                        $jumlah_bl=$jumlahSemalam_bl+$hariIniSemalam_bl;
+    
+                    }
+                    $jumlahBulan_ini_bl=0.0;
+                    $get_GlejerBulan_Tahun_bl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
+                     if( sizeof($get_GlejerBulan_Tahun_bl)==0)
+                     {
+                     $jumlahBulan_ini_bl=0.0;
+                     }
+                    else
+                    {
+
+                    $jumlahBulan_ini_bl=$get_GlejerBulan_Tahun_bl[0]['jumlah'];
+                    $jumlahBulan_ini_bl=$jumlah_bl-$jumlahBulan_ini_bl;
+
+                     }
+
+
+                     $Jumlah_TahunIni_bl=0.0;
+                     $get_Glejer_Tahun_bl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$BAKI_LELONG])->json();
+
+                     if(sizeof($get_Glejer_Tahun_bl)==0)
+                     {
+                          $Jumlah_TahunIni_bl=0.0;
+                     }
+                    else
+                    {
+                        $JumTahunIni_bl=$get_Glejer_Tahun_bl[0]['jumlah'];
+                        $Jumlah_TahunIni_bl=$jumlah_bl-$JumTahunIni_bl;
+        
+                    }
+
+
+                    $HariIni_bl=0.0;
+                    $kelmarin_bl=$jumlah_bl-$HariIni_bl;
+                    $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
+
+                        'kodcaw'=>$auth_user['cawangan'],
+                        'glcode'=>$BAKI_LELONG,
+                        'descpt'=>$keterangan_bl,
+                        'debit'=>$jumlah_byr,
+                        'kredit'=>0.0,
+                        'hariini'=>$HariIni_bl,
+                        'kelmarin'=>$kelmarin_bl,
+                        'jumlah'=>$jumlah_bl,
+                        'bulanini'=>$jumlahBulan_ini_bl,
+                        'tahunini'=>$Jumlah_TahunIni_bl,
+                        'acttype'=> $actype_bl
+     
+                    ]);
+
+
+                }
+                else
+                {
+
+                    $hariIni_BL=$get_current_GLejer_Baki_Lelong[0]['hariini'];
+                    $kelmarin_BL=$get_current_GLejer_Baki_Lelong[0]['kelmarin'];
+                    $jumlah_BL= $get_current_GLejer_Baki_Lelong[0]['jumlah'];
+                    $kredit_BL=$get_current_GLejer_Baki_Lelong[0]['kredit'];
+                    $debit_BL= $get_current_GLejer_Baki_Lelong[0]['debit'];
+                    $recno_BL=$get_current_GLejer_Baki_Lelong[0]['recno'];  
+
+                    $debit_BL=$debit_BL+$jumlah_byr;
+                    $hariIni_Tunai=$debit_BL-$kredit_BL;
+                    $kelmarin_BL=$jumlah_BL-$hariIni_BL;
+
+                    $updateGlejer_BL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                        'recno'=>$recno_BL,
+                        'debit'=>$debit_BL,
+                        'kredit'=>$kredit_BL,
+                        'hariini'=>$hariIni_BL,
+                        'kelmarin' =>$kelmarin_BL,
+                    
+                        ]);
+
+                }
+
+         
+
         }
         else
         {
             $bakiakhir += -($request->jumlah);
-        }
 
+
+            $KOD_TUNAI='1000/010';
+            $get_lejerTunai=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$KOD_TUNAI])->json();
+            $hariIni_Tunai=$get_lejerTunai[0]['hariini'];
+            $kelmarin_Tunai=$get_lejerTunai[0]['kelmarin'];
+            $jumlah_Tunai=$get_lejerTunai[0]['jumlah'];
+            $kredit_Tunai=$get_lejerTunai[0]['kredit'];
+            $debit_Tunai=$get_lejerTunai[0]['debit'];
+            $recno_Tunai=$get_lejerTunai[0]['recno'];  
+
+
+            $debit_Tunai=$debit_Tunai+$jumlah_byr;
+            $hariIni_Tunai=$debit_Tunai-$kredit_Tunai;
+            $kelmarin_Tunai=$jumlah_Tunai-$hariIni_Tunai;
+            $updateGlejer_Tunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                'recno'=>$recno_Tunai,
+                'debit'=>$debit_Tunai,
+                'kredit'=>$kredit_Tunai,
+                'hariini'=>$hariIni_Tunai,
+                'kelmarin' =>$kelmarin_Tunai,
+            
+                ]);
+
+
+
+                  $RUGI_LELONG='3000/020';
+
+                  $get_KOD_RL=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
+              
+                  $gl_cdetails_rl= $get_KOD_RL[0];
+                  $keterangan_rl= $get_KOD_RL[0]['descpt'];  //keterangan glcode
+                  $actype_rl= $get_KOD_RL[0]['acttype'];   
+  
+  
+                  $get_current_GLejer_Rugi_Lelong=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
+  
+                  if(sizeof($get_current_GLejer_Rugi_Lelong)==0)
+                  {
+                      $jumlah_rl=0.0;
+                 
+                      $getGLedjer_rl_Semalam=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
+                      if(sizeof($getGLedjer_rl_Semalam)==0)
+                      {
+                         $jumlah_rl=0.0;
+                      }
+                      else
+                      {
+      
+                          $jumlahSemalam_rl=$getGLedjer_rl_Semalam[0]['jumlah'];
+                    
+                          $hariIniSemalam_rl=$getGLedjer_rl_Semalam[0]['hariini'];
+                          $jumlah_rl=$jumlahSemalam_rl+$hariIniSemalam_rl;
+      
+                      }
+                      $jumlahBulan_ini_rl=0.0;
+                      $get_GlejerBulan_Tahun_rl=Http::get(config('api.url').'/api/getLejerMonthYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
+                       if( sizeof($get_GlejerBulan_Tahun_rl)==0)
+                       {
+                       $jumlahBulan_ini_rl=0.0;
+                       }
+                      else
+                      {
+  
+                      $jumlahBulan_ini_rl=$get_GlejerBulan_Tahun_rl[0]['jumlah'];
+                      $jumlahBulan_ini_rl=$jumlah_rl-$jumlahBulan_ini_rl;
+  
+                       }
+  
+  
+                       $Jumlah_TahunIni_rl=0.0;
+                       $get_Glejer_Tahun_rl=Http::get(config('api.url').'/api/getLejerYear/'.$auth_user['cawangan'],['glcode'=>$RUGI_LELONG])->json();
+  
+                       if(sizeof($get_Glejer_Tahun_rl)==0)
+                       {
+                            $Jumlah_TahunIni_rl=0.0;
+                       }
+                      else
+                      {
+                          $JumTahunIni_rl=$get_Glejer_Tahun_rl[0]['jumlah'];
+                          $Jumlah_TahunIni_rl=$jumlah_rl-$JumTahunIni_rl;
+          
+                      }
+  
+  
+                      $HariIni_rl=0.0;
+                      $kelmarin_rl=$jumlah_rl-$HariIni_rl;
+                      $daftarGlejer_bl=Http::post(config('api.url').'/api/daftarGlejer/'.$auth_user['cawangan'],[
+  
+                          'kodcaw'=>$auth_user['cawangan'],
+                          'glcode'=>$RUGI_LELONG,
+                          'descpt'=>$keterangan_rl,
+                          'debit'=>0.0,
+                          'kredit'=>$jumlah_byr,
+                          'hariini'=>$HariIni_rl,
+                          'kelmarin'=>$kelmarin_rl,
+                          'jumlah'=>$jumlah_rl,
+                          'bulanini'=>$jumlahBulan_ini_rl,
+                          'tahunini'=>$Jumlah_TahunIni_rl,
+                          'acttype'=> $actype_rl
+       
+                      ]);
+  
+  
+                  }
+                  else
+                  {
+  
+                      $hariIni_RL=$get_current_GLejer_Rugi_Lelong[0]['hariini'];
+                      $kelmarin_RL=$get_current_GLejer_Rugi_Lelong[0]['kelmarin'];
+                      $jumlah_RL= $get_current_GLejer_Rugi_Lelong[0]['jumlah'];
+                      $kredit_RL=$get_current_GLejer_Rugi_Lelong[0]['kredit'];
+                      $debit_RL= $get_current_GLejer_Rugi_Lelong[0]['debit'];
+                      $recno_RL=$get_current_GLejer_Rugi_Lelong[0]['recno'];  
+  
+                      $kredit_RL=$kredit_RL+$jumlah_byr;
+                      $hariIni_Tunai=$debit_RL-$kredit_RL;
+                      $kelmarin_BL=$jumlah_RL-$hariIni_RL;
+  
+                      $updateGlejer_RL=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
+                          'recno'=>$recno_RL,
+                          'debit'=>$debit_RL,
+                          'kredit'=>$kredit_RL,
+                          'hariini'=>$hariIni_RL,
+                          'kelmarin' =>$kelmarin_RL,
+                      
+                          ]);
+  
+                  }
+
+
+ 
+       }
         //masuk dalam tunai aliran
         $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
             'kodlaluan' => $request->teller,

resources/views/aliran_tunai/index.blade.php

@@ -116,7 +116,7 @@
             <div class="row">
                 <div class="col-md-12 text-center">
                     <input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
-                    <input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="openuptambahdanserah(this)">
+                    <input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="serahankemaskini(this)">
                 </div>
             </div>
             <div class="row mt-3">
@@ -292,6 +292,56 @@
 
     var tele = "{{ $auth_user['name'] }}";
 
+    function serahankemaskini(data)
+    {
+        
+        $.ajax({
+                type: 'get',
+                url: "{{ route('periksa.alirantunai') }}",
+                success: function(balasbalik){
+                    if(balasbalik == 'sama')
+                    {
+                        openuptambahdanserah(data);
+                    }else{
+
+                        $.ajax({
+                            type: 'get',
+                            url: "{{ route('kemaskini.alirantunai') }}",
+                            data: { "bakiakhir" : balasbalik['bakisemasa'],
+                                    "pendahuluan" : balasbalik['pendahuluan'],
+                                    "serahan" : balasbalik['serahan'],
+                                    "gadaian" : balasbalik['gadaian'],
+                                    "penebusan" : balasbalik['penebusan']
+                            },
+                            success: function(balas){
+                                if(balas == 'berjaya')
+                                {
+                                    Swal.fire({
+                                        icon: 'success',
+                                        title: 'Berjaya',
+                                        text: 'Kemaskini Berjaya!',
+                                        closeOnClickOutside: false
+                                    }).then(function() {
+                                        location.reload();
+                                    });
+
+                                }else{
+                                    Swal.fire({
+                                        icon: 'danger',
+                                        title: 'Tidak Berjaya',
+                                        text: 'Kemaskini tidak berjaya!',
+                                        closeOnClickOutside: false
+                                    }).then(function() {
+                                        location.reload();
+                                    });
+                                }
+                            }
+                        });
+                    }
+                }
+        });
+    }
+
     function periksaalirantunai()
     {
       

resources/views/customers/info.blade.php

@@ -470,6 +470,10 @@
         "ordering": false
     });
 
+    var bayaranupah = $('#tablehistoryupah').DataTable({
+        "ordering": false
+    });
+
     const formatter = new Intl.NumberFormat('en-US', {
         minimumFractionDigits: 2
     });
@@ -821,6 +825,13 @@
                         rekodasal(gadai);
                     }
                 });
+                $.ajax({
+                    method:'get',
+                    url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                    success:function(ansuran){
+                        rekodansuran(ansuran);
+                    }
+                });
             }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
             let histid = $('input[name="sudahtebus"]:checked').val();
@@ -858,6 +869,13 @@
                         rekodasal(gadai);
                     }
                 });
+                $.ajax({
+                    method:'get',
+                    url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                    success:function(ansuran){
+                        rekodansuran(ansuran);
+                    }
+                });
             }
         }
     }
@@ -868,6 +886,24 @@
         $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun']));
     }
 
+    function rekodansuran(data){
+        var counter = 1;
+        
+        bayaranupah.clear().draw();
+        $.each(data,function(index,bayaran){
+
+            var urlroute = '{{ route("resit.advansur", ":id") }}';
+            urlroute = urlroute.replace(':id', bayaran['norujukan']);
+            bayaranupah.row.add([
+                    counter,
+                    bayaran['tarikh'], 
+                    "RM " + bayaran['upahDibayar'],
+                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                ]).draw();
+                counter = counter + 1;
+        });
+    }
+
     function historybayarantable(data){
         var counter = 1;
         

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

@@ -170,6 +170,7 @@
                             <div class="float-right mb-3">
                                 <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
                                 <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
+                                <input type="checkbox" id="selectallcheck" onclick="checkallfunction()"/>
                             </div>
                             <table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
                                 <thead class="thead-dark">
@@ -288,6 +289,29 @@
         location.reload();
     });
 
+    function checkallfunction(){
+        let totalmarhun = 0;
+
+        if(this.checked) {
+            // Iterate each checkbox
+            $(':checkbox').each(function() {
+                let marhun = Number($(this).data("marhun"));
+                totalmarhun += marhun;
+                this.checked = true;                        
+            });
+            $("#btn-serah").prop('disabled', false);
+            $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
+        } else {
+            $(':checkbox').each(function() {
+                let marhun = Number($(this).data("marhun"));
+                totalmarhun -= marhun;
+                this.checked = false;                        
+            });
+            $('#marhunpilih').val(0);
+            $("#btn-serah").prop('disabled', true);
+        }
+    }
+
     function checkallfunc(){
 
         let totalmarhun = 0;

resources/views/homepage/penilai/home.blade.php.save.1

@@ -1,563 +0,0 @@
-@extends('layouts.app')
-@section('content')
-<!-- The Modal -->
-<div class="modal fade" id="marhunModal">
-    <div class="modal-dialog modal-xl modal-dialog-centered">
-        <div class="modal-content">
-
-          <!-- Modal Header -->
-            <div class="modal-header">
-                <h4 class="modal-title"></h4>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-
-          <!-- Modal body -->
-            <div class="modal-body">
-                <h4>Marhun</h4>
-                <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
-                    <thead class="thead-dark">
-                        <tr>
-                            <th>Bil</th>
-                            <th>Jenis Marhun</th>
-                            <th>Berat</th>
-                            <th>Karat</th>
-                            <th>Nilai Marhun</th>
-                            <th>Nota</th>
-                        </tr>
-                    </thead>
-                    <tbody id="tablemarhun">
-                    </tbody>
-                </table>
-                <div class="row form-group">
-                    <div class="col-md-12 text-center">
-                        <form target="_blank" action="{{ route('printsag') }}" id="print_submit" method="post">
-                            @csrf
-                            <input hidden value="gadaiansemasa" name="jenisprint">
-                            <input type="text" hidden name="norujukan_modal" id="norujukan_modal">
-                            <input type="text" hidden name="pinjaman_modal" id="pinjaman_modal">
-                            <input type="submit" class="btn btn-primary" id="cetak_sag" value="Cetak SAG">
-                        </form>
-                    </div>
-                </div>
-          </div>
-
-          <!-- Modal footer -->
-          <div class="modal-footer">
-              <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-          </div>
-
-      </div>
-  </div>
-</div>
-
-<div class="modal fade" id="belum_serah_modal">
-    <div class="modal-dialog modal-xl modal-dialog-centered">
-        <div class="modal-content">
-
-          <!-- Modal Header -->
-            <div class="modal-header">
-                <h4 class="modal-title"></h4>
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-            </div>
-
-          <!-- Modal body -->
-            <div class="modal-body">
-                <h4>Marhun</h4>
-                <table id="biasa" class="table table-striped table-bordered text-center" style="width:100%">
-                    <thead class="thead-dark">
-                        <tr>
-                            <th>Bil</th>
-                            <th>Jenis Marhun</th>
-                            <th>Berat</th>
-                            <th>Karat</th>
-                            <th>Nilai Marhun</th>
-                            <th>Nota</th>
-                        </tr>
-                    </thead>
-                    <tbody id="belum_serah">
-                    </tbody>
-                </table>
-                <div class="row form-group">
-                    <div class="col-md-12 text-center">
-                        <form target="_blank" action="{{ route('printsag') }}" id="print_submit_belum_serah" method="post">
-                            @csrf
-                            <input type="text" hidden name="norujukan_modal" id="norujukan_modal1">
-                            <input type="text" hidden name="pinjaman_modal" id="pinjaman_modal1">
-                            <input type="button" class="btn btn-primary" id="cetak_sag_belum_serah" value="Cetak SAG">
-                        </form>
-                    </div>
-                </div>
-          </div>
-
-          <!-- Modal footer -->
-          <div class="modal-footer">
-              <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
-          </div>
-
-      </div>
-  </div>
-</div>
-
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-12">
-            <div class="card">
-                
-                <nav aria-label="breadcrumb">
-                    <ol class="breadcrumb pb-3">
-                      <li class="breadcrumb-item"><a href="#">Home</a></li>
-                    <li class="breadcrumb-item active" aria-current="page">Gadaian</li>
-                    </ol>
-                  </nav>
-
-                <input type="hidden" name="kodcaw" id="kodcaw" value="{{$cawangan_info['kodcaw']}}">
-                <div class="card-body text-center">
-                    <ul class="nav nav-tabs" id="myTab" role="tablist">
-                        <li class="nav-item">
-                            <a class="nav-link active" id="gadaian-semasa-tab" data-toggle="tab" href="#gadaian-semasa" role="tab" aria-controls="gadaian-semasa" aria-selected="true"> Semasa</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" id="gadaian-belum-serah-tab" data-toggle="tab" href="#gadaian-belum-serah" role="tab" aria-controls="gadaian-belum-serah" aria-selected="false"> Belum Serah</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" id="rekod-gadaian-tab" data-toggle="tab" href="#rekod-gadaian" role="tab" aria-controls="rekod-gadaian" aria-selected="false">Rekod </a>
-                        </li>
-                    </ul>
-                    <div class="tab-content" id="myTabContent">
-                        <div class="tab-pane fade show active" id="gadaian-semasa" role="tabpanel" aria-labelledby="gadaian-semasa-tab">
-                            <table class='table table-striped table-hover' id='table-gadaian-semasa'>
-                                <thead class="thead-dark">
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>Nama</th>
-                                        <th>No KP</th>
-                                        <th>No Rujukan</th>
-                                        <th>Pembiayaan (RM)</th>
-                                        <th>Nilai Marhun (RM)</th>
-                                        <th>Berat (g)</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @php $count=1; @endphp
-                                    @if (is_array($gadaian_semasa) || is_object($gadaian_semasa))
-                                        @foreach($gadaian_semasa as $index=>$gadaian)
-                                            <tr>
-                                                <td>{{ $count }}</td>
-                                                <td>
-                                                    @php
-                                                        $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
-                                                        echo ($customer_info[0]['nama']);
-                                                    @endphp
-                                                </td>
-                                                <td>{{ $gadaian['nokp'] }}</td>
-                                                <td>
-                                                    @php
-                                                        $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
-                                                    @endphp
-                                                    <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$gadaian['pinjaman']}}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#marhunModal"> {{$gadaian['norujukan']}}</a>
-                                                </td>
-                                                <td>{{ number_format($gadaian['pinjaman'],2) }}</td>
-                                                <td>{{ number_format($gadaian['nilaimarhun'],2) }}</td>
-                                                <td>{{ number_format($gadaian['berat'],2) }}</td>
-                                            </tr>
-                                            @php $count++; @endphp
-                                        @endforeach
-                                    @endif
-                                </tbody>
-                            </table>
-                        </div>
-                        <div class="tab-pane fade" id="gadaian-belum-serah" role="tabpanel" aria-labelledby="gadaian-belum-serah-tab">
-                            <div class="float-right mb-3">
-                                <button class="btn btn-primary mt-4 pull-left" onclick="checkallfunc()" disabled>Check All</button>
-                                <button class="btn btn-primary mt-4 pull-left" onclick="uncheckallfunc()" disabled>Uncheck All</button>
-                            </div>
-                            <table class='table table-striped table-hover' id='table-gadaian-belum-serah'>
-                                <thead class="thead-dark">
-                                    <tr>
-                                        <th>Bil</th>
-                                        <th>Nama</th>
-                                        <th>No KP</th>
-                                        <th>No Rujukan</th>
-                                        <th>Pembiayaan (RM)</th>
-                                        <th>Nilai Marhun (RM)</th> 
-                                        <th>Berat (g)</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    @php $count=1; @endphp
-                                    @if (is_array($gadaian_belumserah) || is_object($gadaian_belumserah))
-                                        @foreach($gadaian_belumserah as $index=>$gadaian)
-                                            <tr>
-                                                @php
-                                                    $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json();
-                                                @endphp
-                                                <td><input type="checkbox" id="checkgadai" autocomplete="off" data-nokp="{{ $gadaian['nokp'] }}" data-nama="{{ $customer_info[0]['nama'] }}" data-norujukan="{{$gadaian['norujukan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-marhun="{{$gadaian['nilaimarhun']}}"></input></td>
-                                                <td>{{ $customer_info[0]['nama'] }}</td>
-                                                <td>{{ $gadaian['nokp'] }}</td>
-                                                <td>
-                                                    @php
-                                                        $marhun = Http::get($api_url . '/api/marhun/' . $gadaian['norujukan'] )->json();
-                                                    @endphp
-                                                    <a href="#" data-toggle="modal" data-marhun="{{ json_encode($marhun) }}" data-pinjaman="{{$gadaian['pinjaman']}}" data-norujukan="{{$gadaian['norujukan']}}" data-hargajualan="{{$gadaian['hargajualan']}}" data-kodcaw="{{ $gadaian['kodcaw'] }}" data-target="#belum_serah_modal"> {{$gadaian['norujukan']}}</a>
-                                                </td>
-                                                <td>{{ number_format($gadaian['pinjaman'],2) }}</td>
-                                                <td>{{ number_format($gadaian['nilaimarhun'],2) }}</td>
-                                                <td>{{ number_format($gadaian['berat'],2) }}</td>
-                                            </tr>
-                                            @php $count++; @endphp
-                                        @endforeach
-                                    @endif
-                                </tbody>
-                            </table>
-                            <div class='row mt-md-3'>
-                                <div class='col-md-12 d-flex justify-content-end form-group'>
-                                    Jumlah Nilai Marhun Dipilih
-                                    <div class='col-md-3'>
-                                        <input type="text" name="marhunpilih" id="marhunpilih" readonly class='form-control'>
-                                    </div>
-                                    <form action="{{ route('marhun.serah') }}" method="post">
-                                        @csrf
-                                        <input type="text" name="norujukanpilih" id="norujukanpilih" hidden>
-                                        <button type="submit" id="btn-serah" class='btn btn-primary' disabled>Serah Marhun</button>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="tab-pane fade" id="rekod-gadaian" role="tabpanel" aria-labelledby="rekod-gadaian-tab">
-                            <div class="row">
-                                <div class="col-12">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-2">Tarikh</div>
-                                <div class="col-3"><input class="form-control" autocomplete="off" type="text" placeholder="Tarikh" onchange="fetchRekodGadaian()" name="tarikh_rekod" id="tarikh_rekod"></div>
-                            </div>
-                            <div class="row">
-                                <div class="col-12">
-                                    <table class='table table-striped table-hover' id='table-rekod-gadaian'>
-                                        <thead class="thead-dark">
-                                            <tr>
-                                                <th>Bil</th>
-                                                <th>Nama</th>
-                                                <th>No KP</th>
-                                                <th>No Rujukan</th>
-                                                <th>Pembiayaan (RM)</th>
-                                                <th>Nilai Marhun (RM)</th>
-                                                <th>Berat (g)</th>
-                                            </tr>
-                                        </thead>
-                                    </table>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script>
-    var api_url = "<?php echo $api_url ?>";
-
-    function timedRefresh(timeoutPeriod) {
-        setTimeout("location.reload(true);",timeoutPeriod);
-    }
-
-    window.onload = timedRefresh(100000);
-    var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
-        "ordering": true
-    });
-    var table_gadaian_belum_serah = $('#table-gadaian-belum-serah').DataTable({
-        "ordering": true
-    });
-
-    var table_rekod_gadaian = $('#table-rekod-gadaian').DataTable({
-        "ordering": true
-    });
-
-    $('#tarikh_rekod').datepicker({
-        format: 'dd/mm/yyyy',
-        endDate: new Date()
-    });
-    
-    const formatter = new Intl.NumberFormat('en-US', {
-        minimumFractionDigits: 2
-    });
-
-    $('#cetak_sag').on('click',function(){
-        location.reload();
-    });
-
-    function checkallfunc(){
-
-        let totalmarhun = 0;
-        $(':checkbox').each(function() {
-            let marhun = Number($(this).data("marhun"));
-            totalmarhun += marhun;
-            this.checked = true;                        
-        });
-        $("#btn-serah").prop('disabled', false);
-        $('#marhunpilih').val(formatter.format(totalmarhun.toFixed(2)));
-    }
-
-    function uncheckallfunc(){
-        let totalmarhun = 0;
-        $(':checkbox').each(function() {
-            let marhun = Number($(this).data("marhun"));
-            totalmarhun -= marhun;
-            this.checked = false;                        
-        });
-        $('#marhunpilih').val(0);
-        $("#btn-serah").prop('disabled', true);
-    }
-
-    function fetchRekodGadaian(){
-        var tarikh_rekod = $('#tarikh_rekod').val();
-        if(tarikh_rekod == ''){
-            var current = new Date();
-            var current_date = current.getDate();
-            var current_month = current.getMonth()+1;
-            var current_year = current.getFullYear();
-            var tarikh = current_year + '-' +current_month+'-'+current_date;
-        }else{
-            var split_date = tarikh_rekod.split('/');
-            var tarikh = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
-        }
-        table_rekod_gadaian.clear().draw();
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/gadai/list/rekod/old',
-            data:{
-                'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
-                'tarikh': tarikh
-            },
-            success:function(data){
-                var count = 0;
-                $.each(data,function(index,rekodgadaian){
-                    $.ajax({
-                        url: api_url + '/api/customers/' + rekodgadaian['nokp'],
-                        method:'get',
-                        success:function(rekodcustomer){
-                            count++;
-                            table_rekod_gadaian.row.add([
-                                count,
-                                rekodcustomer[0]['nama'],
-                                rekodgadaian['nokp'],
-                                rekodgadaian['norujukan'],
-                                rekodgadaian['pinjaman'],
-                                rekodgadaian['nilaimarhun'],
-                                rekodgadaian['berat']
-                            ]).draw();
-                        }
-                    });
-                });
-            }
-        });
-    }
-
-    //modal
-    $('#marhunModal').on('show.bs.modal', function(event) {
-        var button = $(event.relatedTarget); // button yg trigger
-        var arraymarhun = button.data('marhun');
-        var norujukan = button.data('norujukan');
-        var kodcaw = button.data('kodcaw');
-        var hargajualan = button.data('hargajualan');
-        var pinjaman = button.data('pinjaman');
-        // $('#pembelian_komuditi').attr('href','http://bsas-arrahn.test/pembelian/komuditi?norujukan='+norujukan);
-
-        $('#norujukan_modal').val(norujukan);
-        $('#pinjaman_modal').val(pinjaman);
-        $('#tablemarhun').empty();
-        var bil_count = 0;
-        $.each(arraymarhun,function(index,marhun){
-            $.each(marhun, function(index2,marhun_detail){
-                
-                var marhun_name;
-                $.ajax({
-                    method:'GET',
-                    url: api_url + '/api/jemas/nama_marhun',
-                    dataType: 'json',
-                    data:{
-                        marhun:marhun_detail['marhun']
-                    },
-                    success:function(marhun_ajax){
-                        bil_count++;
-                        $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
-                    }
-                });
-            });
-        });
-
-    });
-
-    $('#belum_serah_modal').on('show.bs.modal', function(event) {
-        var button = $(event.relatedTarget); // button yg trigger
-        var arraymarhun = button.data('marhun');
-        var norujukan = button.data('norujukan');
-        var kodcaw = button.data('kodcaw');
-        var hargajualan = button.data('hargajualan');
-        var pinjaman = button.data('pinjaman');
-
-        $('#norujukan_modal1').val(norujukan);
-        $('#pinjaman_modal1').val(pinjaman);
-
-        $('#belum_serah').empty();
-        var bil_count = 0;
-        $.each(arraymarhun,function(index,marhun){
-            $.each(marhun, function(index2,marhun_detail){
-                var marhun_name;
-                $.ajax({
-                    method:'GET',
-                    url: api_url + '/api/jemas/nama_marhun',
-                    dataType: 'json',
-                    data:{
-                        marhun:marhun_detail['marhun']
-                    },
-                    success:function(marhun_ajax){
-                        bil_count++;
-                        $("#belum_serah").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
-                    }
-                });
-            });
-        });
-    });
-
-    var total_marhun_pilih = 0;
-    $(document).on('click', '#checkgadai', function(e) {
-        if ($(this).is(':checked')) {
-            var norujukan = $(this).data("norujukan");
-            var kodcaw = $(this).data("kodcaw");
-            var marhun = $(this).data("marhun");
-            
-            total_marhun_pilih += Number(marhun);
-
-            $('#marhunpilih').val(formatter.format(total_marhun_pilih.toFixed(2)));
-
-            $("#btn-serah").prop('disabled', false);
-
-            var norujukanpilih = $('#norujukanpilih').val();
-
-            norujukanpilih += norujukan + ",";
-            
-            $('#norujukanpilih').val(norujukanpilih);
-
-        }else {
-            var norujukan = $(this).data("norujukan");
-            var kodcaw = $(this).data("kodcaw");
-            var marhun = $(this).data("marhun");
-
-            total_marhun_pilih -= Number(marhun);
-
-            $('#marhunpilih').val(total_marhun_pilih.toFixed(2));
-
-            var norujukanpilih = $('#norujukanpilih').val();
-            
-            var sag;
-            sag = norujukan + ",";
-
-            norujukanpilih = norujukanpilih.replace('ALS201203-0001,', "");
-
-            $('#norujukanpilih').val(norujukanpilih);
-        }
-        var legchecked = $('input[id^=checkgadai]:checked').length;
-        if(legchecked == 0){
-            $("#btn-serah").prop('disabled', true);
-        }
-    });
-
-    $(document).on('click', '#cetak_sag_belum_serah', function(e) {
-
-        let norujukan = $('#norujukan_modal1').val();
-        let mohon = "Print SAG";
-
-        const swalWithBootstrapButtons = Swal.mixin({
-            customClass: {
-                confirmButton: 'btn btn-success ml-1',
-                cancelButton: 'btn btn-danger'
-            },
-            buttonsStyling: false
-        });
-        
-        swalWithBootstrapButtons.fire({
-            title: 'Dapatkan Pengesahan Khazanah',
-            text: "Cetak SAG Semula!",
-            icon: 'info',
-            showCancelButton: true,
-            confirmButtonText: 'Hantar',
-            cancelButtonText: 'Batal',
-            reverseButtons: true
-        }).then((result) => {
-            if(result.isConfirmed) {
-                Swal.fire({
-                    title: 'Tunggu Pengesahan Daripada Khazanah.',
-                    icon: 'info',
-                    width: 600,
-                    padding: '6em',
-                    background: '#fffff',
-                    showCancelButton: false,
-                    showConfirmButton: false,
-                    allowOutsideClick: false,
-                    allowEscapeKey: false,
-                    allowEnterKey: false
-                })
-            
-
-                $.ajax({
-                    method:'post',
-                    url: '{{ route("teller.createkelulusan") }}',
-                    data: {
-                        "_token" : "{{ csrf_token() }}",
-                        "norujukan" : norujukan,
-                        "mohon" : mohon
-                    },
-                    success:function(data){
-
-                    },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
-                        console.log(err);
-                    }
-                }); 
-
-
-                //TIME INTERVAL
-                let timerInterval;
-
-                timerInterval = setInterval(function(){
-                    $.ajax({
-                        method:'get',
-                        url: "{{ route('teller.getkelulusan') }}",
-                        data: {
-                        "norujukan" : norujukan
-                        },
-                        success:function(data){
-                            if(data != 0){
-                                clearInterval(timerInterval);
-                                Swal.fire({
-                                    icon: 'success',
-                                    title: 'Telah Disahkan'
-                                }).then(function(){
-                                    $("#print_submit_belum_serah").submit();
-                                });
-                            }
-                        },error: function(xhr, status, error) {
-                            var err = eval("(" + xhr.responseText + ")");
-                            alert(xhr.responseText);
-                        }
-                    });
-                }, 3000);
-        
-
-            }else if (result.dismiss === Swal.DismissReason.cancel) {
-                swalWithBootstrapButtons.fire(
-                    'Batal',
-                    'Tidak Berjaya Mendapatkan Kelulusan Khazanah',
-                    'error'
-                )
-            }
-
-        });
-    });
-    
-</script>
-@endsection

resources/views/khazanah/dashboard.blade.php

@@ -25,8 +25,9 @@
                         </div>
                     </div>
 
-                    
+                    {{-- <div class="input-group mb-3">
-
+                      <input type="text" class="form-control col-3" placeholder="Pilih Tarikh" aria-label="Tarikh" id="dashboarddate" name="dashboarddate" aria-describedby="basic-addon1">
+                    </div> --}}
 
                     <div class="row mt-4 col-12 d-flex justify-content-center">
                         {{-- First Column --}}
@@ -259,6 +260,23 @@
           "scrollX": true
         });
 
+    $('#dashboarddate').datepicker({
+        format: 'dd-mm-yyyy'
+    });
+
+    $('#dashboarddate').change(function(){
+
+      $.ajax({
+            method:'get',
+            url: "{{ route('khazanah.dashboarddate') }}",
+            data:{'kodcaw' : kodcaw,'tarikh' : date },
+            success: function(panjar){
+                gadaitable(panjar);
+            }
+        });
+
+    });
+    
     </script>
 
 @endsection

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

@@ -9,6 +9,7 @@
                     <ol class="breadcrumb pb-3">
                       <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                       <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('homepage.ansuranupah') }}">Ansuran & Upah</a></li>
                       <li class="breadcrumb-item active" aria-current="page">Ansuran</li>
                     </ol>
                   </nav>

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

@@ -0,0 +1,112 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Ansuran & Upah</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                   
+                    <div class="row form-group justify-content-center">   
+                        <div class="col-3 mx-1">    
+                            <div class="row">    
+                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-info btn-lg btn-block mb-3">Ansuran</a>
+                            </div>
+                        </div>
+                        <div class="col-3 mx-1">    
+                            <div class="row">    
+                                <a href="{{ route('laporan.upah') }}" class="btn btn-info btn-lg btn-block mb-3">Upah</a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="modal" id="myModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+  
+        <!-- Modal Header -->
+        <div class="modal-header">
+          <h4 class="modal-title">Laporan GL</h4>
+          <button type="button" class="close" data-dismiss="modal">&times;</button>
+        </div>
+  
+        <!-- Modal body -->
+        <div class="modal-body">
+  
+        <style>
+  #details {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 50%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ffffff;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+      <center>
+     <table id="details">
+     <tr>
+     <td>    <a href="{{route('laporan.datalejer_am')}}" class="btn btn-primary  btn-lg btn-block mb-1">Lejer Am</a>   </td>
+     </tr>
+     
+     <tr>
+     <td>   <a href="{{route('laporan.datalejer_am')}}" class="btn btn-primary btn-lg btn-block mb-1 ">Data Lejer Am</a>  </td>
+     </tr>
+     
+     
+     
+     
+     
+     
+     
+     </table>
+  
+      </center>
+  
+  
+  
+  
+  
+  
+   
+        </div>
+  
+        <!-- Modal footer -->
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" data-dismiss="modal">Kembali</button>
+        </div>
+  
+      </div>
+    </div>
+  </div>
+  
+@endsection

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

@@ -28,7 +28,7 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                     </div>
-                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
                                     <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
                                 </div>
                             </form>
@@ -78,7 +78,7 @@
         "ordering": false
     });
     $(document).ready( function () {
-        $('#datetimepicker1').datepicker({
+        $('#datetarikh').datepicker({
             format: 'dd-mm-yyyy'
         });
         var current = new Date();
@@ -95,7 +95,7 @@
         });
     });
 
-    $('#datetimepicker1').change(function(){
+    $('#datetarikh').change(function(){
         var input_date = this.value;
         var split_date = input_date.split('-');
         var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
@@ -121,17 +121,13 @@
 
         tablegadai.clear().draw();
         $.each(data,function(index,gadai){
-            $.ajax({
-                method:'get',
-                url:api_url + '/api/customers/' + gadai['nokp'],
-                success:function(customer){
                     total_pinjaman += Number(gadai['pinjaman']);
                     total_upah12 += Number(gadai['upah12']);
                     total_nm += Number(gadai['nilaimarhun']);
                     total_berat += Number(gadai['berat']);
                     tablegadai.row.add([
                         counter,
-                        customer['nama'],
+                        gadai['nama'],
                         gadai['nokp'],
                         gadai['norujukan'],
                         formatter.format(gadai['pinjaman']),
@@ -144,11 +140,8 @@
                     $('#nmtotal').text(formatter.format(total_nm.toFixed(2)));
                     $('#berattotal').text(formatter.format(total_berat.toFixed(2)));
                     counter = counter + 1;
-                }
-            });
         });
         
     }
 </script>
 @endsection
-

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

@@ -26,7 +26,7 @@
                                 <a href="{{ route('laporan.pelangganbaru') }}" class="btn btn-dark btn-lg btn-block  mb-3">Pelanggan Baru</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('ringkasanterkumpul.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
+                                <a href="{{ route('laporan.ringkasanterkumpul') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Terkumpul</a>
                             </div>
                             <div class="row">
                                 <a href="{{route('laporan.agingbulanan')}}" class="btn btn-danger btn-lg btn-block mb-3">Aging Bulan</a>
@@ -70,7 +70,7 @@
                         </div>
                         <div class="col-3 mx-1">
                             <div class="row">
-                                <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
+                                <a href="{{ route('homepage.ansuranupah') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran & Upah</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>

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

@@ -28,7 +28,8 @@
                                     <div class="input-group-prepend">
                                         <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                     </div>
-                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker1" name="datetimepicker1" aria-describedby="basic-addon1">
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
+          
                                     <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
                                 </div>
                             </form>
@@ -40,17 +41,16 @@
                                 <thead class="thead-dark">
                                     <tr>
                                         <th>Bil</th>
-                                        <th>Nama</th>
+                                        <th width="22%">Nama</th>
                                         <th>No K/P</th>
                                         <th>No Rujukan</th>
-                                        <th>Tarikh Tebus</th>
                                         <th>Pembiayaan (RM)</th>
                                         <th>Keuntungan (RM)</th>
                                         <th>Bayaran (RM)</th>
                                     </tr>
                                 </thead>
                                 <tfoot class="thead-dark">
-                                    <th colspan="5">TOTAL</th>
+                                    <th colspan="4">TOTAL</th>
                                     <th id="pinjamantotal"></th>
                                     <th id="keuntungantotal"></th>
                                     <th id="bayarantotal"></th>
@@ -76,30 +76,31 @@
         "ordering": true
     });
     $(document).ready( function () {
-        $('#datetimepicker1').datepicker({
+        $('#datetarikh').datepicker({
             format: 'dd-mm-yyyy'
         });
+
         var current = new Date();
         var current_date = current.getDate();
         var current_month = current.getMonth()+1;
         var current_year = current.getFullYear();
-        var today_date = current_year + '-' +current_month+'-'+current_date;
+        var today_date = current_year + '-' + current_month + '-' + current_date;
         $.ajax({
             method:'get',
-            url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
+            url: api_url + '/api/tebus/laporan/' +kodcaw+ '/' + today_date,
             success: function(tebus){
                 tebustable(tebus);
             }
         });
     });
 
-    $('#datetimepicker1').change(function(){
+    $('#datetarikh').change(function(){
         var input_date = this.value;
         var split_date = input_date.split('-');
-        var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+        var today_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
         $.ajax({
             method:'get',
-            url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
+            url: api_url + '/api/tebus/laporan/' + kodcaw + '/' + today_date,
             success: function(tebus){
                 tebustable(tebus);
             }
@@ -110,7 +111,6 @@
 
     });
 
-
     const formatter = new Intl.NumberFormat('en-US', {
         minimumFractionDigits: 2
     });
@@ -121,39 +121,61 @@
         var total_keuntungan = 0;
         var total_bayaran = 0;
 
+        console.log(data);
+        
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
-            $.ajax({
+            total_pinjaman += parseFloat(tebus['pinjaman']);
-                url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
+            total_keuntungan += parseFloat(tebus['bakiupah']);
-                method:'get',
+            total_bayaran += parseFloat(tebus['bakipjm']);
-                success:function(gadai){
+            tabletebus.row.add([
-                    $.ajax({
+                counter,
-                        url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
+                tebus['nama'],
-                        method:'get',
+                tebus['nokp'],
-                        success:function(customer){
+                tebus['norujukan'],
-                            total_pinjaman += parseFloat(tebus['pinjaman']);
+                formatter.format(tebus['pinjaman']),
-                            total_keuntungan += parseFloat(tebus['bakiupah']);
+                formatter.format(tebus['bakiupah']),
-                            total_bayaran += parseFloat(tebus['bakipjm']);
+                formatter.format(tebus['bakipjm'])
-                            tabletebus.row.add([
+            ]).draw();
-                                counter,
+            counter = counter + 1;
-                                customer['nama'],
+            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
-                                gadai[0][0]['nokp'],
+            $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
-                                tebus['norujukan'],
+            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
-                                tebus['t_tebus'],
-                                formatter.format(tebus['pinjaman']),
-                                formatter.format(tebus['bakiupah']),
-                                formatter.format(tebus['bakipjm'])
-                            ]).draw();
-                            counter = counter + 1;
-                            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
-                            $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
-                            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
-
-                        }
-                    });
-                }
-            });
         });
+
+
+        // $.each(data,function(index,tebus){
+        //     $.ajax({
+        //         url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
+        //         method:'get',
+        //         success:function(gadai){
+        //             $.ajax({
+        //                 url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
+        //                 method:'get',
+        //                 success:function(customer){
+        //                     total_pinjaman += parseFloat(tebus['pinjaman']);
+        //                     total_keuntungan += parseFloat(tebus['bakiupah']);
+        //                     total_bayaran += parseFloat(tebus['bakipjm']);
+        //                     tabletebus.row.add([
+        //                         counter,
+        //                         customer['nama'],
+        //                         gadai[0][0]['nokp'],
+        //                         tebus['norujukan'],
+        //                         tebus['t_tebus'],
+        //                         formatter.format(tebus['pinjaman']),
+        //                         formatter.format(tebus['bakiupah']),
+        //                         formatter.format(tebus['bakipjm'])
+        //                     ]).draw();
+        //                     counter = counter + 1;
+        //                     $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+        //                     $('#keuntungantotal').text(formatter.format(total_keuntungan.toFixed(2)));
+        //                     $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+
+        //                 }
+        //             });
+        //         }
+        //     });
+        // });
         // console.log('Total Pinjam : ' + total_pinjaman);
         // $('#jumlah_pinjaman').text('RM '+ total_pinjaman);
 

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

@@ -0,0 +1,70 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Ringkasan Terkumpul</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-">
+                            <form action="{{ route('ringkasanterkumpul.laporancetak') }}" target="_blank" method="get">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend ml-3">
+                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    
+                                    <div class="input-group-prepend ml-2 ">
+                                        <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" aria-describedby="basic-addon1">
+
+                                    
+                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                  
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    var tablecustomers = $('#myTable').DataTable({
+        "ordering": false
+    });
+
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy'
+        });
+    });
+
+</script>
+@endsection
+

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

@@ -0,0 +1,214 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <nav aria-label="breadcrumb">
+                    <ol class="breadcrumb pb-3">
+                      <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
+                      <li class="breadcrumb-item"><a href="{{ route('homepage.ansuranupah') }}">Ansuran & Upah</a></li>
+                      <li class="breadcrumb-item active" aria-current="page">Upah</li>
+                    </ol>
+                  </nav>
+
+                <div class="card-body text-center">
+                    <div class="row form-group">
+                        <div class="col-md-2">
+                        </div>
+                        <div class="col-md-10">
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-">
+                            <form action="{{ route('upah.laporancetak') }}" target="_blank" method="post">
+                                @csrf
+                                <div class="input-group mb-3">
+                                    <div class="input-group-prepend ml-3">
+                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    
+                                    <div class="input-group-prepend ml-2 ">
+                                        <span class="input-group-text" id="basic-addon1">Hingga</span>
+                                    </div>
+                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datehingga" name="datehingga" aria-describedby="basic-addon1">
+
+                                    
+                                    <input type="submit" class="btn btn-primary ml-md-5" id="submit_button" name="submit_button" value="Cetak">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-md-12">
+                            <table class="table table-striped table-hover" id="myTable">
+                                <thead class="thead-dark">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>Tarikh</th>
+                                        <th>No Rujukan</th>
+                                        <th>Teller</th>
+                                        <th>Pinjaman</th>
+                                        <th>JBG</th>
+                                        <th>Upah Dibayar</th>
+                                    </tr>
+                                </thead>
+                                <tfoot class="thead-dark">
+                                    <th colspan="4">TOTAL</th>
+                                    <th id="pinjamantotal"></th>
+                                    <th></th>
+                                    <th id="bayarantotal"></th>
+                                </tfoot>
+                            </table>
+                        </div>
+                    </div>
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script type="text/javascript">
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
+    var advansurtable = $('#myTable').DataTable({
+        "ordering": true
+    });
+    $(document).ready( function () {
+        $('#datemula').datepicker({
+            format: 'dd-mm-yyyy',
+            maxDate: 0
+        });
+        $('#datehingga').datepicker({
+            format: 'dd-mm-yyyy',
+            maxDate: 0
+        });
+
+        var current = new Date();
+        var current_date = current.getDate();
+        var current_month = current.getMonth()+1;
+        var current_year = current.getFullYear();
+        var today_date = current_year + '-' +current_month+'-'+current_date;
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/AnsuranByRangeTarikh/'+kodcaw,
+            data:{ 'mula' : today_date, 'akhir' : today_date },
+            success: function(advansur){
+                console.log(advansur);
+                advansurantable(advansur);
+            }
+        });
+    });
+
+    $('#datemula').change(function(){
+
+        //mula
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+        var mula = mula_date;
+
+        //current time
+        var hinggainput = $('#datehingga').val();
+
+        if(hinggainput != '')
+        {
+            var input_date = hinggainput;
+            var split_date = input_date.split('-');
+            var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+            var hingga = hingga_date;
+
+        }else{
+            var current = new Date();
+            var current_date = current.getDate();
+            var current_month = current.getMonth()+1;
+            var current_year = current.getFullYear();
+            var today_date = current_year + '-' +current_month+'-'+current_date;
+
+            var hingga = today_date;
+        }
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/AnsuranByRangeTarikh/' + kodcaw,
+            data:{ 'mula' : mula, 'akhir' : hingga },
+            success: function(advansur){
+                advansurantable(advansur);
+            }
+        });
+    });
+    
+    $('#datehingga').change(function(){
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+        var hingga = hingga_date;
+
+        //current time
+        var mulainput = $('#datemula').val();
+
+        if(mulainput != '')
+        {
+            var input_date = mulainput;
+            var split_date = input_date.split('-');
+            var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+
+            var mula = mula_date;
+
+        }else{
+
+            var dulu_date = '2017-01-01';
+
+            var mula = dulu_date;
+        }
+
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/AnsuranByRangeTarikh/' + kodcaw,
+            data:{ 'mula' : mula, 'akhir' : hingga },
+            success: function(advansur){
+                advansurantable(advansur);
+            }
+        });
+    });
+
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+    
+    function advansurantable(data){
+        var counter = 1;
+        var total_bayaran = 0;
+        var total_pinjaman = 0;
+        advansurtable.clear().draw();
+        $.each(data,function(index,advansur){
+            total_bayaran += parseFloat(advansur['upahDibayar']);
+            total_pinjaman += parseFloat(advansur['pinjaman']);
+
+            advansurtable.row.add([
+                counter,
+                advansur['tarikh'],
+                advansur['norujukan'],
+                advansur['teller'],
+                formatter.format(advansur['pinjaman']),
+                advansur['jbg'],
+                formatter.format(advansur['upahDibayar'])
+            ]).draw();
+            counter = counter + 1;
+            $('#bayarantotal').text(formatter.format(total_bayaran.toFixed(2)));
+            $('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
+        });
+        
+    }
+</script>
+@endsection
+

resources/views/lelongan/index.blade.php

@@ -54,11 +54,11 @@
                         </div>
                         <div class="col-8">
                             <div class="custom-control custom-radio custom-control-inline">
-                                <input type="radio" class="custom-control-input" id="radbakilelong" name="radlelong" value="baki" disabled>
+                                <input type="radio" class="custom-control-input" id="radbakilelong" name="radlelong" value="baki" readonly>
                                 <label class="custom-control-label" style="color:green;" for="radbakilelong" >Baki Lelong</label>
                               </div>
                               <div class="custom-control custom-radio custom-control-inline">
-                                <input type="radio" class="custom-control-input" id="radrugilelong" name="radlelong" value="rugi" disabled>
+                                <input type="radio" class="custom-control-input" id="radrugilelong" name="radlelong" value="rugi" readonly>
                                 <label class="custom-control-label" style="color:red;" for="radrugilelong" >Rugi Lelong</label>
                               </div>
                         </div>
@@ -239,17 +239,19 @@
                     let api = "{{ config('api.url') }}";
                     let nowakil = 0;
                     let jenis = '';
+                    let mohon = '';
 
                     if($("input[name='radlelong']:checked").val() == 'baki')
                     {
                         jenis = 'T';
-                        let mohon = "Tuntut Baki Lelongan";
+                        mohon = "Tuntut Baki Lelongan";
                     }else{
                         jenis = 'B';
-                        let mohon = "Bayar Baki Lelongan";
+                        mohon = "Bayar Baki Lelongan";
                     }
 
                     
+                    
                     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().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,"");

resources/views/modal/historytebus.blade.php

@@ -24,6 +24,9 @@
             <li class="nav-item">
               <a class="nav-link active" id="custom-tabs-one-home-tab" data-toggle="pill" href="#custom-tabs-one-home" role="tab" aria-controls="custom-tabs-one-home" aria-selected="true">Bayaran</a>
             </li>
+            <li class="nav-item">
+              <a class="nav-link" id="custom-tabs-upah-tab" data-toggle="pill" href="#custom-tabs-upah" role="tab" aria-controls="custom-tabs-upah" aria-selected="false">Upah</a>
+            </li>
             <li class="nav-item">
               <a class="nav-link" id="custom-tabs-one-profile-tab" data-toggle="pill" href="#custom-tabs-one-profile" role="tab" aria-controls="custom-tabs-one-profile" aria-selected="false">Rekod</a>
             </li>
@@ -44,6 +47,21 @@
                 </tbody>
               </table>
             </div>
+            <div class="tab-pane fade show" id="custom-tabs-upah" role="tabpanel" aria-labelledby="custom-content-below-home-tab">
+              <hr>
+              <table id="tablehistoryupah" class="table table-striped table-hover table-bordered text-center">
+                <thead class="thead-dark">
+                  <tr>
+                    <th>Bil</th>
+                    <th>Tarikh</th>
+                    <th>Upah</th>
+                    <th>Action</th>
+                  </tr>
+                </thead>
+                <tbody>
+                </tbody>
+              </table>
+            </div>
             <div class="tab-pane fade" id="custom-tabs-one-profile" role="tabpanel" aria-labelledby="custom-content-below-profile-tab">
               <hr>
               <table id="tablehistorytebus" class="table table-striped table-hover table-bordered text-center">

resources/views/penebusan/index.blade.php

@@ -2234,7 +2234,7 @@
             sumberat += parseFloat(value);
         });
 
-	var jenistebus = $('#sltjenistebus').find(":selected").val();
+	    var jenistebus = $('#sltjenistebus').find(":selected").val();
         var nopelanggan = "{{ $gadai['nopelanggan'] }}";
         var jbg = "{{ $gadai['tempoh'] }}";
         var kadarupah = "{{ $gadai['kadarupah'] }}";

resources/views/print/laporan_gadaian.blade.php

@@ -180,14 +180,14 @@
         $formattedweddingdate = $myDateTime->format('d-m-Y');
         echo($formattedweddingdate)
       @endphp</td>
-  </tr>
-  <tr>
     <td style="width:10px"> <b>Tarikh Cetak</b></td>
     <td style="text-align:left;">@php 
       $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
       $formattedweddingdate = $myDateTime->format('d-m-Y');
       echo($formattedweddingdate)
     @endphp</td>
+  </tr>
+  <tr>
     <td style="width:50px">   
     </td>
     <td> </td>
@@ -214,9 +214,9 @@
     <th>Keuntungan</th>
     <th>Peratus (%)</th>
   </tr>
-  @php $counter = 1; $totalpinjaman = 0; @endphp
+  @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp
   @foreach($gadai as $index=>$item)
-  @php $totalpinjaman += $item['pinjaman'] @endphp
+  @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp
     @if($index > 0)
         @if($item['teller'] != $gadai[$index - 1]['teller'])
             <tr>
@@ -235,12 +235,9 @@
       <td>{{ $counter }}</td>
       <td style="width:100px">{{$item['norujukan']}}</td>
       <td>
-        @php
+        {{ $item['nama'] }}
-            $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json();
-            echo $customer_detail['nama'];
-        @endphp
       </td>
-      <td>{{$customer_detail['alamat1']}}</td>
+      <td>{{ $item['alamat1'] }}</td>
       <td>{{ $item['nokp'] }}</td>
       <td>{{ $item['masa'] }}</td>
       <td>{{ number_format($item['berat'],2) }}</td>
@@ -275,8 +272,25 @@
     @endif
   @endforeach
 </table>
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Berat (g/m)</th>
+    <th style="text-align:center;">Nilai Marhun (RM)</th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalberat,2) }}</td>
+    <td>{{ number_format($totalnm,2) }}</td>
+    <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>{{ number_format($totalupah,2) }}</td>
+  </tr>
+</table>
 
-<h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5>
+{{-- <h5 style="float:right;">JUMLAH KESELURUHAN GADAIAN : RM {{ number_format($totalpinjaman,2) }}</h5> --}}
 
 <br>
 <br>
@@ -298,22 +312,6 @@
 </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_lejer_am.blade.php

@@ -1,381 +1,381 @@
 <style>
-#header {
+  #header {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 100%;
+    width: 100%;
-}
+  }
   
-#header td, #customers th {
+  #header td, #customers th {
    
-  padding:4px;
+    padding:4px;
-  font-size:10px;
+    font-size:10px;
-}
+  }
   
-#header tr:nth-child(even){background-color: #ffffff;}
+  #header tr:nth-child(even){background-color: #ffffff;}
   
-#header tr:hover {background-color: #ddd;}
+  #header tr:hover {background-color: #ddd;}
   
-#header th {
+  #header th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
-}
+  }
-</style>
+  </style>
   
   
   
   
-<style>
+  <style>
-#scan {
+  #scan {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 100%;
+    width: 100%;
-}
+  }
   
-#scan td, #scan th {
+  #scan td, #scan th {
    
-  padding: 8px;
+    padding: 8px;
-  font-size:11px;
+    font-size:11px;
-}
+  }
   
-#scan tr:nth-child(even){background-color: #ffffff;}
+  #scan tr:nth-child(even){background-color: #ffffff;}
   
-#scan tr:hover {background-color: #ddd;}
+  #scan tr:hover {background-color: #ddd;}
   
-#scan th {
+  #scan th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
-}
+  }
-</style>
+  </style>
   
   
-<style>
+  <style>
-#scan {
+  #scan {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 100%;
+    width: 100%;
-}
+  }
   
-#scan td, #scan th {
+  #scan td, #scan th {
-  border-collapse: collapse;
+    border-collapse: collapse;
-  padding: 8px;
+    padding: 8px;
-  font-size:11px;
+    font-size:11px;
-}
+  }
   
-#scan tr:nth-child(even){background-color: #ffffff;}
+  #scan tr:nth-child(even){background-color: #ffffff;}
   
-#scan tr:hover {background-color: #ddd;}
+  #scan tr:hover {background-color: #ddd;}
   
-#scan th {
+  #scan th {
-  border-collapse: collapse;
+    border-collapse: collapse;
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
-}
+  }
-</style>
+  </style>
   
   
   
-<style>
+  <style>
-#details {
+  #details {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 50%;
+    width: 50%;
-}
+  }
   
-#details td, #details th {
+  #details td, #details th {
    
-  padding: 8px;
+    padding: 8px;
-  font-size:11px;
+    font-size:11px;
-}
+  }
   
-#details tr:nth-child(even){background-color: #ffffff;}
+  #details tr:nth-child(even){background-color: #ffffff;}
   
-#details tr:hover {background-color: #ffffff;}
+  #details tr:hover {background-color: #ffffff;}
   
-#details th {
+  #details th {
-  padding-top: 12px;
+    padding-top: 12px;
- font-style:bold;
+   font-style:bold;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
-}
+  }
-</style>
+  </style>
   
-<style>
+  <style>
-#sign {
+  #sign {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 100%;
+    width: 100%;
-}
+  }
   
-#sign td, #sign th {
+  #sign td, #sign th {
   
-  padding: 8px;
+    padding: 8px;
-  font-size:11px;
+    font-size:11px;
-  text-align: center;
+    text-align: center;
-}
+  }
   
-#sign tr:nth-child(even){background-color: #ffffff;}
+  #sign tr:nth-child(even){background-color: #ffffff;}
   
-#sign tr:hover {background-color: #ddd;}
+  #sign tr:hover {background-color: #ddd;}
   
-#sign th {
+  #sign th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
-}
+  }
-</style>
+  </style>
   
   
   
-<style>
+  <style>
-#title {
+  #title {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width: 50%;
+    width: 50%;
-}
+  }
   
-#title td, #title th {
+  #title td, #title th {
    
-  padding:4px;
+    padding:4px;
-  font-size:12px;
+    font-size:12px;
-  border: 0px solid #fff;
+    border: 0px solid #fff;
-}
+  }
   
-#title tr:nth-child(even){background-color: #ffffff;}
+  #title tr:nth-child(even){background-color: #ffffff;}
   
-#title tr:hover {background-color: #ddd;}
+  #title tr:hover {background-color: #ddd;}
   
-#title th {
+  #title th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
   
-}
+  }
-</style>
+  </style>
   
-<style>
+  <style>
-#details {
+  #details {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width:80%;
+    width:80%;
   
-}
+  }
   
-#details td, #details th {
+  #details td, #details th {
    
-  padding:4px;
+    padding:4px;
-  font-size:12px;
+    font-size:12px;
-  border: 0px solid #ddd;
+    border: 0px solid #ddd;
-}
+  }
   
-#details tr:nth-child(even){background-color: #ffffff;}
+  #details tr:nth-child(even){background-color: #ffffff;}
   
-#details tr:hover {background-color: #ddd;}
+  #details tr:hover {background-color: #ddd;}
   
-#details th {
+  #details th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
   
-}
+  }
-</style>
+  </style>
   
-<style>
+  <style>
-#title {
+  #title {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
    
-  width:95%;
+    width:95%;
    
   
-}
+  }
   
-#title td, #title th {
+  #title td, #title th {
    
-  padding:4px;
+    padding:4px;
-  font-size:12px;
+    font-size:12px;
     
-}
+  }
   
-#title tr:nth-child(even){background-color: #ffffff;}
+  #title tr:nth-child(even){background-color: #ffffff;}
   
-#title tr:hover {background-color: #ddd;}
+  #title tr:hover {background-color: #ddd;}
   
-#title th {
+  #title th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
   
-}
+  }
-</style>
+  </style>
   
   
   
-<style>
+  <style>
-#tarikh_cetak {
+  #tarikh_cetak {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width:50%;
+    width:50%;
   
-}
+  }
   
-#tarikh_cetak  td, #tarikh_cetak th {
+  #tarikh_cetak  td, #tarikh_cetak th {
    
-  padding:4px;
+    padding:4px;
-  font-size:12px;
+    font-size:12px;
   
-}
+  }
   
-#tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
+  #tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
   
-#tarikh_cetak  tr:hover {background-color: #ddd;}
+  #tarikh_cetak  tr:hover {background-color: #ddd;}
   
-#tarikh_cetak  th {
+  #tarikh_cetak  th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
   
-}
+  }
-</style>
+  </style>
   
   
-<style>
+  <style>
-#glejer {
+  #glejer {
-  font-family: Arial, Helvetica, sans-serif;
+    font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
+    border-collapse: collapse;
-  width:100%;
+    width:100%;
   
   
-}
+  }
   
-#glejer  td, #glejer th {
+  #glejer  td, #glejer th {
    
-  padding:4px;
+    padding:4px;
-  font-size:12px;
+    font-size:12px;
-  border: 1px solid #ddd;
+    border: 1px solid #ddd;
-  padding: 6px;
+    padding: 6px;
   
-}
+  }
   
-#glejer  tr:nth-child(even){background-color: #ffffff;}
+  #glejer  tr:nth-child(even){background-color: #ffffff;}
   
-#glejer  tr:hover {background-color: #ddd;}
+  #glejer  tr:hover {background-color: #ddd;}
   
-#glejer  th {
+  #glejer  th {
-  padding-top: 12px;
+    padding-top: 12px;
-  padding-bottom: 12px;
+    padding-bottom: 12px;
-  text-align: left;
+    text-align: left;
-  padding:4px;
+    padding:4px;
-  color:black;
+    color:black;
   
-}
+  }
-</style>
+  </style>
   
   
   
-<table id="header">
+  <table id="header">
-  <tr>
-    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
-    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
-    <td></td>
-  </tr>
-</table>
-<br>
-<br>
-
-<table id="title">
-<td> <b><u>LEJER AM</u></b></td>
-</table>
-<br>
-
-
-<table id="tarikh_cetak">
-
-<tr>
-<td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}}  </td>
-<td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td> 
-</tr>
-
-</table>
-
-<br>
-
-<table id="glejer">
     <tr>
-<th  style="width:10px">KOD GL</th><th colspan="2"   style="width:50px">  KETERANGAN</th> <th style="width:5px">DEBIT</th> <th style="width:5px" >KREDIT</th><th style="width:10px">JUMLAH</th>
+      <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
-</tr>
+      <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
-@foreach($data as $index=>$var)
+    </tr>
-<tr>
+    <tr>
+      <td>{{ $cawangan_detail['namacaw'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat1'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+      <td></td>
+    </tr>
+  </table>
+  <br>
+  <br>
   
-<td style="width:10px">{{ $var['glcode']}}</td><td colspan="2"  style="width:50px" >{{$var['descpt']}}</td><td style="width:5px" > {{$var['debit']}}</td><td style="width:5px"> {{$var['kredit']}} </td>
+  <table id="title">
+  <td> <b><u>LEJER AM</u></b></td>
+  </table>
+  <br>
   
-@if($var['hariini'] >0 )
-<td style="width:10px">  {{
   
-            $var['hariini']
+  <table id="tarikh_cetak">
-       }}
+  
+  <tr>
+  <td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}}  </td>
+  <td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td> 
+  </tr>
+  
+  </table>
+  
+  <br>
+  
+  <table id="glejer">
+      <tr>
+  <th  style="width:10px">KOD GL</th><th colspan="2"   style="width:50px">  KETERANGAN</th> <th style="width:5px">DEBIT</th> <th style="width:5px" >KREDIT</th><th style="width:10px">JUMLAH</th>
+  </tr>
+  @foreach($data as $index=>$var)
+  <tr>
+  
+  <td style="width:10px">{{ $var['glcode']}}</td><td colspan="2"  style="width:50px" >{{$var['descpt']}}</td><td style="width:5px" > {{$var['total_debit']}}</td><td style="width:5px"> {{$var['total_kredit']}} </td>
+  
+  @if($var['totalharini'] >0 )
+  <td style="width:10px">  {{
+  
+              $var['totalharini']
+         }}
     
     
     
-   </td>
+     </td>
-@else
+  @else
-<td>
+  <td>
   
   
-(     {{  number_format(abs($var['hariini']),2)}}       )
+  (     {{  number_format(abs($var['totalharini']),2)}}       )
   
   
   
-</td>
+  </td>
   
- @endif
+   @endif
   
-</tr>
+  </tr>
-@endforeach
-<tr>
-
-<td colspan="3" style="width:60px"><B>JUMLAH: </B></td><td><b>@foreach($debit as $db=>$vr) {{  number_format($vr['totalDebit'],2)}} @endforeach    
-
-</b></td><td> <b> @foreach($kredit as $db=>$vr) {{  number_format($vr['totalKredit'],2)}} @endforeach </b> </td>
-<td>    <b>
-
-
-@foreach($kredit as $db=>$vr)
-@foreach($debit as $db2=>$vr2)
-
-{{  number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2)  }}
-@endforeach
   @endforeach
+  <tr>
+  
+  <td colspan="3" style="width:60px"><B>JUMLAH: </B></td><td><b>@foreach($debit as $db=>$vr) {{  number_format($vr['totalDebit'],2)}} @endforeach    
+  
+  </b></td><td> <b> @foreach($kredit as $db=>$vr) {{  number_format($vr['totalKredit'],2)}} @endforeach </b> </td>
+  <td>    <b>
+  
+  
+  @foreach($kredit as $db=>$vr)
+  @foreach($debit as $db2=>$vr2)
+  
+  {{  number_format($vr['totalKredit'] -$vr2['totalDebit'] ,2)  }}
+  @endforeach
+    @endforeach
   
   
   
@@ -393,60 +393,62 @@
   
   
   
-               </b>     </td>
+                 </b>     </td>
   
   
   
-</tr>
+  </tr>
   
   
   
   
   
   
-</table>
   
   
-<br>
+  </table>
-<br>
   
   
-<table id="details">
+  <br>
-<tr>
+  <br>
-<th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
-</tr>
-<tr>
   
-<td> </td> 
-<td> </td> 
   
-<td> </td> 
+  <table id="details">
+  <tr>
+  <th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
+  </tr>
+  <tr>
   
-<td> </td> 
+  <td> </td> 
+  <td> </td> 
   
-</tr>
+  <td> </td> 
   
-<tr>
+  <td> </td> 
   
-<td> </td> 
+  </tr>
-<td> </td> 
   
-<td> </td> 
+  <tr>
   
-<td> </td> 
+  <td> </td> 
+  <td> </td> 
   
-</tr>
+  <td> </td> 
+  
+  <td> </td> 
+  
+  </tr>
   
   
   
   
   
   
- <tr>
+   <tr>
- <td></td>
+   <td></td>
- <td>........................................................</td><td></td>
+   <td>........................................................</td><td></td>
- <td>......................................................... </td>
+   <td>......................................................... </td>
- <td> </td>
+   <td> </td>
- </tr>
+   </tr>
   
-</table>
+  </table>

resources/views/print/laporan_penebusan.blade.php

@@ -145,12 +145,6 @@
 </style>
 
 
-
-
-
-
-
-
 <table id="header">
   <tr>
     {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
@@ -186,7 +180,7 @@
     <th></th>
   </tr>
   <tr>
-    <td style="width:10px"> <b>TARIKH</b></td>
+    <td style="width:10px"> <b>Tarikh:</b></td>
     <td>@php 
           $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
@@ -194,12 +188,6 @@
         @endphp</td>
     <td style="width:50px">   
     </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
   </tr>
 </table>
 
@@ -219,9 +207,9 @@
     <th width="6%;">Bayaran(RM)</th>
     <th width="6%;">Jumlah(RM)</th>
   </tr>
-  @php $counter = 1; $totalbayaran = 0;@endphp
+  @php $counter = 1; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
+  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah'];@endphp
     @if($index > 0)
         @if($item['teller'] != $tebus[$index - 1]['teller'])
             <tr>
@@ -238,18 +226,11 @@
     <tr>
       <td>{{ $counter }}</td>
       <td>{{ $item['norujukan'] }}</td>
+      <td>{{ $item['nama'] }}</td>
+      <td>{{ $item['nokp'] }}</td>
       <td>
         @php 
-            $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']);
-            $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
-            
-            echo $customer_detail['nama'];
-        @endphp
-      </td>
-      <td>{{$gadai_detail[0][0]['nokp']}}</td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_detail[0][0]['t_gadai']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate);
         @endphp
@@ -296,24 +277,19 @@
   @endforeach
 </table>
 
-<h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5>
+<br><br>
-
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
-<br>
-<br>
-<table id="sign">
   <tr>
-    <td></td>
+    <th colspan="9"></th>
-    <td colspan="2"> .................................................................. </td>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
-    <td> </td>
+    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
-    <td colspan="2">.................................................................. </td>
+    <th style="text-align:center;">Jumlah (RM)</th>
-    <td> </td>
   </tr>
   <tr>
-    <td></td>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td>{{ number_format($totalpinjaman,2) }}</td>
-    <td> </td>
+    <td>{{ number_format($totalupah,2) }}</td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td>{{ number_format($totalbayaran,2) }}</td>
-    <td> </td>
   </tr>
 </table>
 
@@ -349,12 +325,26 @@
     <td>{{ number_format($upahlama['total'],2) }}</td>
     <td> Not Applicable </td>
   </tr>
+</table>
+
+{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
+
+<br>
+<br>
+<table id="sign">
   <tr>
-    <td> 0 </td>
+    <td></td>
-    <td>Baki Lelong</td>
+    <td colspan="2"> .................................................................. </td>
-    <td> 0.00 </td>
+    <td> </td>
-    <td> Not Applicable </td>
+    <td colspan="2">.................................................................. </td>
-    <td> Not Applicable </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> DI SEMAK</B> </td>
+    <td> </td>
+    <td colspan="2"><B>DI SAHKAN </B></td>
+    <td> </td>
   </tr>
 </table>
 
@@ -363,3 +353,5 @@
 
 
 
+
+

resources/views/print/laporan_ringkasanterkumpulv2.blade.php

@@ -0,0 +1,188 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+.box{
+  border:1px solid black;
+  padding:3px;
+}
+</style>
+<link rel="stylesheet" href="{{ asset('vendor/bootstrap/css/bootstrap.min.css') }}">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script src="{{ asset('vendor/bootstrap/js/bootstrap.min.js') }}"></script>
+
+<table id="header">
+  <tr>
+    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr>
+</table>
+<br><br>
+<p style="font-weight: bold;margin-left: 10px;">Tarikh Mula: {{ $mula_date }}  <span style="margin-left:20px;">Tarikh Hingga : {{ $hingga_date }}</span> <span style="margin-left:20px;">Tarikh Cetak : {{ $tarikh_cetak }}</span></p>
+
+<div class="row p-4">
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>A) LAPORAN TERKUMPUL</b></p>
+      </div>
+      <div class="col-6">1. PEMBIAYAAN</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}</div>
+      <div class="col-6">2. PENEBUSAN</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['total_tebus'],2) }}</div>
+      <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['total_ansuran'],2) }}</div>
+      <div class="col-6">4. BAYARAN ONLINE</div>
+      <div class="col-6"> RM 0.00 </div>
+      <div class="col-6">5. KEUNTUNGAN</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['total_keuntungan'],2) }}</div>
+      <div class="col-6">6. KEUNTUNGAN ONLINE</div>
+      <div class="col-6"> RM 0.00 </div>
+    </div>
+  </div>
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>B) BIL TRANSAKSI</b></p>
+      </div>
+      <div class="col-6">1. PEMBIAYAAN</div>
+      <div class="col-6">{{ $laporan_ringkasan['bilangan_gadai'] }}</div>
+      <div class="col-6">2. PENEBUSAN</div>
+      <div class="col-6">{{ $laporan_ringkasan['bilangan_tebus'] }}</div>
+      <div class="col-6">3. ANSURAN PEMBIAYAAN</div>
+      <div class="col-6">{{ $laporan_ringkasan['bilangan_ansuran'] }}</div>
+      <div class="col-6">4. BAYARAN ONLINE</div>
+      <div class="col-6">0</div>
+      <div class="col-6">5. PELANGGAN BARU</div>
+      <div class="col-6">{{ $laporan_ringkasan['bilangan_customer_baru'] }}</div>
+    </div>
+  </div>
+</div>
+
+<div class="row p-4">
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>F) LELONG</b></p>
+      </div>
+      <div class="col-6">1. LELONG HARI INI</div>
+      <div class="col-6">RM  {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}</div>
+      <div class="col-6">2. BAKI</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}</div>
+      <div class="col-6">3. RUGI</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}</div>
+      <div class="col-6">4. CAJ LELONG</div>
+      <div class="col-6">RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}</div>
+      <div class="col-6">5. BIL</div>
+      <div class="col-6">{{ $laporan_ringkasan['bilangan_lelong'] }}</div>
+    </div>
+  </div>
+  <div class="col-6 box">
+    <div class="row form-group">
+      <div class="col-12">
+        <p><b>G) BAYAR BAKI LELONG</b></p>
+      </div>
+      <div class="col-6">RM</div>
+      <div class="col-6"></div>
+    </div>
+  </div>
+</div>
+
+<div class="row p-4">
+  <div class="col-12 box">
+    <div class="row">
+      <div class="col-12">
+        <p><b>H) PERATUSAN PEMBIAYAAN</b></p>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <table class="table">
+          <thead>
+            <tr>
+              <th></th>
+              <th>MARGIN</th>
+              <th>70%</th>
+              <th>75%</th>
+              <th>80%</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>1</td>
+              <td>PEMBIAYAAN</td>
+              <td>RM {{ number_format($laporan_ringkasan['gadai_70'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}</td>
+            </tr>
+            <tr>
+              <td>2</td>
+              <td>NILAI MARHUN</td>
+              <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}</td>
+              <td>RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}</td>
+            </tr>
+            <tr>
+              <td>3</td>
+              <td>BILANGAN</td>
+              <td>{{ $laporan_ringkasan['bilangan_70'] }}</td>
+              <td>{{ $laporan_ringkasan['bilangan_75'] }}</td>
+              <td>{{ $laporan_ringkasan['bilangan_80'] }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+</div>
+<br><br>
+<div class="row p-4">
+  <div class="col-6 text-center">
+    <div class="row mb-5">
+      <div class="col-12">DISEMAK</div>
+    </div>
+    <div class="row">
+      <div class="col-12">................................................</div>
+    </div>
+  </div>
+  <div class="col-6 text-center">
+    <div class="row mb-5">
+      <div class="col-12">DISAHKAN</div>
+    </div>
+    <div class="row">
+      <div class="col-12">................................................</div>
+    </div>
+  </div>
+</div>

resources/views/print/laporan_upah.blade.php

@@ -0,0 +1,317 @@
+<style>
+#header {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#header td, #customers th {
+ 
+  padding:4px;
+  font-size:10px;
+}
+
+#header tr:nth-child(even){background-color: #ffffff;}
+
+#header tr:hover {background-color: #ddd;}
+
+#header th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+ 
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+<style>
+#scan {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#scan td, #scan th {
+  border-collapse: collapse;
+  padding: 8px;
+  font-size:11px;
+}
+
+#scan tr:nth-child(even){background-color: #ffffff;}
+
+#scan tr:hover {background-color: #ddd;}
+
+#scan th {
+  border-collapse: collapse;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+
+
+<style>
+#details {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#details td, #details th {
+ 
+  padding: 8px;
+  font-size:8px;
+}
+
+#details tr:nth-child(even){background-color: #ffffff;}
+
+#details tr:hover {background-color: #ddd;}
+
+#details th {
+  padding-top: 12px;
+ font-style:bold;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+</style>
+
+<style>
+#sign {
+  font-family: Arial, Helvetica, sans-serif;
+  border-collapse: collapse;
+  width: 100%;
+}
+
+#sign td, #sign th {
+
+  padding: 8px;
+  font-size:11px;
+  text-align: center;
+}
+
+#sign tr:nth-child(even){background-color: #ffffff;}
+
+#sign tr:hover {background-color: #ddd;}
+
+#sign th {
+  padding-top: 12px;
+  padding-bottom: 12px;
+  text-align: left;
+  padding:4px;
+  color:black;
+}
+
+@media print {
+  .new-page {
+    page-break-before: always;
+  }
+}
+
+</style>
+
+
+
+
+
+
+
+
+<table id="header">
+  <tr>
+    {{-- <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th> --}}
+    {{-- <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th> --}}
+  </tr>
+  <tr>
+    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
+    <td></td>
+  </tr>
+  {{-- <tr>
+    <td>{{ $cawangan_detail['alamat1'] }}</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    <td></td>
+  </tr> --}}
+</table>
+<br>
+
+<table id="scan">
+  <tr>
+    <th colspan ="5"><b>LAPORAN UPAH</b></th>
+    <th> </th>
+    <th> </th>
+    <th></th>
+  </tr>
+  <tr>
+    <th colspan="5"><b> TARIKH CETAK:</b>
+      @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate);
+      @endphp
+  </th>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  <td> </td>
+  </tr>
+  <tr>
+    <td style="width:10px"> <b>MULA:</b></td>
+    <td>@php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
+          $formattedweddingdate = $myDateTime->format('d-m-Y');
+          echo($formattedweddingdate);
+        @endphp</td>
+     <td style="width:10px"> <b>HINGGA:</b></td>
+     <td>@php 
+           $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
+           $formattedweddingdate = $myDateTime->format('d-m-Y');
+           echo($formattedweddingdate);
+         @endphp</td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+    <td> </td>
+  </tr>
+</table>
+
+<br>
+<table id="details">
+  <tr>
+    <th>Bil</th>
+    <th>Tarikh</th>
+    <th>No Rujukan</th>
+    <th>Teller</th>
+    <th>Pinjaman</th>
+    <th>JBG</th>
+    <th>Upah Dibayar</th>
+  </tr>
+  @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+  @foreach($advansur as $index=>$item)
+  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
+    @if($index > 0)
+      @if($item['teller'] != $advansur[$index - 1]['teller'])
+            <tr>
+                <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+            </tr>
+          @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+        @endif
+      @else
+        <tr>
+            <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
+        </tr>
+        @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+
+    @endif
+  
+    <tr>
+      <td>{{ $counter }}</td>
+      <td>{{ $item['tarikh'] }}</td>
+      <td><b>{{ $item['norujukan'] }}</b></td>
+      <td>{{ $item['teller'] }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ $item['jbg'] }}</td>
+      <td>{{ number_format($item['upahDibayar'],2) }}</td>
+    </tr>
+    @php $counter++; @endphp
+    @if($index+1 < sizeof($advansur))
+    @if($item['teller'] != $advansur[$index + 1]['teller'])
+        <tr>
+            <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+            <td></td>
+            <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+        </tr>
+        @php  @endphp
+    @endif
+@else
+    <tr>
+        <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+        <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
+        <td></td>
+        <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+    </tr>
+@endif
+  @endforeach
+</table>
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Upah Dibayar (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalpembiayaan,2) }}</td>
+    <td>{{ number_format($totalbayaran,2) }}</td>
+  </tr>
+</table>
+
+<br>
+<br><br><br>
+<table id="sign">
+  <tr>
+    <td></td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2"> .................................................................. </td>
+    <td> </td>
+    <td colspan="2">.................................................................. </td>
+    <td> </td>
+  </tr>
+  <tr>
+    <td></td>
+    <td colspan="2"><B> Disediakan </B> </td>
+    <td></td>
+    <td colspan="2"><B> Disemak </B> </td>
+    <td> </td>
+    <td colspan="2"><B> Disahkan </B></td>
+    <td> </td>
+  </tr>
+</table>
+
+
+
+
+
+

routes/web.php

@@ -133,7 +133,7 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC
 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('/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');
@@ -150,6 +150,7 @@ Route::post('/kemaskinipendahuluan', ['as' =>'khazanah.kemaskiniPendahuluan','us
 Route::post('/kemaskiniserahan',['as'=>'khazanah.KemaskiniSerahan','uses'=>'KhazanahController@KemaskiniSerahan'])->middleware('auth','khazanah');
 Route::get('/kakitangan',['as'=>'khazanah.kakitangan','uses'=>'KhazanahController@kakitangan'])->middleware('auth','khazanah');
 Route::get('/dashboard',['as'=>'khazanah.dashboard','uses'=>'KhazanahController@dashboard'])->middleware('auth','khazanah');
+Route::get('/dashboarddate',['as'=>'khazanah.dashboarddate','uses'=>'KhazanahController@changedatedashboard'])->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.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah');
@@ -181,6 +182,9 @@ Route::put('/simpantuntutbaki',['as'=>'lelong.tuntutbaki','uses'=>'LelongControl
 //Laporan Baru
 Route::get('/laporan/lelongan',['as'=>'laporan.lelongan','uses'=>'KhazanahController@laporanLelongan'])->middleware('auth','khazanah');
 Route::post('laporan/lelongan/cetak',['as'=>'lelongan.laporancetak','uses'=>'KhazanahController@cetaklaporanLelongan'])->middleware('auth','khazanah');
+Route::get('/laporan/homepage/ansuranupah',['as'=>'homepage.ansuranupah','uses'=>'KhazanahController@PemilihanAnsUpah'])->middleware('auth','khazanah');
+Route::get('/laporan/upah',['as'=>'laporan.upah','uses'=>'KhazanahController@LaporanUpah'])->middleware('auth','khazanah');
+Route::post('laporan/upah/cetak',['as'=>'upah.laporancetak','uses'=>'KhazanahController@cetaklaporan_Upah'])->middleware('auth','khazanah');
 Route::get('/laporan/ansuran',['as'=>'laporan.ansuran','uses'=>'KhazanahController@laporanAnsuran'])->middleware('auth','khazanah');
 Route::post('laporan/ansuran/cetak',['as'=>'ansuran.laporancetak','uses'=>'KhazanahController@cetakLaporanAnsuran'])->middleware('auth','khazanah');
 Route::get('/laporan/pelangganbaru',['as'=>'laporan.pelangganbaru','uses'=>'KhazanahController@laporanPelangganBaru'])->middleware('auth','khazanah');
@@ -199,6 +203,7 @@ Route::get('/laporan/marhunterkumpul',['as'=>'laporan.marhunterkumpul','uses'=>'
 Route::post('laporan/marhunterkumpul/cetak',['as'=>'marhunterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanMarhunTerkumpul'])->middleware('auth','khazanah');
 Route::get('laporan/ringkasanharian/',['as'=>'laporan.ringkasanharian','uses'=>'KhazanahController@laporanRingkasanHarian'])->middleware('auth','khazanah');
 Route::get('laporan/ringkasanharian/cetak',['as'=>'ringkasanharian.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanHarian'])->middleware('auth','khazanah');
+Route::get('laporan/ringkasanterkumpul/',['as'=>'laporan.ringkasanterkumpul','uses'=>'KhazanahController@laporanRingkasanTerkumpul'])->middleware('auth','khazanah');
 Route::get('laporan/ringkasanterkumpul/cetak',['as'=>'ringkasanterkumpul.laporancetak','uses'=>'KhazanahController@cetakLaporanRingkasanTerkumpul'])->middleware('auth','khazanah');
 Route::get('/laporan/agingbulanan', [ 'as'=>'laporan.agingbulanan', 'uses'=>'KhazanahController@laporanAging_Bulanan'])->middleware('auth','khazanah');
 Route::post('/laporan/agingbulanan/cetak', ['as'=>'agingbulan.cetaklaporan', 'uses'=>'KhazanahController@cetaklaporang_Aging'])->middleware('auth','khazanah');