fix ansuran tak masuk dalam keuntungan sebenar dan fix untuk ansuran yang tak update directly

This commit is contained in:
Hafifie PKB
2024-04-29 09:46:00 +08:00
parent 5d2f5c53a5
commit 363ac52949
2 changed files with 25 additions and 4 deletions
+8 -3
View File
@@ -312,8 +312,7 @@ class GadaiV2
$margin_updated = ($baki_pinjaman / $gadai['nilaimarhun']) * 100;
$tempoh_gadai = $this->tempohTransactionGadai($gadai);
$akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa);
$akrual = $this->kiraupahTawarruqStokAuditUjrahOnePercent($tempoh_gadai,$gadai['tempoh'],$gadai['kadarujrah'],$gadai['bakipjm'],$gadai['nilaimarhun'],$margin_semasa);
$update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
'bakipjm' => $baki_pinjaman,
'jbg' => 0,
@@ -449,7 +448,13 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
return $arraypendapatan;
}
private function tempohTransactionGadai($gadai){
public function tempohTransactionGadai($gadai) : Float{
if($gadai['t_update'] == null){
Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
}else{
Carbon::parse($gadai['t_update'].' 00:00:00' );
}
$tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
$current = Carbon::now();
$tahun_gadai = $tarikh_gadai->year;