fix bug rounded first then multiply month
This commit is contained in:
@@ -184,10 +184,19 @@ class Penebusan
|
||||
|
||||
$upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
|
||||
|
||||
$upahrebet_raw = $bilang_bln * $upah['keuntungan'];
|
||||
$upahrebet_raw = $onepercentservices->getRoundedMethod($upahrebet_raw);
|
||||
$upahrebet_raw = $onepercentservices->getRoundedMethod($bilang_bln * $upah['keuntungan']);
|
||||
$upahujrah_raw = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
|
||||
$upahonepercent_raw = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
|
||||
|
||||
return $upahrebet_raw;
|
||||
$array_upah =
|
||||
[
|
||||
'pendapatan' => $upahrebet_raw,
|
||||
'keuntungan' => $upahonepercent_raw,
|
||||
'ujrah' => $upahujrah_raw
|
||||
];
|
||||
|
||||
|
||||
return $array_upah;
|
||||
}
|
||||
|
||||
public function kiraupahTawarruq($norujukan){
|
||||
@@ -734,10 +743,11 @@ class Penebusan
|
||||
|
||||
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
|
||||
$array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
|
||||
$ujrah = $bilang_bln * $array_upah['ujrah'];
|
||||
$onepercent = $bilang_bln * $array_upah['onepercent'];
|
||||
$onepercent_semasa = $onepercentservices->getRoundedMethod($onepercent);
|
||||
$ujrah_semasa = $onepercentservices->getRoundedMethod($ujrah);
|
||||
$onepercent = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
|
||||
$ujrah = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
|
||||
$onepercent_semasa = $bilang_bln * $onepercent;
|
||||
$ujrah_semasa = $bilang_bln * $ujrah;
|
||||
|
||||
|
||||
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
|
||||
}
|
||||
@@ -759,8 +769,10 @@ class Penebusan
|
||||
|
||||
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
|
||||
$array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
|
||||
$ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $array_upah['ujrah']);
|
||||
$onepercent = $onepercentservices->getRoundedMethod($bilang_bln * $array_upah['onepercent']);
|
||||
$ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
|
||||
$keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
|
||||
$ujrah = $bilang_bln * $ujrah_rounded;
|
||||
$onepercent = $bilang_bln * $keuntungan_rounded;
|
||||
|
||||
return ['ujrah' => $ujrah, 'onepercent' => $onepercent];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user