diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a0493c6..2086deb 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1860,6 +1860,7 @@ class AdminPageController extends Controller ->orWhere('tagpb','=',2) ->orWhere('tagdeposit','=',2) ->orWhere('tagprint','=',2) + ->orWhere([['tagcit', 1],['jenismohon','bayaranbalik'],['tagakaun',1]]) ->orderBy('tarikh_permohonan','desc')->paginate(5); }else{ @@ -1871,6 +1872,7 @@ class AdminPageController extends Controller ->orWhere('tagpb','=',2) ->orWhere('tagdeposit','=',2) ->orWhere('tagprint','=',2) + ->orWhere([['tagcit', 1],['jenismohon','bayaranbalik'],['tagakaun',1]]) ->get(); } @@ -1890,6 +1892,11 @@ class AdminPageController extends Controller ->where('tagpb','!=',2) ->where('tagdeposit','!=',2) ->where('tagprint','!=',2) + ->where(function($query){ + $query->where('tagcit', '!=', 1) + ->orWhere('tagoperasi','!=',1) + ->orWhere('tagakaun','!=',1); + }) ->orderBy('tarikh_permohonan','desc')->paginate(5); }else{ @@ -1901,6 +1908,11 @@ class AdminPageController extends Controller ->where('tagpb','!=',2) ->where('tagdeposit','!=',2) ->where('tagprint','!=',2) + ->where(function($query){ + $query->where('tagcit', '!=', 1) + ->orWhere('tagoperasi','!=',1) + ->orWhere('tagakaun','!=',1); + }) ->get(); } @@ -1949,7 +1961,10 @@ class AdminPageController extends Controller break; case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]); break; + case 8: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['bank_cit']]); + break; } + array_push($statusarray,$status_lookup); } @@ -1986,6 +2001,7 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) ->update(array( 'tagoperasi' => 2, + 'komen_batal' => $request->komen, 'nama_operasi' => $request->namaoperasi, 'tarikh_pengesahanoperasi' => $timeloni->toDateString() )); @@ -2032,6 +2048,7 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) ->update(array( 'tagakaun' => 2, + 'komen_batal' => $request->komen, 'nama_akaun' => $request->namaakaun, 'tarikh_pengesahanakaun' => $timeloni->toDateString() )); @@ -2095,7 +2112,8 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( - 'tagpb' => 2 + 'tagpb' => 2, + 'komen_batal' => $request->komen )); } @@ -2136,7 +2154,8 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]]) ->update(array( - 'tagdeposit' => 2 + 'tagdeposit' => 2, + 'komen_batal' => $request->komen )); } @@ -2170,6 +2189,32 @@ class AdminPageController extends Controller return response()->json(1); + }catch (\Throwable $e){ + return response($e); + } + } + + public function TagCit (Request $request) + { + $timeloni = Carbon::now(); + $status = new Status; + + try{ + + $status->mohonid = $request->mohonid; + $status->statusid = 8; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]]) + ->update(array( + 'tagcit' => 1, + 'bank_cit' => $request->bank + )); + + return response()->json(1); + + }catch (\Throwable $e){ return response($e); } diff --git a/app/Pengesahan.php b/app/Pengesahan.php index fabfb02..44a9317 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -34,7 +34,9 @@ class Pengesahan extends Model 'tagprint', 'tarikh_print', 'nama_print', - 'komen_batal' + 'tagcit', + 'bank_cit', + 'komen_batal', ]; /** diff --git a/routes/web.php b/routes/web.php index 5b901a4..a5c13c2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -695,6 +695,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->put('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); $router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']); $router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); + $router->put('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); });