fix laporan

app/Http/Controllers/KhazanahController.php

@@ -2615,13 +2615,6 @@ class KhazanahController extends Controller
         $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
         $cawangan_detail=$cawangan[0];
 
-        //new glcode  2021-02-22
-        $GL_Code_BayaranOnline="1000/210";
-        $GL_CodeUntungSebenar="1000/213";
-        $GL_CodeHutangArrahn="1000/211";
-        $GL_CodeHutangAkru="2000/007";
-
-
         $auth_user = Auth::user();
         $api_url = config('api.url');
 
@@ -2653,69 +2646,23 @@ class KhazanahController extends Controller
 
         //Harta semasa
         $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-
         $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        
         $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); 
-              
-        // $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
         $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        
         $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
 
         //Tanggungan Semasa
         $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-
         $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-
-        // $wtd = Http::get(config('api.url').'/api/SerahBakiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        // $cajlelong = Http::get(config('api.url').'/api/cajlelongLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
         $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
 
-        // $cajperkhidmatan = Http::get(config('api.url').'/api/cajperkhidmatanterkumpulLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        // $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKiraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        // $xtra = Http::get(config('api.url').'/api/XtraLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        
-        //TunaiDitangan Sementara Upah
-        // if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
-        // {
-        //     $advansurharini = Http::get(config('api.url').'/api/advansurhariniLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
-        //     $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini);
-        // }else{
-        //     $totaltunaiditangan = $tunaiditangan;
-        // }
-
-        // $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0;
-        // //1Stop Special Case
-        // if($auth_user['cawangan'] === '1STOP')
-        // {
-        //     $jualan1stop = floatval(129857.00);
-        //     $belian1stop = floatval(122446.50);
-        //     $utgterkumpulxtra = floatval(6727.10);
-        //     $rugilelongxtra = floatval(10079.30);
-        //     $bakilelongxtra = floatval(123.20);
-        //     $cajlelongxtra = floatval(25.50);
-        //     $upahsimpanxtra = floatval(4894.40);
-            
-        // }else{
-        //     $upahsimpanxtra = $xtra['upahsimpan'];
-        //     $bakilelongxtra = $xtra['bakilelong'];
-        //     $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
-        //     $rugilelongxtra = -($xtra['kerugianlelong']);
-        //     $peruntukanhapuskira = ($xtra['phapuskira']);
-        // }
-
-        //Terkumpul
-        // $untungrugiterkumpul = Http::get(config('api.url'). '/api/UntungRugiTerkumpulLejer/'. $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
         $Debit = [];
         $TotalDebit = 0;
         $TotalTunaiDebit = 0;
         $TotalTunaiKredit = 0;
 
-        $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'];
+        $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
-        $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'];
+        $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
-
-        // $Debit = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
 
         array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
         array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
@@ -2727,27 +2674,14 @@ class KhazanahController extends Controller
         if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]);
         if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]);
         if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]);
+        if($bakilelong['rugilelong'] != 0) array_push($Debit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
 
-    //     // if($penghutangkaki > 0) array_push($Debit,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]);
-    //     //array_push($Debit,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]);
-    //     if($bayaranpendahuluan > 0) array_push($Debit,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]);
-    //     if($rebet > 0) array_push($Debit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
-    //     if($imbangduga['pindahkekpkb'] > 0) array_push($Debit,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
-    //     if($peruntukanhapuskira > 0) array_push($Debit,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
-    //     if($belian1stop > 0) array_push($Debit,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
 
-    //     $totalhartasemasa = 0;
+        $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong'];
-    //     foreach($hartasemasa as $index => $hs)
-    //     {
-    //         $totalhartasemasa += $hs['amaun'];
-    //     }
-        $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'];
 
         $Kredit = [];
         $TotalKredit = 0;
 
-    //     // $Kredit = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong];
-
         array_push($Kredit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiDebit]); 
         array_push($Kredit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Tebus']]);
         array_push($Kredit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Tebus']]);
@@ -2757,40 +2691,9 @@ class KhazanahController extends Controller
         array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
         array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]);
         if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+        if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
 
