fix lejeram

app/Http/Controllers/KhazanahController.php

@@ -1401,10 +1401,10 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+        if($request->datetarikh == null){
             $gadai_date = $current->toDateString();
         }else{
-            $split_date = explode('-',$request->datetimepicker1);
+            $split_date = explode('-',$request->datetarikh);
             $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
@@ -1428,10 +1428,10 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+        if($request->datetarikh == null){
             $tebus_date = $current->toDateString();
         }else{
-            $split_date = explode('-',$request->datetimepicker1);
+            $split_date = explode('-',$request->datetarikh);
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
@@ -2364,6 +2364,7 @@ class KhazanahController extends Controller
         $hapuskira = Http::get(config('api.url').'/api/CalculationHapusKira/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
         $xtra = Http::get(config('api.url').'/api/Xtra/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json();
 
+        
         //TunaiDitangan Sementara Upah
         if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05')
         {
@@ -2384,6 +2385,7 @@ class KhazanahController extends Controller
             $bakilelongxtra = floatval(123.20);
             $cajlelongxtra = floatval(25.50);
             $upahsimpanxtra = floatval(4894.40);
+            $peruntukanhapuskira = ($xtra['phapuskira']);
             
         }else{
             $upahsimpanxtra = $xtra['upahsimpan'];
@@ -2391,7 +2393,6 @@ class KhazanahController extends Controller
             $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
             $rugilelongxtra = -($xtra['kerugianlelong']);
             $peruntukanhapuskira = ($xtra['phapuskira']);
-        
         }
 
         //Terkumpul
@@ -2517,9 +2518,9 @@ class KhazanahController extends Controller
         }
 
         //Calculation Imbang Duga
-        $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+        $imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
         
-        #$keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
+        $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
         $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json();
 
         //Harta semasa
@@ -2578,20 +2579,31 @@ class KhazanahController extends Controller
 
         //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'];
+        $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'];
+
         // $Debit = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']];
         
-        array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalkeluar']]); 
+        array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); 
-    //     if($pembiayaantawarruq > 0) array_push($Debit,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]);
+        array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]);
+        array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]);
+        array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]);
+        array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]);
+        array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
+        array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
+        array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]);
+        array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]);
+        array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]);
+
     //     // 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($keuntungan > 0) array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]);
     //     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['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]);
-    //     if($pinjamandiberi['pinjamankoop'] > 0) array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
-    //     if($pinjamandiberi['emaspalsu'] > 0) array_push($Debit,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
     //     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]);
@@ -2601,16 +2613,28 @@ class KhazanahController extends Controller
     //     {
     //         $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($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['totalmasuk']]); 
+        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']]);
+        array_push($Kredit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan)]);
+        array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet)]);
+        array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]);
+        array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]);
+        array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]);
+        array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
+
+
+        $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($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]);
     //     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']]);
@@ -2640,7 +2664,7 @@ class KhazanahController extends Controller
     //     $totaluntungrugi = 0;
     //     $totaluntungrugi = $totaltanggungansemasa + $untungrugi;
 
-        return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','Debit','Kredit'));
+        return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit'));
     }
 
     public function laporan_tuntutbaki(Request $request)

resources/views/print/laporan_lejer_am.blade.php

@@ -339,22 +339,54 @@
     <th style="width:10px">JUMLAH</th>
   </tr>
 
+ @foreach($Kredit as $index=>$kred)
+    @foreach($Debit as $index=>$deb)
+      @if($kred['glcode'] === $deb['glcode'])
+      <tr>
+        <td style="width:10px">{{ $kred['glcode'] }}</td>
+        <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
+        <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
+        <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
+        <td style="width:10px">@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp</td>
+      </tr>
+      @endif
+    @endforeach
+  @endforeach
+
+@foreach($Debit as $index=>$deb)
+  @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019')
+    <tr>
+      <td style="width:10px">{{ $deb['glcode'] }}</td>
+      <td colspan="2" style="width:50px">{{ $deb['descpt'] }}</td>
+      <td style="width:5px">{{ number_format($deb['amaun'],2) }}</td>
+      <td style="width:5px" >{{ number_format(0,2) }}</td>
+      <td style="width:10px">{{ number_format($deb['amaun'],2) }}</td>
+    </tr>
+  @endif
+@endforeach
+
+@foreach($Kredit as $index=>$kred)
+  @if($kred['glcode'] == '5000/241'  || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102')
+    <tr>
+      <td style="width:10px">{{ $kred['glcode'] }}</td>
+      <td colspan="2" style="width:50px">{{ $kred['descpt'] }}</td>
+      <td style="width:5px">{{ number_format(0,2) }}</td>
+      <td style="width:5px" >{{ number_format($kred['amaun'],2) }}</td>
+      <td style="width:10px">{{ number_format(($kred['amaun']*-1),2) }}</td>
+    </tr>
+  @endif
+@endforeach
+
   <tr>
-    <td style="width:10px">KOD GL</td>
+    <th style="width:10px" colspan="3">JUMLAH: </th>
-    <td colspan="2" style="width:50px">KETERANGAN</td>
+    <th style="width:5px">{{ number_format($TotalDebit,2) }}</th>
-    <td style="width:5px">DEBIT</td>
+    <th style="width:5px" >{{ number_format($TotalKredit,2) }}</th>
-    <td style="width:5px" >KREDIT</td>
+    <th style="width:10px">@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphp</th>
-    <td style="width:10px">JUMLAH</td>
   </tr>
-
-
-
-
-
-
 </table>
 
 
+
 <br>
 <br>