diff --git a/app/Http/Controllers/KelulusanController.php b/app/Http/Controllers/KelulusanController.php index 81388a4..c9c357b 100644 --- a/app/Http/Controllers/KelulusanController.php +++ b/app/Http/Controllers/KelulusanController.php @@ -399,6 +399,8 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles) $mohonid_data = Mohonid::on($cawangan['mysql']) ->where('tarikh','=',$harini->toDateString()) + ->whereNotNull('id') + ->whereNotNull('timestamp_approved_by_pc') ->where('tagoperasi', '1') ->whereNull('operasi') ->get(); @@ -472,4 +474,43 @@ public function create(REQUEST $request,$kodcaw,$norujukan,$roles) } + public function getApproval(Request $request){ + $harini = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $kelulusan = Mohonid::on($cawangan['mysql']) + ->where('tarikh','=',$harini->toDateString()) + ->where('teller','=',$request->teller) + ->where('mohon','=',$request->mohon) + ->where('benar','=',0) + ->latest('masa') + ->first(); + + return response()->json($kelulusan, 200); + } + + public function getApprovalList(Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $kelulusan = Mohonid::on($cawangan['mysql']) + ->groupBy('mohon') + ->pluck('mohon'); + + return response()->json($kelulusan, 200); + } + + public function getApprovalLaporan(Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + $kelulusan = Mohonid::on($cawangan['mysql']) + ->selectRaw('recno, benar, tarikh, onlineid, mohon, norujukan, id, katalaluan, benar, operasi, pinjaman, ansuran, nilaimarhun, berat, margin, teller ,masa, timestamp_approved_by_pc, timestamp_approved_by_operasi') + ->whereBetween('tarikh', [$request->tarikh_mula, $request->tarikh_akhir]) + ->where('mohon', $request->mohon) + ->orderBy('tarikh', 'desc') + ->orderBy('masa', 'desc') + ->get(); + + + return response()->json($kelulusan, 200); + } + + + } diff --git a/app/Mohonid.php b/app/Mohonid.php index ce9013f..15ca500 100644 --- a/app/Mohonid.php +++ b/app/Mohonid.php @@ -36,6 +36,10 @@ class Mohonid extends Model 'timestamp_approved_by_operasi', ]; + protected $casts = [ + 'id' => 'string', + ]; + /** * The attributes excluded from the model's JSON form. * diff --git a/routes/web.php b/routes/web.php index d6a6fb8..78894df 100644 --- a/routes/web.php +++ b/routes/web.php @@ -696,6 +696,9 @@ $router->group(['prefix'=>'api'], function () use ($router){ /*Endpoints for Hapus Ansuran*/ $router->put('UpdateHapusAnsuran',['uses'=>'KelulusanController@UpdateHapusAnsuranOperasi']); + $router->get('getApproval',['uses'=>'KelulusanController@getApproval']); + $router->get('getApproval/list',['uses'=>'KelulusanController@getApprovalList']); + $router->get('getApproval/laporan',['uses'=>'KelulusanController@getApprovalLaporan']); }); $router->group(['prefix'=>'e-arrahn'], function () use ($router){