Merged in ujrah_master (pull request #4)

Ujrah master
This commit is contained in:
Amir Hassan Hamzan
2023-11-27 04:12:28 +00:00
4 changed files with 231 additions and 45 deletions
+7 -5
View File
@@ -87,7 +87,7 @@ class PenebusanController extends Controller
'nowakil' => $request->nowakil
])->json();
if($updategadai)
if($updategadai == 'success')
{
$getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$request->kodcaw,['kodlaluan' => $request->teller])->json();
@@ -128,7 +128,7 @@ class PenebusanController extends Controller
return response()->json($updateTunai,200);
}else{
return response('error',500);
return response('error');
}
}
@@ -465,9 +465,10 @@ class PenebusanController extends Controller
$karatbaru = str_replace('.','-',$marhunloop['karat']);
$hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json();
$nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat']));
$harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga'];
$nilaimarhun = (floatval($harga) * floatval($marhunloop['berat']));
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]);
array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]);
}
foreach($arraymarhunbaru as $array1){
@@ -478,7 +479,8 @@ class PenebusanController extends Controller
'karat' => $array1['karat'],
'berat_emas' => $array1['berat'],
'harga' => $array1['harga'],
'nilai_marhun' => $array1['n_marhun']
'nilai_marhun' => $array1['n_marhun'],
'jenisAT' => $request->jenisAT
])->json();
}