Merge branch 'production' of https://bitbucket.org/arrahn-pkb/kaunter into v2.2updatesag

This commit is contained in:
BTMS3
2025-01-27 16:38:28 +08:00
7 changed files with 183 additions and 164 deletions
+15 -9
View File
@@ -192,20 +192,23 @@ class KhazanahController extends Controller
return view('khazanah.menu',compact('cawangan_info','api_url','gadai','listserah','countmodal','countserahan'));
}
public function pendahuluanserahandaftar()
public function pendahuluanserahandaftar(Request $request)
{
$auth_user = Auth::user();
$api_url = config('api.url');
$cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
$listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
// $listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'])->json();
$listgldetail = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url') .'/api/listgldetail/'. $auth_user['cawangan'],['name' => $auth_user['name']])->json();
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/DenominasiController/'.$auth_user['cawangan'])->json();
// dd($denominasi);
if(sizeof($denominasi) == 0)
{
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'])->json();
$denominasi=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/DenominasiCreate/'.$auth_user['cawangan'],['name' => $auth_user['name']])->json();
}
else
{
@@ -215,6 +218,7 @@ class KhazanahController extends Controller
return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi'));
}
public function dashboard()
{
$auth_user = Auth::user();
@@ -738,7 +742,8 @@ class KhazanahController extends Controller
$data_request = $request->except('_token');
$updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],$data_request)->json();
// $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],['name' => $auth_user['name']],$data_request)->json();
// dd($updatepanjar);
if($updatepanjar['result'] == 'success')
{
if($request->jenismodal === 'perubatan')
@@ -2103,7 +2108,7 @@ class KhazanahController extends Controller
'dtacct' => $request->dtacct,
'ktacct' => $request->ktacct
])->json();
$amaun=$request->amaun;
$peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
@@ -2833,7 +2838,8 @@ class KhazanahController extends Controller
// $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh;
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
// $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json();
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan'],['name' => $auth_user['name']]])->json();
$daftar = 0;
if(sizeof($polis) > 0)
@@ -2869,7 +2875,7 @@ class KhazanahController extends Controller
}else{
event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name']));
// return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error');
}
return response($daftarpolis);
@@ -2940,7 +2946,7 @@ class KhazanahController extends Controller
$customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json();
}
$polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json();
$log_ulangcetakagh = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/polis/agh',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan'],'teller' => $auth_user['name']])->json();
return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url'));
}
+4 -1
View File
@@ -69,7 +69,10 @@ class LelongController extends Controller
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0];
$lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
// $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
$lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan, [
'name' => $auth_user['name']])->json();
$wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json();
+3 -2
View File
@@ -733,8 +733,9 @@ class PenebusanController extends Controller
'hubungan' => $request->hubungan,
'alamat' => $request->alamat,
'telefon' => $request->telefon,
'nota' => $request->nota
'nota' => $request->nota,
'teller' => $auth_user['name']
])->json();
if($createwakil)