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

add conflict from branch new-onepercent

Browse Source
This commit is contained in:
Hafifie PKB
2023-11-30 11:23:53 +08:00
parent 532240fdcb 096025bcbc
commit 32adaef8ef
5 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+11 -10
View File
@@ -360,12 +360,13 @@ class GadaiController extends Controller
// $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
$upahsemasa_raw = $bilang_bln * $upah['keuntungan'];
$upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = substr($upah_semasa_round, 0, -1);
// $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
if(strpos($upah_semasa,',')){
$upah_semasa = str_replace(',','',$upah_semasa);
}
$upah_semasa = round($upahsemasa_raw,PHP_ROUND_HALF_UP);
// $upah_semasa_round = number_format($upahsemasa_raw,2);
// $upah_semasa = substr($upah_semasa_round, 0, -1);
// // $upah_semasa = floatval(preg_replace('/[^\d.]/', '', $upah_semasa));
// if(strpos($upah_semasa,',')){
// $upah_semasa = str_replace(',','',$upah_semasa);
// }
return $upah_semasa;
}
@@ -387,7 +388,7 @@ class GadaiController extends Controller
}
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
$upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
// $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahrebet_raw = $bilang_bln * $upah['keuntungan'];
@@ -489,7 +490,7 @@ class GadaiController extends Controller
$margin_semasa = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100;
$keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$margin_semasa);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
$ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['margin_semasa']);
$onepercentasal = $gadai['pinjaman'] * (1/100);
@@ -523,8 +524,8 @@ class GadaiController extends Controller
'keuntungan_rebet'=> $upahrebet,
'tarikh_bayaran'=> $current,
'kodcaw'=> $kodcaw,
'ujrah' => ($ujrahasal*$bilang_bln),
'ujrah_rebet' => ($keuntungan['ujrah'] * $bilang_bln),
'ujrah' => ($keuntungan['ujrah'] * $bilang_bln),
'ujrah_rebet' => ($ujrahasal*$bilang_bln),
'onepercent' => ($onepercentasal * $bilang_bln),
'onepercent_rebet' => ($keuntungan['onepercent'] * $bilang_bln),
'tempoh' => $gadai['tempoh'],