From d58e7dcd09b54d3db8c89cde1a44c70858272cfd Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 21 Mar 2022 10:48:23 +0800 Subject: [PATCH 01/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 48 +++++++++++++++++++- app/LookupStatus.php | 29 ++++++++++++ app/Pengesahan.php | 38 ++++++++++++++++ app/Permohonan.php | 40 ++++++++++++++++ app/Status.php | 31 +++++++++++++ routes/web.php | 1 + 6 files changed, 186 insertions(+), 1 deletion(-) create mode 100644 app/LookupStatus.php create mode 100644 app/Pengesahan.php create mode 100644 app/Permohonan.php create mode 100644 app/Status.php diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 04db6da..e00b9c1 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -22,7 +22,10 @@ use App\BajetTahunan; use App\Blacklist; use App\Pelelong; use App\Mohon; - +use App\Pengesahan; +use App\Permohonan; +use App\Status; +use App\LookupStatus; use DB; use Carbon\Carbon; @@ -1802,4 +1805,47 @@ class AdminPageController extends Controller return response()->json($data); } + + public function TambahPermohonan(Request $request,$kodcaw) + { + + $timeloni = Carbon::now(); + $current = new Carbon(); + $curent_year = substr($current->year,2,2); + $curent_month = sprintf("%02d", $current->month); + $current_day = sprintf("%02d", $current->day); + + try { + $permohonan = new Permohonan; + $pengesahan = new Pengesahan; + $status = new Status; + + $nopermohonan = 'AR' . strtoupper($kodcaw) . $curent_year . $curent_month . $current_day . '-000' .rand(1,9); + + $permohonan->kodcaw = $kodcaw; + $permohonan->jenismohon = $request->jenismohon; + $permohonan->baki_petibesi = $request->bakipetibesi; + $permohonan->amaun_mohon = $request->jumlahmohon; + $permohonan->nama_pemohon = $request->namapemohon; + $permohonan->tarikh_permohonan = $request->tarikhmohon; + $permohonan->outstandingsemasa = $request->outstanding; + $permohonan->nopermohonan = $nopermohonan; + $permohonan->save(); + + + $pengesahan->mohonid = $permohonan->id; + $pengesahan->kodcaw = $kodcaw; + $pengesahan->save(); + + $status->mohonid = $permohonan->id; + $status->statusid = 1; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + + return response(1); + + } catch (\Throwable $e) { + return response($e); + } + } } \ No newline at end of file diff --git a/app/LookupStatus.php b/app/LookupStatus.php new file mode 100644 index 0000000..443c552 --- /dev/null +++ b/app/LookupStatus.php @@ -0,0 +1,29 @@ +group(['prefix'=>'admin'], function () use ($router){ $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']); + $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']); }); $router->group(['prefix'=>'kelantanpay'], function () use ($router){ From cdd5076eb145ac793b21e920b927de4b7f615c15 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 21 Mar 2022 16:39:32 +0800 Subject: [PATCH 02/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 18 ++++++++++++++++++ routes/web.php | 2 ++ 2 files changed, 20 insertions(+) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index e00b9c1..92ce6fa 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1848,4 +1848,22 @@ class AdminPageController extends Controller return response($e); } } + + public function GetPermohonanCawangan($kodcaw,Request $request) + { + $listpermohonan = Permohonan::where('kodcaw', $kodcaw)->get(); + + return response()->json($listpermohonan); + } + + public function GetPermohonanById($kodcaw,$mohonid) + { + $permohonanstatus = []; + $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['mohonid',$mohonid]])->first()->toArray(); + $status = Status::where('mohonid',$mohonid)->get()->toArray(); + + $permohonanstatus = $listpermohonan + $status; + + return response()->json($permohonanstatus); + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 75c0763..354a9b7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -684,6 +684,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('customers/{ic}/gadai/{status}',['uses'=>'AdminPageController@showOneCustomerGadai']); $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']); + $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']); + $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']); }); $router->group(['prefix'=>'kelantanpay'], function () use ($router){ From 4b58f2460baaee30908798fbeef0d93319be2af3 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 22 Mar 2022 02:26:58 +0800 Subject: [PATCH 03/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 31 ++++++++++++++++++-- app/Pengesahan.php | 5 +++- app/Permohonan.php | 3 +- routes/web.php | 3 ++ 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 92ce6fa..2f9c56e 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1851,7 +1851,13 @@ class AdminPageController extends Controller public function GetPermohonanCawangan($kodcaw,Request $request) { - $listpermohonan = Permohonan::where('kodcaw', $kodcaw)->get(); + + if($kodcaw === 'admin') + { + $listpermohonan = Permohonan::where('tagterima',0)->orderBy('tarikh_permohonan','desc')->paginate(5); + }else{ + $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['tagterima',0]])->get(); + } return response()->json($listpermohonan); } @@ -1862,8 +1868,27 @@ class AdminPageController extends Controller $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['mohonid',$mohonid]])->first()->toArray(); $status = Status::where('mohonid',$mohonid)->get()->toArray(); - $permohonanstatus = $listpermohonan + $status; + array_push($listpermohonan,(["status" => $status])); - return response()->json($permohonanstatus); + return response()->json($listpermohonan); + } + + public function GetDescriptionStatus($mohonid) + { + $statusarray = []; + + $status = Status::where('mohonid',$mohonid)->get()->toArray(); + + foreach($status as $index=>$stat) + { + $status_lookup = LookupStatus::where('statusid',$stat['statusid'])->first()->toArray(); + // $status_lookup = $stat['tarikhmasa']; + $date = date('d-m-Y',strtotime($stat['tarikhmasa'])); + $time = date('g:i a',strtotime($stat['tarikhmasa'])); + array_push($status_lookup,['tarikh' => $date, 'masa' => $time]); + array_push($statusarray,$status_lookup); + } + + return response()->json($statusarray); } } \ No newline at end of file diff --git a/app/Pengesahan.php b/app/Pengesahan.php index 232416a..b7647c5 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -26,7 +26,10 @@ class Pengesahan extends Model 'noresit', 'tarikh_bankin', 'kodcaw', - 'mohonid' + 'mohonid', + 'tagoperasi', + 'tagakaun', + 'tagpb' ]; /** diff --git a/app/Permohonan.php b/app/Permohonan.php index 934bb67..9071841 100644 --- a/app/Permohonan.php +++ b/app/Permohonan.php @@ -28,7 +28,8 @@ class Permohonan extends Model 'tarikh_terima', 'nama_penerima', 'outstandingsemasa', - 'nopermohonan' + 'nopermohonan', + 'tagterima' ]; /** diff --git a/routes/web.php b/routes/web.php index 354a9b7..e31ce13 100644 --- a/routes/web.php +++ b/routes/web.php @@ -686,6 +686,9 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']); $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']); $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']); + $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@GetDescriptionStatus']); + + }); $router->group(['prefix'=>'kelantanpay'], function () use ($router){ From 91f5d6038acdb74b444f1741f019db4017981110 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 22 Mar 2022 18:43:15 +0800 Subject: [PATCH 04/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 6 +++++- routes/web.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 2f9c56e..50ba766 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1882,7 +1882,6 @@ class AdminPageController extends Controller foreach($status as $index=>$stat) { $status_lookup = LookupStatus::where('statusid',$stat['statusid'])->first()->toArray(); - // $status_lookup = $stat['tarikhmasa']; $date = date('d-m-Y',strtotime($stat['tarikhmasa'])); $time = date('g:i a',strtotime($stat['tarikhmasa'])); array_push($status_lookup,['tarikh' => $date, 'masa' => $time]); @@ -1891,4 +1890,9 @@ class AdminPageController extends Controller return response()->json($statusarray); } + + public function KelulusanPermohonanByOperasi(Request $request) + { + + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index e31ce13..19401c7 100644 --- a/routes/web.php +++ b/routes/web.php @@ -688,6 +688,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']); $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@GetDescriptionStatus']); + // $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@KelulusanPermohonanByOperasi']); }); From 8b52cb4033bcd01967b4b01da9d7bed930583ec6 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 23 Mar 2022 11:07:43 +0800 Subject: [PATCH 05/15] fix adminapi --- app/Http/Controllers/AdminPageController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 50ba766..4e1ecb6 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1854,7 +1854,10 @@ class AdminPageController extends Controller if($kodcaw === 'admin') { - $listpermohonan = Permohonan::where('tagterima',0)->orderBy('tarikh_permohonan','desc')->paginate(5); + $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') + ->where('tagterima',0) + ->orderBy('tarikh_permohonan','desc')->paginate(5); + }else{ $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['tagterima',0]])->get(); } From 033578fd08a3897d44a1fc2c6ca6720ee284e5da Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 23 Mar 2022 16:48:10 +0800 Subject: [PATCH 06/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 88 +++++++++++++++++++- routes/web.php | 5 +- 2 files changed, 91 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 4e1ecb6..703682d 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1896,6 +1896,92 @@ class AdminPageController extends Controller public function KelulusanPermohonanByOperasi(Request $request) { - + $timeloni = Carbon::now(); + + try{ + + if($request->kelulusan == 'Lulus') + { + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) + ->update(array( + 'tagoperasi' => 1, + 'nama_operasi' => $request->namaoperasi, + 'tarikh_pengesahanoperasi' => $timeloni->toDateString() + )); + }else{ + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) + ->update(array( + 'tagoperasi' => 2, + 'nama_operasi' => $request->namaoperasi, + 'tarikh_pengesahanoperasi' => $timeloni->toDateString() + )); + } + + return response()->json(1); + + + }catch (\Throwable $e){ + return response($e); + } + + } + + + public function KelulusanPermohonanByAkaun(Request $request) + { + $timeloni = Carbon::now(); + + try{ + + if($request->kelulusan == 'Lulus') + { + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) + ->update(array( + 'tagakaun' => 1, + 'nama_akaun' => $request->namaakaun, + 'tarikh_pengesahanakaun' => $timeloni->toDateString() + )); + }else{ + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) + ->update(array( + 'tagakaun' => 2, + 'nama_akaun' => $request->namaakaun, + 'tarikh_pengesahanakaun' => $timeloni->toDateString() + )); + } + + return response()->json(1); + + + }catch (\Throwable $e){ + return response($e); + } + } + + public function KelulusanPermohonanByPB(Request $request) + { + $timeloni = Carbon::now(); + + try{ + + if($request->kelulusan == 'Lulus') + { + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) + ->update(array( + 'tagpb' => 1 + )); + }else{ + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) + ->update(array( + 'tagpb' => 2 + )); + } + + return response()->json(1); + + + }catch (\Throwable $e){ + return response($e); + } } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 19401c7..231dad0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -688,7 +688,10 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']); $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@GetDescriptionStatus']); - // $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@KelulusanPermohonanByOperasi']); + $router->put('permohonan/updateoperasi',['uses'=>'AdminPageController@KelulusanPermohonanByOperasi']); + $router->put('permohonan/updateakaun',['uses'=>'AdminPageController@KelulusanPermohonanByAkaun']); + $router->put('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); + }); From 65f75598c52fa5dc82d552f2c6f6fb9e39c27a0f Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 27 Mar 2022 11:12:51 +0800 Subject: [PATCH 07/15] fix stki2 --- app/Http/Controllers/AdminPageController.php | 210 ++++++++++++++++++- app/Pengesahan.php | 6 +- routes/web.php | 4 + 3 files changed, 209 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 703682d..7088435 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1849,6 +1849,35 @@ class AdminPageController extends Controller } } + public function GetRekodPermohonanCawangan($kodcaw) + { + if($kodcaw === 'admin') + { + $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') + ->where('tagterima',1) + ->orWhere('tagoperasi','=',2) + ->orWhere('tagakaun','=',2) + ->orWhere('tagpb','=',2) + ->orWhere('tagdeposit','=',2) + ->orWhere('tagprint','=',2) + ->orderBy('tarikh_permohonan','desc')->paginate(5); + + }else{ + $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') + ->where('pengesahan.kodcaw', $kodcaw) + ->where('tagterima',1) + ->orWhere('tagoperasi','=',2) + ->orWhere('tagakaun','=',2) + ->orWhere('tagpb','=',2) + ->orWhere('tagdeposit','=',2) + ->orWhere('tagprint','=',2) + ->get(); + + } + + return response()->json($listpermohonan); + } + public function GetPermohonanCawangan($kodcaw,Request $request) { @@ -1856,10 +1885,23 @@ class AdminPageController extends Controller { $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') ->where('tagterima',0) + ->where('tagoperasi','!=',2) + ->where('tagakaun','!=',2) + ->where('tagpb','!=',2) + ->where('tagdeposit','!=',2) + ->where('tagprint','!=',2) ->orderBy('tarikh_permohonan','desc')->paginate(5); }else{ - $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['tagterima',0]])->get(); + $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') + ->where('pengesahan.kodcaw', $kodcaw) + ->where('tagterima',0) + ->where('tagoperasi','!=',2) + ->where('tagakaun','!=',2) + ->where('tagpb','!=',2) + ->where('tagdeposit','!=',2) + ->where('tagprint','!=',2) + ->get(); } return response()->json($listpermohonan); @@ -1868,7 +1910,9 @@ class AdminPageController extends Controller public function GetPermohonanById($kodcaw,$mohonid) { $permohonanstatus = []; - $listpermohonan = Permohonan::where([['kodcaw', $kodcaw],['mohonid',$mohonid]])->first()->toArray(); + $listpermohonan = Permohonan::join('pengesahan', 'permohonan.mohonid', '=', 'pengesahan.mohonid') + ->where([['permohonan.kodcaw', $kodcaw],['permohonan.mohonid',$mohonid]])->first()->toArray(); + $status = Status::where('mohonid',$mohonid)->get()->toArray(); array_push($listpermohonan,(["status" => $status])); @@ -1879,15 +1923,33 @@ class AdminPageController extends Controller public function GetDescriptionStatus($mohonid) { $statusarray = []; - - $status = Status::where('mohonid',$mohonid)->get()->toArray(); + $statusdetails = []; + $status = Status::join('pengesahan', 'status.mohonid', '=', 'pengesahan.mohonid') + ->join('permohonan', 'status.mohonid', '=', 'permohonan.mohonid') + ->where('status.mohonid',$mohonid)->get()->toArray(); foreach($status as $index=>$stat) { $status_lookup = LookupStatus::where('statusid',$stat['statusid'])->first()->toArray(); $date = date('d-m-Y',strtotime($stat['tarikhmasa'])); $time = date('g:i a',strtotime($stat['tarikhmasa'])); - array_push($status_lookup,['tarikh' => $date, 'masa' => $time]); + + switch($stat['statusid']){ + case 1: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_pemohon' => $stat['nama_pemohon']]); + break; + case 2: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_operasi' => $stat['nama_operasi']]); + break; + case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]); + break; + case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan']]); + break; + case 5: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jenisbank' => $stat['jenisbank'],'noresit' => $stat['noresit']]); + break; + case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]); + break; + case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time]); + break; + } array_push($statusarray,$status_lookup); } @@ -1897,28 +1959,40 @@ class AdminPageController extends Controller public function KelulusanPermohonanByOperasi(Request $request) { $timeloni = Carbon::now(); - + $status = new Status; try{ if($request->kelulusan == 'Lulus') { + $status->mohonid = $request->mohonid; + $status->statusid = 2; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) ->update(array( 'tagoperasi' => 1, 'nama_operasi' => $request->namaoperasi, 'tarikh_pengesahanoperasi' => $timeloni->toDateString() )); + }else{ + + $status->mohonid = $request->mohonid; + $status->statusid = 7; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagoperasi',0]]) ->update(array( 'tagoperasi' => 2, 'nama_operasi' => $request->namaoperasi, 'tarikh_pengesahanoperasi' => $timeloni->toDateString() )); + } - return response()->json(1); - + return response()->json($pengesahan,200); }catch (\Throwable $e){ return response($e); @@ -1930,18 +2004,31 @@ class AdminPageController extends Controller public function KelulusanPermohonanByAkaun(Request $request) { $timeloni = Carbon::now(); + $status = new Status; try{ if($request->kelulusan == 'Lulus') { + $status->mohonid = $request->mohonid; + $status->statusid = 3; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) ->update(array( 'tagakaun' => 1, 'nama_akaun' => $request->namaakaun, 'tarikh_pengesahanakaun' => $timeloni->toDateString() )); - }else{ + + }else + { + $status->mohonid = $request->mohonid; + $status->statusid = 7; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',0]]) ->update(array( 'tagakaun' => 2, @@ -1950,7 +2037,7 @@ class AdminPageController extends Controller )); } - return response()->json(1); + return response()->json($pengesahan); }catch (\Throwable $e){ @@ -1958,19 +2045,54 @@ class AdminPageController extends Controller } } + public function PengesahanCetakan(Request $request) + { + $timeloni = Carbon::now(); + + try{ + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagakaun',1]]) + ->update(array( + 'tagprint' => 1, + 'nama_print' => $request->namaprint, + 'tarikh_print' => $timeloni->toDateString() + )); + + return response()->json($pengesahan); + }catch (\Throwable $e){ + return response($e); + } + } + public function KelulusanPermohonanByPB(Request $request) { $timeloni = Carbon::now(); + $status = new Status; try{ if($request->kelulusan == 'Lulus') { + $status->mohonid = $request->mohonid; + $status->statusid = 4; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 1 )); + + $permohonan = Permohonan::where('mohonid',$request->mohonid) + ->update(array( + 'tarikh_diluluskan' => $timeloni->toDateTimeString(), + 'jumlah_diluluskan' => $request->amaun_lulus + )); }else{ + $status->mohonid = $request->mohonid; + $status->statusid = 7; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 2 @@ -1980,6 +2102,74 @@ class AdminPageController extends Controller return response()->json(1); + }catch (\Throwable $e){ + return response($e); + } + } + + public function DepositBank(Request $request) + { + $timeloni = Carbon::now(); + $status = new Status; + + try{ + + if($request->kelulusan == 'Lulus') + { + $status->mohonid = $request->mohonid; + $status->statusid = 5; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]]) + ->update(array( + 'tagdeposit' => 1, + 'tarikh_bankin' => $timeloni->toDateString(), + 'jenisbank' => $request->jenisbank, + 'noresit' => $request->noresit + )); + }else{ + $status->mohonid = $request->mohonid; + $status->statusid = 7; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagdeposit',0]]) + ->update(array( + 'tagdeposit' => 2 + )); + } + + return response()->json(1); + + + }catch (\Throwable $e){ + return response($e); + } + } + + public function TagTerima(Request $request) + { + $timeloni = Carbon::now(); + $status = new Status; + + try{ + + $status->mohonid = $request->mohonid; + $status->statusid = 6; + $status->tarikhmasa = $timeloni->toDateTimeString(); + $status->save(); + + $pengesahan = Permohonan::where([['mohonid',$request->mohonid],['tagterima',0]]) + ->update(array( + 'tagterima' => 1, + 'tarikh_terima' => $timeloni->toDateString(), + 'nama_penerima' => $request->namapenerima + )); + + return response()->json(1); + + }catch (\Throwable $e){ return response($e); } diff --git a/app/Pengesahan.php b/app/Pengesahan.php index b7647c5..cffba1e 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -29,7 +29,11 @@ class Pengesahan extends Model 'mohonid', 'tagoperasi', 'tagakaun', - 'tagpb' + 'tagpb', + 'tagdeposit', + 'tagprint', + 'tarikh_print', + 'nama_print' ]; /** diff --git a/routes/web.php b/routes/web.php index 231dad0..5b901a4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -685,12 +685,16 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('permohonan/add/{kodcaw}',['uses'=>'AdminPageController@TambahPermohonan']); $router->get('permohonan/get/{kodcaw}',['uses'=>'AdminPageController@GetPermohonanCawangan']); + $router->get('permohonan/rekod/{kodcaw}',['uses'=>'AdminPageController@GetRekodPermohonanCawangan']); $router->get('permohonan/get/{kodcaw}/{mohonid}',['uses'=>'AdminPageController@GetPermohonanById']); $router->get('permohonan/description/{mohonid}',['uses'=>'AdminPageController@GetDescriptionStatus']); $router->put('permohonan/updateoperasi',['uses'=>'AdminPageController@KelulusanPermohonanByOperasi']); $router->put('permohonan/updateakaun',['uses'=>'AdminPageController@KelulusanPermohonanByAkaun']); + $router->put('permohonan/updatecetak',['uses'=>'AdminPageController@PengesahanCetakan']); $router->put('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); + $router->put('permohonan/updatebank',['uses'=>'AdminPageController@DepositBank']); + $router->put('permohonan/tagterima',['uses'=>'AdminPageController@TagTerima']); }); From 60ee7620ba9658824d69322121215b34d5c53cbf Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 29 Mar 2022 11:45:59 +0800 Subject: [PATCH 08/15] fix skit2 --- app/Http/Controllers/AdminPageController.php | 2 +- app/Pengesahan.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 7088435..a0493c6 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1947,7 +1947,7 @@ class AdminPageController extends Controller break; case 6: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_penerima' => $stat['nama_penerima']]); break; - case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time]); + case 7: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'komen' => $stat['komen_batal']]); break; } array_push($statusarray,$status_lookup); diff --git a/app/Pengesahan.php b/app/Pengesahan.php index cffba1e..fabfb02 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -33,7 +33,8 @@ class Pengesahan extends Model 'tagdeposit', 'tagprint', 'tarikh_print', - 'nama_print' + 'nama_print', + 'komen_batal' ]; /** From f433e323cd98083c3e7356d9f198423131ab5f3d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 3 Apr 2022 09:56:56 +0800 Subject: [PATCH 09/15] fix skit --- app/Http/Controllers/AdminPageController.php | 49 +++++++++++++++++++- app/Pengesahan.php | 4 +- routes/web.php | 1 + 3 files changed, 51 insertions(+), 3 deletions(-) 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']); }); From 9f87040211bd8c5417221410e86df73582931198 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 4 Apr 2022 17:30:53 +0800 Subject: [PATCH 10/15] fx --- app/Http/Controllers/AdminPageController.php | 3 ++- app/Pengesahan.php | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 2086deb..49d1cdf 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2096,7 +2096,8 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( - 'tagpb' => 1 + 'tagpb' => 1, + 'kelulusanpbimage' => $request->kelulusanpbimage )); $permohonan = Permohonan::where('mohonid',$request->mohonid) diff --git a/app/Pengesahan.php b/app/Pengesahan.php index 44a9317..6639d34 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -37,6 +37,7 @@ class Pengesahan extends Model 'tagcit', 'bank_cit', 'komen_batal', + 'kelulusanpbimage' ]; /** From 7cea54ffd1a866baf75ce6dd995cece793a841b8 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 7 Apr 2022 06:25:36 +0800 Subject: [PATCH 11/15] adding function --- app/Http/Controllers/AdminPageController.php | 1 + app/Http/Controllers/LelongController.php | 60 ++++++++++++++------ app/Pengesahan.php | 3 +- routes/web.php | 4 +- 4 files changed, 49 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 49d1cdf..b46c718 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2210,6 +2210,7 @@ class AdminPageController extends Controller $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagcit',0]]) ->update(array( 'tagcit' => 1, + 'resit_cit' => $request->resitcit, 'bank_cit' => $request->bank )); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c3ccc90..433e4aa 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -643,24 +643,38 @@ class LelongController extends Controller } } - public function getSenaraiLelongAktif($kodcaw){ + public function getSenaraiLelongAktif($kodcaw,$fasa){ $current = Carbon::now(); $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw',$kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql']) - ->selectRaw('count(*) as total, batchno,t_lelong') - ->where('t_lelong','>=',$current->toDateString()) - ->whereNull('t_jual') - ->orderBy('t_lelong','desc') - ->groupBy('batchno') - ->get(); + if($fasa == 'fasa1') + { + $lelong = Lelong::on($cawangan['mysql']) + ->selectRaw('count(*) as total, batchno,t_lelong') + ->where('t_lelong','>=',$current->toDateString()) + ->where('fasa', 0) + ->whereNull('t_jual') + ->orderBy('t_lelong','desc') + ->groupBy('batchno') + ->get(); + }else{ + $lelong = Lelong::on($cawangan['mysql']) + ->selectRaw('count(*) as total, batchno,t_lelong') + ->where('t_lelong','>=',$current->toDateString()) + ->where('fasa', 1) + ->whereNull('t_jual') + ->orderBy('t_lelong','desc') + ->groupBy('batchno') + ->get(); + } + return response()->json($lelong); } - public function getSenaraiBatchNoAktif($kodcaw,Request $request){ + public function getSenaraiBatchNoAktif($kodcaw,$fasa,Request $request){ $current = Carbon::now(); $current = new Carbon(); @@ -668,13 +682,27 @@ class LelongController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - $lelong = Lelong::on($cawangan['mysql']) - ->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah') - ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') - // ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') - ->where('batchno','=',$request->batchno) - ->orderBy('gadai.t_gadai','asc') - ->where('gadai.taglel','=', 1); + if($fasa == 'fasa1') + { + $lelong = Lelong::on($cawangan['mysql']) + ->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah') + ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') + // ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') + ->where('batchno','=',$request->batchno) + ->where('fasa',0) + ->orderBy('gadai.t_gadai','asc') + ->where('gadai.taglel','=', 1); + }else{ + $lelong = Lelong::on($cawangan['mysql']) + ->select('lelong.t_lelong','lelong.norujukan','gadai.jbg','gadai.nokp','gadai.pinjaman','gadai.bakiupah') + ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') + // ->leftJoin('customer', 'customer.kpbaru', '=', 'gadai.nokp') + ->where('batchno','=',$request->batchno) + ->where('fasa',1) + ->orderBy('gadai.t_gadai','asc') + ->where('gadai.taglel','=', 1); + } + $batchlel = BatchLel::on($cawangan['mysql']) ->where('batchno','=',$request->batchno) diff --git a/app/Pengesahan.php b/app/Pengesahan.php index 6639d34..8a46eaf 100644 --- a/app/Pengesahan.php +++ b/app/Pengesahan.php @@ -37,7 +37,8 @@ class Pengesahan extends Model 'tagcit', 'bank_cit', 'komen_batal', - 'kelulusanpbimage' + 'kelulusanpbimage', + 'resit_cit' ]; /** diff --git a/routes/web.php b/routes/web.php index a5c13c2..ffd2cb1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -262,8 +262,8 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('gadai/JumlahagingBulanan/test/{kodcaw}/{tarikh}',['uses'=>'GadaiController@carian_Seluruh_AgingBulanan']); //LELONG API - $router->get('senaraibatch/aktif/{kodcaw}',['uses'=>'LelongController@getSenaraiLelongAktif']); - $router->get('senaraibatch/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiBatchNoAktif']); + $router->get('senaraibatch/aktif/{kodcaw}/{fasa}',['uses'=>'LelongController@getSenaraiLelongAktif']); + $router->get('senaraibatch/laporan/{kodcaw}/{fasa}',['uses'=>'LelongController@getSenaraiBatchNoAktif']); $router->get('details/notislelong/{kodcaw}',['uses'=>'LelongController@DetailsNotisLelong']); From c401f17f7dc1a5fe407a33e253a9756faf68dfb5 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 10 Apr 2022 10:02:36 +0800 Subject: [PATCH 12/15] fix kelulusan --- app/Http/Controllers/AdminPageController.php | 21 ++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index b46c718..3653096 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1684,19 +1684,28 @@ class AdminPageController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $arraykelulusan = []; - foreach($cawangan_all as $index=>$cawangan){ - $kelulusan=Mohon::on($cawangan['mysql']) + foreach($cawangan_all as $index=>$cawangan){ + $kelulusan=Mohon::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) ->where('masalulus','=','') ->where('pelulus','=','operasi') - ->get(); + ->get()->toArray(); if(sizeof($kelulusan) != 0){ - array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); + foreach($kelulusan as $index=>$kel) + { + $kelulusan[$index]['cawangan'] = $cawangan['details_caw']; + $kelulusan[$index]['cawangankod'] = $cawangan['kodcaw']; + array_push($arraykelulusan,$kelulusan[$index]); + } + // $arraykelulusan += $kelulusan; + // array_push($arraykelulusan,$kelulusan); + // $arraykelulusan += $kelulusan; + // array_push($arraykelulusan,["kelulusanall" => $kelulusan,"cawangan" => $cawangan['details_caw'],"cawangankod" => $cawangan['kodcaw']]); } } - - $data = $this->paginate($arraykelulusan); + + $data = $this->paginate($arraykelulusan,3); return response()->json($data,200); } From 62d1252f4e520f8e94fb6e5a1d14a75e7b795eed Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Apr 2022 11:00:52 +0800 Subject: [PATCH 13/15] fix files --- app/Http/Controllers/AdminPageController.php | 25 ++++++++++++++- app/KPFiles.php | 32 ++++++++++++++++++++ app/Pengesahan.php | 4 ++- routes/web.php | 5 +-- 4 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 app/KPFiles.php diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 3653096..8c93613 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -26,6 +26,7 @@ use App\Pengesahan; use App\Permohonan; use App\Status; use App\LookupStatus; +use App\KPFiles; use DB; use Carbon\Carbon; @@ -2093,6 +2094,7 @@ class AdminPageController extends Controller { $timeloni = Carbon::now(); $status = new Status; + $kp_files = new KPFiles; try{ @@ -2103,10 +2105,16 @@ class AdminPageController extends Controller $status->tarikhmasa = $timeloni->toDateTimeString(); $status->save(); + $kp_files->data = $request->dataimage; + $kp_files->type = $request->imagetype; + $kp_files->filename = $request->imagename; + $kp_files->tarikhmasa = $timeloni->toDateTimeString(); + $kp_files->save(); + $pengesahan = Pengesahan::where([['mohonid',$request->mohonid],['tagpb',0]]) ->update(array( 'tagpb' => 1, - 'kelulusanpbimage' => $request->kelulusanpbimage + 'kp_id' => $kp_files->id )); $permohonan = Permohonan::where('mohonid',$request->mohonid) @@ -2230,4 +2238,19 @@ class AdminPageController extends Controller return response($e); } } + + public function viewFile(Request $request) { + // $data = \DB::connection($conn) + // ->table($tbl) + // ->where('filename', $filename) + // ->first(); + + $kp = KPFiles::where('kp_id',$request->kp_id) + ->first(); + + return response(base64_decode(stream_get_contents($kp->data)), 200, [ + 'Content-type' => 'application/' . $kp->type, + 'Content-Disposition' => 'inline; filename='.$kp->filename + ]); + } } \ No newline at end of file diff --git a/app/KPFiles.php b/app/KPFiles.php new file mode 100644 index 0000000..6bb564e --- /dev/null +++ b/app/KPFiles.php @@ -0,0 +1,32 @@ +group(['prefix'=>'admin'], function () use ($router){ $router->put('permohonan/updateoperasi',['uses'=>'AdminPageController@KelulusanPermohonanByOperasi']); $router->put('permohonan/updateakaun',['uses'=>'AdminPageController@KelulusanPermohonanByAkaun']); $router->put('permohonan/updatecetak',['uses'=>'AdminPageController@PengesahanCetakan']); - $router->put('permohonan/updatepb',['uses'=>'AdminPageController@KelulusanPermohonanByPB']); + $router->post('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']); - + $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@viewFile']); + }); From 9320550558998ead028e5fc5178af04b7b83a628 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Apr 2022 12:22:39 +0800 Subject: [PATCH 14/15] fix pasal notislelong --- app/Http/Controllers/AdminPageController.php | 12 ++++++++++++ app/Http/Controllers/LelongController.php | 2 +- routes/web.php | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 8c93613..9c34a16 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1670,6 +1670,18 @@ class AdminPageController extends Controller return response()->json($detailslelong, 200); } + public function UpdateNotisLelong2($kodcaw,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $detailslelong = Pelelong::on($cawangan['mysql'])-> + update(array( + 'para3'=>$request->content + )); + + return response()->json($detailslelong, 200); + } + public function paginate($items, $perPage = 5, $page = null, $options = []) { $page = $page ?: (Paginator::resolveCurrentPage() ?: 1); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 433e4aa..7582037 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -663,7 +663,7 @@ class LelongController extends Controller $lelong = Lelong::on($cawangan['mysql']) ->selectRaw('count(*) as total, batchno,t_lelong') ->where('t_lelong','>=',$current->toDateString()) - ->where('fasa', 1) + ->where('fasa', 2) ->whereNull('t_jual') ->orderBy('t_lelong','desc') ->groupBy('batchno') diff --git a/routes/web.php b/routes/web.php index 856ff17..0970d55 100644 --- a/routes/web.php +++ b/routes/web.php @@ -677,6 +677,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']); $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']); + $router->put('notislelong/update2/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong2']); $router->get('ListOperasi/Paginate',['uses'=>'AdminPageController@listoperasi']); $router->get('ListOperasiKelulusan/Paginate',['uses'=>'AdminPageController@listoperasikelulusan']); From 01a041da64c4e821677f2bbfac52f623a4d373af Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Apr 2022 12:47:18 +0800 Subject: [PATCH 15/15] settle lelongan orderby --- app/Http/Controllers/LelongController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7582037..cffdc2f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -691,6 +691,7 @@ class LelongController extends Controller ->where('batchno','=',$request->batchno) ->where('fasa',0) ->orderBy('gadai.t_gadai','asc') + ->orderBy('gadai.sirig','asc') ->where('gadai.taglel','=', 1); }else{ $lelong = Lelong::on($cawangan['mysql']) @@ -700,6 +701,7 @@ class LelongController extends Controller ->where('batchno','=',$request->batchno) ->where('fasa',1) ->orderBy('gadai.t_gadai','asc') + ->orderBy('gadai.sirig','asc') ->where('gadai.taglel','=', 1); }