-
+        $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong'];
-        $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'];
-    //     if($keuntungan > 0) array_push($Kredit,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
-    //     if($keuntungansebenar > 0) array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
-    //     if($rebet > 0) array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]);
-    //     if($panjar['bds'] > 0) array_push($Kredit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]);
-    //     if($panjar['perubatan'] > 0) array_push($Kredit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]);
-    //     if($panjar['keraian'] > 0) array_push($Kredit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => -$panjar['keraian']]);
-    //     if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]);
-    //     if($bakilelong['rugilelong'] != 0) array_push($Kredit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]);
-    //     if($wtd > 0) array_push($Kredit,['glcode' => '3000/021','descpt' => 'WANG TAK DITUNTUT','amaun' => $wtd]);
-    //     if($cajlelong > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]);
-    //     if($untungrugiterkumpul > 0) array_push($Kredit,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]);
-    //     if($cajperkhidmatan > 0) array_push($Kredit,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]);
-    //     if($cajlelongxtra > 0) array_push($Kredit,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]);
-    //     if($upahsimpanxtra > 0) array_push($Kredit,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]);
-    //     if($bakilelongxtra > 0) array_push($Kredit,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]);
-    //     if($rugilelongxtra != 0) array_push($Kredit,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]);
-    //     if($utgterkumpulxtra > 0) array_push($Kredit,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]);
-    //     if($jualan1stop > 0) array_push($Kredit,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]);
-  	// if($hapuskira > 0) array_push($Kredit,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]);
-        
-    //     $totaltanggungansemasa = 0;
-    //     foreach($tanggungansemasa as $index => $ts)
-    //     {
-    //         $totaltanggungansemasa += $ts['amaun'];
-    //     }
-
-    //     $untungrugifield = [];
-    //     array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]);
-
-    //     $totaluntungrugi = 0;
-    //     $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
    
         return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit'));
     }

resources/views/customers/info.blade.php

