diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index a3805af..b75c6e9 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3800,4 +3800,11 @@ class GadaiController extends Controller return response()->json($view); } + + public function getApprovalFromOperation(Request $request){ + $ansuranserv = new AnsServ($request->kodcaw); + $view = $ansuranserv->getApprovalFromOperation($request); + + return response()->json($view); + } } diff --git a/app/Services/Transaction/AnsuranServices.php b/app/Services/Transaction/AnsuranServices.php index 69d395b..5cf56e7 100644 --- a/app/Services/Transaction/AnsuranServices.php +++ b/app/Services/Transaction/AnsuranServices.php @@ -8,6 +8,7 @@ use App\Tunai; use App\Transaction; use App\TransaksiKeuntungan; use App\Cawangan; +use App\Mohon; use App\TransaksiGadai; use Carbon\Carbon; use Illuminate\Http\Request; @@ -40,6 +41,7 @@ class AnsuranServices $harisemasa = $tarikh->toDateString(); if($harisemasa !== $tarikh_request->toDateString()){ + Log::debug('Date mismatch: ' . $harisemasa . ' vs ' . $tarikh_request->toDateString()); return 'date not equal'; } $transaction_gadai = TransaksiGadai::on('mysql7')->where('id',$request->tg_id)->first(); @@ -91,6 +93,19 @@ class AnsuranServices 'softDelete' => 1, )); + $tarikh_audit = Carbon::now(); + + $audit = new Audit(); + $audit->users = $request->teller; + $audit->actions = 'Hapus Ansuran'; + $audit->norujukan = $request->norujukan; + $audit->new_data = ''; + $audit->old_data = ''; + $audit->kodcaw = $this->cawangan; + $audit->created_at = $tarikh_audit; + $audit->updated_at = $tarikh_audit; + $audit->save(); + return 'success'; @@ -103,18 +118,6 @@ class AnsuranServices } return 'success'; - - // $audit = new Audit(); - // $audit->users = $request->teller; - // $audit->actions = 'Hapus Ansuran'; - // $audit->norujukan = $norujukan; - // $audit->new_data = $new_data; - // $audit->old_data = $old_data; - // $audit->kodcaw = $kodcaw; - // $audit->created_at = $current; - // $audit->updated_at = $current; - // $audit->save(); - } public function getLatestAdvanceWithoutDelete(Request $request){ @@ -125,5 +128,21 @@ class AnsuranServices return $latest; } + public function getApprovalFromOperation(Request $request){ + $tarikh = Carbon::now(); + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$this->cawangan)->first(); + + $latest = Mohon::on($cawangan['mysql']) + ->whereDate('tarikh',$tarikh->toDateString()) + ->where('teller',$request->teller) + ->where('masalulus','=','') + ->where('operasi','=','') + ->where('status','Hapus Ansuran') + ->latest('tarikh') + ->first(); + + return $latest; + } + } diff --git a/routes/web.php b/routes/web.php index 3698995..6925a0e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -885,6 +885,8 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('ansuran/delete',['uses'=>'GadaiController@deleteAnsuran']); $router->get('ansuran/getLatest',['uses'=>'GadaiController@getLatestAdvanceWithoutDelete']); $router->get('laporan/imbangdugabackup',['uses' => 'LaporanController@getImbangDugaBackup']); + $router->get('ansuran/getApproval',['uses'=>'GadaiController@getApprovalFromOperation']); + $router->get('laporan/online',['uses'=>'AdminPageController@LaporanOnline']); $router->get('laporan/tuntutbaki',['uses'=>'AdminPageController@LaporanTuntutBaki']);