fixes of kelulusan and resit and marhun and notifikasi
This commit is contained in:
@@ -236,8 +236,9 @@ class KhazanahController extends Controller
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
|
||||
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json();
|
||||
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
|
||||
|
||||
return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan'));
|
||||
return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid'));
|
||||
|
||||
}
|
||||
|
||||
@@ -276,7 +277,18 @@ class KhazanahController extends Controller
|
||||
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
|
||||
|
||||
if($request->khazanah != null)
|
||||
{
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"khazanah" => $request->khazanah
|
||||
])->json();
|
||||
}
|
||||
else
|
||||
{
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json();
|
||||
}
|
||||
|
||||
|
||||
return response()->json($updatelulus,200);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user