fix penebusan upah

app/Http/Controllers/KhazanahController.php

@@ -2817,38 +2817,17 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-
+        if($request->datetarikh == null){
-        // dd($request->all());
+            $gadai_date = $current->toDateString();
-      
-        if($request->datemula == null){
-            $split_date = explode('-', $request->datehingga);
-            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
-            
         }else{
-            $split_date = explode('-', $request->datemula);
+            $split_date = explode('-',$request->datetarikh);
-            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+            $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();
-        if($request->datehingga == null){
-            $hingga_date = $request->datemula;
-        }else{
-            $split_date = explode('-', $request->datehingga);
-            $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
-        }
-
-        if($request->datemula == null && $request->datehingga == null)
-        {
-            $mula_date = $current->toDateString();
-            $hingga_date = $current->toDateString();
-        }
-
-        // $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
-        $gadai = Http::get(config('api.url'). '/api/gadailaporanRange/'. $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];
-        // dd($gadai);
+     
-        return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+        return view('print.laporan_gadaian', compact('gadai','cawangan_detail','tarikh_cetak','gadai_date','api_url'));
     }
 
     public function laporanPenebusan(){
@@ -2859,43 +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->datetarikh == null){
-        if($request->datemula == null){
+              $tebus_date = $current->toDateString();
-            $split_date = explode('-', $request->datehingga);
+          }else{
-            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
+              $split_date = explode('-',$request->datetarikh);
-            
+              $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
-        }else{
+          }
-            $split_date = explode('-', $request->datemula);
+          $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
-            $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+          $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();
-
+  
-        if($request->datehingga == null){
+          $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
-            $hingga_date = $request->datemula;
+          $cawangan_detail=$cawangan[0];
-        }else{
+          // dd($gadai);
-            $split_date = explode('-', $request->datehingga);
+          return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','tebus_date','tebuspengasingan','api_url','upahlama'));
-            $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
+  
-        }
-
-        if($request->datemula == null && $request->datehingga == null)
-        {
-            $mula_date = $current->toDateString();
-            $hingga_date = $current->toDateString();
-        }
-
-        $tebus = Http::get(config('api.url'). '/api/tebuslaporanRange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
-        $tebuspengasingan = Http::get(config('api.url'). '/api/tebuslaporanjenistawarruqrange/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json();
-        $upahlama = Http::get(config('api.url'). '/api/advansurdetailsrange/'. $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];
-        // dd($gadai);
-        return view('print.laporan_penebusan', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama'));
     }
 
     public function laporanLelongan(){
@@ -4321,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();
@@ -4456,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'));

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/khazanah/dashboard.blade.php

@@ -25,9 +25,9 @@
                         </div>
                     </div>
 
-                    <div class="input-group mb-3">
+                    {{-- <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> --}}
 
                     <div class="row mt-4 col-12 d-flex justify-content-center">
                         {{-- First Column --}}

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

@@ -21,21 +21,14 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-">
+                        <div class="col-md-5">
                             <form action="{{ route('gadaian.laporancetak') }}" target="_blank" method="post">
                                 @csrf
                                 <div class="input-group mb-3">
-                                    <div class="input-group-prepend ml-3">
+                                    <div class="input-group-prepend">
-                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                     </div>
-                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" 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>
@@ -85,10 +78,7 @@
         "ordering": false
     });
     $(document).ready( function () {
-        $('#datemula').datepicker({
+        $('#datetarikh').datepicker({
-            format: 'dd-mm-yyyy'
-        });
-        $('#datehingga').datepicker({
             format: 'dd-mm-yyyy'
         });
         var current = new Date();
@@ -98,81 +88,22 @@
         var today_date = current_year + '-' +current_month+'-'+current_date;
         $.ajax({
             method:'get',
-            url: api_url + '/api/gadailaporanRange/'+kodcaw,
+            url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date,
-            data:{'mula' : today_date, 'akhir' : today_date },
             success: function(gadai){
-                console.log(gadai);
                 gadaitable(gadai);
             }
         });
     });
 
-    $('#datemula').change(function(){
+    $('#datetarikh').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 today_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 hingga = mula_date;
-        }
-
         $.ajax({
             method:'get',
-            url: api_url + '/api/gadailaporanRange/' + kodcaw,
+            url: api_url + '/api/gadai/laporan/'+kodcaw+'/' + today_date,
-            data:{'mula' : mula, 'akhir' : hingga },
+            success: function(gadai){
-            success: function(panjar){
+                gadaitable(gadai);
-                gadaitable(panjar);
-            }
-        });
-    });
-
-    $('#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 = hingga_date;
-
-            var mula = dulu_date;
-        }
-
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/gadailaporanRange/' + kodcaw,
-            data:{'mula' : mula, 'akhir' : hingga },
-            success: function(panjar){
-                gadaitable(panjar);
             }
         });
     });
@@ -190,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']),
@@ -213,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/penebusan.blade.php

@@ -21,21 +21,15 @@
                         </div>
                     </div>
                     <div class="row">
-                        <div class="col-md-">
+                        <div class="col-md-5">
                             <form action="{{ route('tebus.laporancetak') }}" target="_blank" method="post">
                                 @csrf
                                 <div class="input-group mb-3">
-                                    <div class="input-group-prepend ml-3">
+                                    <div class="input-group-prepend">
-                                        <span class="input-group-text" id="basic-addon1">Mula</span>
+                                        <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                     </div>
-                                    <input type="text" class="form-control col-4" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datemula" name="datemula" aria-describedby="basic-addon1">
+                                    <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" 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>
@@ -47,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>
@@ -83,115 +76,41 @@
         "ordering": true
     });
     $(document).ready( function () {
-        $('#datemula').datepicker({
+        $('#datetarikh').datepicker({
-            format: 'dd-mm-yyyy'
-        });
-        $('#datehingga').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/tebuslaporanRange/' + kodcaw,
+            url: api_url + '/api/tebus/laporan/' +kodcaw+ '/' + today_date,
-            data:{'mula' : today_date, 'akhir' : 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];
-    //     $.ajax({
-    //         method:'get',
-    //         url: api_url + '/api/tebus/laporan/'+kodcaw+'/' + today_date,
-    //         success: function(tebus){
-    //             tebustable(tebus);
-    //         }
-    //     });
-    //     $('#pinjamantotal').text('0.00');
-    //     $('#keuntungantotal').text('0.00');
-    //     $('#bayarantotal').text('0.00');
-
-    // });
-
-    $('#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 today_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 hingga = mula_date;
-        }
-
         $.ajax({
             method:'get',
-            url: api_url + '/api/tebuslaporanRange/' + kodcaw,
+            url: api_url + '/api/tebus/laporan/' + kodcaw + '/' + today_date,
-            data:{'mula' : mula, 'akhir' : hingga },
+            success: function(tebus){
-            success: function(panjar){
+                tebustable(tebus);
-                tebustable(panjar);
             }
         });
+        $('#pinjamantotal').text('0.00');
+        $('#keuntungantotal').text('0.00');
+        $('#bayarantotal').text('0.00');
+
     });
 
-    $('#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 = hingga_date;
-
-            var mula = dulu_date;
-        }
-
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/gadailaporanRange/' + kodcaw,
-            data:{'mula' : mula, 'akhir' : hingga },
-            success: function(panjar){
-                tebustable(panjar);
-            }
-        });
-    });
-
-
     const formatter = new Intl.NumberFormat('en-US', {
         minimumFractionDigits: 2
     });
