diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index c3d34b5c..f9bb36c4 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -1462,23 +1462,7 @@ class ReportController extends Controller $gadai_all[$index90]['baki_lelong'] = $baki_lelong; - if ($gadai->tempoh <= 9) { - $keuntungan_1_bulan = $gadai->bakipjm * ($gadai->kadarupah / 100); - $baki_jbg_sebelum_9_bulan = 9 - $gadai->tempohbayar; - if ($transaksi_keuntungan_all->contains('norujukan', $gadai->norujukan)) { - $keuntungan_9_bulan = $keuntungan_1_bulan * $baki_jbg_sebelum_9_bulan; - } else { - $keuntungan_9_bulan = $keuntungan_1_bulan * $baki_jbg_sebelum_9_bulan; - } - $value_to_calculate = $keuntungan_9_bulan; - } else { - $keuntungan_9_bulan = 0.00; - $value_to_calculate = $gadai->keuntungan_semasa; - } - - $gadai_all[$index90]['keuntungan_9_bulan'] = bcdiv($keuntungan_9_bulan, 1, 1); - - $harga_sandaran = (floatval($gadai->bakipjm) + floatval($value_to_calculate) + floatval($gadai->caj_lelong)) / $gadai->berat; + $harga_sandaran = ( round($jumlah_harga_emas) - $baki_lelong ) / $gadai->berat; $gadai_all[$index90]['harga_sandaran'] = bcdiv($harga_sandaran, 1, 1); diff --git a/resources/views/forecastgadaian/cawangan.blade.php b/resources/views/forecastgadaian/cawangan.blade.php index eccceb00..fec1bda7 100644 --- a/resources/views/forecastgadaian/cawangan.blade.php +++ b/resources/views/forecastgadaian/cawangan.blade.php @@ -331,7 +331,6 @@