From 3e8f118f7cf3722b948c58899d0110d8c52914cc Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Tue, 18 Apr 2023 12:19:36 +0800 Subject: [PATCH] update cron kemaskini lelong --- app/Console/Commands/kemaskiniLelong.php | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/app/Console/Commands/kemaskiniLelong.php b/app/Console/Commands/kemaskiniLelong.php index 59348ea4..8bdb9db9 100644 --- a/app/Console/Commands/kemaskiniLelong.php +++ b/app/Console/Commands/kemaskiniLelong.php @@ -86,11 +86,11 @@ class kemaskiniLelong extends Command $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan; } - $lelongbid->jbg = $gadai->tempoh; - $lelongbid->pinjaman = $gadai->bakipjm; - $lelongbid->bakiupah = bcdiv($keuntungan,1,1); - $lelongbid->save(); } + $lelongbid->jbg = $gadai->tempoh; + $lelongbid->pinjaman = $gadai->bakipjm; + $lelongbid->bakiupah = bcdiv($keuntungan,1,1); + $lelongbid->save(); } } }else{ @@ -101,9 +101,13 @@ class kemaskiniLelong extends Command $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('keuntungan_rebet'); $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan',$lelongbid->norujukan)->sum('bayaran_keuntungan'); $beza_keuntungan = $total_untung_asal - $total_untung_rebet; - if($gadai->tempoh >= $gadai->tempohbayar ){ + if($gadai->tempohbayar == 12){ $keuntungan = 0.00; - }else{ + } + elseif($gadai->tempohbayar == $gadai->tempoh ){ + $keuntungan = 0.00; + } + else{ $jbg = $gadai->tempoh - $gadai->tempohbayar; $jbg2 = 12 - $gadai->tempohbayar; if($gadai->tempoh <= '12.00'){ @@ -111,12 +115,11 @@ class kemaskiniLelong extends Command }else{ $keuntungan = bcdiv(($jbg2)*$gadai->kadarupah/100*$gadai->bakipjm,1,1)-$beza_keuntungan; } - - $lelongbid->jbg = $gadai->tempoh; - $lelongbid->pinjaman = $gadai->bakipjm; - $lelongbid->bakiupah = bcdiv($keuntungan,1,1); - $lelongbid->save(); } + $lelongbid->jbg = $gadai->tempoh; + $lelongbid->pinjaman = $gadai->bakipjm; + $lelongbid->bakiupah = bcdiv($keuntungan,1,1); + $lelongbid->save(); } }