@@ -201,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/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

@@ -174,15 +174,9 @@
     <th></th>
   </tr>
   <tr>
-    <td><b> Tarikh Mula:</b></td>
+    <td><b> Tarikh:</b></td>
     <td style="text-align:left;"> @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date);
-        $formattedweddingdate = $myDateTime->format('d-m-Y');
-        echo($formattedweddingdate)
-      @endphp</td>
-    <td><b> Tarikh Hingga:</b></td>
-    <td style="text-align:left;"> @php 
-        $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
         $formattedweddingdate = $myDateTime->format('d-m-Y');
         echo($formattedweddingdate)
       @endphp</td>
@@ -241,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>

resources/views/print/laporan_lejer_am.blade.php

@@ -1,452 +1,454 @@
 <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 {
- 
-  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: 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>
-
-<style>
-#sign {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#sign td, #sign th {
-
-  padding: 8px;
-  font-size:11px;
-  text-align: center;
-}
-
-#sign tr:nth-child(even){background-color: #ffffff;}
-
-#sign tr:hover {background-color: #ddd;}
-
-#sign th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#title {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 50%;
-}
-
-#title td, #title th {
- 
-  padding:4px;
-  font-size:12px;
-  border: 0px solid #fff;
-}
-
-#title tr:nth-child(even){background-color: #ffffff;}
-
-#title tr:hover {background-color: #ddd;}
-
-#title th {
-  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:80%;
-
-}
-
-#details td, #details th {
- 
-  padding:4px;
-  font-size:12px;
-  border: 0px solid #ddd;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ddd;}
-
-#details th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-
-}
-</style>
-
-<style>
-#title {
-  font-family: Arial, Helvetica, sans-serif;
- 
-  width:95%;
- 
-
-}
-
-#title td, #title th {
- 
-  padding:4px;
-  font-size:12px;
   
