fix baki, rugi lelong

This commit is contained in:
Amirah22
2022-11-25 21:17:00 +08:00
parent 195aef00cb
commit 3437608035
2 changed files with 12 additions and 7 deletions
+10 -5
View File
@@ -129,7 +129,6 @@ class ReportController extends Controller
->get()
->toArray();
foreach($brgdetails as $brg)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -393,15 +392,21 @@ class ReportController extends Controller
$sumcajlelong = $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100);
$totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1);
if($totalbaki > 0)
if($laplelong['baki'] > 0)
{
$bakilelong = $bakilelong + $totalbaki;
$bakilelong = $bakilelong + $laplelong['baki'];
}
else
{
$rugilelong = $rugilelong - $totalbaki;
$rugilelong = $rugilelong + $laplelong['baki'];
}
// if($laplelong['baki'] < 0)
// {
// $rugilelong = $rugilelong + $laplelong['baki'];
// }
$total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
@@ -431,7 +436,7 @@ class ReportController extends Controller
$pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','margin','arraydetails',
'total_rugilelong','total_bakilelong'))
'total_rugilelong','total_bakilelong','bakilelong','rugilelong'))
->setPaper('a4', 'landscape');
return $pdf->download('Laporan Lelong Keseluruhan.pdf');
+2 -2
View File
@@ -200,8 +200,8 @@ tr:nth-child(even) {
<tr>
<td>Jumlah Baki A: {{$total_bakilelong}}</td>
<td>Jumlah Baki B: {{$total_rugilelong}}</td>
<td>Jumlah Baki A: {{$bakilelong}}</td>
<td>Jumlah Baki B: {{$rugilelong}}</td>
<td><b>Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}<b></td>
</tr>