From cf5eb188d5ee0c9958eda56da26ee65daeaa1017 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 18 Jul 2022 16:53:58 +0800 Subject: [PATCH] fix --- app/Http/Controllers/AdminPageController.php | 22 +++++++++++++++++--- routes/web.php | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index f917b98..dcae249 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2014,6 +2014,7 @@ class AdminPageController extends Controller { $timeloni = Carbon::now(); $status = new Status; + $ar_files = new ARFiles; try{ if($request->kelulusan == 'Lulus') @@ -2023,11 +2024,18 @@ class AdminPageController extends Controller $status->tarikhmasa = $timeloni->toDateTimeString(); $status->save(); + $ar_files->data = $request->dataimage; + $ar_files->type = $request->imagetype; + $ar_files->filename = $request->imagename; + $ar_files->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files->save(); + $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagoperasi',0]]) ->update(array( 'tagoperasi' => 1, 'nama_operasi' => $request->namaoperasi, - 'tarikh_pengesahanoperasi' => $timeloni->toDateString() + 'tarikh_pengesahanoperasi' => $timeloni->toDateString(), + 'files_kelope_id' => $ar_files->id )); }else{ @@ -2060,6 +2068,7 @@ class AdminPageController extends Controller { $timeloni = Carbon::now(); $status = new Status; + $ar_files = new ARFiles; try{ @@ -2070,11 +2079,18 @@ class AdminPageController extends Controller $status->tarikhmasa = $timeloni->toDateTimeString(); $status->save(); + $ar_files->data = $request->dataimage; + $ar_files->type = $request->imagetype; + $ar_files->filename = $request->imagename; + $ar_files->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files->save(); + $pengesahan = Pengesahan::where([['nopermohonan',$request->mohonid],['tagakaun',0]]) ->update(array( 'tagakaun' => 1, 'nama_akaun' => $request->namaakaun, - 'tarikh_pengesahanakaun' => $timeloni->toDateString() + 'tarikh_pengesahanakaun' => $timeloni->toDateString(), + 'files_kelakaun_id' => $ar_files->id )); }else @@ -2475,7 +2491,7 @@ class AdminPageController extends Controller 'tarikh' => $current->toDateString(), 'prkod' => "01", 'teller' => "DM", - 'bakipjm' => $lel['bakipjm'], + 'bakipjm' => ($lel['bakipjm']) ? $lel['bakipjm'] : 0, 'bakiupah' => $lel['bakiupah'], 'cajlain' => '0.00', 'cajlelong' => $lel['cajlelong'], diff --git a/routes/web.php b/routes/web.php index 618d880..62e41ab 100644 --- a/routes/web.php +++ b/routes/web.php @@ -704,7 +704,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); $router->post('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']); - $router->post('permohonan/updatejanapc',['uses'=>'AdminPageController@PenjanaanPC']); + $router->put('permohonan/updatejanapc',['uses'=>'AdminPageController@PenjanaanPC']); $router->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']);