KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix forecast gadaian

Browse Source
This commit is contained in:
Amir
2023-09-04 14:43:08 +08:00
parent 53f7b52917
commit e2321b9bd5
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportController.php
+1 -17
View File
@@ -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);
resources/views/forecastgadaian/cawangan.blade.php
+1 -3
View File
@@ -331,7 +331,6 @@
<th>Caj Lelong</th>
<th>Harga Asas</th>
<th>Baki Lelong Semasa</th>
<th>Keuntungan 9 Bulan</th>
<th>Harga Emas 2nd Simulasi</th>
</tr>
</thead>
@@ -366,7 +365,7 @@
$('#main-table tbody').on('click', '.click-norujukan', function() {
marhunTable.clear().draw();
var data = mainTable.row($(this).parents('tr')).data()[13];
var data = mainTable.row($(this).parents('tr')).data()[12];
$('#perincianMaklumatModal').modal('show');
$('#textNama').val(data.customer_detail.nama);
$('#textNokp').val(data.customer_detail.nokp);
@@ -498,7 +497,6 @@
formatter.format(data.caj_lelong),
formatter.format(data.harga_asas),
(data.baki_lelong > 0) ? "<strong style='color:green;'>" + formatter.format(data.baki_lelong) + "</strong>" : "<strong style='color:red;'>" + formatter.format(data.baki_lelong) + "</strong>",
formatter.format(data.keuntungan_9_bulan),
formatter.format(data.harga_sandaran),
data
]).draw();