From 4666bdcc7d8e0faa6f628613a7e55f9865896548 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 3 Jul 2022 10:25:10 +0800 Subject: [PATCH 1/9] fix skit --- app/Http/Controllers/AdminPageController.php | 53 ++++++++++++++++++++ app/Permohonan.php | 1 + routes/web.php | 3 ++ 3 files changed, 57 insertions(+) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 169331d..2243d51 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -27,6 +27,7 @@ use App\Permohonan; use App\Status; use App\LookupStatus; use App\ARFiles; +use App\WTDDraft; use DB; use Carbon\Carbon; @@ -2289,4 +2290,56 @@ class AdminPageController extends Controller return response($kp,200); } + + public function RangeBakiLelong($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + // $gadai = Gadai::on($cawangan['mysql']) + // ->where([['sttebus','=',$gadai_status],['nokp','=',$ic],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) + // ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') + // ->get(); + $lelong = Lelong::on($cawangan['mysql']) + ->where([['baki','>',0],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) + ->get(); + + return response()->json($lelong,200); + } + + public function InsertDraftWTD(Request $request){ + + // $current = Carbon::now(); + // $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + // dd($request->all()); + $norujukan = $request->norujukan; + // foreach($norujukan as $nor) + // { + // } + + $lelong = Lelong::on($cawangan['mysql']) + ->whereIn('lelong.norujukan',$norujukan) + ->join('gadai','lelong.norujukan','=','gadai.norujukan') + ->get(); + + + foreach($lelong as $lel) + { + $wtddraft = new WTDDraft; + $wtddraft->nokp = $lel->nokp; + $wtddraft->kodcaw = $lel->kodcaw; + $wtddraft->norujukan = $lel->norujukan; + $wtddraft->t_jual = $lel->t_jual; + $wtddraft->t_gadai = $lel->t_gadai; + $wtddraft->t_lelong = $lel->t_lelong; + $wtddraft->save(); + } + + return response()->json('success',200); + + } } \ No newline at end of file diff --git a/app/Permohonan.php b/app/Permohonan.php index 3503c13..8f79d90 100644 --- a/app/Permohonan.php +++ b/app/Permohonan.php @@ -29,6 +29,7 @@ class Permohonan extends Model 'nama_penerima', 'outstandingsemasa', 'nopermohonan', + 'tagjanapc', 'tagterima' ]; diff --git a/routes/web.php b/routes/web.php index ea4f777..f3f3b13 100644 --- a/routes/web.php +++ b/routes/web.php @@ -705,6 +705,9 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('permohonan/tagcit',['uses'=>'AdminPageController@TagCit']); $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']); + $router->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']); + $router->post('wtd/insert',['uses'=>'AdminPageController@InsertDraftWTD']); + }); From 9c652045df4f577be8ebabc25c89b144d015493e Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 4 Jul 2022 10:46:56 +0800 Subject: [PATCH 2/9] fix --- app/Http/Controllers/AdminPageController.php | 102 +++++++++++++++---- routes/web.php | 1 + 2 files changed, 86 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 2243d51..a22daef 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -28,6 +28,7 @@ use App\Status; use App\LookupStatus; use App\ARFiles; use App\WTDDraft; +use App\SerahBaki; use DB; use Carbon\Carbon; @@ -2311,35 +2312,102 @@ class AdminPageController extends Controller public function InsertDraftWTD(Request $request){ - // $current = Carbon::now(); - // $current = new Carbon(); + $current = Carbon::now(); + $current = new Carbon(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - // dd($request->all()); $norujukan = $request->norujukan; - // foreach($norujukan as $nor) - // { - // } + + + try{ + $lelong = Lelong::on($cawangan['mysql']) + ->whereIn('lelong.norujukan',$norujukan) + ->join('gadai','lelong.norujukan','=','gadai.norujukan') + ->get(); + + + foreach($lelong as $lel) + { + $wtddraft = new WTDDraft; + $wtddraft->nokp = $lel->nokp; + $wtddraft->kodcaw = $lel->kodcaw; + $wtddraft->norujukan = $lel->norujukan; + $wtddraft->t_jual = $lel->t_jual; + $wtddraft->t_gadai = $lel->t_gadai; + $wtddraft->t_lelong = $lel->t_lelong; + $wtddraft->save(); + } + + return response()->json('success',200); + + }catch (\Throwable $e){ + return response($e); + } + + + } + + public function ProsesWTD(Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $norujukan = $request->norujukan; + $lelong = Lelong::on($cawangan['mysql']) ->whereIn('lelong.norujukan',$norujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') ->get(); + //Updating t_update + // $lelong=Lelong::on($cawangan['mysql']) + // ->whereIn('norujukan',$norujukan) + // ->update( + // array('trkhtuntut'=> $current->toDateString(), + // 't_update' => $current->toDateString())); - foreach($lelong as $lel) - { - $wtddraft = new WTDDraft; - $wtddraft->nokp = $lel->nokp; - $wtddraft->kodcaw = $lel->kodcaw; - $wtddraft->norujukan = $lel->norujukan; - $wtddraft->t_jual = $lel->t_jual; - $wtddraft->t_gadai = $lel->t_gadai; - $wtddraft->t_lelong = $lel->t_lelong; - $wtddraft->save(); + try{ + foreach($lelong as $lel) + { + $tuntutbaki = new TuntutBaki; + $tuntutbaki->batchno = $lel->batchno; + $tuntutbaki->jenis = "T"; + $tuntutbaki->kodcaw = $lel->kodcaw; + $tuntutbaki->norujukan = $lel->norujukan; + $tuntutbaki->tarikh = $current->toDateString(); + $tuntutbaki->prkod = "01"; + $tuntutbaki->teller = "DM"; + $tuntutbaki->bakipjm = $lel->bakipjm; + $tuntutbaki->bakiupah = $lel->bakiupah; + $tuntutbaki->cajlain = $lel->cajlain; + $tuntutbaki->cajlelong = $lel->cajlelong; + $tuntutbaki->kodgl = ''; + $tuntutbaki->glcode = ''; + $tuntutbaki->terima = "*"; + $tuntutbaki->f_lulus ="L"; + $tuntutbaki->jumlah = $lel->baki; + $tuntutbaki->nowakil = 0; + $tuntutbaki->hargajual = $lel->hargajual; + $tuntutbaki->save(); + + $lelong=Lelong::on($cawangan['mysql']) + ->where('norujukan',$lel->norujukan) + ->update( + array('trkhtuntut'=> $current->toDateString(), + 't_update' => $current->toDateString())); + } + + return response()->json('success',200); + + }catch (\Throwable $e){ + return response($e); } + - return response()->json('success',200); } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index f3f3b13..41f5b87 100644 --- a/routes/web.php +++ b/routes/web.php @@ -707,6 +707,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']); $router->post('wtd/insert',['uses'=>'AdminPageController@InsertDraftWTD']); + $router->post('wtd/process',['uses'=>'AdminPageController@ProsesWTD']); }); From 4e38b12429385be5332cc14b48cb738099fd59ba Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 5 Jul 2022 16:38:48 +0800 Subject: [PATCH 3/9] fix --- app/Http/Controllers/AdminPageController.php | 21 ++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index a22daef..45b1353 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2299,15 +2299,20 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); - // $gadai = Gadai::on($cawangan['mysql']) - // ->where([['sttebus','=',$gadai_status],['nokp','=',$ic],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) - // ->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan') - // ->get(); - $lelong = Lelong::on($cawangan['mysql']) - ->where([['baki','>',0],['trkhtuntut',null],['t_lelong','>=',$request->mula],['t_lelong','<=', $request->hingga]]) - ->get(); + + $mula = explode('-', $request->mula); + $hingga = explode('-', $request->hingga); - return response()->json($lelong,200); + + $lelong = Lelong::on($cawangan['mysql']) + ->where([['baki','>',0],['trkhtuntut',null]]) + ->whereMonth('t_lelong','>=',$mula[0]) + ->whereMonth('t_lelong','<=',$hingga[0]) + ->whereYear('t_lelong','>=',$mula[1]) + ->whereYear('t_lelong','<=',$hingga[1]) + ->get()->toArray(); + + return response()->json($lelong,200); } public function InsertDraftWTD(Request $request){ From 3eb565af4cd2c432a6f3f8aeb1cf86fe8f94e571 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 6 Jul 2022 02:50:31 +0800 Subject: [PATCH 4/9] wtd --- app/Http/Controllers/AdminPageController.php | 185 +++++++++++++++---- routes/web.php | 7 + 2 files changed, 155 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 45b1353..f56425b 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -29,6 +29,7 @@ use App\LookupStatus; use App\ARFiles; use App\WTDDraft; use App\SerahBaki; +use App\WTD; use DB; use Carbon\Carbon; @@ -2292,12 +2293,39 @@ class AdminPageController extends Controller return response($kp,200); } + public function rekodWTD(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $latestbatch = SerahBaki::on($cawangan['mysql'])->where('norujukan','baru')->get(); + + return response()->json($latestbatch,200); + + } + + public function rekodWTDByBatchNo($batchno,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$batchno)->pluck('norujukan'); + + $lelong = Lelong::on($cawangan['mysql']) + ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') + ->whereIn('lelong.norujukan',$wtdnorujukan) + ->join('gadai','lelong.norujukan','=','gadai.norujukan') + ->get(); + + return response()->json($lelong,200); + + } + public function RangeBakiLelong($kodcaw,Request $request){ $current = Carbon::now(); $current = new Carbon(); $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $mula = explode('-', $request->mula); @@ -2309,10 +2337,51 @@ class AdminPageController extends Controller ->whereMonth('t_lelong','>=',$mula[0]) ->whereMonth('t_lelong','<=',$hingga[0]) ->whereYear('t_lelong','>=',$mula[1]) - ->whereYear('t_lelong','<=',$hingga[1]) - ->get()->toArray(); + ->whereYear('t_lelong','<=',$hingga[1]); - return response()->json($lelong,200); + $lelongdetails = $lelong->get()->toArray(); + $lelongcount = $lelong->count(); + $lelongpluck = $lelong->pluck('norujukan'); + + $draft = WTDDraft::on('mysql7') + ->whereIn('norujukan',$lelongpluck) + ->where('kodcaw',$kodcaw) + ->whereMonth('t_lelong','>=',$mula[0]) + ->whereMonth('t_lelong','<=',$hingga[0]) + ->whereYear('t_lelong','>=',$mula[1]) + ->whereYear('t_lelong','<=',$hingga[1]); + + $draftcount = $draft->count(); + $draftpluck = $draft->pluck('norujukan'); + + if($lelongcount == $draftcount) + { + $dummy = []; + return response()->json($dummy,200); + }else{ + $dif = array_diff($lelongpluck->toArray(),$draftpluck->toArray()); + + $lelongbaru = Lelong::on($cawangan['mysql']) + ->whereIn('norujukan',$dif) + ->get()->toArray(); + + return response()->json($lelongbaru,200); + } + } + + public function SenaraiTuntutWTD(Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $norujukan = $request->norujukan; + + $lelong = Lelong::on($cawangan['mysql']) + ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') + ->whereIn('lelong.norujukan',$norujukan) + ->join('gadai','lelong.norujukan','=','gadai.norujukan') + ->get(); + + return response()->json($lelong,200); } public function InsertDraftWTD(Request $request){ @@ -2327,10 +2396,13 @@ class AdminPageController extends Controller try{ $lelong = Lelong::on($cawangan['mysql']) + ->select('gadai.nokp','lelong.kodcaw','gadai.norujukan','lelong.t_jual','gadai.t_gadai','lelong.t_lelong','lelong.baki') ->whereIn('lelong.norujukan',$norujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') ->get(); + $totalbaki = 0; + $latestbatch = SerahBaki::on($cawangan['mysql'])->max('batchno'); foreach($lelong as $lel) { @@ -2341,10 +2413,30 @@ class AdminPageController extends Controller $wtddraft->t_jual = $lel->t_jual; $wtddraft->t_gadai = $lel->t_gadai; $wtddraft->t_lelong = $lel->t_lelong; + $wtddraft->batchno_serah = $latestbatch + 1; $wtddraft->save(); + + $totalbaki += $lel->baki; } - return response()->json('success',200); + + $serahbaki = SerahBaki::on($cawangan['mysql'])->create([ + 'batchno' => $latestbatch + 1, + 'norujukan' => 'baru', + 'hargajual' => 0.00, + 'pinjaman' => 0.00, + 'upah' => 0.00, + 'cajlel' => 0.00, + 'gst_cl' => 0.00, + 'gst_hj' => 0.00, + 'baki' => $totalbaki, + 'tarikh' => $current->toDateString(), + 'nopelanggan' => '', + 'aktif' => 0 + ]); + + + return response()->json(['status' => 'success','batchno' => $latestbatch + 1],200); }catch (\Throwable $e){ return response($e); @@ -2360,52 +2452,71 @@ class AdminPageController extends Controller $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); - $norujukan = $request->norujukan; - + $batchno = $request->batch; + + $selectnorujukan = $lelong = WTDDraft::on('mysql7') + ->where('batchno_serah',$batchno) + ->pluck('norujukan'); + $lelong = Lelong::on($cawangan['mysql']) - ->whereIn('lelong.norujukan',$norujukan) + ->select('lelong.batchno','lelong.kodcaw','gadai.nokp','lelong.t_jual','gadai.pinjaman','gadai.nopelanggan','lelong.norujukan','gadai.bakipjm','gadai.bakiupah','lelong.cajlain','lelong.cajlelong','lelong.baki','lelong.hargajual','lelong.gst_cl') + ->whereIn('lelong.norujukan',$selectnorujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') - ->get(); - - //Updating t_update - // $lelong=Lelong::on($cawangan['mysql']) - // ->whereIn('norujukan',$norujukan) - // ->update( - // array('trkhtuntut'=> $current->toDateString(), - // 't_update' => $current->toDateString())); - + ->get()->toArray(); try{ foreach($lelong as $lel) { - $tuntutbaki = new TuntutBaki; - $tuntutbaki->batchno = $lel->batchno; - $tuntutbaki->jenis = "T"; - $tuntutbaki->kodcaw = $lel->kodcaw; - $tuntutbaki->norujukan = $lel->norujukan; - $tuntutbaki->tarikh = $current->toDateString(); - $tuntutbaki->prkod = "01"; - $tuntutbaki->teller = "DM"; - $tuntutbaki->bakipjm = $lel->bakipjm; - $tuntutbaki->bakiupah = $lel->bakiupah; - $tuntutbaki->cajlain = $lel->cajlain; - $tuntutbaki->cajlelong = $lel->cajlelong; - $tuntutbaki->kodgl = ''; - $tuntutbaki->glcode = ''; - $tuntutbaki->terima = "*"; - $tuntutbaki->f_lulus ="L"; - $tuntutbaki->jumlah = $lel->baki; - $tuntutbaki->nowakil = 0; - $tuntutbaki->hargajual = $lel->hargajual; - $tuntutbaki->save(); + $tuntutbaki = TuntutBaki::on($cawangan['mysql'])->create([ + 'batchno' => $lel['batchno'], + 'jenis' => "T", + 'kodcaw' => $lel['kodcaw'], + 'norujukan' => $lel['norujukan'], + 'tarikh' => $current->toDateString(), + 'prkod' => "01", + 'teller' => "DM", + 'bakipjm' => $lel['bakipjm'], + 'bakiupah' => $lel['bakiupah'], + 'cajlain' => '0.00', + 'cajlelong' => $lel['cajlelong'], + 'kodgl' => '', + 'glcode' => '', + 'terima' => "*", + 'f_lulus' =>"L", + 'jumlah' => $lel['baki'], + 'nowakil' => 0, + 'hargajual' => $lel['hargajual'] + ]); + + $wtd = WTD::on($cawangan['mysql'])->create([ + 'norujukan' => $lel['norujukan'], + 'tarikh' => $current->toDateString(), + 'nokp' => $lel['nokp'], + 'nopelanggan' => $lel['nopelanggan'], + 'nama' => '', + 'batchno' => $lel['batchno'], + 't_jual' => $lel['t_jual'], + 'hargajual' => $lel['hargajual'], + 'pinjaman' => $lel['pinjaman'], + 'bakiupah' => $lel['bakiupah'], + 'cajlelong' => $lel['cajlelong'], + 'gst_cl' => $lel['gst_cl'], + 'baki' => $lel['baki'], + 'rugi' => 0.00, + 'ansrugi' => 0.00, + 'wtd' => $lel['baki'], + + ]); $lelong=Lelong::on($cawangan['mysql']) - ->where('norujukan',$lel->norujukan) + ->where('norujukan',$lel['norujukan']) ->update( array('trkhtuntut'=> $current->toDateString(), 't_update' => $current->toDateString())); } + $serahbakiupdate = SerahBaki::on($cawangan['mysql'])->where('batchno',$batchno)->update(array('aktif' => 1));; + return response()->json('success',200); }catch (\Throwable $e){ diff --git a/routes/web.php b/routes/web.php index 41f5b87..7a01a9a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -706,8 +706,15 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('permohonan/viewfiles',['uses'=>'AdminPageController@downloadFile']); $router->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']); + $router->get('wtd/senarai',['uses'=>'AdminPageController@SenaraiTuntutWTD']); $router->post('wtd/insert',['uses'=>'AdminPageController@InsertDraftWTD']); $router->post('wtd/process',['uses'=>'AdminPageController@ProsesWTD']); + $router->get('wtd/rekod',['uses'=>'AdminPageController@rekodWTD']); + $router->get('wtd/rekod/{batchno}',['uses'=>'AdminPageController@rekodWTDByBatchNo']); + + + + }); From 5552fcc98633fb53ee0b87b0dfc58b20228ce3ce Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 17 Jul 2022 09:08:55 +0800 Subject: [PATCH 5/9] fix skit2 --- app/Http/Controllers/AdminPageController.php | 38 +++++++++++++++++++- routes/web.php | 2 ++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index f56425b..f917b98 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -2376,7 +2376,7 @@ class AdminPageController extends Controller $norujukan = $request->norujukan; $lelong = Lelong::on($cawangan['mysql']) - ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki') + ->select('gadai.norujukan','lelong.t_lelong','gadai.pinjaman','lelong.baki','gadai.nokp') ->whereIn('lelong.norujukan',$norujukan) ->join('gadai','lelong.norujukan','=','gadai.norujukan') ->get(); @@ -2525,5 +2525,41 @@ class AdminPageController extends Controller + } + + public function PenjanaanPC(Request $request){ + + $timeloni = Carbon::now(); + $status = new Status; + + try{ + if($request->status == 'jana') + { + $pengesahan = Permohonan::where('nopermohonan',$request->mohonid) + ->update(array( + 'tagjanapc' => 1 + )); + }else{ + + $ar_files = new ARFiles; + $ar_files->data = $request->dataimage; + $ar_files->type = $request->imagetype; + $ar_files->filename = $request->imagename; + $ar_files->tarikhmasa = $timeloni->toDateTimeString(); + $ar_files->save(); + + + $pengesahan = Permohonan::where('nopermohonan',$request->mohonid) + ->update(array( + 'tagjanapc' => 2 + )); + } + + + return response()->json($pengesahan); + }catch (\Throwable $e){ + return response($e); + } + } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 7a01a9a..618d880 100644 --- a/routes/web.php +++ b/routes/web.php @@ -704,6 +704,8 @@ $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->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']); $router->get('wtd/senarai',['uses'=>'AdminPageController@SenaraiTuntutWTD']); From cf5eb188d5ee0c9958eda56da26ee65daeaa1017 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 18 Jul 2022 16:53:58 +0800 Subject: [PATCH 6/9] 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']); From 9582afe466c0189bc735011f2342b97ed4f29aec Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 20 Jul 2022 08:14:49 +0800 Subject: [PATCH 7/9] add notis tuntut baki --- app/Http/Controllers/LelongController.php | 48 +++++++++++++++++++++++ routes/web.php | 1 + 2 files changed, 49 insertions(+) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 006cbc4..54a50b4 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -802,4 +802,52 @@ class LelongController extends Controller } } + public function getSenaraiTuntutBaki($kodcaw,Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + $arraylelong = []; + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $bulanlepas = $current->subMonth()->toDateString(); + + $lelong = Lelong::on($cawangan['mysql']) + ->select('lelong.t_lelong','lelong.norujukan','gadai.nokp','gadai.bakipjm','lelong.bakiupah','lelong.t_jual','lelong.cajlelong','lelong.baki','lelong.cajlain','lelong.gst_hj','lelong.gst_cl','lelong.hargajual') + ->leftJoin('gadai', 'gadai.norujukan', '=', 'lelong.norujukan') + ->where('baki','>',0) + ->where('lelong.t_lelong','>=',$bulanlepas) + ->whereNotNull('t_jual') + ->whereNull('trkhtuntut') + ->orderBy('gadai.t_gadai','asc') + ->orderBy('gadai.sirig','asc') + ->where('gadai.taglel','=', 1); + $lelonglist = $lelong->get(); + + foreach($lelonglist as $index=>$lel) + { + $customer = Customer::on('mysql7') + ->select('nama','telefon','telefon2','alamat1','alamat2','poskod','koddaerah') + ->where('kpbaru','=',$lel['nokp']) + ->orWhere('kplama','=',$lel['nokp']) + ->first(); + + $poskod = Poskod::on('mysql7') + ->where('poskod','=',$customer['poskod']) + ->first(); + + $daerah = Daerah::on('mysql7') + ->where('koddaerah','=',$poskod['koddaerah']) + ->first(); + + $negeri = Negeri::on('mysql7') + ->where('kodnegeri','=',$poskod['kodnegeri']) + ->first(); + + array_push($arraylelong,['poskod'=>$customer['poskod'],'negeri' => $negeri['negeri'],'daerah' => $daerah['namadaerah'],'alamat' => $customer['alamat1'],'alamat2' => $customer['alamat2'],'tarikhlelong' => $lel['t_lelong'],'nama' => $customer['nama'], 'telefon1' => $customer['telefon'], 'telefon2' => $customer['telefon2'], 'norujukan' => $lel['norujukan'], 't_jual' => $lel['t_jual'], 'IC' => $lel['nokp'], 'bakipjm' => $lel['bakipjm'], 'bakiupah' => $lel['bakiupah'],'cajlelong' => $lel['cajlelong'],'baki' => $lel['baki'],'cajlain' => $lel['cajlain'],'gst_hj' => $lel['gst_hj'],'gst_cl' => $lel['gst_cl'],'hargajual' => $lel['hargajual']]); + } + + return response()->json($arraylelong); + } + } diff --git a/routes/web.php b/routes/web.php index 62e41ab..3c35904 100644 --- a/routes/web.php +++ b/routes/web.php @@ -267,6 +267,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $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']); + $router->get('senaraituntutbaki/laporan/{kodcaw}',['uses'=>'LelongController@getSenaraiTuntutBaki']); //API BARU From b0f4eafb998f0607a53905a7156503ba8ae1a96a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 25 Jul 2022 10:22:54 +0800 Subject: [PATCH 8/9] fix permoh --- app/Http/Controllers/AdminPageController.php | 9 +++++---- routes/web.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index dcae249..511d2df 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1986,11 +1986,11 @@ class AdminPageController extends Controller $time = date('g:i a',strtotime($stat['tarikhmasa'])); switch($stat['statusid']){ - case 1: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_pemohon' => $stat['nama_pemohon']]); + case 1: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_pemohon' => $stat['nama_pemohon'],'permohonanfiles_id' => $stat['files_permohonan_id']]); break; - case 2: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_operasi' => $stat['nama_operasi']]); + case 2: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_operasi' => $stat['nama_operasi'],'operasifiles_id' => $stat['files_kelope_id']]); break; - case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun']]); + case 3: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'nama_akaun' => $stat['nama_akaun'],'akaunfiles_id' => $stat['files_kelakaun_id']]); break; case 4: array_push($status_lookup,['tarikh' => $date, 'masa' => $time,'jumlah_diluluskan' => $stat['jumlah_diluluskan'],'pbfiles' => $stat['files_id']]); break; @@ -2567,7 +2567,8 @@ class AdminPageController extends Controller $pengesahan = Permohonan::where('nopermohonan',$request->mohonid) ->update(array( - 'tagjanapc' => 2 + 'tagjanapc' => 2, + 'files_permohonan_id' => $ar_files->id )); } diff --git a/routes/web.php b/routes/web.php index 3c35904..34bb9a9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -705,7 +705,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->put('permohonan/updatejanapc',['uses'=>'AdminPageController@PenjanaanPC']); + $router->post('permohonan/updatejanapc',['uses'=>'AdminPageController@PenjanaanPC']); $router->get('rangebakilelong/{kodcaw}',['uses'=>'AdminPageController@RangeBakiLelong']); From 27f8a56fb2dfd7c4084f564b26d4e3bd73daceb0 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 25 Jul 2022 23:36:04 +0800 Subject: [PATCH 9/9] persediaan kemasukan ke server untuk semua editing --- app/Http/Controllers/CustomerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 3a38793..66b17e9 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -146,7 +146,7 @@ class CustomerController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]]) ->orderBy('t_update', 'desc') - ->take(50)->get(); + ->take(100)->get(); }elseif($status == 'lelong'){ $gadai = Gadai::on($cawangan['mysql']) ->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])