Merge branch 'new-pipi' into 'new-super'

perubahan dari segi alirantunai upah semua la okay?

See merge request online-sistem1/kaunter!144

app/Http/Controllers/KhazanahController.php

@@ -3182,6 +3182,15 @@ class KhazanahController extends Controller
         return view('print.laporan_marhunterkumpul', compact('marhun','cawangan_detail','tarikh_cetak','tebus_date','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 laporanRingkasanHarian(){
         $auth_user = Auth::user();
         $api_url = config('api.url');
@@ -3278,21 +3287,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(){
@@ -3486,335 +3507,6 @@ class KhazanahController extends Controller
 
                         $amaun=$request->amaun;
                         
-                        if($request->jenisgldetail == 'serahan')
-                        {
-
-
-
-                            $KOD_SERAH='1000/020';
-                            $TUNAI='1000/010';
-                            $get_glCode_Details=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$KOD_SERAH])->json();
-
-                            $gl_cdetails=$get_glCode_Details[0];
-                            $keterangan=$get_glCode_Details[0]['descpt'];  //keterangan glcode
-                            $actype=$get_glCode_Details[0]['acttype'];     //keterangan acctype
-
-                            $get_current_GLejer_Details=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KOD_SERAH])->json();
-                            if(sizeof($get_current_GLejer_Details)==0)
-                            {
-                                
-                                $jumlah=0.0;
-
-
-                                $getGLedjer=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KOD_SERAH])->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'=>$KOD_SERAH])->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'=>$KOD_SERAH])->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'=>$KOD_SERAH,
-                                    'descpt'=>$keterangan,
-                                    'debit'=>$amaun,
-                                    'kredit'=>0.0,
-                                    'hariini'=>$HariIni,
-                                    'kelmarin'=>$kelmarin,
-                                    'jumlah'=>$jumlah,
-                                    'bulanini'=>$jumlahBulan_ini,
-                                    'tahunini'=>$Jumlah_TahunIni,
-                                    'acttype'=> $actype
-               
-                                ]);
-
-                                $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
-                                        
-                                $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+$amaun;
-                                $Hari_Ini=$debit-$kredit;
-                                $Kelmarin=$jumlah-$Hari_Ini;     
-                                $update_lejerTunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno,
-                                    'debit'=>$debit,
-                                    'kredit'=>$kredit,
-                                    'hariini'=>$Hari_Ini,
-                                    'kelmarin' =>$kelmarin,    
-                                
-                                    ]);
-
-                            }
-                            else
-                            {
-                     
-                                $hariIni_serah=$get_current_GLejer_Details=[0]['hariini'];
-                                $jumlah_serah=$get_current_GLejer_Details=[0]['kelmarin'];
-                                $kredit_serah=$get_current_GLejer_Details=[0]['kredit'];
-                                $debit_serah=$get_current_GLejer_Details=[0]['debit'];
-                                $recno_serah=$get_current_GLejer_Details=[0]['recno'];
-
-
-                                
-                                $debit_serah=$debit_serah+$amaun;
-                                $hariIni_serah=$debit_serah-$kredit_serah;
-                                $kelmarin_serah=$jumlah_serah-$hariIni_serah;     
-                                $update_lejerSerah=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno_serah,
-                                    'debit'=>$debit_serah,
-                                    'kredit'=>$kredit_serah,
-                                    'hariini'=>$hariIni_serah,
-                                    'kelmarin' =>$kelmarin_serah,    
-                                
-                                    ]);
-
-
-                                $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
-                                        
-                                $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+$amaun;
-                                $Hari_Ini=$debit-$kredit;
-                                $Kelmarin=$jumlah-$Hari_Ini;     
-                                $update_lejerTunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno,
-                                    'debit'=>$debit,
-                                    'kredit'=>$kredit,
-                                    'hariini'=>$Hari_Ini,
-                                    'kelmarin' =>$Kelmarin,    
-                                
-                                    ]);
-
-                            }
-                           
-                            
-
-                        }
-
-
-
-
-                        if($request->jenisgldetail == 'pendahuluan')
-                        {
-
-
-
-                            $KOD_SERAH='7000/102';
-                            $TUNAI='1000/010';
-                            $get_glCode_Details=Http::get(config('api.url').'/api/getGlCode/'. $auth_user['cawangan'],['glcode'=>$KOD_SERAH])->json();
-
-                            $gl_cdetails=$get_glCode_Details[0];
-                            $keterangan=$get_glCode_Details[0]['descpt'];  //keterangan glcode
-                            $actype=$get_glCode_Details[0]['acttype'];     //keterangan acctype
-
-                            $get_current_GLejer_Details=Http::get(config('api.url').'/api/getGlejer/'. $auth_user['cawangan'],['glcode'=>$KOD_SERAH])->json();
-                            if(sizeof($get_current_GLejer_Details)==0)
-                            {
-                                
-                                $jumlah=0.0;
-
-
-                                $getGLedjer=Http::get(config('api.url').'/api/getSemalam_Glejer/'.$auth_user['cawangan'],['glcode'=>$KOD_SERAH])->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'=>$KOD_SERAH])->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'=>$KOD_SERAH])->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'=>$KOD_SERAH,
-                                    'descpt'=>$keterangan,
-                                    'debit'=>0.0,
-                                    'kredit'=>$amaun,
-                                    'hariini'=>$HariIni,
-                                    'kelmarin'=>$kelmarin,
-                                    'jumlah'=>$jumlah,
-                                    'bulanini'=>$jumlahBulan_ini,
-                                    'tahunini'=>$Jumlah_TahunIni,
-                                    'acttype'=> $actype
-               
-                                ]);
-
-                                $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
-                                        
-                                $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'];
-
-                                $debit=$debit+$amaun;
-                                $Hari_Ini=$debit-$kredit;
-                                $Kelmarin=$jumlah-$Hari_Ini;     
-                                $update_lejerTunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno,
-                                    'debit'=>$debit,
-                                    'kredit'=>$kredit,
-                                    'hariini'=>$Hari_Ini,
-                                    'kelmarin' =>$kelmarin,    
-                                
-                                    ]);
-
-                            }
-                            else
-                            {
-                     
-                                $hariIni_serah=$get_current_GLejer_Details=[0]['hariini'];
-                                $jumlah_serah=$get_current_GLejer_Details=[0]['kelmarin'];
-                                $kredit_serah=$get_current_GLejer_Details=[0]['kredit'];
-                                $debit_serah=$get_current_GLejer_Details=[0]['debit'];
-                                $recno_serah=$get_current_GLejer_Details=[0]['recno'];
-
-
-                                
-                                $kredit_serah=$kredit_serah+$amaun;
-                                $hariIni_serah=$debit_serah-$kredit_serah;
-                                $kelmarin_serah=$jumlah_serah-$hariIni_serah;     
-                                $update_lejerSerah=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno_serah,
-                                    'debit'=>$debit_serah,
-                                    'kredit'=>$kredit_serah,
-                                    'hariini'=>$hariIni_serah,
-                                    'kelmarin' =>$kelmarin_serah,    
-                                
-                                    ]);
-
-
-                                $get_lejer=Http::get(config('api.url').'/api/getGlejer/'.$auth_user['cawangan'],['glcode'=>$TUNAI])->json();
-                                        
-                                $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'];
-
-                                $debit=$debit+$amaun;
-                                $Hari_Ini=$debit-$kredit;
-                                $Kelmarin=$jumlah-$Hari_Ini;     
-                                $update_lejerTunai=Http::put(config('api.url').'/api/kemasKiniGlejer/'.$auth_user['cawangan'],[
-                                    'recno'=>$recno,
-                                    'debit'=>$debit,
-                                    'kredit'=>$kredit,
-                                    'hariini'=>$Hari_Ini,
-                                    'kelmarin' =>$Kelmarin,    
-                                
-                                    ]);
-
-                            }
-                           
-                            
-
-                        }
-
-                        
-
-
-
-
-
-
-                      
-
-
-                            
-        
          $peti_besi_terkini=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
 
         if(sizeof($peti_besi_terkini) == 0){
@@ -3826,7 +3518,6 @@ class KhazanahController extends Controller
             ])->json();
 
         }else{
-
            
             $pendahuluanserahan = Http::put(config('api.url').'/api/UpdateVaultPendahuluanSerahan/'. $auth_user['cawangan'],[
                 'jenispendahuluanserahan' => $request->jenisgldetail,
@@ -4518,4 +4209,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'));
+    }
+
 }

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/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
     });
