Merge branch 'apiaku' into 'master'

fix tebus separuh dan tambah pinjaman

See merge request online-sistem1/api_arrahn!101
This commit is contained in:
hafifie rahman
2021-05-28 10:33:05 +00:00
2 changed files with 17 additions and 2 deletions
+16 -2
View File
@@ -38,7 +38,13 @@ class TebusController extends Controller
$harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
return response()->json($harga_tebus);
$hargatebus = bcdiv(round($harga_tebus,2),1,1);
$hargatebus = number_format($hargatebus,2);
if(strpos($hargatebus,',')){
$hargatebus = str_replace(',','',$hargatebus);
}
return response()->json($hargatebus);
}
public function kiraupahTawarruq($kodcaw,$norujukan){
@@ -86,6 +92,13 @@ class TebusController extends Controller
return response()->json(number_format($upah_semasa,2));
}
public function upahRebetTawarruq($kodcaw,$norujukan){
$upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
return response()->json(number_format($upah_rebet,2));
}
public function tebusSeparuhTawarruq($kodcaw,$norujukan,Request $request){
$cawangan = Cawangan::on('mysql7')
@@ -269,7 +282,8 @@ class TebusController extends Controller
$rebet_raw =$gadai_data['upah12'] - $transaction_keuntungan - $upah_rebet;
$rebet_round = number_format($rebet_raw,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);
+1
View File
@@ -86,6 +86,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
//Tebus API
$router->get('tebustawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusTawarruq']);
$router->get('upahtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahTawarruq']);
$router->get('upahrebettawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahRebetTawarruq']);
$router->get('tebusseparuhtawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusSeparuhTawarruq']);
$router->get('tebusseparuhbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusSeparuhNotTawarruq']);
$router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);