@@ -430,7 +430,7 @@
                     event.preventDefault();
                     return false;
                 }else{
-                    if(Number(data['unit_komuditi']) < 10000){
+                    if(Number(data['unit_komuditi']) < 50000){
                         Swal.fire({
                             icon: 'error',
                             title: 'Unit Komoditi Berbaki Minumum',

resources/views/khazanah/alirantunai.blade.php

@@ -20,14 +20,14 @@
           <thead class="thead-dark">
               <tr>
                   <th>Bil</th>
-                  <th>Tarikh</th>
+                  <th width="60%">Tarikh</th>
-                  <th>Baki Awal Tunai</th>
+                  <th>C/F</th>
                   <th>Keluar</th>
                   <th>Masuk</th>
-                  <th>Baki EOD</th>
-                  <th>Baki Akhir Tunai</th>
                   <th>Pendahuluan</th>
                   <th>Serahan</th>
+                  <th>Panjar</th>
+                  <th>B/F</th>
               </tr>
           </thead>
           <tbody>
@@ -35,14 +35,14 @@
               @foreach ($petibesi as $tunai)
                 <tr>
                 <td>{{ $loop->iteration }}</td>
-                <td>{{ $tunai['tarikh'] }}</td>
+                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh']))  }}</td>
-                <td>{{ $tunai['bakiawal'] }}</td>
+                <td>{{ number_format($tunai['bakiawal'],2) }}</td>
-                <td>{{ $tunai['keluar'] }}</td>
+                <td>{{ number_format($tunai['keluar'],2) }}</td>
-                <td>{{ $tunai['masuk'] }}</td>
+                <td>{{ number_format($tunai['masuk'],2) }}</td>
-                <td>{{ $tunai['bakieod'] }}</td>
+                <td>{{ number_format($tunai['pendahuluan'],2) }}</td>
-                <td>{{ $tunai['bakiakhir'] }}</td>
+                <td>{{ number_format($tunai['serahan'],2) }}</td>
-                <td>{{ $tunai['pendahuluan'] }}</td>
+                <td>{{ number_format($tunai['totpanjar'],2) }}</td>
-                <td>{{ $tunai['serahan'] }}</td>
+                <td>{{ number_format($tunai['bakiakhir'],2) }}</td>
                 </tr>
               @endforeach
           </tbody>
@@ -206,7 +206,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
                       
-                                            <p>Tebusan</p>
+                                            <p>Penebusan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -244,19 +244,19 @@
                                               <tr>
                                                   <th>Bil</th>
                                                   <th>Tarikh</th>
-                                                  <th>Baki Awal Tunai</th>
+                                                  <th>C/F</th>
-                                                  <th>Tunai Diterima</th>
+                                                  <th>Pendahuluan</th>
-                                                  <th>Tunai Dikeluar</th>
+                                                  <th>Serahan</th>
                                                   <th>Gadaian</th>
-                                                  <th>Tebusan</th>
+                                                  <th>Penebusan</th>
-                                                  <th>Baki Akhir Tunai</th>
+                                                  <th>B/F</th>
                                               </tr>
                                           </thead>
                                           <tbody>
                                               @foreach ($arraytunai[$index1] as $tunai)
                                                 <tr>
                                                 <td>{{ $loop->iteration }}</td>
-                                                <td>{{ $tunai['tarikh'] }}</td>
+                                                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh']))  }}</td>
                                                 <td>{{ number_format($tunai['bakiawal'],2) }}</td>
                                                 <td>{{ number_format($tunai['tambah'],2) }}</td>
                                                 <td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -287,7 +287,7 @@
                                             @foreach($arrayaddtunai[$index1] as $at)
                                             <tr>
                                               <td> {{ $loop->iteration }} </td>
-                                              <td> {{ $at['tarikh'] }} </td>
+                                              <td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
                                               <td> {{ number_format($at['tambah'],2) }} </td>
                                               <td> {{ number_format($at['kurang'],2) }} </td>
                                               <td> {{ $at['nota'] }} </td>
@@ -348,7 +348,7 @@
                                             @foreach($arraytuntutbaki[$index1] as $tb)
                                             <tr>
                                             <td> {{ $loop->iteration }} </td>
-                                            <td> {{ $tb['tarikh'] }} </td>
+                                            <td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
                                             <td> {{ number_format($tb['cajlelong'],2) }} </td>
                                             <td> {{ number_format($tb['jumlah'],2) }} </td>
                                             <td> @php if($tb['jenis'] == 'T'){
@@ -396,7 +396,7 @@
                                         <div class="inner">
                                           <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}</h5>
                     
-                                          <p>Tunai Diterima</p>
+                                          <p>Pendahuluan</p>
                                         </div>
                                         <div class="icon">
                                         </div>
@@ -409,7 +409,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}</h5>
                       
-                                            <p>Tunai Dikeluar</p>
+                                            <p>Serahan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -450,7 +450,7 @@
                                           <div class="inner">
                                             <h5>RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}</h5>
                       
-                                            <p>Tebusan</p>
+                                            <p>Penebusan</p>
                                           </div>
                                           <div class="icon">
                                           </div>
@@ -489,19 +489,19 @@
                                               <tr>
                                                   <th>Bil</th>
                                                   <th>Tarikh</th>
-                                                  <th>Baki Awal Tunai</th>
+                                                  <th>C/F</th>
-                                                  <th>Tunai Diterima</th>
+                                                  <th>Pendahuluan</th>
-                                                  <th>Tunai Dikeluar</th>
+                                                  <th>Serahan</th>
                                                   <th>Gadaian</th>
-                                                  <th>Tebusan</th>
+                                                  <th>Penebusan</th>
-                                                  <th>Baki Akhir Tunai</th>
+                                                  <th>B/F</th>
                                               </tr>
                                           </thead>
                                           <tbody>
                                               @foreach ($arraytunai[$index1] as $tunai)
                                                 <tr>
                                                 <td>{{ $loop->iteration }}</td>
-                                                <td>{{ $tunai['tarikh'] }}</td>
+                                                <td>{{ $Tarikh = date("d-m-Y", strtotime($tunai['tarikh'])) }}</td>
                                                 <td>{{ number_format($tunai['bakiawal'],2) }}</td>
                                                 <td>{{ number_format($tunai['tambah'],2) }}</td>
                                                 <td>{{ number_format($tunai['kurang'],2) }}</td>
@@ -532,7 +532,7 @@
                                             @foreach($arrayaddtunai[$index1] as $at)
                                             <tr>
                                               <td> {{ $loop->iteration }} </td>
-                                              <td> {{ $at['tarikh'] }} </td>
+                                              <td> {{ $Tarikh = date("d-m-Y", strtotime($at['tarikh'])) }} </td>
                                               <td> {{ number_format($at['tambah'],2) }} </td>
                                               <td> {{ number_format($at['kurang'],2) }} </td>
                                               <td> {{ $at['nota'] }} </td>
@@ -594,7 +594,7 @@
                                             @foreach($arraytuntutbaki[$index1] as $tb)
                                             <tr>
                                             <td> {{ $loop->iteration }} </td>
-                                            <td> {{ $tb['tarikh'] }} </td>
+                                            <td> {{ $Tarikh = date("d-m-Y", strtotime($tb['tarikh'])) }} </td>
                                             <td> {{ number_format($tb['cajlelong'],2) }} </td>
                                             <td> {{ number_format($tb['jumlah'],2) }} </td>
                                             <td> @php if($tb['jenis'] == 'T'){

resources/views/khazanah/khazanahserahan.blade.php

@@ -36,7 +36,7 @@
   <div class="col-2"> </div>
   <div class="col-6">
     <button type="button"  data-toggle="modal" data-target="#marhunModal" class="btn btn-info">Panduan Format Bundle</button>
-    <input type="button" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
+    <input type="button" id="terima_transaksi" onclick="triggersubmit();" class="btn btn-success" value="Lulus"/>
     <a onclick="triggerbatal();" class="btn btn-danger">Batal</a>
   </div>
 </div>
@@ -338,6 +338,8 @@
 
   function triggersubmit()
   {
+    $("#terima_transaksi").prop('disabled', true);
+    
     $('#form-pendahuluan').trigger('submit');
   }
 

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

@@ -6,7 +6,13 @@
     <div class="row">
         <div class="col-md-12">
             <div class="card">
-                <div class="card-header">{{ __('Data Lejer AM') }}</div>
+              <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">Lejer Am</li>
+                </ol>
+              </nav>
 
                 <div class="card-body text-center">
                     <div class="row form-group">

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

@@ -35,10 +35,12 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pemodal</a>
                             </div>
                              <div class="row">
-                                <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Bersih </a>
+                                {{-- <a href="{{route('laporan.stokauditbersih')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a> --}}
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Bersih </a>
                             </div> 
                              <div class="row">
-                                <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit Details</a>
+                                {{-- <a href="{{ route('laporan.stokauditdetails')}}" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a> --}}
+                                <a href="#" class="btn btn-danger btn-lg btn-block mb-3">Stok Audit Details</a>
                             </div> 
                         </div>
                         <div class="col-3 mx-1">
@@ -61,7 +63,7 @@
                                 <a href="" class="btn btn-danger btn-lg btn-block mb-3">Aging Pelanggan</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('laporan.datalejer_am') }}" class="btn btn-danger btn-lg btn-block mb-3">Lejer Am</a>
+                                <a href="{{ route('laporan.datalejer_am') }}" class="btn btn-dark btn-lg btn-block mb-3">Lejer Am</a>
                             </div>
                             <div class="row">
                                 <a href="{{route('laporan.tuntutbaki')}}" class="btn btn-dark btn-lg btn-block mb-3">Tuntut Baki</a>

resources/views/khazanah/panjar.blade.php

@@ -155,9 +155,18 @@
         var counter = 1;
         tablepanjar.clear().draw();
 
+        var today = new Date();
+        var dd = String(today.getDate()).padStart(2, '0');
+        var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
+        var yyyy = today.getFullYear();
+
+        today = yyyy + '-' + mm + '-' + dd;
+
         $.each(data,function(index,panjar){
           
-                    tablepanjar.row.add([
+            if(today === panjar['tarikh'])
+            {
+                tablepanjar.row.add([
                         counter,
                         panjar['tarikh'],
                         panjar['deskripsi'],
@@ -165,7 +174,20 @@
                         panjar['bayaran'],
                         '<button onclick="deletepanjar(this);" data-recno="' + panjar['recno'] + '" class="btn btn-danger fas fa-trash-alt"></button>'
                     ]).draw();
-                    counter = counter + 1;
+            }else{
+                tablepanjar.row.add([
+                        counter,
+                        panjar['tarikh'],
+                        panjar['deskripsi'],
+                        panjar['kategori'],
+                        panjar['bayaran'],
+                        '<button data-recno="' + panjar['recno'] + '" class="btn btn-secondary fas fa-trash-alt"></button>'
+                    ]).draw();
+            }
+
+            counter = counter + 1;
+
+                  
            
         });
         
@@ -198,11 +220,8 @@
 
                     if(data === 'berjaya')
                     {
-                        Swal.fire(
+                        location.reload();
-                            'Deleted!',
+
-                            'Your file has been deleted.',
-                            'success'
-                        )
                     }else{
                         Swal.fire(
                             'Tidak Berjaya!',
@@ -375,6 +394,13 @@ function kiraanpanjar(datakeyin)
 
     function checkformpanjar(formdata)
     {
+        $("#terima_transaksi_keraian").prop('disabled', true);
+        $("#terima_transaksi_selenggara").prop('disabled', true);
+        $("#terima_transaksi_belanjaam").prop('disabled', true);
+        $("#terima_transaksi_perubatan").prop('disabled', true);
+        $("#terima_transaksi_dapur").prop('disabled', true);
+        $("#terima_transaksi_pos").prop('disabled', true);
+        
 
         // let keraian = $('#KeraianForm').hasClass('in'); //-- check dapur only for tuntutan;
 
@@ -462,9 +488,18 @@ function kiraanpanjar(datakeyin)
        
         if(booltarikh === true && booltarikhbil === true && booldeskripsi === true && boolbayaran === true)
         {
+           
+
             return true;
         }else{
             
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
             event.preventDefault();
             return;
         }
@@ -553,6 +588,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
         
     });
 
@@ -584,6 +626,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     $('#BelanjaamModal').on('hidden.bs.modal', function (e) {
@@ -614,6 +663,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     $('#PerubatanModal').on('hidden.bs.modal', function (e) {
@@ -644,6 +700,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
 
@@ -675,6 +738,13 @@ function kiraanpanjar(datakeyin)
             $(this).find("[name='errorbayaran']").hide();
             $(this).find("[name='bayaran']").removeClass('is-invalid');
             $(this).find("[name='bayaran']").parent().addClass("mb-4");
+            $("#terima_transaksi_keraian").prop('disabled', false);
+            $("#terima_transaksi_selenggara").prop('disabled', false);
+            $("#terima_transaksi_belanjaam").prop('disabled', false);
+            $("#terima_transaksi_perubatan").prop('disabled', false);
+            $("#terima_transaksi_dapur").prop('disabled', false);
+            $("#terima_transaksi_pos").prop('disabled', false);
+
     });
 
     // $('#denominasipanjar').on('hidden.bs.modal', function (e) {

resources/views/khazanah/pendahuluanserahanmain.blade.php

@@ -21,7 +21,7 @@
                 <div class="card-body">
 
                     <div class="mt-3 mx-auto">
-                               
+                     {{-- @php $date = date('yy-m-d'); @endphp --}}
                         <table class='table table-hover table-striped table-bordered' id='table-pendahuluanserahan' style="width: 100%;">
                             <thead class="thead-dark">
                                 <tr>
@@ -29,7 +29,7 @@
                                     <th>Description</th>
                                     <th>Pendahuluan (RM)</th>
                                     <th>Serahan (RM)</th>
-                                    <th>Tindakan</th>
+                                    {{-- <th>Tindakan</th> --}}
                                 </tr>
                             </thead>
                             <tbody>
@@ -39,7 +39,7 @@
                                         <td>{{ $gldetail['descpt'] }}</td>
                                         <td>{{ ($gldetail['pendahuluan'] == 0 && ($gldetail['ktacct'] == '7000/102' || $gldetail['ktacct'] == '7000/106')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['pendahuluan'],2) }}</td>
                                         <td>{{ ($gldetail['serahan'] == 0 && ($gldetail['dtacct'] == '1000/026' || $gldetail['dtacct'] == '1000/020' || $gldetail['dtacct'] == '1000/090')) ? number_format($gldetail['amaun'],2) : number_format($gldetail['serahan'],2) }}</td>
-                                        <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-trash-alt"></button></td>
+                                       {{-- @if($date === $gldetail['tarikh']) <td class="text-center"><button onclick="deletependser();" class="btn btn-danger fas fa-trash-alt"></button></td>@else<td></td> @endif --}}
                                     </tr>
                                 @endforeach
                             </tbody>
@@ -168,6 +168,7 @@
 
         function functerima()
         {
+
             let amaun = $('#amaun').val();
             let keterangan = $('#keterangan').val();
             let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -222,6 +223,9 @@
                 $('#pendahuluanserahanModal').modal('hide');
                 return true;
             }else{
+
+                $("#terima_transaksi").prop('disabled', false);
+
                 event.preventDefault();
                 return false;
             }
@@ -250,6 +254,8 @@
             $('#denominasiHQModal').modal('hide');
             $('#pendahuluanserahanModal').modal('show');
 
+            $("#terima_transaksi").prop('disabled', false);
+
             $('#bundle1').val('');
             $('#totalb1').val(0.00);
             $('#bundle5').val('');
@@ -267,6 +273,8 @@
 
         function terimapost()
         {
+            $("#terima_transaksi").prop('disabled', true);
+
             let amaun = $('#amaundiminta').val();
             let keterangan = $('#keterangan').val();
             let jenis = $('#radiopendahuluanserahan:checked').val();
@@ -333,6 +341,7 @@
 
                             $('#denominasiHQModal').modal('hide');
                             $('#pendahuluanserahanModal').modal('hide');
+                            $("#terima_transaksi").prop('disabled', false);
                            
                         });
                     }

resources/views/lelongan/index.blade.php

@@ -199,6 +199,39 @@
 
     function bayarantuntubaki()
     {
+	$.ajax({
+            method: 'put',
+            url: "{{ route('lelong.tuntutbaki') }}",
+            data: { 
+            "_token": "{{ csrf_token() }}",
+            'batchno' : batchno,
+            'jenis' : jenis,
+            'norujukan' : norujukan,
+            'teller' : teller,
+            'bakipjm' : bakipjm,
+            'bakiupah' : bakiupah,
+            'cajlain' : cajlain,
+            'cajlelong' : cajlelong,
+            'jumlah' : jumlah,
+            'nowakil' : nowakil,
+            'hargajual' : hargajual
+            },
+            success:function(data){
+                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
+                        'Berjaya!',
+                        'Tuntut Baki Berjaya',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success',

resources/views/modal/panjar.blade.php

@@ -81,7 +81,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_keraian" class="btn btn-success">Terima</button>
         </div>
       </form>
       </div>
@@ -171,7 +171,7 @@
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_selenggara" class="btn btn-success">Terima</button>
         </div>
       </form>
       </div>
@@ -262,7 +262,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_belanjaam" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>
@@ -354,7 +354,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-            <button type="submit" class="btn btn-success">Terima</button>
+            <button type="submit" id="terima_transaksi_perubatan" class="btn btn-success">Terima</button>
           </div>
         </form>
         </div>
@@ -444,7 +444,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_dapur" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>
@@ -523,7 +523,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-danger" data-dismiss="modal">Batal</button>
-              <button type="submit" class="btn btn-success">Terima</button>
+              <button type="submit" id="terima_transaksi_pos" class="btn btn-success">Terima</button>
             </div>
           </form>
           </div>

resources/views/modal/pendahuluanserahan.blade.php

@@ -45,7 +45,7 @@
 
         <div class="modal-footer">
             <button type="button" class="btn btn-danger btn-lg" data-dismiss="modal">Batal</button>
-            <button type="button" class="btn btn-success btn-lg" onclick="functerima()">Terima</button>
+            <button type="button" id="terima_transaksi" class="btn btn-success btn-lg" onclick="functerima()">Terima</button>
         </div>
       </div>
     </div>

resources/views/penebusan/index.blade.php

@@ -442,7 +442,7 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    $('#jumlahupah').val(formatter.format(data));
+                    $('#jumlahupah').val(data);
                 }
             });
 
@@ -700,8 +700,8 @@
 
     $("#sltjenistebus").change(function(){
     
-        var jumupah = parseFloat($('#jumlahupah').val());
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
-        var jumupahrebet = parseFloat($('#bayaranditerima').val());
+        var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));
 
         switch($(this).val()) {
             case "T":

resources/views/print/laporan_ringkasanharian.blade.php

@@ -216,6 +216,7 @@
               <th>70%</th>
               <th>75%</th>
               <th>80%</th>
+              <th>JUMLAH</th>
             </tr>
           </thead>
           <tbody>
@@ -225,6 +226,7 @@
               <td>{{ 'RM '. number_format($laporan['gadai_70'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['gadai_75'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['gadai_80'],2) }}</td>
+              <td>{{ 'RM '. number_format($laporan['total_gadaian'],2) }}</td>
             </tr>
             <tr>
               <td>2</td>
@@ -232,6 +234,7 @@
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_70'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_75'],2) }}</td>
               <td>{{ 'RM '. number_format($laporan['nilaimarhun_80'],2) }}</td>
+              <td>{{ 'RM '. number_format($laporan['total_nm'],2) }}</td>
             </tr>
             <tr>
               <td>3</td>
@@ -239,6 +242,7 @@
               <td>{{ $laporan['bilangan_70'] }}</td>
               <td>{{ $laporan['bilangan_75'] }}</td>
               <td>{{ $laporan['bilangan_80'] }}</td>
+              <td>{{ number_format($laporan['total_bilangan']) }}</td>
             </tr>
           </tbody>
         </table>

resources/views/print/laporan_ringkasanterkumpulv2.blade.php

@@ -115,9 +115,9 @@
         <p><b>G) BAYAR BAKI LELONG</b></p>
       </div>
       <div class="col-6">1. BAKI LELONG</div>
-      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}</div>
       <div class="col-6">2. RUGI LELONG</div>
-      <div class="col-6">{{ 'RM '. number_format($laporan['bayar_rugi_lelong'],2) }}</div>
+      <div class="col-6">{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}</div>
     </div>
   </div>
 </div>
@@ -139,6 +139,7 @@
               <th>70%</th>
               <th>75%</th>
               <th>80%</th>
+              <th>JUMLAH</th>
             </tr>
           </thead>
           <tbody>
@@ -148,6 +149,7 @@
               <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>
+              <td>RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}</td>
             </tr>
             <tr>
               <td>2</td>
@@ -155,6 +157,7 @@
               <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>
+              <td>RM {{ number_format($laporan_ringkasan['total_nm'],2) }}</td>
             </tr>
             <tr>
               <td>3</td>
@@ -162,6 +165,7 @@
               <td>{{ $laporan_ringkasan['bilangan_70'] }}</td>
               <td>{{ $laporan_ringkasan['bilangan_75'] }}</td>
               <td>{{ $laporan_ringkasan['bilangan_80'] }}</td>
+              <td>{{ number_format($laporan_ringkasan['total_bilangan']) }}</td>
             </tr>
           </tbody>
         </table>