fixing
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Events\StatusLiked;
|
||||
use App\Events\NotifikasiPembayaran;
|
||||
use App\Events\OperasiNotice;
|
||||
use App\Events\PendahuluanSerahan;
|
||||
use App\Events\NotifikasiKelulusan;
|
||||
|
||||
|
||||
use App\User;
|
||||
@@ -112,20 +113,25 @@ class KhazanahController extends Controller
|
||||
$auth_user = Auth::user();
|
||||
$api_url = config('api.url');
|
||||
|
||||
$tunai = Http::get( config('api.url') .'/api/TunaiController/'. $auth_user['cawangan'])->json();
|
||||
$arraytunaiharini = [];
|
||||
$arraytunai = [];
|
||||
|
||||
if(sizeof($tunai) > 0)
|
||||
$tunai = $tunai[0];
|
||||
$listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get();
|
||||
|
||||
$addtunai = Http::get( config('api.url') .'/api/getAddTunai/'. $auth_user['cawangan'])->json();
|
||||
foreach($listUser as $index1 => $ls)
|
||||
{
|
||||
$tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
|
||||
$tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
|
||||
|
||||
// if(sizeof($addtunai) > 0)
|
||||
// $addtunai = $addtunai[0];
|
||||
array_push($arraytunaiharini,$tunai);
|
||||
array_push($arraytunai,$tunaipast);
|
||||
}
|
||||
|
||||
$cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
|
||||
|
||||
|
||||
|
||||
return view('khazanah.alirantunai',compact('cawangan_info','api_url','tunai','addtunai'));
|
||||
return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser'));
|
||||
}
|
||||
|
||||
public function gadaian()
|
||||
@@ -312,7 +318,7 @@ class KhazanahController extends Controller
|
||||
|
||||
$kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json();
|
||||
$kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json();
|
||||
|
||||
|
||||
foreach($kelulusan as $index=>$k)
|
||||
{
|
||||
$komen = explode("|",$k['komen']);
|
||||
@@ -322,7 +328,7 @@ class KhazanahController extends Controller
|
||||
unset($komen[$results]);
|
||||
}
|
||||
|
||||
array_push($arraykelulusan,['norujukan' => $k['norujukan'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
|
||||
array_push($arraykelulusan,['norujukan' => $k['norujukan'],'siri' => $k['siri'], 'namateller' => $k['teller'], 'pinjaman' => $k['jumpinj'], 'nilaimarhun' => ($komen[1] ?? '-'), 'berat' => ($komen[2] ?? '-'),'margin' => ($komen[3] ?? '-'), 'komen' => ($komen[0] ?? '-'), 'pelulus' => $k['pelulus']]);
|
||||
}
|
||||
|
||||
return view('khazanah.kelulusan',compact('cawangan_info','api_url','arraykelulusan','kelulusanmohonid'));
|
||||
@@ -422,24 +428,57 @@ class KhazanahController extends Controller
|
||||
{
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"pengesahan" => "khazanah"
|
||||
"pengesahan" => "khazanah",
|
||||
'siri' => $request->siri
|
||||
])->json();
|
||||
|
||||
if($updatelulus)
|
||||
{
|
||||
event(new NotifikasiKelulusan($norujukan,"lulus",$request->siri,$request->komenkelulusan));
|
||||
}
|
||||
|
||||
}else{
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"pengesahan" => "khazanah",
|
||||
'siri' => $request->siri,
|
||||
"pembatalan" => "batal"
|
||||
])->json();
|
||||
|
||||
if($updatelulus)
|
||||
{
|
||||
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"pengesahan" => "operasi"
|
||||
{
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusanKomen/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"komen" => $request->komen,
|
||||
'siri' => $request->siri
|
||||
])->json();
|
||||
|
||||
if($request->pembatalan == null)
|
||||
{
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"pengesahan" => "operasi",
|
||||
'siri' => $request->siri
|
||||
])->json();
|
||||
|
||||
}else{
|
||||
|
||||
$updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan,[
|
||||
"pengesahan" => "operasi",
|
||||
'siri' => $request->siri,
|
||||
"pembatalan" => "batal"
|
||||
])->json();
|
||||
|
||||
event(new NotifikasiKelulusan($norujukan,"batal",$request->siri,$request->komenkelulusan));
|
||||
|
||||
}
|
||||
|
||||
event(new OperasiNotice($auth_user['cawangan'],$auth_user['name']));
|
||||
}
|
||||
}
|
||||
@@ -483,7 +522,7 @@ class KhazanahController extends Controller
|
||||
|
||||
event(new StatusLiked($auth_user['cawangan'],$auth_user['name']));
|
||||
|
||||
return response()->json($createlulus,201);
|
||||
return response()->json($siri,201);
|
||||
}
|
||||
|
||||
///END KELULUSAN///
|
||||
|
||||
Reference in New Issue
Block a user