diff --git a/app/Services/Reports/ImbangDugaService.php b/app/Services/Reports/ImbangDugaService.php index 8516993..13e2e4d 100644 --- a/app/Services/Reports/ImbangDugaService.php +++ b/app/Services/Reports/ImbangDugaService.php @@ -896,7 +896,7 @@ class ImbangDugaService $totalharta = imbangdugabackup::on($cawangan['mysql'])->where('tarikh', $this->tarikh) ->get() ->map(function ($ig) use ($keuntungan_penggadai,$tunaiditangan,$serahan,$bayaranpend) { - return floatval($tunaiditangan) + $ig['pembiayaantawarruq'] + (-$bayaranpend) + $ig['pinjamankoop'] + $ig['emaspalsu'] + return floatval($tunaiditangan) + $ig['pembiayaantawarruq'] + $bayaranpend + $ig['pinjamankoop'] + $ig['emaspalsu'] + $ig['pindahkekpkb'] + $ig['penghutangkaki'] + $ig['phapuskira'] + $ig['belian1stop'] + $keuntungan_penggadai + $serahan; }); @@ -925,6 +925,7 @@ class ImbangDugaService 'pend_terakru' => $pend_terakru, 'ujrah' => $ujrah, 'onepercent' => $onepercent, + 'bayaranpendahuluan' => $bayaranpend, 'untungrugiterkumpul' => $untungrugiterkumpul, 'totalharta' => round($totalharta[0], 2), 'totaltanggungan' => round($totaltanggungan[0], 2),