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

fix one percent mengikut excel kak aida

Browse Source
This commit is contained in:
Hafifie PKB
2023-11-30 09:33:12 +08:00
parent e42025d367
commit 096025bcbc
3 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+55 -51
View File
@@ -57,14 +57,14 @@ class TebusController extends Controller
$jeniskeuntungan = ($gadai_data['tagbaru'] == 1) ? 'onepercent' : 'asal';
$rebet = $this->rebetselepastawarruq($kodcaw,$norujukan,$jeniskeuntungan);
$harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
$hargatebus = bcdiv(round($harga_tebus,2),1,1);
$hargatebus = number_format($hargatebus,2);
if(strpos($hargatebus,',')){
$hargatebus = str_replace(',','',$hargatebus);
}
$hargatebus = round($harga_tebus,PHP_ROUND_HALF_UP);
// $hargatebus = bcdiv(round($harga_tebus,2),1,1);
// $hargatebus = number_format($hargatebus,2);
// if(strpos($hargatebus,',')){
// $hargatebus = str_replace(',','',$hargatebus);
// }
return response()->json($hargatebus);
}
@@ -115,16 +115,17 @@ class TebusController extends Controller
}else{
$upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']);
}
$upah_semasa_round = number_format($upahsemasa_raw,2);
if(strpos($upah_semasa_round,',')){
$upah_semasa_round = str_replace(',','',$upah_semasa_round);
}
$upah_semasa = substr($upah_semasa_round, 0, -1);
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);
// if(strpos($upah_semasa_round,',')){
// $upah_semasa_round = str_replace(',','',$upah_semasa_round);
// }
// $upah_semasa = substr($upah_semasa_round, 0, -1);
// if(strpos($upah_semasa,',')){
// $upah_semasa = str_replace(',','',$upah_semasa);
// }
return $upah_semasa;
}
@@ -148,20 +149,21 @@ class TebusController extends Controller
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
if($jeniskeuntungan == 'onepercent'){
$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 * $upah['keuntungan'];
}else{
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
}
$upah_rebet_round = number_format($upahrebet_raw,2);
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
$upah_rebet = round($upahrebet_raw ,PHP_ROUND_HALF_UP);
// $upah_rebet_round = number_format($upahrebet_raw,2);
// if(strpos($upah_rebet_round,',')){
// $upah_rebet_round = str_replace(',','',$upah_rebet_round);
// }
// $upah_rebet = substr($upah_rebet_round, 0, -1);
// if(strpos($upah_rebet,',')){
// $upah_rebet = str_replace(',','',$upah_rebet);
// }
return $upah_rebet;
}
@@ -185,14 +187,15 @@ class TebusController extends Controller
$upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_rebet_round = number_format($upahrebet_raw,2);
if(strpos($upah_rebet_round,',')){
$upah_rebet_round = str_replace(',','',$upah_rebet_round);
}
$upah_rebet = substr($upah_rebet_round, 0, -1);
if(strpos($upah_rebet,',')){
$upah_rebet = str_replace(',','',$upah_rebet);
}
$upah_rebet = round($upahrebet_raw,PHP_ROUND_HALF_UP);
// $upah_rebet_round = number_format($upahrebet_raw,2);
// if(strpos($upah_rebet_round,',')){
// $upah_rebet_round = str_replace(',','',$upah_rebet_round);
// }
// $upah_rebet = substr($upah_rebet_round, 0, -1);
// if(strpos($upah_rebet,',')){
// $upah_rebet = str_replace(',','',$upah_rebet);
// }
$total_untung_rebet = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('mysql7')->where('norujukan','=',$norujukan)->sum('bayaran_keuntungan');
@@ -444,7 +447,7 @@ class TebusController extends Controller
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan,$jeniskeuntungan);
$rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
// dd($gadai_data['upah12'],$transaction_keuntungan,$upah_rebet,$jeniskeuntungan,$rebet_raw);
$rebet_round = bcdiv(round($rebet_raw,2),1,1);
$rebet_round = number_format($rebet_round,2);
@@ -2285,28 +2288,29 @@ class TebusController extends Controller
}
$bilang_bln = $tempoh - $gadai_data['tempohbayar'];
$array_upah = $onepercentservices->kiraanKeuntunganSebenar($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
$array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']);
$ujrah = $bilang_bln * $array_upah['ujrah'];
$onepercent = $bilang_bln * $array_upah['onepercent'];
$ujrah_semasa = round($ujrah,PHP_ROUND_HALF_UP);
// $ujrah_semasa_round = number_format($ujrah,2);
// if(strpos($ujrah_semasa_round,',')){
// $ujrah_semasa_round = str_replace(',','',$ujrah_semasa_round);
// }
// $ujrah_semasa = substr($ujrah_semasa_round, 0, -1);
// if(strpos($ujrah_semasa,',')){
// $ujrah_semasa = str_replace(',','',$ujrah_semasa);
// }
$ujrah_semasa_round = number_format($ujrah,2);
if(strpos($ujrah_semasa_round,',')){
$ujrah_semasa_round = str_replace(',','',$ujrah_semasa_round);
}
$ujrah_semasa = substr($ujrah_semasa_round, 0, -1);
if(strpos($ujrah_semasa,',')){
$ujrah_semasa = str_replace(',','',$ujrah_semasa);
}
$onepercent_semasa_round = number_format($onepercent,2);
if(strpos($onepercent_semasa_round,',')){
$onepercent_semasa_round = str_replace(',','',$onepercent_semasa_round);
}
$onepercent_semasa = substr($onepercent_semasa_round, 0, -1);
if(strpos($onepercent_semasa,',')){
$onepercent_semasa = str_replace(',','',$onepercent_semasa);
}
$onepercent_semasa = round($onepercent,PHP_ROUND_HALF_UP);
// $onepercent_semasa_round = number_format($onepercent,2);
// if(strpos($onepercent_semasa_round,',')){
// $onepercent_semasa_round = str_replace(',','',$onepercent_semasa_round);
// }
// $onepercent_semasa = substr($onepercent_semasa_round, 0, -1);
// if(strpos($onepercent_semasa,',')){
// $onepercent_semasa = str_replace(',','',$onepercent_semasa);
// }
return ['ujrah' => $ujrah_semasa, 'onepercent' => $onepercent_semasa];
}