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

update

Browse Source
This commit is contained in:
afiq
2021-02-27 12:32:58 +08:00
parent 31617d2861
commit 7256f1903f
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+5 -10
View File
@@ -267,8 +267,7 @@ class GadaiController extends Controller
->first(); ->first();
if($gadai_data['tempoh'] > 6){ if($gadai_data['tempoh'] > 6){
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
}else{ }else{
@@ -276,14 +275,12 @@ class GadaiController extends Controller
if($gadai_data['bakiupah'] != 0){ if($gadai_data['bakiupah'] != 0){
$upah_semasa = $gadai_data['bakiupah']; $upah_semasa = $gadai_data['bakiupah'];
}else{ }else{
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
} }
}else{ }else{
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
} }
@@ -345,8 +342,7 @@ class GadaiController extends Controller
'bakiupah' => $baki_upah, 'bakiupah' => $baki_upah,
'jbg' => 0, 'jbg' => 0,
't_update' => $current->toDateString(), 't_update' => $current->toDateString(),
'bakihargajualan' => $baki_hargajualan, 'bakihargajualan' => $baki_hargajualan
'tempohbayar' => $gadai['tempoh']
)); ));
return response()->json($update_gadai, 200); return response()->json($update_gadai, 200);
} }
@@ -404,8 +400,7 @@ class GadaiController extends Controller
'bakiupah' => $baki_upah, 'bakiupah' => $baki_upah,
'jbg' => 0, 'jbg' => 0,
't_update' => $current->toDateString(), 't_update' => $current->toDateString(),
'bakihargajualan' => $baki_hargajualan, 'bakihargajualan' => $baki_hargajualan
'tempohbayar' => $gadai['tempoh']
)); ));
return response()->json($update_gadai, 200); return response()->json($update_gadai, 200);
} }
app/Http/Controllers/TebusController.php
+3 -6
View File
@@ -67,8 +67,7 @@ class TebusController extends Controller
->first(); ->first();
if($gadai_data['tempoh'] > 6){ if($gadai_data['tempoh'] > 6){
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
}else{ }else{
@@ -76,14 +75,12 @@ class TebusController extends Controller
if($gadai_data['bakiupah'] != 0){ if($gadai_data['bakiupah'] != 0){
$upah_semasa = $gadai_data['bakiupah']; $upah_semasa = $gadai_data['bakiupah'];
}else{ }else{
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
} }
}else{ }else{
$tempoh_sebenar = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upahsemasa_raw = $tempoh_sebenar * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
$upah_semasa_round = number_format($upahsemasa_raw,2); $upah_semasa_round = number_format($upahsemasa_raw,2);
$upah_semasa = (float)substr($upah_semasa_round, 0, -1); $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
} }