@@ -120,40 +120,62 @@
         var total_pinjaman = 0;
         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/khazanah/pendahuluanserahanmain.blade.php

@@ -298,7 +298,7 @@
 
                             $('#denominasiHQModal').modal('hide');
                             $('#pendahuluanserahanModal').modal('hide');
-
+                            location.reload();
                         });
 
                     }else if(data == 'GAGAL'){

resources/views/layouts/app.blade.php

@@ -172,7 +172,7 @@
                                 });
                             
                             </script>
-                        @elseif($auth_user['roles'] == 'teller') 
+                        @elseif($auth_user['role_harian'] == 'teller') 
                             <li class="nav-item dropdown" style="margin-right:10px;">
                                 <a id="navbarDropdown" class="nav-link " href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
                                     <i id="bell" class="fa fa-bell"></i>
@@ -187,7 +187,7 @@
                                 </div>
                             </li>
 
-                            <script>
+                            {{-- <script>
 
                                 // Enable pusher logging - don't include this in production
                                 // Pusher.logToConsole = true;
@@ -228,7 +228,7 @@
                                     $('#bell').css("color", "grey");
                                 });
                             
-                            </script>
+                            </script> --}}
                             
                         @endif
 

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/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_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>
+      <td>{{ $item['nama'] }}</td>
-        @php
+      <td>{{ $item['nokp'] }}</td>
-            $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
-            $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']);
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['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

@@ -181,6 +181,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 +202,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');