-}
+  #header td, #customers th {
-
+   
-#title tr:nth-child(even){background-color: #ffffff;}
+    padding:4px;
-
+    font-size:10px;
-#title tr:hover {background-color: #ddd;}
+  }
-
+  
-#title th {
+  #header tr:nth-child(even){background-color: #ffffff;}
-  padding-top: 12px;
+  
-  padding-bottom: 12px;
+  #header tr:hover {background-color: #ddd;}
-  text-align: left;
+  
-  padding:4px;
+  #header th {
-  color:black;
+    padding-top: 12px;
-
+    padding-bottom: 12px;
-}
+    text-align: left;
-</style>
+    padding:4px;
-
+    color:black;
-
+  }
-
+  </style>
-<style>
+  
-#tarikh_cetak {
+  
-  font-family: Arial, Helvetica, sans-serif;
+  
-  border-collapse: collapse;
+  
-  width:50%;
+  <style>
-
+  #scan {
-}
+    font-family: Arial, Helvetica, sans-serif;
-
+    border-collapse: collapse;
-#tarikh_cetak  td, #tarikh_cetak th {
+    width: 100%;
- 
+  }
-  padding:4px;
+  
-  font-size:12px;
+  #scan td, #scan th {
-
+   
-}
+    padding: 8px;
-
+    font-size:11px;
-#tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
+  }
-
+  
-#tarikh_cetak  tr:hover {background-color: #ddd;}
+  #scan tr:nth-child(even){background-color: #ffffff;}
-
+  
-#tarikh_cetak  th {
+  #scan tr:hover {background-color: #ddd;}
-  padding-top: 12px;
+  
-  padding-bottom: 12px;
+  #scan th {
-  text-align: left;
+    padding-top: 12px;
-  padding:4px;
+    padding-bottom: 12px;
-  color:black;
+    text-align: left;
-
+    padding:4px;
-}
+    color:black;
-</style>
+  }
-
+  </style>
-
+  
-<style>
+  
-#glejer {
+  <style>
-  font-family: Arial, Helvetica, sans-serif;
+  #scan {
-  border-collapse: collapse;
+    font-family: Arial, Helvetica, sans-serif;
-  width:100%;
+    border-collapse: collapse;
-
+    width: 100%;
-
+  }
-}
+  
-
+  #scan td, #scan th {
-#glejer  td, #glejer th {
+    border-collapse: collapse;
- 
+    padding: 8px;
-  padding:4px;
+    font-size:11px;
-  font-size:12px;
+  }
-  border: 1px solid #ddd;
+  
-  padding: 6px;
+  #scan tr:nth-child(even){background-color: #ffffff;}
-
+  
-}
+  #scan tr:hover {background-color: #ddd;}
-
+  
-#glejer  tr:nth-child(even){background-color: #ffffff;}
+  #scan th {
-
+    border-collapse: collapse;
-#glejer  tr:hover {background-color: #ddd;}
+    padding-top: 12px;
-
+    padding-bottom: 12px;
-#glejer  th {
+    text-align: left;
-  padding-top: 12px;
+    padding:4px;
-  padding-bottom: 12px;
+    color:black;
-  text-align: left;
+  }
-  padding:4px;
+  </style>
-  color:black;
+  
-
+  
-}
+  
-</style>
+  <style>
-
+  #details {
-
+    font-family: Arial, Helvetica, sans-serif;
-
+    border-collapse: collapse;
-<table id="header">
+    width: 50%;
-  <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>
+  #details td, #details th {
-  </tr>
+   
-  <tr>
+    padding: 8px;
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
+    font-size:11px;
-    <td></td>
+  }
-  </tr>
+  
-  <tr>
+  #details tr:nth-child(even){background-color: #ffffff;}
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
+  
-    <td></td>
+  #details tr:hover {background-color: #ffffff;}
-  </tr>
+  
-  <tr>
+  #details th {
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+    padding-top: 12px;
-    <td></td>
+   font-style:bold;
-  </tr>
+    padding-bottom: 12px;
-</table>
+    text-align: left;
-<br>
+    padding:4px;
-<br>
+    color:black;
-
+  }
-<table id="title">
+  </style>
-<td> <b><u>LEJER AM</u></b></td>
+  
-</table>
+  <style>
-<br>
+  #sign {
-
+    font-family: Arial, Helvetica, sans-serif;
-
+    border-collapse: collapse;
-<table id="tarikh_cetak">
+    width: 100%;
-
+  }
-<tr>
+  
-<td style="width:5px" ><b>TARIKH DARI</b></td ><td style="width:1px"> {{$tarikh_mula}}  </td>
+  #sign td, #sign th {
-<td style="width:5px" ><b>HINGGA</b></td><td style="width:1px"> {{$tarikh_akhir}} </td> 
+  
-</tr>
+    padding: 8px;
-
+    font-size:11px;
-</table>
+    text-align: center;
-
+  }
-<br>
+  
-
+  #sign tr:nth-child(even){background-color: #ffffff;}
-<table id="glejer">
+  
+  #sign tr:hover {background-color: #ddd;}
+  
+  #sign th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #title {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 50%;
+  }
+  
+  #title td, #title th {
+   
+    padding:4px;
+    font-size:12px;
+    border: 0px solid #fff;
+  }
+  
+  #title tr:nth-child(even){background-color: #ffffff;}
+  
+  #title tr:hover {background-color: #ddd;}
+  
+  #title th {
+    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:80%;
+  
+  }
+  
+  #details td, #details th {
+   
+    padding:4px;
+    font-size:12px;
+    border: 0px solid #ddd;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  
+  }
+  </style>
+  
+  <style>
+  #title {
+    font-family: Arial, Helvetica, sans-serif;
+   
+    width:95%;
+   
+  
+  }
+  
+  #title td, #title th {
+   
+    padding:4px;
+    font-size:12px;
+    
+  }
+  
+  #title tr:nth-child(even){background-color: #ffffff;}
+  
+  #title tr:hover {background-color: #ddd;}
+  
+  #title th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  
+  }
+  </style>
+  
+  
+  
+  <style>
+  #tarikh_cetak {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:50%;
+  
+  }
+  
+  #tarikh_cetak  td, #tarikh_cetak th {
+   
+    padding:4px;
+    font-size:12px;
+  
+  }
+  
+  #tarikh_cetak  tr:nth-child(even){background-color: #ffffff;}
+  
+  #tarikh_cetak  tr:hover {background-color: #ddd;}
+  
+  #tarikh_cetak  th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  
+  }
+  </style>
+  
+  
+  <style>
+  #glejer {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width:100%;
+  
+  
+  }
+  
+  #glejer  td, #glejer th {
+   
+    padding:4px;
+    font-size:12px;
+    border: 1px solid #ddd;
+    padding: 6px;
+  
+  }
+  
+  #glejer  tr:nth-child(even){background-color: #ffffff;}
+  
+  #glejer  tr:hover {background-color: #ddd;}
+  
+  #glejer  th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  
+  }
+  </style>
+  
+  
+  
+  <table id="header">
     <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 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>
