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

fix autotawarruq and imbangduga

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-06 23:41:22 +08:00
parent 43b33c96df
commit 3b6f5c17a4
13 changed files with 153 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+27 -23
View File
@@ -65,7 +65,6 @@ class TebusController extends Controller
if(strpos($hargatebus,',')){
$hargatebus = str_replace(',','',$hargatebus);
}
return response()->json($hargatebus);
}
@@ -89,7 +88,11 @@ class TebusController extends Controller
$hargatebus = str_replace(',','',$hargatebus);
}
return $hargatebus;
$rounded = $hargatebus - $harga_tebus;
Log::info([$harga_tebus,$rebet]);
$arrayharga = ['harga' => $hargatebus, 'rounded' => $rounded];
return $arrayharga;
}
public function kiraupahTawarruq($kodcaw,$norujukan,$jeniskeuntungan){
@@ -157,16 +160,16 @@ class TebusController extends Controller
}
// $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);
}
// $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;
return $upahrebet_raw;
}
public function kiraUpahRebetSebenar($kodcaw,$norujukan){
@@ -449,15 +452,15 @@ class TebusController extends Controller
$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);
// $rebet_round = bcdiv(round($rebet_raw,2),1,1);
// $rebet_round = number_format($rebet_round,2);
if(strpos($rebet_round,',')){
$rebet_round = str_replace(',','',$rebet_round);
}
$rebet = substr($rebet_round, 0, -1);
return $rebet;
// if(strpos($rebet_round,',')){
// $rebet_round = str_replace(',','',$rebet_round);
// }
// $rebet = substr($rebet_round, 0, -1);
return $rebet_raw;
}
public function tebusUpdate($kodcaw,$norujukan,Request $request){
@@ -479,7 +482,7 @@ class TebusController extends Controller
$gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
$ujrah=0;$onepercent=0;
$ujrah=0;$onepercent=0;$rounded=0;
if($gadai['hargajualan'] == null){
$harga_tebus = $this->hargaTebusNotTawarruq($kodcaw,$norujukan);
$upah_tebus = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
@@ -489,7 +492,7 @@ class TebusController extends Controller
$harga_tebus = $this->hargaTebusTawarruq($kodcaw,$norujukan,$request->jeniskeuntungan);
$upah_tebus = $this->kiraupahTawarruq($kodcaw,$norujukan,$request->jeniskeuntungan);
$upah_rebet = $this->kiraUpahRebetSebenar($kodcaw,$norujukan);
$upah_rebet_sebenar = $harga_tebus - $gadai['bakipjm'];
$upah_rebet_sebenar = $harga_tebus['harga'] - $gadai['bakipjm'];
if($request->jeniskeuntungan == 'onepercent'){
$array_onepercent = $this->kiraupahUjrahOnePercent($kodcaw,$norujukan);
@@ -515,7 +518,7 @@ class TebusController extends Controller
'pinjaman' => $gadai['pinjaman'],
'ansuran' => 0.00,
'addpinjaman' => $request->addpinjaman,
'bakipjm' => $harga_tebus,
'bakipjm' => $harga_tebus['harga'],
'bakiupah' => $upah_tebus,
'terima' => "*",
'kodgl' => "0",
@@ -557,6 +560,7 @@ class TebusController extends Controller
'margin_semasa' => ($request->jeniskeuntungan == 'onepercent') ? $margin_semasa : 0,
'tempoh' => $gadai['tempoh'],
'beza_tempoh' => ($gadai['tempoh'] - $gadai['tempohbayar']),
'rounded' => $harga_tebus['rounded'],
]);
if($request->jenistebus == 'P'){
@@ -579,7 +583,7 @@ class TebusController extends Controller
'nokp' => $gadai['nokp'],
'teller' => $request->teller,
'kodcaw' => $kodcaw,
'duit_masuk' => $harga_tebus,
'duit_masuk' => $harga_tebus['harga'],
'created_at' => $current,
'bakiharga' => $baki_hargajualan,
'nowakil' => (int)$request->nowakil,