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

fix imbangduga latest

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-30 14:23:59 +08:00
parent 9b611cbaf7
commit bc8f9a14e9
7 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Support/v1/Penebusan.php
+1 -1
View File
@@ -645,7 +645,7 @@ class Penebusan
'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah,
'bayaran_pembiayaan' => $bayaran_pembiayaan,
'keuntungan_rebet' => 0,
'keuntungan_rebet' => $request->bakiupah,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw
]);
app/Support/v2/GadaiV2.php
+3
View File
@@ -412,6 +412,9 @@ public function kiraupahTawarruqStokAuditUjrahOnePercent($tempoh,$tempohbayar,$k
$bilang_bln = $tempoh - $tempohbayar;
$keuntungan_semasa = $bilang_bln * $upah['onepercent'];
$ujrah_semasa = $bilang_bln * $upah['ujrah'];
$keuntungan_semasa = $onepercentservices->getRoundedMethod($keuntungan_semasa);
$ujrah_semasa = $onepercentservices->getRoundedMethod($ujrah_semasa);
$pendapatan = $keuntungan_semasa + $ujrah_semasa;
$arraypendapatan = [
'keuntungan' => $keuntungan_semasa,
app/Support/v2/Penebusan.php
+13 -5
View File
@@ -145,9 +145,10 @@ class Penebusan
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['pinjaman'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['percentpinj']);
$upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
$keuntungan_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
$ujrah_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
$upahsemasa_raw = $keuntungan_semasa + $ujrah_semasa;
$upahsemasa_raw = $onepercentservices->getRoundedMethod($upahsemasa_raw);
$keuntungan_1bln = $onepercentservices->getRoundedMethod((1 * $upah['onepercent'])+(1 * $upah['ujrah']));
@@ -464,8 +465,11 @@ 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);
$ujrah = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
$onepercent = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
$keuntungan = $ujrah + $onepercent;
$upahrebet_raw = $onepercentservices->getRoundedMethod($keuntungan);
return $upahrebet_raw;
}
@@ -695,7 +699,7 @@ class Penebusan
'norujukan' => $norujukan,
'bayaran_keuntungan' => $request->bakiupah,
'bayaran_pembiayaan' => $bayaran_pembiayaan,
'keuntungan_rebet' => 0,
'keuntungan_rebet' => $request->bakiupah,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw
]);
@@ -747,6 +751,8 @@ class Penebusan
$ujrah = $onepercentservices->getRoundedMethod($array_upah['ujrah']);
$onepercent_semasa = $bilang_bln * $onepercent;
$ujrah_semasa = $bilang_bln * $ujrah;
$onepercent_semasa = $onepercentservices->getRoundedMethod($onepercent_semasa);
$ujrah_semasa = $onepercentservices->getRoundedMethod($ujrah_semasa);
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
@@ -773,7 +779,9 @@ class Penebusan
$keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']);
$ujrah = $bilang_bln * $ujrah_rounded;
$onepercent = $bilang_bln * $keuntungan_rounded;
$ujrah = $onepercentservices->getRoundedMethod($ujrah);
$onepercent = $onepercentservices->getRoundedMethod($onepercent);
return ['ujrah' => $ujrah, 'onepercent' => $onepercent];
}