+      <td></td>
-
+    </tr>
-@if($var['hariini'] >0 )
+    <tr>
-<td style="width:10px">  {{
+      <td>{{ $cawangan_detail['alamat1'] }}</td>
-
+      <td></td>
-            $var['hariini']
+    </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>
+  </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>
+  @else
+  <td>
+  
+  
+  (     {{  number_format(abs($var['totalharini']),2)}}       )
   
   
   
-   </td>
+  </td>
-@else
+  
-<td>
+   @endif
-
+  
-
+  </tr>
-(     {{  number_format(abs($var['hariini']),2)}}       )
-
-
-
-</td>
-
- @endif
-
-</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
-
+  
-
+  
-
+  
-               </b>     </td>
+  
-
+  
-
+  
-
+  
-</tr>
+  
-
+  
-
+  
-
+  
-
+  
-
+  
-
+  
-</table>
+  
-
+  
-
+  
-<br>
+                 </b>     </td>
-<br>
+  
-
+  
-
+  
-<table id="details">
+  </tr>
-<tr>
+  
-<th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
+  
-</tr>
+  
-<tr>
+  
-
+  
-<td> </td> 
+  
-<td> </td> 
+  
-
+  
-<td> </td> 
+  </table>
-
+  
-<td> </td> 
+  
-
+  <br>
-</tr>
+  <br>
-
+  
-<tr>
+  
-
+  <table id="details">
-<td> </td> 
+  <tr>
-<td> </td> 
+  <th> </th><th> DISEMAK  </th><th></th> <th> DISAHKAN </th><th></th>
-
+  </tr>
-<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>
+  
- </tr>
+  <td> </td> 
-
+  
-</table>
+  <td> </td> 
+  
+  </tr>
+  
+  
+  
+  
+  
+  
+   <tr>
+   <td></td>
+   <td>........................................................</td><td></td>
+   <td>......................................................... </td>
+   <td> </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,26 +180,14 @@
     <th></th>
   </tr>
   <tr>
-    <td style="width:10px"> <b>Tarikh Mula:</b></td>
+    <td style="width:10px"> <b>Tarikh:</b></td>
     <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date);
+          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp</td>
     <td style="width:50px">   
     </td>
-    <td style="width:10px"> <b>Tarikh Hingga:</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp</td>
-    <td style="width:50px">   
-    </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
   </tr>
 </table>
 
@@ -244,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