Merge branch 'main' of https://bitbucket.org/arrahn-pkb/lelong into izzati-ujrah

This commit is contained in:
Nur Izzati Zulkifli
2023-12-26 21:51:05 +08:00
3 changed files with 56 additions and 23 deletions
+25 -5
View File
@@ -691,15 +691,21 @@ class ReportAllController extends Controller
$total_bil_lelong = 0;
$jum_billelong = 0;
$jum_berat = 0;
$jum_nilaimarhun = 0;
$jum_pembiayaan = 0;
$jum_hargajual = 0;
$jum_bakiupah = 0;
$jum_cajlelong = 0;
$jum_baki = 0;
$jum_rugi = 0;
foreach($cawangan_all as $cawangan){
$rugilelong = 0;
$bakilelong = 0;
$getsurat = LelongCawangan::on($cawangan->caw_code)
->where('t_lelong','>=',$tarikh_dari)
->where('t_lelong','<=',$tarikh_hingga);
$surat = $getsurat->get()->toArray();
$bil_lelong = $getsurat->count('norujukan');
$total_bil_lelong += $bil_lelong;
@@ -710,6 +716,17 @@ class ReportAllController extends Controller
$total_cajlelong = $getsurat->sum('cajlelong');
$total_baki = $getsurat->sum('baki');
$total_pembiayaan = $getsurat->sum('pinjaman');
foreach($surat as $index => $sag){
if($sag['baki'] > 0)
{
$bakilelong = $bakilelong + $sag['baki'];
}
else
{
$rugilelong = $rugilelong - $sag['baki'];
}
}
$data = [
't_dari'=>$tarikh_dari,
't_hingga'=>$tarikh_hingga,
@@ -719,7 +736,8 @@ class ReportAllController extends Controller
'total_hargajual'=>$total_hargajual,
'total_bakiupah'=>$total_bakiupah,
'total_cajlelong'=>$total_cajlelong,
'total_baki'=>$total_baki,
'total_baki'=>$bakilelong,
'total_rugi'=>$rugilelong,
'total_pembiayaan'=>$total_pembiayaan,
'kodcaw'=>$cawangan->caw_code,
'caw_name'=>$cawangan->caw_name];
@@ -727,11 +745,13 @@ class ReportAllController extends Controller
$jum_billelong += $bil_lelong;
$jum_berat += $total_berat;
$jum_nilaimarhun += $total_nilaimarhun;
$jum_pembiayaan += $total_pembiayaan;
$jum_hargajual += $total_hargajual;
$jum_bakiupah += $total_bakiupah;
$jum_cajlelong += $total_cajlelong;
$jum_baki += $total_baki;
$jum_baki += $bakilelong;
$jum_rugi += $rugilelong;
}
if($total_bil_lelong == 0)
{
@@ -747,8 +767,8 @@ class ReportAllController extends Controller
'getsurat',
'senarai',
'tarikh_dari',
'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'))
->setPaper('a4', 'potrait');
'tarikh_hingga','jum_billelong','jum_berat','jum_nilaimarhun','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong','jum_rugi'))
->setPaper('a4', 'landscape');
return $pdf->download('laporan lelong dari'.$t_dari.'hingga'.$t_hingga.'.pdf');
}else{
@@ -757,7 +777,7 @@ class ReportAllController extends Controller
'getsurat',
'senarai',
'tarikh_dari',
'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'
'tarikh_hingga','jum_billelong','jum_berat','jum_nilaimarhun','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong','jum_rugi'
));
}
}