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

Merged in amir_dev_2 (pull request #5)

Browse Source 
Update changes from server
This commit is contained in:
Amir Hassan Hamzan
2023-06-19 02:43:24 +00:00
parent 4cbf48e56e 04bb76f968
commit b9598e777b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/kemaskiniLelong.php
+2 -2
View File
@@ -89,7 +89,7 @@ class kemaskiniLelong extends Command
}
$lelongbid->jbg = $gadai->tempoh;
$lelongbid->pinjaman = $gadai->bakipjm;
$lelongbid->bakiupah = bcdiv($keuntungan,1,1);
$lelongbid->bakiupah = $keuntungan;
$lelongbid->save();
}
}
@@ -118,7 +118,7 @@ class kemaskiniLelong extends Command
}
$lelongbid->jbg = $gadai->tempoh;
$lelongbid->pinjaman = $gadai->bakipjm;
$lelongbid->bakiupah = bcdiv($keuntungan,1,1);
$lelongbid->bakiupah = $keuntungan;
$lelongbid->save();
}
}
app/Http/Controllers/LelongController.php
+2 -1
View File
@@ -3709,6 +3709,7 @@ class LelongController extends Controller
$total_untung_rebet = $data_transaksi->sum('keuntungan_rebet');
$total_untung_asal = $data_transaksi->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
$beza_keuntungan = bcdiv($beza_keuntungan, 1, 2);
// dd($beza_keuntungan);
// dd(true);
$jbg = $datagadai->tempoh - $datagadai->tempohbayar;
@@ -3740,7 +3741,7 @@ class LelongController extends Controller
$totalbaki = $lelongbid_true->hargaasas - $lelongbid_true->pinjaman - $lelongbid_true->bakiupah - $cajlelongnew;
$customer['gadai'][$index2]['bakilelong'] = $totalbaki;
$customer['gadai'][$index2]['ktlhbyr'] = $ktlhbyr;
$customer['gadai'][$index2]['keuntungan'] = $keuntungan;
$customer['gadai'][$index2]['keuntungan'] = bcdiv($keuntungan,1,1);
}
}
// dd($customer);
resources/views/forecastgadaian/cawangan.blade.php
+1 -1
View File
@@ -332,7 +332,7 @@
<th>Harga Asas</th>
<th>Baki Lelong Semasa</th>
<th>Keuntungan 9 Bulan</th>
<th>Harga Emas 2nd</th>
<th>Harga Emas 2nd Simulasi</th>
</tr>
</thead>
</table>