From 38b89ef2c6f5e535b44e2974f2b2c8a6081a102b Mon Sep 17 00:00:00 2001 From: root Date: Thu, 15 May 2025 00:45:13 +0800 Subject: [PATCH] changes from server 2025/05/15 --- app/Http/Controllers/GadaianController.php | 9 ++++++--- app/Http/Controllers/KhazanahController.php | 22 ++++++++++++++++----- app/Services/ImbangdugaServices.php | 7 ++++++- config/redeemoption.php | 10 +++++----- public/js/notification.js | 10 +++++----- resources/views/customers/v2/info.blade.php | 2 +- routes/web.php | 2 +- 7 files changed, 41 insertions(+), 21 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index ff94002..56bb537 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -717,12 +717,15 @@ class GadaianController extends Controller // dd($penebusan['nowakil']); + $surat_wakil = []; if($penebusan['nowakil'] != 0) { $wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); - if(sizeof($wakil) != 0) - $wakil = $wakil[0]; + if(sizeof($wakil) != 0){ + $wakil = $wakil[0]; + $surat_wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getsuratwakil/' . $auth_user['cawangan'] . '/' . $id)->json(); + } } else { @@ -733,7 +736,7 @@ class GadaianController extends Controller $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first(); $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json(); - return view('print.resit.tambah_pinjaman',compact('totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil','cawangan_info')); + return view('print.resit.tambah_pinjaman',compact('surat_wakil','totalrebate','khazanah_user','totalBayaranAnsuran','transaction_tebus','gadai','customers_info','penebusan','wakil','cawangan_info')); } public function history(Request $request) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index cd7faf8..533ede1 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4296,12 +4296,18 @@ class KhazanahController extends Controller public function AutoSerahan(Request $request) { if(isset($request->do_delete) && $request->do_delete == true){ - $call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')]) + + $teller = $request->teller; + + if ($teller !== html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8')) + $teller = html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8'); + + $call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')]) ->post(config('api.url_koop') . '/api/autoserahan/delete', [ 'recno' => $request->recno, 'version' => 'v3', 'kodcaw' => $request->kodcaw, - 'teller' => $request->teller, + 'teller' => $teller, 'amaun' => $request->amaun, ])->json(); @@ -4313,11 +4319,17 @@ class KhazanahController extends Controller } + $teller = $request->arraysend['teller']; + + if ($teller !== html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8')) + $teller = html_entity_decode($teller, ENT_QUOTES | ENT_HTML5, 'UTF-8'); + + // Step 1: Call API v3 First $call_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')]) ->post(config('api.url_koop') . '/api/autoserahan/create', [ 'kodcaw' => $request->arraysend['kodcaw'], - 'teller' => $request->arraysend['teller'], + 'teller' => $teller, 'amaun' => $request->arraysend['amaun'], 'txtring1' => $request->arraysend['ambilanring1'], 'txtring5' => $request->arraysend['ambilanring5'], @@ -4349,7 +4361,7 @@ class KhazanahController extends Controller ->post(config('api.url_pkb') . '/api/autoserahan/create', [ 'id' => $call_approval_v3['id'], // Use ID from API v3 response 'kodcaw' => $request->arraysend['kodcaw'], - 'teller' => $request->arraysend['teller'], + 'teller' => $teller, 'amaun' => $request->arraysend['amaun'], 'txtring1' => $request->arraysend['ambilanring1'], 'txtring5' => $request->arraysend['ambilanring5'], @@ -4376,7 +4388,7 @@ class KhazanahController extends Controller // Step 3: Check if both API v3 and API v2 were successful if ($call_approval_v2['status'] === 'success' && $call_approval_v3['status'] === 'success' && $call_set_approval_v3['status'] === 'success') { - event(new AutoSerahan("Operasi",$call_approval_v3['id'],$request->arraysend['kodcaw'],$request->arraysend['teller'])); + event(new AutoSerahan("Operasi",$call_approval_v3['id'],$request->arraysend['kodcaw'],$teller)); return response()->json([ 'status' => 'success', diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index f4909cc..bd490fb 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -287,7 +287,12 @@ class ImbangdugaServices foreach($response as $variable=>$res) { if($variable !== 'recno' && $variable !== 'kodcaw' && $variable !== 'tarikh' && $variable !== 'totalharta' && $variable !== 'totaltanggungan' && $variable !== 'tagtally' && $variable !== 'created_at' && $variable !== 'updated_at'){ - $imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray(); + //$imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray(); + if($variable == 'bakilelong'){ + $imbangdugadata = ImbangDuga::orderBy('glcode')->where([['single_var',$variable],['variable',$variable]])->first()->toArray(); + }else{ + $imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray(); + } if($imbangdugadata['jenis'] == 'harta'){ array_push($array_harta,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]); }else{ diff --git a/config/redeemoption.php b/config/redeemoption.php index 717c6fb..ed814c8 100644 --- a/config/redeemoption.php +++ b/config/redeemoption.php @@ -1,10 +1,10 @@ env('ENABLE_TAMBAHPINJAM',1), - 'enable_separuh' => env('ENABLE_SEPARUH',1), - 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1), + 'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',0), + 'enable_separuh' => env('ENABLE_SEPARUH',0), + 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',0), // 'enable_specific_block' => env('ENABLE_BLOCK',0), - 'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', '1STOP,010915,010219,011013,011412,010621,010620,010617,010618')), - 'ansuran_block' => explode(',', env('ANSURAN_BLOCK', '')), + 'ansuran_block' => explode(',', env('ANSURAN_BLOCK', '011227')), + 'cawangan_block' => explode(',', env('CAWANGAN_BLOCK', 'KB2,WCY,1STOP,020301,WB,ALS,020306,ARM,APM,010311,GC,JLI,ARP,010621,011227,010620,010617,010915,011228,010219,011229,011230,011013,011412,011231,011232,020303,010618,KB1,011238,011235,010136,011233,011234,011237')), ]; ?> diff --git a/public/js/notification.js b/public/js/notification.js index 58dc253..e24df5a 100644 --- a/public/js/notification.js +++ b/public/js/notification.js @@ -17,14 +17,14 @@ const Toast = Swal.mixin({ const notify = new NotifyKhazanah(channel,event,apikey); notify.channel_subscribe((data) => { - console.log(data); - Toast.fire({ - icon: 'info', - title: 'Permohonan Kelulusan Wang Tunai Teller!' - }); const currentPath = window.location.pathname; if(window.kodcaw == data.cawangan){ + Toast.fire({ + icon: 'info', + title: 'Permohonan Kelulusan Wang Tunai Teller!' + }); + if (currentPath === "/home") { notify_main(); } else if (currentPath === "/menu") { diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index b91e22a..f9baeeb 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -625,7 +625,7 @@ let array_tempblock = ['011237240808-0003','011237240719-0015','011237240806-0011','011237240828-0001', '011237240904-0007','011237240904-0008','011237240904-0009','011237240719-0023','011237240719-0024', '011237240719-0025','011237240618-0026','011237240719-0027','011237240719-0028','011237240618-0020', - '011237240719-0030','011237240618-0029','011237240731-0026','011237240715-0027','011237240912-0009', + '011237240719-0030','011237240618-0029','011237240731-0026','011237240912-0009', ]; diff --git a/routes/web.php b/routes/web.php index e6719ef..26a8f5e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -185,7 +185,7 @@ Route::get('/capaian',['as'=>'khazanah.capaian','uses'=>'KhazanahController@capa Route::get('/alirantunai',['as'=>'khazanah.alirantunai','uses'=>'KhazanahController@alirantunai'])->middleware('auth','khazanah'); Route::get('/pelangganan',['as'=>'khazanah.pelangganan','uses'=>'KhazanahController@pelanggan'])->middleware('auth','khazanah'); Route::get('/bajet',['as'=>'khazanah.bajet','uses'=>'KhazanahController@bajet'])->middleware('auth','khazanah'); -Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah'); +//Route::get('/panjar',['as'=>'khazanah.panjar','uses'=>'KhazanahController@panjar'])->middleware('auth','khazanah'); Route::get('/getkelulusan',['as'=>'khazanah.getkelulusan','uses'=>'KhazanahController@getkelulusan'])->middleware('auth','teller'); Route::post('/createkelulusan',['as'=>'khazanah.createkelulusan','uses'=>'KhazanahController@createkelulusan'])->middleware('auth','teller'); Route::put('/updatekelulusan',['as'=>'khazanah.updatekelulusan','uses'=>'KhazanahController@updatekelulusan'])->middleware('auth','khazanah');