From 042cd579b025fa3785328f32309dec90ec545764 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 21 Oct 2024 00:46:45 +0800 Subject: [PATCH 01/40] added block specific cawangan transaction --- config/redeemoption.php | 4 +++- resources/views/customers/v2/info.blade.php | 2 ++ resources/views/penebusan/v2/index.blade.php | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/redeemoption.php b/config/redeemoption.php index 5987f202..306610d9 100644 --- a/config/redeemoption.php +++ b/config/redeemoption.php @@ -2,6 +2,8 @@ return [ 'enable_tambahpinjam' => env('ENABLE_TAMBAHPINJAM',1), 'enable_separuh' => env('ENABLE_SEPARUH',1), - 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1) + 'enable_pembiayaansemula' => env('ENABLE_AUTOTAWARRUQ',1), + 'enable_specific_block' => env('ENABLE_BLOCK',0), + 'cawangan_block' => env('CAWANGAN_BLOCK','011227') ]; ?> \ No newline at end of file diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 970f9c61..bf7a5e7c 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -135,9 +135,11 @@
+ @if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block'))
Daftar Pembiayaan
+ @endif
diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php index a31a109c..6501b411 100644 --- a/resources/views/penebusan/v2/index.blade.php +++ b/resources/views/penebusan/v2/index.blade.php @@ -93,14 +93,20 @@ @if($gadai['tagbaru'] == 1) @if(config('redeemoption.enable_separuh') == 1) + @if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) + @endif @endif @if(config('redeemoption.enable_tambahpinjam') == 1) + @if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) + @endif @endif @endif @if(config('redeemoption.enable_pembiayaansemula') == 1) + @if(config('redeemoption.enable_specific_block') == 0 || Auth::user()->cawangan !== config('redeemoption.cawangan_block')) + @endif @endif From 8ec68e891329dc930710ff967216df220c0c02b1 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 1 Nov 2024 09:30:38 +0800 Subject: [PATCH 02/40] first commit for kaunter in fixing cash deposit --- app/Events/PendahuluanSerahan.php | 4 +- app/Http/Controllers/KhazanahController.php | 174 ++++-------------- public/js/main.js | 23 ++- .../views/khazanah/pendahuluan.blade.php | 6 +- 4 files changed, 61 insertions(+), 146 deletions(-) diff --git a/app/Events/PendahuluanSerahan.php b/app/Events/PendahuluanSerahan.php index b6ca1ffb..71ba288f 100644 --- a/app/Events/PendahuluanSerahan.php +++ b/app/Events/PendahuluanSerahan.php @@ -14,10 +14,12 @@ class PendahuluanSerahan implements ShouldBroadcast public $pengesahan; public $cawangan; public $kodlaluan; + public $jenis; - public function __construct($pengesahan,$cawangan,$kodlaluan) + public function __construct($pengesahan,$jenis,$cawangan,$kodlaluan) { $this->pengesahan = $pengesahan; + $this->jenis = $jenis; $this->cawangan = $cawangan; $this->kodlaluan = $kodlaluan; } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 16838c92..c288fa29 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1156,7 +1156,7 @@ class KhazanahController extends Controller ]); - event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller)); + event(new PendahuluanSerahan("Lulus","pendahuluan",$auth_user['cawangan'],$request->teller)); $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[ 'kodlaluan' => $request->teller, @@ -1236,7 +1236,7 @@ class KhazanahController extends Controller ]); - event(new PendahuluanSerahan("Lulus",$auth_user['cawangan'],$request->teller)); + event(new PendahuluanSerahan("Lulus","serahan",$auth_user['cawangan'],$request->teller)); $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[ 'kodlaluan' => $request->teller, @@ -1247,144 +1247,41 @@ class KhazanahController extends Controller return redirect()->route('khazanah.serahan'); } - public function kemaskiniPendahuluan(Request $request) //Daftar Pendahuluan kepada Kaunter + public function kemaskiniPendahuluan(Request $request) { - // return $this->denominasicalculationpendahuluan($request); + $auth_user = Auth::user(); + $api_url = config('api.url'); + $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); - $auth_user = Auth::user(); - $api_url = config('api.url'); - $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); + if(sizeof($peti_besi_terkini) == 0) + { + $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); + $baki_awal = $peti_besi_terkini["bakiakhir"]; + } + else + { + $baki_awal = $peti_besi_terkini[0]["bakiakhir"]; + } - if(sizeof($peti_besi_terkini) == 0) - { - $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); - $baki_awal=$peti_besi_terkini["bakiakhir"]; - } - else - { - $baki_awal=$peti_besi_terkini[0]["bakiakhir"]; - } + $amount = $request->amt; - $amount = $request->amt; + if($amount > $baki_awal){ + return redirect()->route('khazanah.pendahulu')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); + } + else{ + $response_data = $request->except('_token'); + $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/test/updatetunai/'.$auth_user['cawangan'],$response_data)->json(); + + if($test == 'success'){ + event(new PendahuluanSerahan("Lulus","pendahuluan",$auth_user['cawangan'],$request->teller)); + return redirect()->route('khazanah.pendahulu'); + }else{ + return redirect()->route('khazanah.pendahulu')->with('error','Permohonan tidak berjaya! Permohonan Semula perlu melebihi 1 minit.'); + } + } - if($amount>$baki_awal) - { - //WI ERROR MESSAGE SKIT - // dd($baki_awal); - return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.'); - } - else - { - - $tarikh=$request->tarikh; - $kodlaluan=$request->teller; - $tambah=$request->amt; - $kurang=0.0; - $nota=$request->nota; - $kodcaw=$auth_user['cawangan']; - - $addTunai=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[ - 'kodcaw'=>$kodcaw, - 'kodlaluan'=>$kodlaluan, - 'tambah'=>$tambah, - 'kurang'=>$kurang, - 'nota'=>$nota - ]); - - $getTunai=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json(); - - if(sizeof($getTunai) == 0) - { - dd($getTunai); - } - else - { - $bakiawal=0;$masuk=0;$yuran=0;$keluar=0;$baki=0;$tmbh=0;$kurang=0; - - $BakiAkhirT=0;$BakiAwalT=0;$tambahT=0; - - $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json(); - $bakiAwal=$getTunai2['bakiawal']; - $keluar=$getTunai2['keluar']; - $baki=$getTunai2['baki']; - $kurangT=$getTunai2['kurang']; - $tam=$getTunai2['tambah']; - $masukT=$getTunai2['masuk']; - - if($bakiAwal==0) - { - $BakiAwalT=0; - } - else - { - $BakiAwalT=$bakiAwal; - } - - $tambahT=$tambah + $tam; - - $kurang=$kurangT; - $keluarT = $keluar; - // $bakiAkhirT= $bakiAwal + $tambahT + $masukT - $keluarT - $kurang; - $bakiAkhirT = $baki + $tambah; - - $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [ - 'kodlaluan'=>$kodlaluan, - 'tambah'=>$tambahT, - 'kurang'=>$kurang, - 'bakiakhir'=>$bakiAkhirT - ]); - - $latestVault=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); - $masukV=$latestVault[0]['masuk']; - $keluarV=$latestVault[0]['keluar']; - $pendahuluanV=$latestVault[0]['pendahuluan']; - $serahanV=$latestVault[0]['serahan']; - $bakiAwalV=$latestVault[0]['bakiawal']; - $totpanjar = $latestVault[0]['totpanjar']; - - // return; - // dd($tambahT); - // $keluarV=$tambahT; - $keluarV = $tambah + $keluarV; - - $GetLatestBakiTunai=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); - - $bakiTerkini=$GetLatestBakiTunai; - $bakiAkhirV=$bakiAwalV - $keluarV + $masukV + $pendahuluanV - $serahanV - $totpanjar; - // $bakiEOD=$bakiAkhirV+$GetLatestBakiTunai; //try test - $bakiEOD = $bakiAkhirV; - - // dd($bakiEOD); - // $createTempVault=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan']); - - // dd($bakiAkhirV); - //get temporary latest vault/ petibesi - - - - $updateVault=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[ - - 'masuk'=>$masukV, - 'keluar'=>$keluarV, - 'bakiawal'=>$bakiAwalV, - 'bakiakhir'=>$bakiAkhirV, - 'bakieod'=>$bakiEOD - - ]); - - //-----PROCESS SELESAI----------------------------------- - //display final result - - return $this->denominasicalculationpendahuluan($request); - //dd($updateVault); - - - } //endif - - } //end - - } //End + } public function KemaskiniSerahan(Request $request) { @@ -1397,11 +1294,6 @@ class KhazanahController extends Controller if(sizeof($peti_besi_terkini) == 0) { $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); - $baki_awal=$peti_besi_terkini["bakiakhir"]; - } - else - { - $baki_awal=$peti_besi_terkini[0]["bakiakhir"]; } $amount = $request->amt; @@ -3232,12 +3124,12 @@ class KhazanahController extends Controller $nombor = $request->no; $kodlaluan = $request->kodlaluan; - $updatebatal = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[ + Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/batal/'.$kodcaw,[ 'no'=>$nombor, 'kodlaluan'=>$kodlaluan ]); - event(new PendahuluanSerahan("Batal",$auth_user['cawangan'],$kodlaluan)); + event(new PendahuluanSerahan("Batal","all",$auth_user['cawangan'],$kodlaluan)); return response('Berjaya'); } diff --git a/public/js/main.js b/public/js/main.js index e1620b14..a4fb40b7 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -465,7 +465,8 @@ async function openuptambahdanserah(e) var channel = pusher.subscribe('pendahuluanserahan-notice'); channel.bind('penserahan-event', function(data) { - if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller) + console.log(data); + if(data.pengesahan === 'Lulus' && data.jenis == 'pendahuluan' && data.cawangan == kodcaw && data.kodlaluan == teller) { Swal.fire({ icon: 'success', @@ -474,7 +475,7 @@ async function openuptambahdanserah(e) }).then(function(){ location.reload(); }); - }else{ + }else if(data.pengesahan == 'Batal' && data.jenis == 'all' && data.cawangan == kodcaw && data.kodlaluan == teller){ Swal.fire({ icon: 'error', title: 'Tambah Pendahuluan', @@ -482,6 +483,14 @@ async function openuptambahdanserah(e) }).then(function(){ location.reload(); }); + }else{ + Swal.fire({ + icon: 'error', + title: 'Tambah Pendahuluan', + text: 'Tambah Pendahuluan tidak berjaya!' + }).then(function(){ + location.reload(); + }); } @@ -630,7 +639,7 @@ function tambahdanserahanfunc(e) channel.bind('penserahan-event', function(data) { // let message = JSON.stringify(data); - if(data.pengesahan === 'Lulus' && data.cawangan == kodcaw && data.kodlaluan == teller) + if(data.pengesahan === 'Lulus' && data.jenis == 'serahan' && data.cawangan == kodcaw && data.kodlaluan == teller) { Swal.fire({ icon: 'success', @@ -640,6 +649,14 @@ function tambahdanserahanfunc(e) window.open(laporanroute, '_blank'); location.reload(); }); + }else if(data.pengesahan == 'Batal' && data.jenis == 'all' && data.cawangan == kodcaw && data.kodlaluan == teller){ + Swal.fire({ + icon: 'error', + title: 'Serahan Modal', + text: 'Serahan modal tidak diluluskan!' + }).then(function(){ + location.reload(); + }); }else{ Swal.fire({ icon: 'error', diff --git a/resources/views/khazanah/pendahuluan.blade.php b/resources/views/khazanah/pendahuluan.blade.php index 634b216e..21b9472c 100644 --- a/resources/views/khazanah/pendahuluan.blade.php +++ b/resources/views/khazanah/pendahuluan.blade.php @@ -16,7 +16,11 @@
- + @if (session('error')) +
+ {{ session('error') }} +
+ @endif
From f3020b33c59b4bae6f5fd75c3eddf649b4af42e4 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 4 Nov 2024 01:18:29 +0800 Subject: [PATCH 03/40] addded notification --- app/Events/Teller/NotifyDeposit.php | 34 +++++ .../Controllers/EventTriggerController.php | 20 +++ app/Http/Controllers/KhazanahController.php | 144 ++---------------- public/css/main.css | 19 +++ public/js/Class/SubscribePusher.js | 16 ++ public/js/main.js | 19 +++ public/js/notification.js | 75 +++++++++ .../views/homepage/khazanah/home.blade.php | 1 + resources/views/khazanah/menu.blade.php | 4 +- resources/views/layouts/app.blade.php | 4 + routes/web.php | 4 + 11 files changed, 204 insertions(+), 136 deletions(-) create mode 100644 app/Events/Teller/NotifyDeposit.php create mode 100644 app/Http/Controllers/EventTriggerController.php create mode 100644 public/js/Class/SubscribePusher.js create mode 100644 public/js/notification.js diff --git a/app/Events/Teller/NotifyDeposit.php b/app/Events/Teller/NotifyDeposit.php new file mode 100644 index 00000000..a10bc46d --- /dev/null +++ b/app/Events/Teller/NotifyDeposit.php @@ -0,0 +1,34 @@ +jenis = $jenis; + $this->cawangan = $cawangan; + $this->kodlaluan = $kodlaluan; + } + + public function broadcastOn() + { + return ['notify-deposit']; + } + + public function broadcastAs() + { + return 'deposit-event'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/EventTriggerController.php b/app/Http/Controllers/EventTriggerController.php new file mode 100644 index 00000000..37803d3d --- /dev/null +++ b/app/Http/Controllers/EventTriggerController.php @@ -0,0 +1,20 @@ +middleware('auth'); + } + + public function TellerCash(){ + event(new NotifyDeposit("pendahuluan",Auth::user()->cawangan,Auth::user()->name)); + } + + +} diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c288fa29..5d2f2d31 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1295,140 +1295,16 @@ class KhazanahController extends Controller { $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); } - - $amount = $request->amt; - - $tarikh=$request->tarikh; - $kodlaluan=$request->teller; - - $kurang=$request->amt; - $nota=$request->nota; - $kodcaw=$auth_user['cawangan']; - $tambahT = 0; - $kurangvault = $request->amt; - - $addTunai=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/add/addTunai/'.$auth_user['cawangan'],[ - 'kodcaw'=>$kodcaw, - 'kodlaluan'=>$kodlaluan, - 'tambah'=>$tambahT, - 'kurang'=>$kurang, - 'nota'=>$nota]); - - $getTunai=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json(); - - if(sizeof($getTunai) == 0) - { - // dd($getTunai); - } - else - { - $getTunai2=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/GetCurrentTunai/'.$auth_user['cawangan'],['kodlaluan' => $kodlaluan])->json(); - $bakiAwalT=$getTunai2['bakiawal']; - $keluarT=$getTunai2['keluar']; - $baki=$getTunai2['baki']; - $tambahT=$getTunai2['tambah']; - $kurangT=$getTunai2['kurang']; - $masukT=$getTunai2['masuk']; - - $serahanakhir = $kurang; - $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0; - - if($tambahT==0) - $tambah_T=0; - - else - $tambah_T=$tambahT; - - - if($kurangT==0) - $kurang_T=$kurang; - - else - { - $kurang=$kurang+$kurangT; - $kurang_T=$kurang; - } - - if($bakiAwalT==0) - $baki_AwalT=0; - - else - $baki_AwalT=$bakiAwalT; - - //$bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T; //untuk kegunaan urgent - $bakiAkhirT = $baki - $serahanakhir; - - $updateTunai=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [ - 'kodlaluan'=>$kodlaluan, - 'tambah'=>$tambah_T, - 'kurang'=>$kurang_T, - 'bakiakhir'=>$bakiAkhirT - ]); - - - $latestVault=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json(); - - $masukV=$latestVault[0]['masuk']; - $keluarV=$latestVault[0]['keluar']; - $pendahuluanV=$latestVault[0]['pendahuluan']; - $serahanV=$latestVault[0]['serahan']; - $bakiAwalV=$latestVault[0]['bakiawal']; - $totpanjar = $latestVault[0]['totpanjar']; - - - $masuk_V = 0;$pendahuluan_V = 0;$keluar_V = 0;$serahan_V = 0; - - if($masukV == 0) - { - $masuk_V = 0 + $kurangvault; - } - else - { - $masuk_V = $masukV + $kurangvault; - } - - if($keluarV == 0) - $keluar_V = 0; - - else - $keluar_V=$keluarV; - - - if($pendahuluanV == 0) - $pendahuluan_V = 0; - - else - $pendahuluan_V = $pendahuluanV; - - - if($serahanV == 0) - $serahan_V = 0; - - else - $serahan_V = $serahanV; - - } - - $GetLatestBakiTunai=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json(); - $sumBaki=$GetLatestBakiTunai; - - - $bakiAkhirV = $bakiAwalV - $keluar_V + $masuk_V + $pendahuluan_V - $serahan_V - $totpanjar; - - $BakiEOD=$bakiAkhirV; - //$BakiEOD=$bakiAkhirV+$sumBaki; - - $updateVault=Http::withOptions(['verify' => config('app.api_verify')])->put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[ - 'masuk'=>$masuk_V, - 'keluar'=>$keluar_V, - 'bakiawal'=>$bakiAwalV, - 'bakiakhir'=>$bakiAkhirV, - 'bakieod'=>$BakiEOD - ]); - - //--FINAL RESULT...KENA RIDERECT KE PAGE SEBELUMNYA.. - - return $this->denominasicalculationserahan($request); + $response_data = $request->except('_token'); + $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/test/serahantunai/'.$auth_user['cawangan'],$response_data)->json(); + + if($test == 'success'){ + event(new PendahuluanSerahan("Lulus","serahan",$auth_user['cawangan'],$request->teller)); + return redirect()->route('khazanah.serahan'); + }else{ + return redirect()->route('khazanah.serahan')->with('error','Permohonan tidak berjaya! Permohonan Semula perlu melebihi 1 minit.'); + } + } diff --git a/public/css/main.css b/public/css/main.css index 7c3b3438..5baef765 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -94,3 +94,22 @@ span#basic-hargaemas { padding: 5px 10px; text-align: center; } + + @keyframes heartbeat { + 0% { + transform: scale(1); + } + 30% { + transform: scale(1.2); + } + 60% { + transform: scale(1); + } + 100% { + transform: scale(1); + } +} + +.heartbeat { + animation: heartbeat 1s infinite; +} diff --git a/public/js/Class/SubscribePusher.js b/public/js/Class/SubscribePusher.js new file mode 100644 index 00000000..7778361b --- /dev/null +++ b/public/js/Class/SubscribePusher.js @@ -0,0 +1,16 @@ +class SubscribePusher { + constructor(subscribe, event, apikey) { + this.subscribe = subscribe; + this.event = event; + this.apikey = apikey; + } + + channel_subscribe() { + let channel = pusher.subscribe(this.subscribe); + channel.bind(this.event, function(data){ + callback(data); + }); + } +} + +export default SubscribePusher; \ No newline at end of file diff --git a/public/js/main.js b/public/js/main.js index a4fb40b7..d40633b6 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -434,6 +434,17 @@ async function openuptambahdanserah(e) } else { + $.ajax({ + method: "GET", + url: "{{ route('event.tellercash') }}", + success:function(data){ + console.log('successfull trigger'); + }, + error: function(xhRequest, ajaxOptions, thrownError){ + console.log(xhRequest,thrownError); + } + }) + $.ajax({ method:"POST", url: api_url + '/api/requestTeller/' + kodcaw, @@ -589,6 +600,14 @@ function tambahdanserahanfunc(e) if(id == "serahanmodal") { + $.ajax({ + method: "GET", + url: "{{ route('event.tellercash') }}", + success:function(data){ + console.log('successfull trigger'); + } + }) + $.ajax({ method:"POST", url: api_url + '/api/requestTeller/' + kodcaw, diff --git a/public/js/notification.js b/public/js/notification.js new file mode 100644 index 00000000..c5850008 --- /dev/null +++ b/public/js/notification.js @@ -0,0 +1,75 @@ +import NotifyKhazanah from './Class/SubscribePusher.js'; + +let channel = 'notify-deposit'; +let event = 'deposit-event'; +let apikey = "{{ env('PUSHER_APP_KEY') }}"; +let api = "{{ config('api.url') }}"; +let kodcaw = "{{ Auth::user()->kodcaw }}"; + +let requestApi = (url, method, datarequest, callback) => { + $.ajax({ + method: method, + url: url, + data: datarequest, + success: function(data) { + callback(data); + }, + error: function(xhRequest, ajaxOptions, thrownError) { + console.error("Request failed:", xhRequest, thrownError); + } + }); +}; + +let triggerPage = () =>{ + const notify = new NotifyKhazanah(channel,event,apikey); + notify.channel_subscribe((data) => { + console.log(data); + + const currentPath = window.location.pathname; + + if (currentPath === "/home") { + notify_main(); + } else if (currentPath === "/menu") { + notify_khazanah_main(); + }else if(currentPath === '/pendahuluan'){ + notify_pendahuluan(); + }else if(currentPath === '/serahan'){ + notify_serahan(); + } + + }); +} + +let notify_main = () =>{ + const button = document.getElementById("btn-khazanah"); + + if(!button){ + return; + } + + button.classList.add('btn-danger'); + button.classList.add('heartbeat'); +} + +let notify_khazanah_main = () =>{ + requestApi(api + '/api/requestTeller/get/' + kodcaw,"GET",{}, (response) =>{ + let countModal = 0; + let countSerahan = 0; + + response.forEach((req) => { + if (req.modal !== 0) { + countModal++; + } else if (req.serahan !== 0) { + countSerahan++; + } + }); + }); +} + +let notify_pendahuluan = () =>{ + +} + +let notify_serahan = () =>{ + +} diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index bcb12707..66578f88 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -255,6 +255,7 @@
Khazanah
diff --git a/resources/views/khazanah/menu.blade.php b/resources/views/khazanah/menu.blade.php index dfa87137..95c8a11b 100644 --- a/resources/views/khazanah/menu.blade.php +++ b/resources/views/khazanah/menu.blade.php @@ -18,9 +18,9 @@ Penyelesaian Pem. {{ count($listserah) }} - Pendahuluan {{ $countmodal }} + Pendahuluan {{ $countmodal }} - Serahan {{ $countserahan }} + Serahan {{ $countserahan }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 4d974ac7..f01e6e39 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -49,6 +49,10 @@ {{-- Pusher --}} + @if(Auth::user()->role_harian == 'khazanah') + + @endif + @endif From dae6ba55a6c15094d10af971a3ae09b3fc11b43c Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 6 Nov 2024 19:44:08 +0800 Subject: [PATCH 05/40] fix perubatan --- app/Http/Controllers/KhazanahController.php | 14 ++++---- app/Http/Controllers/PerubatanController.php | 27 ++++++++++++++ ...6_000000_add_users_perubatanasal_table.php | 35 +++++++++++++++++++ .../views/homepage/operasi/home.blade.php | 1 + .../views/operasi/perubatan/index.blade.php | 34 ++++++++++++++++++ routes/web.php | 3 ++ 6 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 app/Http/Controllers/PerubatanController.php create mode 100644 database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php create mode 100644 resources/views/operasi/perubatan/index.blade.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 6eb13d09..c82629ae 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -770,21 +770,21 @@ class KhazanahController extends Controller $request->merge(['kodlaluan' => $auth_user['name']]); $data_request = $request->except('_token'); - dd($data_request); - $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/createpanjar/'. $auth_user['cawangan'],$data_request)->json(); + $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/deletepanjar/'. $auth_user['cawangan'],$data_request)->json(); + if($updatepanjar['result'] == 'success') { - if($denopanjar['jenis'] === 'perubatan') + if($updatepanjar['jenis'] === 'perubatan') { - $listUser = User::where('name','=',$senaraipanjar['tuntutoleh'])->get(); + $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->get(); - $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']); + // $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']); $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) - ->where('name','=',$senaraipanjar['tuntutoleh']) + ->where('name','=',$updatepanjar['tuntutoleh']) ->update(array( - 'perubatan' => $bakiperubatan + 'perubatan' => $updatepanjar['bakiperubatan'] )); } diff --git a/app/Http/Controllers/PerubatanController.php b/app/Http/Controllers/PerubatanController.php new file mode 100644 index 00000000..3c896f09 --- /dev/null +++ b/app/Http/Controllers/PerubatanController.php @@ -0,0 +1,27 @@ +middleware('auth'); + } + + public function index(){ + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $paginate = User::paginate(5); + + return view('operasi.perubatan.index',compact('cawangan_info','api_url','auth_user','paginate')); + + } +} diff --git a/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php b/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php new file mode 100644 index 00000000..2dc1c896 --- /dev/null +++ b/database/migrations/2024_11_06_000000_add_users_perubatanasal_table.php @@ -0,0 +1,35 @@ +decimal('perubatan_asal', 11, 2); + } + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + // public function down() + // { + // Schema::dropIfExists('users'); + // } +} diff --git a/resources/views/homepage/operasi/home.blade.php b/resources/views/homepage/operasi/home.blade.php index a4135e96..a86275b9 100644 --- a/resources/views/homepage/operasi/home.blade.php +++ b/resources/views/homepage/operasi/home.blade.php @@ -18,6 +18,7 @@ Kakitangan Parameter Komoditi + Perubatan
diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php new file mode 100644 index 00000000..d8459f54 --- /dev/null +++ b/resources/views/operasi/perubatan/index.blade.php @@ -0,0 +1,34 @@ +@extends('layouts.app_operasi') + +@section('content') +
+
+
+
+ + + +
+ @foreach($paginate as $page) +
+

{{ $page->name }}

+

{{ $page->perubatan }}

+

{{ $page->perubatan_asal }}

+
+ @endforeach + + + +
+
+
+
+
+@endsection diff --git a/routes/web.php b/routes/web.php index 9a312fc2..5d56b036 100644 --- a/routes/web.php +++ b/routes/web.php @@ -475,4 +475,7 @@ Route::get('supports/driver/mykad-reader/download',['as'=>'mykadreader.driver.do Route::get('/event/tellercash',['as'=>'event.tellercash','uses'=>'EventTriggerController@TellerCash'])->middleware('auth'); +/* Perubatan */ +Route::get('/perubatan',['as'=>'perubatan','uses'=>'PerubatanController@index'])->middleware('auth','operasi'); + From adc62b2ba2b20b2057152e9358d9bcf29e5b5d53 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 7 Nov 2024 01:16:32 +0800 Subject: [PATCH 06/40] add scaffold for perubatan --- app/Http/Controllers/PerubatanController.php | 19 ++++ public/js/perubatan.js | 17 +++ .../views/operasi/perubatan/index.blade.php | 46 ++++++-- .../vendor/pagination/bootstrap-4.blade.php | 47 ++++++++ .../views/vendor/pagination/default.blade.php | 46 ++++++++ .../vendor/pagination/semantic-ui.blade.php | 36 +++++++ .../pagination/simple-bootstrap-4.blade.php | 27 +++++ .../pagination/simple-default.blade.php | 19 ++++ .../pagination/simple-tailwind.blade.php | 25 +++++ .../vendor/pagination/tailwind.blade.php | 102 ++++++++++++++++++ routes/web.php | 1 + 11 files changed, 378 insertions(+), 7 deletions(-) create mode 100644 public/js/perubatan.js create mode 100644 resources/views/vendor/pagination/bootstrap-4.blade.php create mode 100644 resources/views/vendor/pagination/default.blade.php create mode 100644 resources/views/vendor/pagination/semantic-ui.blade.php create mode 100644 resources/views/vendor/pagination/simple-bootstrap-4.blade.php create mode 100644 resources/views/vendor/pagination/simple-default.blade.php create mode 100644 resources/views/vendor/pagination/simple-tailwind.blade.php create mode 100644 resources/views/vendor/pagination/tailwind.blade.php diff --git a/app/Http/Controllers/PerubatanController.php b/app/Http/Controllers/PerubatanController.php index 3c896f09..ac504161 100644 --- a/app/Http/Controllers/PerubatanController.php +++ b/app/Http/Controllers/PerubatanController.php @@ -24,4 +24,23 @@ class PerubatanController extends Controller return view('operasi.perubatan.index',compact('cawangan_info','api_url','auth_user','paginate')); } + + public function search(Request $request){ + $api_url = config('api.url'); + $auth_user = Auth::user(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + + $search = $request->input('search'); + + $query = User::query(); + + if ($search) { + $query->where('name', 'LIKE', "%{$search}%"); + } + $paginate = $query->paginate(5); + $paginate->appends($request->all()); + + return view('operasi.perubatan.index',compact('cawangan_info','api_url','auth_user','paginate')); + } } diff --git a/public/js/perubatan.js b/public/js/perubatan.js new file mode 100644 index 00000000..c78ddd3a --- /dev/null +++ b/public/js/perubatan.js @@ -0,0 +1,17 @@ +let editfunc = () => { + document.getElementById('editButton').style.display = 'none'; + document.getElementById('saveButton').style.display = 'block'; + document.getElementById('cancelButton').style.display = 'block'; +} + +let savefunc = () => { + document.getElementById('editButton').style.display = 'block'; + document.getElementById('saveButton').style.display = 'none'; + document.getElementById('cancelButton').style.display = 'none'; +} + +let cancelfunc = () => { + document.getElementById('editButton').style.display = 'block'; + document.getElementById('saveButton').style.display = 'none'; + document.getElementById('cancelButton').style.display = 'none'; +} \ No newline at end of file diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php index d8459f54..eca0334e 100644 --- a/resources/views/operasi/perubatan/index.blade.php +++ b/resources/views/operasi/perubatan/index.blade.php @@ -14,15 +14,46 @@
- @foreach($paginate as $page) -
-

{{ $page->name }}

-

{{ $page->perubatan }}

-

{{ $page->perubatan_asal }}

+
+
+ + +
+ + + + + + + + + + + + + @foreach($paginate as $page) + + + + + + + + @endforeach + +
#NamaBaki PerubatanPerubatanTindakan
{{ ($paginate->currentPage() - 1) * $paginate->perPage() + $loop->index + 1 }}{{ $page->name }}{{ $page->perubatan }} + {{ $page->perubatan_asal }} + + + Edit +
+ Save + Cancel +
+
- @endforeach -
+ @endsection diff --git a/resources/views/vendor/pagination/bootstrap-4.blade.php b/resources/views/vendor/pagination/bootstrap-4.blade.php new file mode 100644 index 00000000..0b4defbd --- /dev/null +++ b/resources/views/vendor/pagination/bootstrap-4.blade.php @@ -0,0 +1,47 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/default.blade.php b/resources/views/vendor/pagination/default.blade.php new file mode 100644 index 00000000..0db70b56 --- /dev/null +++ b/resources/views/vendor/pagination/default.blade.php @@ -0,0 +1,46 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/semantic-ui.blade.php b/resources/views/vendor/pagination/semantic-ui.blade.php new file mode 100644 index 00000000..ef0dbb18 --- /dev/null +++ b/resources/views/vendor/pagination/semantic-ui.blade.php @@ -0,0 +1,36 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-bootstrap-4.blade.php b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php new file mode 100644 index 00000000..4bb49174 --- /dev/null +++ b/resources/views/vendor/pagination/simple-bootstrap-4.blade.php @@ -0,0 +1,27 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-default.blade.php b/resources/views/vendor/pagination/simple-default.blade.php new file mode 100644 index 00000000..36bdbc18 --- /dev/null +++ b/resources/views/vendor/pagination/simple-default.blade.php @@ -0,0 +1,19 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/simple-tailwind.blade.php b/resources/views/vendor/pagination/simple-tailwind.blade.php new file mode 100644 index 00000000..1c5e52f3 --- /dev/null +++ b/resources/views/vendor/pagination/simple-tailwind.blade.php @@ -0,0 +1,25 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/resources/views/vendor/pagination/tailwind.blade.php b/resources/views/vendor/pagination/tailwind.blade.php new file mode 100644 index 00000000..4b92aaba --- /dev/null +++ b/resources/views/vendor/pagination/tailwind.blade.php @@ -0,0 +1,102 @@ +@if ($paginator->hasPages()) + +@endif diff --git a/routes/web.php b/routes/web.php index 5d56b036..64560a4f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -477,5 +477,6 @@ Route::get('/event/tellercash',['as'=>'event.tellercash','uses'=>'EventTriggerCo /* Perubatan */ Route::get('/perubatan',['as'=>'perubatan','uses'=>'PerubatanController@index'])->middleware('auth','operasi'); +Route::get('/perubatan/search',['as'=>'perubatan.search','uses'=>'PerubatanController@search'])->middleware('auth','operasi'); From 4c113cb0521696573f11f2f7c7c8c32ded07d096 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 7 Nov 2024 16:27:59 +0800 Subject: [PATCH 07/40] add function in perubatan.js --- app/Http/Controllers/KhazanahController.php | 15 ++--- public/js/perubatan.js | 57 +++++++++++++++---- .../views/operasi/perubatan/index.blade.php | 13 +++-- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c82629ae..b5b1eafe 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -745,11 +745,11 @@ class KhazanahController extends Controller if($request->jenismodal === 'perubatan') { $listUser=User::where('name','=',$request->tuntutan)->get(); - // $totalsebenar = floatval($listUser[0]->perubatan) - floatval($request->bayaran); - $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) + $totalsebenar = floatval($listUser[0]->perubatan_asal) - floatval($updatepanjar['bakiperubatan']); + User::where('cawangan','=',$auth_user['cawangan']) ->where('name','=',$request->tuntutan) ->update(array( - 'perubatan' => $updatepanjar['bakiperubatan'] + 'perubatan' => $totalsebenar )); } @@ -777,14 +777,15 @@ class KhazanahController extends Controller { if($updatepanjar['jenis'] === 'perubatan') { - $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->get(); + $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->first(); + $listUser = optional($listUser)->toArray(); - // $totalsebenar = floatval($listUser[0]->perubatan) + floatval($denopanjar['serahan']); + $totalsebenar = floatval($listUser['perubatan_asal']) + $updatepanjar['bakiperubatan']; - $overrideuser = User::where('cawangan','=',$auth_user['cawangan']) + User::where('cawangan','=',$auth_user['cawangan']) ->where('name','=',$updatepanjar['tuntutoleh']) ->update(array( - 'perubatan' => $updatepanjar['bakiperubatan'] + 'perubatan' => $totalsebenar )); } diff --git a/public/js/perubatan.js b/public/js/perubatan.js index c78ddd3a..761280a6 100644 --- a/public/js/perubatan.js +++ b/public/js/perubatan.js @@ -1,17 +1,50 @@ -let editfunc = () => { - document.getElementById('editButton').style.display = 'none'; - document.getElementById('saveButton').style.display = 'block'; - document.getElementById('cancelButton').style.display = 'block'; +let editfunc = (pageid) => { + let editbtn = document.getElementById('divedit-' + pageid); + let divbtn = document.getElementById('div-' + pageid); + let inputbtn = document.getElementById('input-' + pageid); + + if(editbtn.classList.contains('d-block')){ + editbtn.classList.remove('d-block'); + editbtn.classList.add('d-none'); + } + + if(divbtn.classList.contains('d-none')){ + divbtn.classList.remove('d-none'); + divbtn.classList.add('d-block'); + } + inputbtn.disabled = false; + } -let savefunc = () => { - document.getElementById('editButton').style.display = 'block'; - document.getElementById('saveButton').style.display = 'none'; - document.getElementById('cancelButton').style.display = 'none'; +let savefunc = (pageid) => { + // let editbtn = document.getElementById('editButton-' + pageid); + // let divbtn = document.getElementById('div-' + pageid); + + // if(editbtn.classList.contains('d-block')){ + // editbtn.classList.remove('d-block'); + // editbtn.classList.add('d-none'); + // } + + // if(divbtn.classList.contains('d-none')){ + // divbtn.classList.remove('d-none'); + // divbtn.classList.add('d-block'); + // } } -let cancelfunc = () => { - document.getElementById('editButton').style.display = 'block'; - document.getElementById('saveButton').style.display = 'none'; - document.getElementById('cancelButton').style.display = 'none'; +let cancelfunc = (pageid) => { + let editbtn = document.getElementById('divedit-' + pageid); + let divbtn = document.getElementById('div-' + pageid); + let inputbtn = document.getElementById('input-' + pageid); + + if(editbtn.classList.contains('d-none')){ + editbtn.classList.remove('d-none'); + editbtn.classList.add('d-block'); + } + + if(divbtn.classList.contains('d-block')){ + divbtn.classList.remove('d-block'); + divbtn.classList.add('d-none'); + } + + inputbtn.disabled = true; } \ No newline at end of file diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php index eca0334e..fb5b131c 100644 --- a/resources/views/operasi/perubatan/index.blade.php +++ b/resources/views/operasi/perubatan/index.blade.php @@ -37,14 +37,15 @@ {{ $page->name }} {{ $page->perubatan }} - {{ $page->perubatan_asal }} - + - Edit -
- Save - Cancel +
+ Edit +
+
+ Save + Cancel
From c4388321aaa7ec205f197e630b0f84ef1ba2dc21 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 8 Nov 2024 22:00:17 +0800 Subject: [PATCH 08/40] finished notification --- .../Controllers/AliranTunaiController.php | 53 ++ app/Http/Controllers/KhazanahController.php | 10 +- public/js/Class/SubscribePusher.js | 8 +- public/js/main.js | 4 +- public/js/notification.js | 85 ++- resources/views/aliran_tunai/index.blade.php | 10 + .../laporan/laporanrekodteller.blade.php | 546 ++++++++++++++++++ resources/views/layouts/app.blade.php | 7 +- routes/web.php | 1 + 9 files changed, 688 insertions(+), 36 deletions(-) create mode 100644 resources/views/aliran_tunai/laporan/laporanrekodteller.blade.php diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index b31b784e..2e0d19d2 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -624,5 +624,58 @@ class AliranTunaiController extends Controller return view('aliran_tunai.laporan.laporanalirantunai',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','addtunai','alirantunai','teller')); } + public function LaporanTunaiTeller(Request $request){ + + + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $tarikh_cetak = $current->toDateString(); + + $array_requestteller = []; + //wang Syilling Initialize + $rekodsen1 = 0; $rekodsen5 = 0; $rekodsen10 = 0; + $rekodsen20 = 0; $rekodsen50 = 0; + + //Wang Ringgit Initialize + $rekodring1 = 0; $rekodring5 = 0; $rekodring10 = 0; + $rekodring20 = 0; $rekodring50 = 0; $rekodring100 = 0; + + $requestteller = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/requestTeller/getrekod/'.$auth_user['cawangan'],["teller" => Auth::user()->name,"recno" => $request->recno ])->json(); + if($requestteller[0]['modal'] != 0){ + $jenisserah = 'pendahuluan'; + }else{ + $jenisserah = 'serahan'; + } + + foreach($requestteller as $index => $reqtel) + { + $rekodsen1 += $reqtel['txtsen1']; + $rekodsen5 += $reqtel['txtsen5']; + $rekodsen10 += $reqtel['txtsen10']; + $rekodsen20 += $reqtel['txtsen20']; + $rekodsen50 += $reqtel['txtsen50']; + + $rekodring1 += $reqtel['txtring1']; + $rekodring5 += $reqtel['txtring5']; + $rekodring10 += $reqtel['txtring10']; + $rekodring20 += $reqtel['txtring20']; + $rekodring50 += $reqtel['txtring50']; + $rekodring100 += $reqtel['txtring100']; + } + + array_push($array_requestteller,[ "rekodsen1" => $rekodsen1,"rekodsen5" => $rekodsen5,"rekodsen10" => $rekodsen10,"rekodsen20" => $rekodsen20,"rekodsen50" => $rekodsen50 + ,"rekodring1" => $rekodring1,"rekodring5" => $rekodring5,"rekodring10" => $rekodring10,"rekodring20" => $rekodring20,"rekodring50" => $rekodring50,"rekodring100" => $rekodring100]); + + return view('aliran_tunai.laporan.laporanrekodteller',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller','jenisserah')); + } + } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index b5b1eafe..d8ac3511 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -28,6 +28,7 @@ use Carbon\Carbon; use PDF; use DateTime; use App\Helper; +use Log; class KhazanahController extends Controller { @@ -744,8 +745,9 @@ class KhazanahController extends Controller { if($request->jenismodal === 'perubatan') { - $listUser=User::where('name','=',$request->tuntutan)->get(); - $totalsebenar = floatval($listUser[0]->perubatan_asal) - floatval($updatepanjar['bakiperubatan']); + $listUser = User::where('name','=',$request->tuntutan)->first(); + $listUser = optional($listUser)->toArray(); + $totalsebenar = floatval($listUser['perubatan_asal']) - floatval($updatepanjar['totalperubatan']); User::where('cawangan','=',$auth_user['cawangan']) ->where('name','=',$request->tuntutan) ->update(array( @@ -779,9 +781,7 @@ class KhazanahController extends Controller { $listUser = User::where('name','=',$updatepanjar['tuntutoleh'])->first(); $listUser = optional($listUser)->toArray(); - - $totalsebenar = floatval($listUser['perubatan_asal']) + $updatepanjar['bakiperubatan']; - + $totalsebenar = floatval($listUser['perubatan_asal']) - floatval($updatepanjar['totalperubatan']); User::where('cawangan','=',$auth_user['cawangan']) ->where('name','=',$updatepanjar['tuntutoleh']) ->update(array( diff --git a/public/js/Class/SubscribePusher.js b/public/js/Class/SubscribePusher.js index 7778361b..ec277950 100644 --- a/public/js/Class/SubscribePusher.js +++ b/public/js/Class/SubscribePusher.js @@ -3,14 +3,18 @@ class SubscribePusher { this.subscribe = subscribe; this.event = event; this.apikey = apikey; + this.pusher = new Pusher(this.apikey, { + cluster: 'ap1', // Replace 'your_cluster' with the actual cluster of your Pusher app + }); } - channel_subscribe() { - let channel = pusher.subscribe(this.subscribe); + channel_subscribe(callback) { + let channel = this.pusher.subscribe(this.subscribe); channel.bind(this.event, function(data){ callback(data); }); } } + export default SubscribePusher; \ No newline at end of file diff --git a/public/js/main.js b/public/js/main.js index d40633b6..32041b68 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -436,7 +436,7 @@ async function openuptambahdanserah(e) { $.ajax({ method: "GET", - url: "{{ route('event.tellercash') }}", + url: event_tellercash, success:function(data){ console.log('successfull trigger'); }, @@ -602,7 +602,7 @@ function tambahdanserahanfunc(e) $.ajax({ method: "GET", - url: "{{ route('event.tellercash') }}", + url: event_tellercash, success:function(data){ console.log('successfull trigger'); } diff --git a/public/js/notification.js b/public/js/notification.js index c5850008..5655959f 100644 --- a/public/js/notification.js +++ b/public/js/notification.js @@ -1,10 +1,40 @@ import NotifyKhazanah from './Class/SubscribePusher.js'; - let channel = 'notify-deposit'; let event = 'deposit-event'; -let apikey = "{{ env('PUSHER_APP_KEY') }}"; -let api = "{{ config('api.url') }}"; -let kodcaw = "{{ Auth::user()->kodcaw }}"; +let apikey = window.apikey; + +const Toast = Swal.mixin({ + toast: true, + position: 'top-end', + showConfirmButton: false, + timer: 5000, + timerProgressBar: true, + didOpen: (toast) => { + toast.addEventListener('mouseenter', Swal.stopTimer) + toast.addEventListener('mouseleave', Swal.resumeTimer) + } +}) + +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 (currentPath === "/home") { + notify_main(); + } else if (currentPath === "/menu") { + notify_khazanah_main(); + }else if(currentPath === '/pendahuluan'){ + notify_pendahuluan(); + }else if(currentPath === '/serahan'){ + notify_serahan(); + } + +}); let requestApi = (url, method, datarequest, callback) => { $.ajax({ @@ -20,25 +50,6 @@ let requestApi = (url, method, datarequest, callback) => { }); }; -let triggerPage = () =>{ - const notify = new NotifyKhazanah(channel,event,apikey); - notify.channel_subscribe((data) => { - console.log(data); - - const currentPath = window.location.pathname; - - if (currentPath === "/home") { - notify_main(); - } else if (currentPath === "/menu") { - notify_khazanah_main(); - }else if(currentPath === '/pendahuluan'){ - notify_pendahuluan(); - }else if(currentPath === '/serahan'){ - notify_serahan(); - } - - }); -} let notify_main = () =>{ const button = document.getElementById("btn-khazanah"); @@ -52,7 +63,7 @@ let notify_main = () =>{ } let notify_khazanah_main = () =>{ - requestApi(api + '/api/requestTeller/get/' + kodcaw,"GET",{}, (response) =>{ + requestApi(window.api + '/api/requestTeller/get/' + window.kodcaw,"GET",{}, (response) =>{ let countModal = 0; let countSerahan = 0; @@ -63,13 +74,35 @@ let notify_khazanah_main = () =>{ countSerahan++; } }); + + let btn_serahan = document.getElementById('btn-ser'); + let btn_pendahuluan = document.getElementById('btn-pend'); + let span_element_ser = btn_serahan.querySelector('span'); + let span_element_pend = btn_pendahuluan.querySelector('span'); + + if(!btn_serahan.classList.contains('btn-danger') && countSerahan > 0){ + btn_serahan.classList.add('btn-danger'); + span_element_ser.innerText = countSerahan; + } + + if(!btn_pendahuluan.classList.contains('btn-danger') && countModal > 0){ + btn_pendahuluan.classList.add('btn-danger'); + span_element_pend.innerText = countModal; + } + }); } let notify_pendahuluan = () =>{ - + timer_reload(); } let notify_serahan = () =>{ - + timer_reload(); +} + +let timer_reload = () =>{ + setTimeout(() => { + window.location.reload(); + }, 3000); } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index a8dedd02..b19e2ea6 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -214,6 +214,7 @@ Debit (RM) Kredit (RM) Nota + Tindakan @@ -225,6 +226,7 @@ {{ number_format($at['tambah'],2) }} {{ number_format($at['kurang'],2) }} {{ $at['nota'] }} + @endforeach @endif @@ -602,8 +604,16 @@ }); } + function rekodprint(recno){ + + let urlroute = '{{ route("laporan.tunaiteller") }}'; + urlroute += '?recno=' + encodeURIComponent(recno); + window.open(urlroute, '_blank'); + } + let pusherenv = "{{ env('PUSHER_APP_KEY') }}"; let laporanroute = "{{ route('laporan.serahantellerberkala') }}"; + let event_tellercash = "{{ route('event.tellercash') }}"; @endsection diff --git a/resources/views/aliran_tunai/laporan/laporanrekodteller.blade.php b/resources/views/aliran_tunai/laporan/laporanrekodteller.blade.php new file mode 100644 index 00000000..5ed231c6 --- /dev/null +++ b/resources/views/aliran_tunai/laporan/laporanrekodteller.blade.php @@ -0,0 +1,546 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
Laporan Pemeriksaan Wang Peti Besi (Cash Box)
+ + + + + +
+ + + + +
ID {{ (Auth::user()->name) ? Auth::user()->name : ''}} Jenis {{ strtoupper($jenisserah) }}
Tarikh Laporan {{ $tarikh_cetak }} Tarikh Cetak {{ $tarikh_cetak }}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RMKUANTITIJUMLAH (RM)
RM100{{ $array_requestteller[0]['rekodring100'] }}@php $totalsemua = 0; $total = ($array_requestteller[0]['rekodring100'] * 100); $totalsemua += $total; echo number_format($total,2); @endphp
RM 50{{ $array_requestteller[0]['rekodring50'] }}@php $total = ($array_requestteller[0]['rekodring50'] * 50); $totalsemua += $total; echo number_format($total,2); @endphp
RM 20{{ $array_requestteller[0]['rekodring20'] }}@php $total = ($array_requestteller[0]['rekodring20'] * 20); $totalsemua += $total; echo number_format($total,2); @endphp
RM 10{{ $array_requestteller[0]['rekodring10'] }}@php $total = ($array_requestteller[0]['rekodring10'] * 10); $totalsemua += $total; echo number_format($total,2); @endphp
RM 5{{ $array_requestteller[0]['rekodring5'] }}@php $total = ($array_requestteller[0]['rekodring5'] * 5); $totalsemua += $total; echo number_format($total,2); @endphp
RM 1.00{{ $array_requestteller[0]['rekodring1'] }}@php $total = ($array_requestteller[0]['rekodring1'] * 1); $totalsemua += $total; echo number_format($total,2); @endphp
RM 0.50{{ $array_requestteller[0]['rekodsen50'] }}@php $total = ($array_requestteller[0]['rekodsen50'] * 0.5); $totalsemua += $total; echo number_format($total,2); @endphp
RM 0.20{{ $array_requestteller[0]['rekodsen20'] }}@php $total = ($array_requestteller[0]['rekodsen20'] * 0.2); $totalsemua += $total; echo number_format($total,2); @endphp
RM0.10{{ $array_requestteller[0]['rekodsen10'] }}@php $total = ($array_requestteller[0]['rekodsen10'] * 0.1); $totalsemua += $total; echo number_format($total,2); @endphp
RM 0.05{{ $array_requestteller[0]['rekodsen5'] }}@php $total = ($array_requestteller[0]['rekodsen5'] * 0.05); $totalsemua += $total; echo number_format($total,2); @endphp
RM 0.01{{ $array_requestteller[0]['rekodsen1'] }}@php $total = ($array_requestteller[0]['rekodsen1'] * 0.01); $totalsemua += $total; echo number_format($total,2); @endphp
JUMLAH (RM){{ number_format($totalsemua,2) }}
+ +
CATATAN:
@if($jenisserah == 'pendahuluan') + Pendahuluan daripada peti besi + @else + Serahan kepada peti besi + @endif + ialah sebanyak RM {{ number_format($totalsemua,2) }} +
+
+ + + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f01e6e39..cc68dc2b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -49,7 +49,12 @@ {{-- Pusher --}} - @if(Auth::user()->role_harian == 'khazanah') + @if(Auth::user()->roles == 'ppc' || Auth::user()->roles == 'pc') + @endif diff --git a/routes/web.php b/routes/web.php index 64560a4f..21ebbb40 100644 --- a/routes/web.php +++ b/routes/web.php @@ -87,6 +87,7 @@ Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@ind Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth'); Route::get('/lelongan/{norujukan}',['as'=>'lelongan','uses' => 'LelongController@index'])->middleware('auth','teller'); Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller'); +Route::get('/aliran_tunai/laporantunaiteller',['as'=>'laporan.tunaiteller','uses' => 'AliranTunaiController@LaporanTunaiTeller'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanserahan',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanserahanberkala',['as'=>'laporan.serahantellerberkala','uses' => 'AliranTunaiController@LaporanSerahanBerkala'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanalirantunai/{teller}',['as'=>'laporan.alirantunai','uses' => 'AliranTunaiController@LaporanAliranTunai'])->middleware('auth','teller'); From f59e0a4d4e495149cdd86836659fc9e9d042dd92 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 10 Nov 2024 22:31:55 +0800 Subject: [PATCH 09/40] added function operasi can edit perubatan asal --- app/Http/Controllers/KhazanahController.php | 8 ++-- app/Http/Controllers/PerubatanController.php | 20 +++++++++ public/js/perubatan.js | 45 +++++++++++++++++++ .../views/operasi/perubatan/index.blade.php | 9 ++-- routes/web.php | 3 +- 5 files changed, 76 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d8ac3511..48eb3f69 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -739,7 +739,7 @@ class KhazanahController extends Controller $request->merge(['kodlaluan' => $auth_user['name']]); $data_request = $request->except('_token'); - $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/createpanjar/'. $auth_user['cawangan'],$data_request)->json(); + $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/createpanjar/'. $auth_user['cawangan'],$data_request)->json(); if($updatepanjar['result'] == 'success') { @@ -773,7 +773,7 @@ class KhazanahController extends Controller $request->merge(['kodlaluan' => $auth_user['name']]); $data_request = $request->except('_token'); - $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/test/deletepanjar/'. $auth_user['cawangan'],$data_request)->json(); + $updatepanjar = Http::withOptions(['verify' => config('app.api_verify')])->post( config('api.url') .'/api/panjar/deletepanjar/'. $auth_user['cawangan'],$data_request)->json(); if($updatepanjar['result'] == 'success') { @@ -1062,7 +1062,7 @@ class KhazanahController extends Controller } else{ $response_data = $request->except('_token'); - $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/test/updatetunai/'.$auth_user['cawangan'],$response_data)->json(); + $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/panjar/updatetunai/'.$auth_user['cawangan'],$response_data)->json(); if($test == 'success'){ event(new PendahuluanSerahan("Lulus","pendahuluan",$auth_user['cawangan'],$request->teller)); @@ -1087,7 +1087,7 @@ class KhazanahController extends Controller $peti_besi_terkini=Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json(); } $response_data = $request->except('_token'); - $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/test/serahantunai/'.$auth_user['cawangan'],$response_data)->json(); + $test = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/panjar/serahantunai/'.$auth_user['cawangan'],$response_data)->json(); if($test == 'success'){ event(new PendahuluanSerahan("Lulus","serahan",$auth_user['cawangan'],$request->teller)); diff --git a/app/Http/Controllers/PerubatanController.php b/app/Http/Controllers/PerubatanController.php index ac504161..7815f23e 100644 --- a/app/Http/Controllers/PerubatanController.php +++ b/app/Http/Controllers/PerubatanController.php @@ -43,4 +43,24 @@ class PerubatanController extends Controller return view('operasi.perubatan.index',compact('cawangan_info','api_url','auth_user','paginate')); } + + public function update(Request $request){ + $api_url = config('api.url'); + $auth_user = Auth::user(); + + $user = User::where('id', $request->id)->first(); + $user = optional($user)->toArray(); + + $amount = str_replace(',', '', $request->amount); + + $total_perubatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/panjar/getperubatan/'. $user['cawangan'],[ + 'tuntutoleh' => $user['name'] + ])->json(); + + $remaining = floatval($amount) - floatval($total_perubatan); + + $response = User::where('id', $request->id)->update(['perubatan_asal' => $amount,'perubatan' => $remaining]); + + return $response; + } } diff --git a/public/js/perubatan.js b/public/js/perubatan.js index 761280a6..b48fd7a2 100644 --- a/public/js/perubatan.js +++ b/public/js/perubatan.js @@ -17,6 +17,51 @@ let editfunc = (pageid) => { } let savefunc = (pageid) => { + let amount = document.getElementById("input-" + pageid); + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); + + $.ajax({ + url : updateurl, + method : 'PUT', + data : { + "amount" : amount.value, + "id" : pageid, + "_token": $('meta[name="csrf-token"]').attr('content') + }, + success:function(response){ + if(response == 0){ + Swal.fire({ + icon: 'error', + title: 'Perubahan Nilai Perubatan Tidak Berjaya!', + }); + return false; + } + + Swal.fire({ + icon: 'success', + title: 'Perubahan Nilai Perubatan Berjaya!', + showCancelButton: false, + confirmButtonText: "Okay!", + allowEscapeKey: false, + allowOutsideClick: false + }).then((result) => { + if (result.isConfirmed) { + window.location.reload(); + } + }); + + } + }); + + // let editbtn = document.getElementById('editButton-' + pageid); // let divbtn = document.getElementById('div-' + pageid); diff --git a/resources/views/operasi/perubatan/index.blade.php b/resources/views/operasi/perubatan/index.blade.php index fb5b131c..6c10a214 100644 --- a/resources/views/operasi/perubatan/index.blade.php +++ b/resources/views/operasi/perubatan/index.blade.php @@ -26,7 +26,7 @@ # Nama Baki Perubatan - Perubatan + Perubatan Tindakan @@ -35,9 +35,9 @@ {{ ($paginate->currentPage() - 1) * $paginate->perPage() + $loop->index + 1 }} {{ $page->name }} - {{ $page->perubatan }} + {{ number_format($page->perubatan,2) }} - +
@@ -63,5 +63,8 @@
+ @endsection diff --git a/routes/web.php b/routes/web.php index 21ebbb40..46391193 100644 --- a/routes/web.php +++ b/routes/web.php @@ -479,5 +479,4 @@ Route::get('/event/tellercash',['as'=>'event.tellercash','uses'=>'EventTriggerCo /* Perubatan */ Route::get('/perubatan',['as'=>'perubatan','uses'=>'PerubatanController@index'])->middleware('auth','operasi'); Route::get('/perubatan/search',['as'=>'perubatan.search','uses'=>'PerubatanController@search'])->middleware('auth','operasi'); - - +Route::put('/perubatan/update',['as'=>'perubatan.update','uses'=>'PerubatanController@update'])->middleware('auth','operasi'); From 8b1dccb7181cd91189869ebf5376c98863f05ebe Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Tue, 12 Nov 2024 13:51:26 +0800 Subject: [PATCH 10/40] test AT transaction --- app/Http/Controllers/PenebusanController.php | 119 +------------------ 1 file changed, 3 insertions(+), 116 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index b31d6aba..f185a807 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -455,129 +455,16 @@ class PenebusanController extends Controller 'totalbayaran' => $request->totalbayaran, "duitpelanggan" => $request->bayaran, "bakipelanggan" => $request->bakipelanggan, + "noic" => $request->noic, + "jenisAT" => $request->jenisAT, ])->json(); - - ////////////////////// - /// MAKING NEW SAG//// - ///////////////////// - $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); - if($gadai_transaction){ - $new_sirig = $gadai_transaction['sirig'] + 1; - - }else{ - $new_sirig = 1; - } - - $new_transaction = sprintf("%04d",$new_sirig); - $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'nopelanggan' => $request->nopelanggan, - 'nokp' => $request->noic, - 'sirig' => $new_sirig - ]); - - /////////////////////////// - /// MARHUN UPDATE TABLE//// - ////////////////////////// - - $arraymarhunbaru = []; - - $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); - - $marhunyangdiambil = $marhunsediada[0]; - foreach($marhunyangdiambil as $index=>$marhunloop) - { - $karatbaru = str_replace('.','-',$marhunloop['karat']); - $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga']; - $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat'])); - - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]); - } - - foreach($arraymarhunbaru as $array1){ - $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'marhun' => $array1['marhun'], - 'nota' => $array1['nota'], - 'karat' => $array1['karat'], - 'berat_emas' => $array1['berat'], - 'harga' => $array1['harga'], - 'nilai_marhun' => $array1['n_marhun'], - 'tag_permata' => $array1['tag_permata'], - 'berat_batu_permata' => $array1['berat_batu_permata'], - 'jenisAT' => $request->jenisAT - ])->json(); - } - - ////////////////////// - ////Update SAG BARU/// - ///////////////////// - - - $total_nilai_marhun = $request->total_nilai_marhun; - $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun); - - $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ - 'pembiayaan' => $request->pinjaman, - 'nilaimarhun' => $total_nilai_marhun, - 'kadarujrah' => $request->kadarkeuntungan, - 'margin' => ($margin_pinjaman*100), - 'kodcaw' => Auth::user()->cawangan - ])->json(); - - $keuntungan_sebln = $onepercent['keuntungan']; - $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); - - $kadarupah = $request->kadarkeuntungan * 100; - $keuntungan6bulan = $keuntungan_sebln * 6; - $keuntungan12bulan = $keuntungan_sebln * 12; - $hargajualan = $request->pinjaman + $keuntungan12bulan; - - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'kodcaw' => $auth_user['cawangan'], - 'nilaimarhun' => round($total_nilai_marhun, 2), - 'berat' => round($request->total_berat, 2), - 'pinjaman' => round($request->pinjaman, 2), - 'kadarupah' => round($kadarupah, 2), - 'marhun' => $request->marhun_detail, - 'percentpinj' => $margin_pinjaman, - 'teller'=> $auth_user['name'], - 'upah6' => $keuntungan6bulan, - 'upah12' => $keuntungan12bulan, - 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun, - ]); - - - $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ - 'unit_komuditi' => round($request->pinjaman, 2), - 'norujukan' => $norujukanbaru, - 'kodcaw' => $auth_user['cawangan'], - 'teller' => $auth_user['name'] - ]); - - //////////////////////////// - ////Update History Gadaian/// - //////////////////////////// - - $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'historygadaian' => $request->norujukan, - 'jenistebus' => $request->jenistebus, - ])->json(); - - $alirantunai = new AliranTunaiController(); event(new TebusNotify('lulus',Auth::user()->cawangan)); event(new GadaiNotify('lulus',Auth::user()->cawangan)); $alirantunai->alirantunaiTebusAutoTawarruq($request); - return response()->json($updatemarhun,200); + return response()->json($updatetebus['data'],200); } From 8383bb80c2f8115230008c392b079bc474992ced Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Sun, 17 Nov 2024 14:07:57 +0800 Subject: [PATCH 11/40] added rekod tunai in aliran tunai --- .../Controllers/AliranTunaiController.php | 19 + resources/views/aliran_tunai/index.blade.php | 10 + .../laporan/account_statement.blade.php | 493 ++++++++++++++++++ routes/web.php | 1 + 4 files changed, 523 insertions(+) create mode 100644 resources/views/aliran_tunai/laporan/account_statement.blade.php diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index 2e0d19d2..32acd648 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -677,5 +677,24 @@ class AliranTunaiController extends Controller return view('aliran_tunai.laporan.laporanrekodteller',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller','jenisserah')); } + public function LaporanAccStatement(Request $request){ + + $auth_user = Auth::user(); + $current = Carbon::now(); + $api_url = config('api.url'); + + $tarikh_cetak = $current->toDateString(); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $tarikh = date("Y-m-d", $request->tarikh); + + $acc_statement = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/record/accountstatement/' . $auth_user['cawangan'] ,['teller' => $auth_user['name'],'tarikh' => $tarikh])->json(); + + return view('aliran_tunai.laporan.account_statement',compact('tarikh_cetak','tarikh','cawangan_info','cawangan','api_url','cawangan_detail','acc_statement')); + } + } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index b19e2ea6..d1ebd87d 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -174,6 +174,7 @@ Pembiayaan Penebusan B/F + Tindakan @@ -187,6 +188,7 @@ {{ number_format($tp['keluar'],2) }} {{ number_format($tp['masuk'],2) }} {{ number_format($tp['baki'],2) }} + @endforeach @endif @@ -611,6 +613,14 @@ window.open(urlroute, '_blank'); } + function rec_acc_statement(tarikh){ + console.log(tarikh); + let urlroute = '{{ route("laporan.acc_statement" )}}'; + urlroute += '?tarikh=' + tarikh; + + window.open(urlroute, '_blank'); + } + let pusherenv = "{{ env('PUSHER_APP_KEY') }}"; let laporanroute = "{{ route('laporan.serahantellerberkala') }}"; let event_tellercash = "{{ route('event.tellercash') }}"; diff --git a/resources/views/aliran_tunai/laporan/account_statement.blade.php b/resources/views/aliran_tunai/laporan/account_statement.blade.php new file mode 100644 index 00000000..8cd75d0a --- /dev/null +++ b/resources/views/aliran_tunai/laporan/account_statement.blade.php @@ -0,0 +1,493 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
Laporan Kenyataan Akaun
+ + + + +
+ + +
ID {{ (Auth::user()->name) ? Auth::user()->name : ''}}
Tarikh Laporan {{ $tarikh }} Tarikh Cetak {{ $tarikh_cetak }}
+
+ + + + + + + + + + + + @foreach ($acc_statement as $acc) + + + + + + + @endforeach + +
TarikhDebitKreditNota
{{ $acc['tarikh'] }}{{ number_format($acc['tambah'],2) }}{{ number_format($acc['kurang'],2) }}{{ $acc['nota'] }}
+ +
+ + + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 46391193..d31216d0 100644 --- a/routes/web.php +++ b/routes/web.php @@ -88,6 +88,7 @@ Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanContr Route::get('/lelongan/{norujukan}',['as'=>'lelongan','uses' => 'LelongController@index'])->middleware('auth','teller'); Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller'); Route::get('/aliran_tunai/laporantunaiteller',['as'=>'laporan.tunaiteller','uses' => 'AliranTunaiController@LaporanTunaiTeller'])->middleware('auth','teller'); +Route::get('/aliran_tunai/account_statement',['as'=>'laporan.acc_statement','uses' => 'AliranTunaiController@LaporanAccStatement'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanserahan',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanserahanberkala',['as'=>'laporan.serahantellerberkala','uses' => 'AliranTunaiController@LaporanSerahanBerkala'])->middleware('auth','teller'); Route::get('/aliran_tunai/laporanalirantunai/{teller}',['as'=>'laporan.alirantunai','uses' => 'AliranTunaiController@LaporanAliranTunai'])->middleware('auth','teller'); From 89d3084bcd886a22aa99926046e34ba424beaa17 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 18 Nov 2024 00:32:06 +0800 Subject: [PATCH 12/40] commit error swal fire --- app/Http/Controllers/PenebusanController.php | 12 ++++---- resources/views/penebusan/v1/index.blade.php | 26 +++++++++++----- .../penebusan/v2/index-khazanah.blade.php | 30 ++++++++++++------- resources/views/penebusan/v2/index.blade.php | 27 ++++++++++++----- 4 files changed, 63 insertions(+), 32 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index f185a807..5a8b7008 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -459,13 +459,15 @@ class PenebusanController extends Controller "jenisAT" => $request->jenisAT, ])->json(); - $alirantunai = new AliranTunaiController(); - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $alirantunai->alirantunaiTebusAutoTawarruq($request); - return response()->json($updatetebus['data'],200); + if($updatetebus['result'] == 'success'){ + $alirantunai = new AliranTunaiController(); + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $alirantunai->alirantunaiTebusAutoTawarruq($request); + } + return response()->json($updatetebus['result'],200); } public function tebusseparuh(Request $request) diff --git a/resources/views/penebusan/v1/index.blade.php b/resources/views/penebusan/v1/index.blade.php index a5f3e0c6..12e7ad3c 100644 --- a/resources/views/penebusan/v1/index.blade.php +++ b/resources/views/penebusan/v1/index.blade.php @@ -2402,14 +2402,24 @@ var urlroute = '{{ route("resit.autotawarruq", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); - Swal.fire( - 'Berjaya!', - 'Tebus Auto Tawarruq Berjaya', - 'success' - ) .then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) + if(success_data == 'success'){ + Swal.fire( + 'Berjaya!', + 'Penyelesaian Pembiayaan Semula Berjaya', + 'success' + ) .then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + }else{ + Swal.fire( + 'Tidak Berjaya!', + 'Penyelesaian Pembiayaan Semula Tidak Berjaya!', + 'error' + ).then(function(){ + window.location.replace("{{ route('customer_info') }}"); + }); + } },error: function (request, status, error) { console.log(request.responseText); } diff --git a/resources/views/penebusan/v2/index-khazanah.blade.php b/resources/views/penebusan/v2/index-khazanah.blade.php index 677c3969..a99406b4 100644 --- a/resources/views/penebusan/v2/index-khazanah.blade.php +++ b/resources/views/penebusan/v2/index-khazanah.blade.php @@ -2660,17 +2660,25 @@ }, success:function(success_data){ - - var urlroute = '{{ route("resit.autotawarruq", ":id") }}'; - urlroute = urlroute.replace(':id', norujukan); - Swal.fire( - 'Berjaya!', - 'Penyelesaian Pembiayaan Semula Berjaya', - 'success' - ) .then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) + if(success_data == 'success'){ + var urlroute = '{{ route("resit.autotawarruq", ":id") }}'; + urlroute = urlroute.replace(':id', norujukan); + Swal.fire( + 'Berjaya!', + 'Penyelesaian Pembiayaan Semula Berjaya', + 'success' + ) .then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + }else{ + Swal.fire( + 'Tidak Berjaya!', + 'Penyelesaian Pembiayaan Semula Tidak Berjaya!', + 'error' + ); + } + },error: function (request, status, error) { console.log(request.responseText); } diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php index a31a109c..77b8d41b 100644 --- a/resources/views/penebusan/v2/index.blade.php +++ b/resources/views/penebusan/v2/index.blade.php @@ -3298,14 +3298,25 @@ var urlroute = '{{ route("resit.autotawarruq", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); - Swal.fire( - 'Berjaya!', - 'Penyelesaian Pembiayaan Semula Berjaya', - 'success' - ) .then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); - }) + if(success_data == 'success'){ + Swal.fire( + 'Berjaya!', + 'Penyelesaian Pembiayaan Semula Berjaya', + 'success' + ) .then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + }else{ + Swal.fire( + 'Tidak Berjaya!', + 'Penyelesaian Pembiayaan Semula Tidak Berjaya!', + 'error' + ).then(function(){ + window.location.replace("{{ route('customer_info') }}"); + }); + } + },error: function (request, status, error) { console.log(request.responseText); } From 56a957a3dc1399b8eb51eb3653172a1c49a8eb8d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 20 Nov 2024 23:31:53 +0800 Subject: [PATCH 13/40] added function to detect customers that underage --- resources/views/customers/v2/index.blade.php | 25 ++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index b151aea7..c96a8dba 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -1222,6 +1222,31 @@ var id_type = $('#customerIDType').val(); var nokp = $('#noic').val(); if(id_type=='nokp'){ + const date = nokp.substring(0, 6); + const year = parseInt(date.substring(0, 2), 10); + const month = parseInt(date.substring(2, 4), 10) - 1; + const day = parseInt(date.substring(4, 6), 10); + + const cutofYear = 10; + + const fullYear = year < cutofYear ? 2000 + year : 1900 + year; + const dateconvert = new Date(fullYear, month, day); + const today = new Date(); + + const eighteenthBirthday = new Date(dateconvert); + + eighteenthBirthday.setFullYear(dateconvert.getFullYear() + 18); + + if (today < eighteenthBirthday) { + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Pelanggan Ini Dibawah Umur!' + }); + event.preventDefault(); + return false; + } + if($.isNumeric(nokp) == false){ if(nokp.substr(-1) != '*') { From 9b23f52180bf68592d5caa0c8189cd34f0c7ecb0 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 21 Nov 2024 11:00:45 +0800 Subject: [PATCH 14/40] fix commit notification bawah umur --- resources/views/customers/v2/index.blade.php | 30 +++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index c96a8dba..28f95420 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -527,6 +527,34 @@ function newcustomer(){ var id_type = $('#customerIDType').val(); + var nokp = $('#noic').val(); + + const date = nokp.substring(0, 6); + const year = parseInt(date.substring(0, 2), 10); + const month = parseInt(date.substring(2, 4), 10) - 1; + const day = parseInt(date.substring(4, 6), 10); + + const cutofYear = 20; + + const fullYear = year < cutofYear ? 2000 + year : 1900 + year; + const dateconvert = new Date(fullYear, month, day); + const today = new Date(); + + const eighteenthBirthday = new Date(dateconvert); + + eighteenthBirthday.setFullYear(dateconvert.getFullYear() + 18); + console.log(today,eighteenthBirthday); + if (today < eighteenthBirthday) { + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Pelanggan Ini Dibawah Umur!' + }); + event.preventDefault(); + return false; + } + + if(id_type=='nokp'){ $('#daftar_pelanggan').modal('show'); }else if(id_type=='passport'){ @@ -1227,7 +1255,7 @@ const month = parseInt(date.substring(2, 4), 10) - 1; const day = parseInt(date.substring(4, 6), 10); - const cutofYear = 10; + const cutofYear = 20; const fullYear = year < cutofYear ? 2000 + year : 1900 + year; const dateconvert = new Date(fullYear, month, day); From c2b655bdde1835bc55db3b2d17e2020a0d9e43ec Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 25 Nov 2024 01:32:53 +0800 Subject: [PATCH 15/40] added tambah pinjaman --- app/Http/Controllers/PenebusanController.php | 177 ++++--------------- 1 file changed, 33 insertions(+), 144 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 5a8b7008..e6249966 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -279,157 +279,46 @@ class PenebusanController extends Controller //////////////////////// /// UPDATE TEBUS API//// /////////////////////// - $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetebus/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ - 'nopelanggan' => $request->nopelanggan, - 'jenistebus' => $request->jenistebus, - 'jbg' => $request->jbg, - 'kadarupah' => $request->kadarupah, - 'nilai_marhun' => $request->nilai_marhun, - 'pinjaman' => $request->pinjaman_lama, - 'ansuran' => $request->ansuran, - 'nowakil' => $request->nowakil, - 'addpinjaman'=> $request->addpinjaman, - 'bakipinjaman' => $request->bakipinjaman, - 'bakiupah' => $request->bakiupah, - 'historygadaian' => $request->historygadaian, - 'marhun' => $request->marhun, - 'jenisbayarantebus' => $request->jenisbayarantebus, - 'jeniskeuntungan' => $request->jeniskeuntungan, - 'teller' => $request->teller, - "duitpelanggan" => $request->bayaran, + $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetambahpinjaman/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ + "nopelanggan" => $request->nopelanggan, + "jenistebus" => $request->jenistebus, + "jbg" => $request->jbg, + "kadarupah" => $request->kadarupah, + "nilai_marhun" => $request->nilai_marhun, + "pinjaman" => $request->pinjaman, + "pinjaman_lama" => $request->pinjaman_lama, + "ansuran" => $request->ansuran, + "addpinjaman" => $request->addpinjaman, + "bakipinjaman" => $request->bakipinjaman, + "bakiupah" => $request->bakiupah, + "historygadaian" => $request->historygadaian, + "marhun" => $request->marhun, + "kuantiti_marhun" => $request->kuantiti_marhun, + "total_berat" => $request->total_berat, + "kadarkeuntungan" => $request->kadarkeuntungan, + "keuntungan_6bln" => $request->keuntungan_6bln, + "keuntungan_sebulan" => $request->keuntungan_sebulan, + "noic" => $request->noic, + "norujukan" => $request->norujukan, + "jenisbayarantebus" => $request->jenisbayarantebus, + "jeniskeuntungan" => $request->jeniskeuntungan, + "teller" => $request->teller, + "bayaran" => $request->bayaran, "bakipelanggan" => $request->bakipelanggan, + "nowakil" => isset($request->nowakil) ? $request->nowakil : 0 ])->json(); - - ////////////////////// - /// MAKING NEW SAG//// - ///////////////////// - - $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); - if($gadai_transaction){ - $new_sirig = $gadai_transaction['sirig'] + 1; - - }else{ - $new_sirig = 1; + + if($updatetebus['result'] == 'success'){ + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $this->AliranTunaiController->alirantunaiTebus($request); } - - $new_transaction = sprintf("%04d",$new_sirig); - $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'nopelanggan' => $request->nopelanggan, - 'nokp' => $request->noic, - 'sirig' => $new_sirig - ]); - - /////////////////////////// - /// MARHUN UPDATE TABLE//// - ////////////////////////// - - - $arraymarhunbaru = []; - - $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); - - $marhunyangdiambil = $marhunsediada[0]; - foreach($marhunyangdiambil as $index=>$marhunloop) - { - $karatbaru = str_replace('.','-',$marhunloop['karat']); - $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); - - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); - } - - foreach($arraymarhunbaru as $array1){ - $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'marhun' => $array1['marhun'], - 'nota' => $array1['nota'], - 'karat' => $array1['karat'], - 'berat_emas' => $array1['berat'], - 'harga' => $array1['harga'], - 'tag_permata' => $array1['tag_permata'], - 'berat_batu_permata' => $array1['berat_batu_permata'], - 'nilai_marhun' => $array1['n_marhun'] - ])->json(); - } - - - - ////////////////////// - ////Update SAG BARU/// - ///////////////////// - - $total_nilai_marhun = $request->nilai_marhun; - $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; - $kadarupah = $request->kadarkeuntungan * 100; - - $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ - 'pembiayaan' => $request->pinjaman, - 'nilaimarhun' => $total_nilai_marhun, - 'kadarujrah' => $request->kadarkeuntungan, - 'margin' => ($margin_pinjaman*100), - 'kodcaw' => Auth::user()->cawangan - ])->json(); - - $keuntungan_sebln = $onepercent['keuntungan']; - $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); - $keuntungan6bulan = $keuntungan_sebln * 6; - $keuntungan12bulan = $keuntungan_sebln * 12; - $hargajualan = $request->pinjaman + $keuntungan12bulan; - - - - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'kodcaw' => $auth_user['cawangan'], - 'nilaimarhun' => round($total_nilai_marhun, 2), - 'berat' => round($request->total_berat, 2), - 'pinjaman' => round($request->pinjaman, 2), - 'kadarupah' => round($kadarupah, 2), - 'marhun' => $request->marhun, - 'percentpinj' => $margin_pinjaman, - 'teller'=> $auth_user['name'], - 'upah6' => $keuntungan6bulan, - 'upah12' => $keuntungan12bulan, - 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun - ])->json(); - - $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ - 'unit_komuditi' => round($request->pinjaman, 2), - 'norujukan' => $norujukanbaru, - 'kodcaw' => $auth_user['cawangan'], - 'teller' => $auth_user['name'] - ]); - - //////////////////////////// - ////Update History Gadaian/// - //////////////////////////// - - $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'historygadaian' => $request->norujukan, - 'jenistebus' => $request->jenistebus, - ])->json(); - - - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $this->AliranTunaiController->alirantunaiTebus($request); - + return response()->json($updatetebus['result'],200); } public function tebusautotawarruq(Request $request) { - $api_url = config('api.url'); - $current = Carbon::now(); - $current = new Carbon(); - $curent_year = substr($current->year,2,2); - $curent_month = sprintf("%02d", $current->month); - $current_day = sprintf("%02d", $current->day); - + dd($request->all()); $auth_user = Auth::user(); //////////////////////// From fd0f28432da86822c77d24300534a87d8634af9f Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 25 Nov 2024 12:13:03 +0800 Subject: [PATCH 16/40] added parameter to call in api for tebus pinjaman and auto tawarruq --- app/Http/Controllers/PenebusanController.php | 261 +------------------ 1 file changed, 13 insertions(+), 248 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index d489d3cf..d97527cc 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -280,7 +280,7 @@ class PenebusanController extends Controller //////////////////////// /// UPDATE TEBUS API//// /////////////////////// - $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetambahpinjaman/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ + $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetambahpinjaman/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ "nopelanggan" => $request->nopelanggan, "jenistebus" => $request->jenistebus, "jbg" => $request->jbg, @@ -309,140 +309,24 @@ class PenebusanController extends Controller "nowakil" => isset($request->nowakil) ? $request->nowakil : 0 ])->json(); - if($updatetebus == 'duplicate'){ - return response()->json('duplicate'); + + if($updatetebus['result'] == 'success'){ + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $this->AliranTunaiController->alirantunaiTebus($request); } - - ////////////////////// - /// MAKING NEW SAG//// - ///////////////////// - - $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); - if($gadai_transaction){ - $new_sirig = $gadai_transaction['sirig'] + 1; - - }else{ - $new_sirig = 1; - } - - $new_transaction = sprintf("%04d",$new_sirig); - $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'nopelanggan' => $request->nopelanggan, - 'nokp' => $request->noic, - 'sirig' => $new_sirig - ]); - - /////////////////////////// - /// MARHUN UPDATE TABLE//// - ////////////////////////// - - - $arraymarhunbaru = []; - - $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); - - $marhunyangdiambil = $marhunsediada[0]; - foreach($marhunyangdiambil as $index=>$marhunloop) - { - $karatbaru = str_replace('.','-',$marhunloop['karat']); - $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); - - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); - } - - foreach($arraymarhunbaru as $array1){ - $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'marhun' => $array1['marhun'], - 'nota' => $array1['nota'], - 'karat' => $array1['karat'], - 'berat_emas' => $array1['berat'], - 'harga' => $array1['harga'], - 'tag_permata' => $array1['tag_permata'], - 'berat_batu_permata' => $array1['berat_batu_permata'], - 'kuantiti' => $array1['bil'] - ])->json(); - } - - - - ////////////////////// - ////Update SAG BARU/// - ///////////////////// - - $total_nilai_marhun = $request->nilai_marhun; - $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; - $kadarupah = $request->kadarkeuntungan * 100; - - $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ - 'pembiayaan' => $request->pinjaman, - 'nilaimarhun' => $total_nilai_marhun, - 'kadarujrah' => $request->kadarkeuntungan, - 'margin' => ($margin_pinjaman*100), - 'kodcaw' => Auth::user()->cawangan - ])->json(); - - $keuntungan_sebln = $onepercent['keuntungan']; - $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); - $keuntungan6bulan = $keuntungan_sebln * 6; - $keuntungan12bulan = $keuntungan_sebln * 12; - $hargajualan = $request->pinjaman + $keuntungan12bulan; - - - - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'kodcaw' => $auth_user['cawangan'], - 'nilaimarhun' => round($total_nilai_marhun, 2), - 'berat' => round($request->total_berat, 2), - 'pinjaman' => round($request->pinjaman, 2), - 'kadarupah' => round($kadarupah, 2), - 'marhun' => $request->marhun, - 'percentpinj' => $margin_pinjaman, - 'teller'=> $auth_user['name'], - 'upah6' => $keuntungan6bulan, - 'upah12' => $keuntungan12bulan, - 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun - ])->json(); - - $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ - 'unit_komuditi' => round($request->pinjaman, 2), - 'norujukan' => $norujukanbaru, - 'kodcaw' => $auth_user['cawangan'], - 'teller' => $auth_user['name'] - ]); - - //////////////////////////// - ////Update History Gadaian/// - //////////////////////////// - - $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'historygadaian' => $request->norujukan, - 'jenistebus' => $request->jenistebus, - ])->json(); - - - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $this->AliranTunaiController->alirantunaiTebus($request); + return response()->json($updatetebus['result'],200); } public function tebusautotawarruq(Request $request) { - dd($request->all()); $auth_user = Auth::user(); //////////////////////// /// UPDATE TEBUS API//// /////////////////////// - $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ + $updatetebus = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updateautotawarruq/'. $auth_user['cawangan'] .'/' . $request->norujukan,[ 'nopelanggan' => $request->nopelanggan, 'jenistebus' => $request->jenistebus, 'jbg' => $request->jbg, @@ -465,131 +349,12 @@ class PenebusanController extends Controller "noic" => $request->noic, "jenisAT" => $request->jenisAT, ])->json(); - - if($updatetebus == 'duplicate'){ - return response()->json('duplicate'); + if($updatetebus['result'] == 'success'){ + $alirantunai = new AliranTunaiController(); + event(new TebusNotify('lulus',Auth::user()->cawangan)); + event(new GadaiNotify('lulus',Auth::user()->cawangan)); + $alirantunai->alirantunaiTebusAutoTawarruq($request); } - - ////////////////////// - /// MAKING NEW SAG//// - ///////////////////// - $gadai_transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/'. $auth_user['cawangan'] . '/' . $current->toDateString())->json(); - if($gadai_transaction){ - $new_sirig = $gadai_transaction['sirig'] + 1; - - }else{ - $new_sirig = 1; - } - - $new_transaction = sprintf("%04d",$new_sirig); - $norujukanbaru = strtoupper($auth_user['cawangan']) . $curent_year . $curent_month . $current_day . '-' .$new_transaction; - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/gadai/'.$auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'nopelanggan' => $request->nopelanggan, - 'nokp' => $request->noic, - 'sirig' => $new_sirig - ]); - - /////////////////////////// - /// MARHUN UPDATE TABLE//// - ////////////////////////// - - $arraymarhunbaru = []; - - $marhunsediada = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); - - $marhunyangdiambil = $marhunsediada[0]; - foreach($marhunyangdiambil as $index=>$marhunloop) - { - $karatbaru = str_replace('.','-',$marhunloop['karat']); - $hargabaru = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $harga = ($request->jenisAT == 'hargalama') ? $marhunloop['harga'] : $hargabaru['harga']; - $nilaimarhun = (floatval($harga) * floatval($marhunloop['berat'])); - - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"tag_permata" => $marhunloop['tag_permata'],"berat_batu_permata" => $marhunloop['berat_batu_permata'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $harga, "n_marhun" => $nilaimarhun]); - } - - foreach($arraymarhunbaru as $array1){ - $updatemarhun = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/marhun/'. $auth_user['cawangan'],[ - 'norujukan' => $norujukanbaru, - 'marhun' => $array1['marhun'], - 'nota' => $array1['nota'], - 'karat' => $array1['karat'], - 'berat_emas' => $array1['berat'], - 'harga' => $array1['harga'], - 'nilai_marhun' => $array1['n_marhun'], - 'tag_permata' => $array1['tag_permata'], - 'berat_batu_permata' => $array1['berat_batu_permata'], - 'jenisAT' => $request->jenisAT - 'kuantiti' => $array1['bil'] - ])->json(); - } - - ////////////////////// - ////Update SAG BARU/// - ///////////////////// - - - $total_nilai_marhun = $request->total_nilai_marhun; - $margin_pinjaman = ($request->pinjaman / $total_nilai_marhun); - - $onepercent = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url').'/api/onepercent',[ - 'pembiayaan' => $request->pinjaman, - 'nilaimarhun' => $total_nilai_marhun, - 'kadarujrah' => $request->kadarkeuntungan, - 'margin' => ($margin_pinjaman*100), - 'kodcaw' => Auth::user()->cawangan - ])->json(); - - $keuntungan_sebln = $onepercent['keuntungan']; - $keuntungan_sebln = str_replace(',','',$keuntungan_sebln); - - $kadarupah = $request->kadarkeuntungan * 100; - $keuntungan6bulan = $keuntungan_sebln * 6; - $keuntungan12bulan = $keuntungan_sebln * 12; - $hargajualan = $request->pinjaman + $keuntungan12bulan; - - - $gadai = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'kodcaw' => $auth_user['cawangan'], - 'nilaimarhun' => round($total_nilai_marhun, 2), - 'berat' => round($request->total_berat, 2), - 'pinjaman' => round($request->pinjaman, 2), - 'kadarupah' => round($kadarupah, 2), - 'marhun' => $request->marhun_detail, - 'percentpinj' => $margin_pinjaman, - 'teller'=> $auth_user['name'], - 'upah6' => $keuntungan6bulan, - 'upah12' => $keuntungan12bulan, - 'hargajualan' => $hargajualan, - 'kuantiti_marhun' => $request->kuantiti_marhun, - ]); - - - $komuditi = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/komuditi/transaksi',[ - 'unit_komuditi' => round($request->pinjaman, 2), - 'norujukan' => $norujukanbaru, - 'kodcaw' => $auth_user['cawangan'], - 'teller' => $auth_user['name'] - ]); - - //////////////////////////// - ////Update History Gadaian/// - //////////////////////////// - - $updatehistorygadaian = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/gadai/updatehistory/'. $auth_user['cawangan'] .'/' . $norujukanbaru,[ - 'historygadaian' => $request->norujukan, - 'jenistebus' => $request->jenistebus, - ])->json(); - - - $alirantunai = new AliranTunaiController(); - event(new TebusNotify('lulus',Auth::user()->cawangan)); - event(new GadaiNotify('lulus',Auth::user()->cawangan)); - $alirantunai->alirantunaiTebusAutoTawarruq($request); - return response()->json($updatetebus['result'],200); } From b4c1267932440dfa86776653ba6f5046a7a34721 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 25 Nov 2024 12:20:28 +0800 Subject: [PATCH 17/40] added wakil in tambah pinjaman --- resources/views/penebusan/v2/index.blade.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php index 77b8d41b..e99f3a02 100644 --- a/resources/views/penebusan/v2/index.blade.php +++ b/resources/views/penebusan/v2/index.blade.php @@ -3201,6 +3201,15 @@ function gadaiautotawarruq() { + var jenisbayarantebus = ''; + if(hargajualan == '') + { + jenisbayarantebus = "nottawarruq"; + } + else if (hargajualan != ''){ + jenisbayarantebus = "tawarruq"; + } + let jeniskeuntungan = (tagbaru == 1) ? 'onepercent' : 'asal'; var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = 'AT'; @@ -3274,7 +3283,7 @@ "historygadaian" : historygadaian, "marhun" : marhun, "nowakil" : nowakil, - "jenisbayarantebus" : "nottawarruq", + "jenisbayarantebus" : jenisbayarantebus, "teller" : teller, "jeniskeuntungan" : jeniskeuntungan, @@ -3517,7 +3526,8 @@ var total_berat = parseFloat("{{ $gadai['berat'] }}"); var kuantiti_marhun = Number("{{sizeof($marhun)}}"); var noic = "{{ $gadai['nokp'] }}"; - + var nowakil = nw; + var duitpelanggan = $('#duitPelanggan').val().replace(/[^0-9.-]+/g,""); var bakipelanggan = $('#bakiPelanggan').val().replace(/[^0-9.-]+/g,""); @@ -3579,6 +3589,7 @@ "teller" : teller, "bayaran" : duitpelanggan, "bakipelanggan" : bakipelanggan, + "nowakil" : nowakil, }, success:function(success_data){ From 644354808144cb997e58128fd13dd44bb66ff98f Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Sun, 1 Dec 2024 14:15:15 +0800 Subject: [PATCH 18/40] update pekerjaan lain-lain --- app/Http/Controllers/CustomersController.php | 14 ++-- app/Http/Controllers/KhazanahController.php | 72 ++++++++++--------- resources/views/admin/customer_info.blade.php | 4 +- resources/views/callcenter/index.blade.php | 18 ++--- resources/views/customers/v2/index.blade.php | 49 ++++++++----- resources/views/customers/v2/info.blade.php | 72 +++++++++++++++---- resources/views/khazanah/index.blade.php | 11 ++- resources/views/khazanah/v2/info.blade.php | 53 ++++++++++++-- 8 files changed, 203 insertions(+), 90 deletions(-) diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index f86df085..c5b978d0 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -40,9 +40,10 @@ class CustomersController extends Controller $idtype = 'nokp'; $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json(); + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); $blacklist_search = false; - return view('customers.' . $cawangan_info['version'] . '.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype')); + return view('customers.' . $cawangan_info['version'] . '.index',compact('search','blacklist_search','cawangan_info','bank','api_url','idtype','pekerjaan')); } public function info(Request $request){ @@ -51,7 +52,8 @@ class CustomersController extends Controller $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); - + // dd($customer_info); + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); $komoditi = Komoditi::first(); $min_komoditi = $komoditi['min_komoditi']; @@ -68,7 +70,7 @@ class CustomersController extends Controller $request->session()->flash('activate_tab', 'SAG_baru'); } - return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi')); + return view($customer_page,compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi','pekerjaan')); } public function search(Request $request){ @@ -81,6 +83,7 @@ class CustomersController extends Controller $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/bank')->json(); $customer_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json(); + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); $blacklist = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customer/blacklist',[ 'nokp' => $noic @@ -105,9 +108,9 @@ class CustomersController extends Controller }else{ if($blacklist){ $blacklist_search = true; - return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype','pekerjaan')); }else{ - return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype')); + return view('customers.' . $cawangan_info['version'] . '.index',compact('blacklist_search','customer_info','search','noic','cawangan_info','bank','api_url','idtype','pekerjaan')); } } } @@ -219,6 +222,7 @@ class CustomersController extends Controller 'nosiri' => $nosiri_latest, 'nota'=>$request->nota, 'kodkerja'=>$request->pekerjaan, + 'nota_pekerjaan'=>$request->nota_pekerjaan, 'tujuangadai'=>$request->tujuan_gadai, ]); diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 16838c92..fea5a66d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -78,15 +78,17 @@ class KhazanahController extends Controller Session::put('customer_info_khazanah',$customer_info); if($auth_user->roles == 'admin'){ return redirect()->route('admin.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); - }else{ - return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); } + return redirect()->route('khazanah.customer_info')->with( ['customer_info' => $customer_info,'cawangan_info'=>$cawangan_info,'api_url'=>$api_url]); + + // return redirect()->back()->with('failed','Maaf,Tiada Data Pelanggan...'); + }else{ if($auth_user->roles == 'admin'){ return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype')); - }else{ - return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype')); } + // return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype')); + return redirect()->back()->with('failed','Maaf,Tiada Data Pelanggan...'); } } @@ -2181,7 +2183,7 @@ class KhazanahController extends Controller $tarikh_cetak = $current->toDateString(); $kod_cawangan = $auth_user['cawangan']; - + if($request->dateringkasanharian == null){ $startDate = $current->toDateString(); }else{ @@ -2195,22 +2197,22 @@ class KhazanahController extends Controller $split_date = explode('-',$request->dateringkasanharian); $endDate = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - + $laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[ 'startDate' => $startDate, 'endDate' => $endDate, - ])->json(); - + ])->json(); + $laporan = $laporan_ringkasan[0]; - + $kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [ 'startDate' => $startDate, 'endDate' => $endDate, ])->json(); - + /* Kawalan Stok */ //Gadai $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil']; @@ -2424,11 +2426,11 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - + $data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json(); $data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json(); $data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json(); - + return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter')); } @@ -3135,34 +3137,34 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - + if($request->datetimepicker1 == null){ $gadai_date = $current->toDateString(); } else { $split_date = explode('-', $request->datetimepicker1); $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + // Fetching the data from API $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date]) ->json(); - + $cawangan = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan']) ->json(); - + // Check if $tuntutbaki is an array and not empty before sending it to the view if (!is_array($tuntutbaki) || empty($tuntutbaki)) { $tuntutbaki = []; // If not valid, set it to an empty array } - - $cawangan_detail = $cawangan[0] ?? null; - + + $cawangan_detail = $cawangan[0] ?? null; + return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url')); } - - + + @@ -4315,12 +4317,12 @@ class KhazanahController extends Controller if($request->datetimepicker2 == null){ $tarikh_cetak = $current->toDateString(); }else{ - $split_date = explode('-',$request->datetimepicker2); - $tarikh_imbangan2 = $request->datetimepicker2; + $split_date = explode('-',$request->datetimepicker2); + $tarikh_imbangan2 = $request->datetimepicker2; } $tarikh_imbangan2 = new Carbon($tarikh_imbangan2); - + // if($tarikh_imbangan2 < $current->toDateString()){ if($tarikh_imbangan2 < $current->toDateString()){ @@ -4374,12 +4376,12 @@ class KhazanahController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - + $stokaudit_aktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); - $stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); - + $stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); + // return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); - + return view('print.laporan_stokauditcombine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); } @@ -4466,7 +4468,7 @@ class KhazanahController extends Controller $cawangan_detail=$cawangan[0]; return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet')); } - + public function laporanAnsuranUjrah(){ $auth_user = Auth::user(); $api_url = config('api.url'); @@ -4496,12 +4498,12 @@ class KhazanahController extends Controller $split_date = explode('-', $request->datehingga); $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuranujrah/laporan/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); - } + } public function laporanStokAuditKhas(){ $auth_user = Auth::user(); @@ -4549,7 +4551,7 @@ class KhazanahController extends Controller $cawangan_detail=$cawangan[0]; $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokauditkhas/aktif/'. $auth_user['cawangan'],['daritempoh' => $daritempoh, 'hinggatempoh' => $hinggatempoh])->json(); - + if($request->type == 'excel') { return view('excel.excel_stokauditkhas', compact('stokaudit','cawangan_detail','tarikh_cetak','daritempoh','hinggatempoh','api_url','cawangan_info')); @@ -4567,7 +4569,7 @@ class KhazanahController extends Controller return redirect()->route('laporan.stokauditkhas') ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.'); } - + } else { @@ -4693,7 +4695,7 @@ class KhazanahController extends Controller $kodcaw = $auth_user['cawangan']; $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json(); $bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/cawangan/bycawnotisperingatan/'.$auth_user['cawangan'].'/'.$notisid)->json(); - + return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url')); } diff --git a/resources/views/admin/customer_info.blade.php b/resources/views/admin/customer_info.blade.php index 84006722..5d939386 100644 --- a/resources/views/admin/customer_info.blade.php +++ b/resources/views/admin/customer_info.blade.php @@ -145,10 +145,10 @@ -
+ {{--
-
+
--}} diff --git a/resources/views/callcenter/index.blade.php b/resources/views/callcenter/index.blade.php index 909a8dc3..c707dc73 100644 --- a/resources/views/callcenter/index.blade.php +++ b/resources/views/callcenter/index.blade.php @@ -46,7 +46,7 @@ - +
@@ -56,14 +56,14 @@ @if ($message = Session::get('success')) -
-

{{ $message }}

-
- @elseif ($message = Session::get('failed')) -
-

{{ $message }}

-
- @endif +
+

{{ $message }}

+
+ @elseif ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif @if($search == true ) diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index b151aea7..debe3783 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -182,23 +182,23 @@
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
-
+
-
@@ -321,16 +321,17 @@
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
@@ -446,16 +447,17 @@
Pekerjaan
- @php - $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); - @endphp +
- @foreach($pekerjaan as $kerja) - + @endforeach +
Nota
@@ -1281,6 +1283,17 @@ + @push('additional_scripts') @endpush -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 2fe50245..ed868981 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -121,13 +121,13 @@
- + +
+ - -
@@ -143,14 +143,14 @@ +
- + - +
@@ -345,6 +345,27 @@
+
+
+ Pekerjaan +
+
+ @php + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); + @endphp + +
+ +
+
+
No Akaun @@ -2500,6 +2521,8 @@ $('#telefon').attr('readonly', false); $('#telefon2').attr('readonly', false); $('#kodbank').attr('disabled', false); + $('#kodkerja').attr('disabled', false); + $('#nota_pekerjaan').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); $('#alamat').attr('readonly', false); @@ -2521,6 +2544,8 @@ $('#telefon').attr('readonly', true); $('#telefon2').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); $('#alamat').attr('readonly', true); @@ -2534,6 +2559,8 @@ var telefon1 = $('#telefon').val(); var telefon2 = $('#telefon2').val(); var kodbank = $('#kodbank').val(); + var kodkerja = $('#kodkerja').val(); + var nota_pekerjaan = $('#nota_pekerjaan').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); var alamat = $('#alamat').val(); @@ -2547,6 +2574,8 @@ "telefon1": telefon1, "telefon2": telefon2, "kodbank":kodbank, + "kodkerja":kodkerja, + "nota_pekerjaan":nota_pekerjaan, "noakaun":noakaun, 'nota':nota, 'alamat':alamat, @@ -2631,6 +2660,8 @@ $('#telefon2').attr('readonly', true); $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#nota').attr('readonly', true); $('#alamat').attr('readonly', true); $('#poskod').attr('readonly', true); @@ -2676,7 +2707,7 @@ }); async function removeansuran(event){ - + let ansid = $('input[name="belum"]:checked').val(); let harini = new Date();harini.setHours(0, 0, 0, 0); @@ -2687,7 +2718,7 @@ text: 'Ansuran untuk Pembiayaan Belum Selesai Sahaja!' }); - return false; + return false; } if(ansid == null && $("input[name='options']:checked").val() == 'belum_tebus'){ @@ -2710,7 +2741,7 @@ let ansuranlatest = await fetch(api_url + '/admin/ansuran/getLatest?' + queryString) .then(response => response.json()) .then(response => {return response}); - + if(Object.keys(ansuranlatest).length == 0){ Swal.fire({ icon: 'error', @@ -2728,9 +2759,9 @@ }catch(error){ console.error("Error:", error); } - - - + + + } @@ -2743,7 +2774,7 @@ } async function getKelulusanKhazanahOperasi(textstatus = 'none',norujukan){ - + const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -2810,7 +2841,7 @@ }) .then(response => response.json()) .then(response => {return response}); - + return siricreated; }else if (result.dismiss === Swal.DismissReason.cancel){ @@ -2904,7 +2935,7 @@ }).then(()=>{ location.reload(); }); - + }catch(error){ Swal.fire({ @@ -2915,4 +2946,15 @@ } } + @endsection diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php index 9423656e..d161ad5c 100644 --- a/resources/views/khazanah/index.blade.php +++ b/resources/views/khazanah/index.blade.php @@ -33,13 +33,22 @@
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @elseif ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif
diff --git a/resources/views/khazanah/v2/info.blade.php b/resources/views/khazanah/v2/info.blade.php index e558cbaa..b45c2bfc 100644 --- a/resources/views/khazanah/v2/info.blade.php +++ b/resources/views/khazanah/v2/info.blade.php @@ -122,13 +122,13 @@
- + +
+ - -
@@ -142,7 +142,7 @@ +
@@ -332,6 +332,27 @@ +
+
+ Pekerjaan +
+
+ @php + $pekerjaan = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/pekerjaan')->json(); + @endphp + +
+ +
+
+
No Akaun @@ -869,7 +890,7 @@ $.each(data,function(index,gadai_detail){ let histid = $('input[name="sudahtebus"]:checked').val(); let checkps = await checkPS(histid); - + if(histid == null){ Swal.fire({ icon: 'error', @@ -1383,6 +1404,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon').attr('readonly', false); $('#telefon2').attr('readonly', false); $('#kodbank').attr('disabled', false); + $('#kodkerja').attr('disabled', false); + $('#nota_pekerjaan').attr('disabled', false); $('#noakaun').attr('readonly', false); $('#nota').attr('readonly', false); $('#nama').attr('readonly', false); @@ -1404,6 +1427,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon').attr('readonly', true); $('#telefon2').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#noakaun').attr('readonly', true); $('#nota').attr('readonly', true); $('#nama').attr('readonly', true); @@ -1427,6 +1452,8 @@ $.each(data,function(index,gadai_detail){ var telefon1 = $('#telefon').val(); var telefon2 = $('#telefon2').val(); var kodbank = $('#kodbank').val(); + var kodkerja = $('#kodkerja').val(); + var nota_pekerjaan = $('#nota_pekerjaan').val(); var noakaun = $('#noakaun').val(); var nota = $('#nota').val(); var nama = $('#nama').val(); @@ -1441,6 +1468,8 @@ $.each(data,function(index,gadai_detail){ "telefon1": telefon1, "telefon2": telefon2, "kodbank":kodbank, + "kodkerja":kodkerja, + "nota_pekerjaan":nota_pekerjaan, "noakaun":noakaun, 'nota':nota, 'nama':nama, @@ -1526,6 +1555,8 @@ $.each(data,function(index,gadai_detail){ $('#telefon2').attr('readonly', true); $('#noakaun').attr('readonly', true); $('#kodbank').attr('disabled', true); + $('#kodkerja').attr('disabled', true); + $('#nota_pekerjaan').attr('disabled', true); $('#nota').attr('readonly', true); $('#nama').attr('readonly', true); $('#alamat').attr('readonly', true); @@ -1580,4 +1611,16 @@ $.each(data,function(index,gadai_detail){ }); }); + + @endsection From b0269fab397eee8a20623f0525153d84ed7461b0 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Wed, 4 Dec 2024 22:22:01 +0800 Subject: [PATCH 19/40] update message di khazanah dan importan work --- app/Http/Controllers/KhazanahController.php | 2 +- resources/views/customers/v2/index.blade.php | 3 ++- resources/views/customers/v2/info.blade.php | 3 ++- resources/views/khazanah/v2/info.blade.php | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index fea5a66d..cf6f0834 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -88,7 +88,7 @@ class KhazanahController extends Controller return view('admin.customer_index',compact('search','noic','cawangan_info','bank','api_url','idtype')); } // return view('khazanah.index',compact('search','noic','cawangan_info','bank','api_url','idtype')); - return redirect()->back()->with('failed','Maaf,Tiada Data Pelanggan...'); + return redirect()->back()->with('failed','Maaf, hanya taraf teller sahaja yang boleh mendaftar'); } } diff --git a/resources/views/customers/v2/index.blade.php b/resources/views/customers/v2/index.blade.php index debe3783..37680cdb 100644 --- a/resources/views/customers/v2/index.blade.php +++ b/resources/views/customers/v2/index.blade.php @@ -191,7 +191,8 @@ @endforeach
Nota
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index ed868981..e7d18edb 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -362,7 +362,8 @@ @endforeach
- +
diff --git a/resources/views/khazanah/v2/info.blade.php b/resources/views/khazanah/v2/info.blade.php index b45c2bfc..1be8e8aa 100644 --- a/resources/views/khazanah/v2/info.blade.php +++ b/resources/views/khazanah/v2/info.blade.php @@ -349,7 +349,8 @@ @endforeach
- +
From ca1ccb6469e24276b939414225a104f0eb065639 Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Mon, 9 Dec 2024 15:25:35 +0800 Subject: [PATCH 20/40] feat Log Masuk & Keluar Sistem --- app/Http/Controllers/Auth/LoginController.php | 17 +++++++++++++ app/Http/Controllers/HomeController.php | 24 +++++++++++++++++-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index c62fa885..f29fcc28 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http; use App\Dashboard; use App\User; +use Carbon\Carbon; class LoginController extends Controller { @@ -62,6 +63,7 @@ class LoginController extends Controller $credentials = $request->only('email', 'password'); if (Auth::guard('web')->attempt($credentials)) { + $auth_user = Auth::guard('web')->user(); $api_url = config('api.url'); if($auth_user['roles'] == 'teller'){ @@ -147,8 +149,23 @@ class LoginController extends Controller } public function logout(){ + $current = Carbon::now(); + $current = new Carbon(); + $current = $current->toDateString(); + $auth_user = Auth::guard('web')->user(); Auth::logout(); Session::flush(); + $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logoutsession/' . $auth_user['cawangan'], [ + 'id' => $auth_user['id'], + 'nama' => $auth_user['name'], + 'nokp' => $auth_user['no_kp'], + 'email' => $auth_user['email'], + 'taraf' => $auth_user['role_harian'], + 'tarikh' => $current, + + + ]); + return Redirect::to('/'); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d96f40b8..1a600d98 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -35,13 +35,13 @@ class HomeController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); - + $check_nokp = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/checknokp/' . $auth_user['cawangan'] . '/' . $auth_user['no_kp'] . '/' . $current) ->json(); if($check_nokp == $auth_user['no_kp']){ - + if(session()->has('iklan') && session()->get('iklan') == 0) { session()->put('iklan', 1); @@ -75,10 +75,30 @@ class HomeController extends Controller $countkhazanah = sizeof($gadai) + sizeof($listserah); + $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [ + 'id' => $auth_user['id'], + 'nama' => $auth_user['name'], + 'nokp' => $auth_user['no_kp'], + 'email' => $auth_user['email'], + 'taraf' => $auth_user['role_harian'], + 'tarikh' => $current, + + + ]); return view('homepage.khazanah.home',compact('cawangan_info','api_url','countkhazanah')); } else{ $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $session = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/logsession/' . $auth_user['cawangan'], [ + 'id' => $auth_user['id'], + 'nama' => $auth_user['name'], + 'nokp' => $auth_user['no_kp'], + 'email' => $auth_user['email'], + 'taraf' => $auth_user['role_harian'], + 'tarikh' => $current, + + + ]); return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','api_url')); } From a06e5539142ecf236e9f2c1c09748bc9958ef958 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Sun, 15 Dec 2024 12:13:56 +0800 Subject: [PATCH 21/40] fix bug fix --- app/Http/Controllers/PenebusanController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index d97527cc..194574cb 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -333,6 +333,7 @@ class PenebusanController extends Controller 'kadarupah' => $request->kadarupah, 'nilai_marhun' => $request->nilai_marhun, 'pinjaman' => $request->pinjaman_lama, + 'pinjamanbaru' => $request->pinjaman, 'ansuran' => $request->ansuran, 'addpinjaman'=> $request->addpinjaman, 'bakipinjaman' => $request->bakipinjaman, @@ -454,8 +455,8 @@ class PenebusanController extends Controller 'harga' => $array1['harga'], 'tag_permata' => $array1['tag_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'], - 'nilai_marhun' => $array1['n_marhun'] - 'kuantiti' => $array1['bil'] + 'nilai_marhun' => $array1['n_marhun'], + 'kuantiti' => $array1['bil'] ])->json(); } From 38e4e404ff96372b463fe85464970e5c474028fa Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 16 Dec 2024 21:58:59 +0800 Subject: [PATCH 22/40] added tambahpinjam --- app/Http/Controllers/PenebusanController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 194574cb..d60a0bae 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -12,6 +12,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Illuminate\Support\Facades\Auth; use App\Http\Controllers\AliranTunaiController; +use Illuminate\Support\Facades\Log; use Carbon\Carbon; @@ -286,8 +287,8 @@ class PenebusanController extends Controller "jbg" => $request->jbg, "kadarupah" => $request->kadarupah, "nilai_marhun" => $request->nilai_marhun, - "pinjaman" => $request->pinjaman, - "pinjaman_lama" => $request->pinjaman_lama, + "pinjamanbaru" => $request->pinjaman, + "pinjaman" => $request->pinjaman_lama, "ansuran" => $request->ansuran, "addpinjaman" => $request->addpinjaman, "bakipinjaman" => $request->bakipinjaman, From 834737ee3b81d450b88b9097e2db45126147a599 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Thu, 26 Dec 2024 08:49:39 +0800 Subject: [PATCH 23/40] add record password --- app/Http/Controllers/ChangePasswordController.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/app/Http/Controllers/ChangePasswordController.php b/app/Http/Controllers/ChangePasswordController.php index 8ddc49a5..93a1b0fd 100644 --- a/app/Http/Controllers/ChangePasswordController.php +++ b/app/Http/Controllers/ChangePasswordController.php @@ -8,6 +8,7 @@ use App\Rules\MatchOldPassword; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Http; use App\User; +use Carbon\Carbon; class ChangePasswordController extends Controller { @@ -28,7 +29,10 @@ class ChangePasswordController extends Controller */ public function index() { + + $auth_user = Auth::user(); + // dd($cawangan_info); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); return view('user.update_password',compact('cawangan_info')); } @@ -40,12 +44,19 @@ class ChangePasswordController extends Controller */ public function store(Request $request) { + $auth_user = Auth::user(); $request->validate([ 'current_password' => ['required', new MatchOldPassword], 'new_password' => ['required'], 'new_confirm_password' => ['same:new_password'], ]); + $id = auth()->user()->id; + + // dd($auth_user['name']); + + $auth_user = Http::withOptions(['verify' => config('app.api_verify')]) ->post(config('api.url') . '/api/changepassword/' . $auth_user['cawangan'] . '/' . $id, ['nama' => $auth_user['name']])->json(); + User::find(auth()->user()->id)->update(['password'=> Hash::make($request->new_password)]); return redirect()->route('profile'); From 8ccb07dd9833c151e43df3900d77563cf080de49 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Thu, 26 Dec 2024 13:16:17 +0800 Subject: [PATCH 24/40] add changes di tukarcawanganupdate --- app/Http/Controllers/KakitanganController.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php index e1c1f709..f8346092 100644 --- a/app/Http/Controllers/KakitanganController.php +++ b/app/Http/Controllers/KakitanganController.php @@ -199,12 +199,21 @@ class KakitanganController extends Controller } public function tukarcawanganUpdate(Request $request){ + + $auth_user = Auth::user(); $user = User::find($request->user_id); + + $old_data = $user->toArray(); $user->cawangan = $request->cawangan; $user->roles = $request->role; $user->role_harian = $request->role; $user->save(); $auth_user = Auth::user(); + $new_data = $user->toArray(); + + $id = auth()->user()->id; + + Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/api/tukarcawangan/'. $auth_user['cawangan'],['namaoperasi' => $auth_user['name'],'old_data' => $old_data,'new_data' => $new_data ])->json(); if($auth_user->roles == 'operasi'){ return redirect()->route('daftar.kakitangan'); @@ -221,7 +230,7 @@ class KakitanganController extends Controller // if($auth_user->roles == 'operasi'){ // // return redirect()->route('daftar.kakitangan'); - // return "route('daftar.kakitangan')"; + // return "route('daftar.kakitangan')"; // }else if($auth_user->roles == 'admin'){ // // return redirect()->route('admin.daftar.kakitangan'); // return "route('admin.daftar.kakitangan')"; @@ -251,7 +260,7 @@ class KakitanganController extends Controller $user->password = Hash::make($request->nokp); $user->save(); - + if($auth_user->roles == 'operasi'){ return redirect()->route('daftar.kakitangan'); }else if($auth_user->roles == 'admin'){ From 6f1829c2db287099521e9dbf1e54cbb3b766ac5b Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Thu, 26 Dec 2024 15:47:00 +0800 Subject: [PATCH 25/40] changes funct kakitangan di khazanahcontr --- app/Http/Controllers/KhazanahController.php | 78 +++++++++++++-------- 1 file changed, 47 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 16838c92..2543166f 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2181,7 +2181,7 @@ class KhazanahController extends Controller $tarikh_cetak = $current->toDateString(); $kod_cawangan = $auth_user['cawangan']; - + if($request->dateringkasanharian == null){ $startDate = $current->toDateString(); }else{ @@ -2195,22 +2195,22 @@ class KhazanahController extends Controller $split_date = explode('-',$request->dateringkasanharian); $endDate = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - + $laporan_ringkasan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/ringkasan-harian/' . $kod_cawangan,[ 'startDate' => $startDate, 'endDate' => $endDate, - ])->json(); - + ])->json(); + $laporan = $laporan_ringkasan[0]; - + $kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [ 'startDate' => $startDate, 'endDate' => $endDate, ])->json(); - + /* Kawalan Stok */ //Gadai $totalbilgadaikeseluruhan = $kawalanstok[0]['gadai1'][0]['bil'] + $kawalanstok[0]['gadai2'][0]['bil'] + $kawalanstok[0]['gadai3'][0]['bil']; @@ -2377,6 +2377,22 @@ class KhazanahController extends Controller $ppc = User::where([['roles','=','ppc'],['cawangan','=',$auth_user['cawangan']]])->first(); $pc = User::where([['roles','=','pc'],['cawangan','=',$auth_user['cawangan']]])->first(); + $old_data = [ + 'teller' => $teller->pluck('name')->toArray(), + 'khazanah' => $khazanah->pluck('name')->toArray(), + 'pc'=> $pc ? $pc->name : null, + 'ppc' => $ppc ? $ppc->name : null, + ]; + + $new_data = [ + 'teller' => $teller->pluck('name')->toArray(), + 'khazanah' => $khazanah->pluck('name')->toArray(), + 'pc' => $pc ? $pc->name : null, + 'ppc' => $ppc ? $ppc->name : null, + ]; + + Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url'). '/api/kakitangan/'. $auth_user['cawangan'], ['namaoperasi' => $auth_user['name'],'new_data' => $new_data])->json(); + return view('khazanah.kakitangan',compact('cawangan_info','api_url','teller','khazanah','pc','ppc')); } @@ -2424,11 +2440,11 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - + $data_sebenar = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'sebenar'])->json(); $data_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'datalelong'])->json(); $data_filter = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/dashboard/aging',['kodcaw' => $auth_user['cawangan'], 'options' => 'filter'])->json(); - + return view('khazanah.bajet',compact('cawangan_info','api_url','data_sebenar','data_lelong','data_filter')); } @@ -3135,34 +3151,34 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - + if($request->datetimepicker1 == null){ $gadai_date = $current->toDateString(); } else { $split_date = explode('-', $request->datetimepicker1); $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + // Fetching the data from API $tuntutbaki = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/TuntutBakiTarikh/' . $auth_user['cawangan'], ['tarikh' => $gadai_date]) ->json(); - + $cawangan = Http::withOptions(['verify' => config('app.api_verify')]) ->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan']) ->json(); - + // Check if $tuntutbaki is an array and not empty before sending it to the view if (!is_array($tuntutbaki) || empty($tuntutbaki)) { $tuntutbaki = []; // If not valid, set it to an empty array } - - $cawangan_detail = $cawangan[0] ?? null; - + + $cawangan_detail = $cawangan[0] ?? null; + return view('print.laporan_tuntutbaki', compact('tuntutbaki', 'cawangan_detail', 'tarikh_cetak', 'gadai_date', 'api_url')); } - - + + @@ -4315,12 +4331,12 @@ class KhazanahController extends Controller if($request->datetimepicker2 == null){ $tarikh_cetak = $current->toDateString(); }else{ - $split_date = explode('-',$request->datetimepicker2); - $tarikh_imbangan2 = $request->datetimepicker2; + $split_date = explode('-',$request->datetimepicker2); + $tarikh_imbangan2 = $request->datetimepicker2; } $tarikh_imbangan2 = new Carbon($tarikh_imbangan2); - + // if($tarikh_imbangan2 < $current->toDateString()){ if($tarikh_imbangan2 < $current->toDateString()){ @@ -4374,12 +4390,12 @@ class KhazanahController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - + $stokaudit_aktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/aktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); - $stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); - + $stokaudit_takaktif = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/takaktif/'. $auth_user['cawangan'],['tarikh' => $stokaudit_date])->json(); + // return view('print.laporan_stokauditbelumaktif', compact('stokaudit','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); - + return view('print.laporan_stokauditcombine', compact('stokaudit_aktif','stokaudit_takaktif','cawangan_detail','tarikh_cetak','stokaudit_date','api_url')); } @@ -4466,7 +4482,7 @@ class KhazanahController extends Controller $cawangan_detail=$cawangan[0]; return view('print.laporan_tebus_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','tebuspengasingan','api_url','upahlama','ansuran','totalkeuntunganrebet')); } - + public function laporanAnsuranUjrah(){ $auth_user = Auth::user(); $api_url = config('api.url'); @@ -4496,12 +4512,12 @@ class KhazanahController extends Controller $split_date = explode('-', $request->datehingga); $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - + $tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/ansuranujrah/laporan/'. $auth_user['cawangan'],['mula' => $mula_date,'akhir' => $hingga_date])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; return view('print.laporan_ansuran_ujrah', compact('tebus','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); - } + } public function laporanStokAuditKhas(){ $auth_user = Auth::user(); @@ -4549,7 +4565,7 @@ class KhazanahController extends Controller $cawangan_detail=$cawangan[0]; $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokauditkhas/aktif/'. $auth_user['cawangan'],['daritempoh' => $daritempoh, 'hinggatempoh' => $hinggatempoh])->json(); - + if($request->type == 'excel') { return view('excel.excel_stokauditkhas', compact('stokaudit','cawangan_detail','tarikh_cetak','daritempoh','hinggatempoh','api_url','cawangan_info')); @@ -4567,7 +4583,7 @@ class KhazanahController extends Controller return redirect()->route('laporan.stokauditkhas') ->with('failed','Blast Whatsapp Tidak Berjaya, Sila Semak Semula Rekod Blasted.'); } - + } else { @@ -4693,7 +4709,7 @@ class KhazanahController extends Controller $kodcaw = $auth_user['cawangan']; $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'.$auth_user['cawangan'])->json(); $bycawnotisperingatan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/cawangan/bycawnotisperingatan/'.$auth_user['cawangan'].'/'.$notisid)->json(); - + return view('callcenter.khazanah.bycawdetailnotisperingatan',compact('cawangan_info','bycawnotisperingatan','kodcaw','notisid','api_url')); } From 6f9319b7feac555f38207aae552cd6b35d0d511b Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Sun, 29 Dec 2024 14:49:18 +0800 Subject: [PATCH 26/40] add insert record utk pendahuluan dan serah --- app/Http/Controllers/KhazanahController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2543166f..0e094468 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1160,7 +1160,9 @@ class KhazanahController extends Controller $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[ 'kodlaluan' => $request->teller, - 'no' => $request->no + 'no' => $request->no, + 'jenis' =>'pendahuluan', + 'khazanah' => Auth::user()->name ]); @@ -1240,8 +1242,9 @@ class KhazanahController extends Controller $updaterequest=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/requestTeller/update/'. $auth_user['cawangan'],[ 'kodlaluan' => $request->teller, - 'no' => $request->no - + 'no' => $request->no, + 'jenis' => 'serahan', + 'khazanah' => Auth::user()->name ]); return redirect()->route('khazanah.serahan'); From 352d6411b19fdf408efe050b3ee283581baf9128 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 30 Dec 2024 11:03:28 +0800 Subject: [PATCH 27/40] fix resit PS(based on shahmin operasi) --- .../print/resittebusautotawarruq.blade.php | 51 +++++++++++-------- 1 file changed, 29 insertions(+), 22 deletions(-) diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php index 98b8706e..318e7e70 100644 --- a/resources/views/print/resittebusautotawarruq.blade.php +++ b/resources/views/print/resittebusautotawarruq.blade.php @@ -452,24 +452,21 @@ hr.new5 { - + - + - - - - - - + + @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp - + - + @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp + @@ -483,7 +480,13 @@ hr.new5 { - + @php $total = $temp_loan - $temp_totalpay; @endphp + + + + + +
PembiayaanBaki Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }} : RM {{ number_format($gadai['bakipjm'],2) }}
(-) Bayaran Pembiayaan : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
Keuntungan(+) Keuntungan (Semasa) : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
Pembiayaan Baru(-) Bayaran Pelanggan : RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} : RM {{ number_format($temp_totalpay,2) }}
Jumlah Bayaran : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}: RM {{ number_format($total,2) }}
Pembiayaan Baru : RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}
@@ -599,24 +602,22 @@ hr.new5 {
- + - + - - - - - - + + @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp - + - + @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp + + @@ -630,7 +631,13 @@ hr.new5 { - + @php $total = $temp_loan - $temp_totalpay; @endphp + + + + + +
PembiayaanBaki Pembiayaan : RM {{ number_format($gadai['pinjaman'],2) }} : RM {{ number_format($gadai['bakipjm'],2) }}
(-) Bayaran Pembiayaan : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan'],2) }}
Keuntungan(+) Keuntungan (Semasa) : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }}
Pembiayaan Baru(-) Bayaran Pelanggan : RM {{ number_format($gadai['bakipjm']-$transaction_keuntungan['bayaran_pembiayaan'],2) }} : RM {{ number_format($temp_totalpay,2) }}
Jumlah Bayaran : RM {{ number_format($transaction_keuntungan['bayaran_pembiayaan']+$transaction_keuntungan['bayaran_keuntungan'],2) }}: RM {{ number_format($total,2) }}
Pembiayaan Baru : RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}
From 88c5acbd92f5b329c5a670de8cb75b375d85c7a7 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Mon, 30 Dec 2024 12:07:20 +0800 Subject: [PATCH 28/40] fix bakipembiayaan + keuntungan (based on shahmi operasi) --- .../print/resittebusautotawarruq.blade.php | 65 ++++++++----------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/resources/views/print/resittebusautotawarruq.blade.php b/resources/views/print/resittebusautotawarruq.blade.php index 318e7e70..96e01fa6 100644 --- a/resources/views/print/resittebusautotawarruq.blade.php +++ b/resources/views/print/resittebusautotawarruq.blade.php @@ -452,15 +452,10 @@ hr.new5 {
- - - - - - + @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp - + @@ -469,24 +464,24 @@ hr.new5 { - - - - - - - - - - + @php $total = $temp_loan - $temp_totalpay; @endphp - + + + + + + + + + + - +
Baki Pembiayaan : RM {{ number_format($gadai['bakipjm'],2) }}
(+) Keuntungan (Semasa)B. Pembiayaan + Keuntungan : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} : RM {{ number_format($temp_loan,2) }}
(-) Bayaran Pelanggan: RM {{ number_format($temp_totalpay,2) }}
Jumlah BayaranJumlah Bayaran : RM {{ number_format($total,2) }}: RM {{ number_format($total,2) }}
Pembiayaan Baru : RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }} : RM {{ number_format($gadai['bakipjm'] - $transaction_keuntungan['bayaran_pembiayaan'],2) }}
@@ -602,37 +597,31 @@ hr.new5 {
- - - - - - + @php $temp_loan = $gadai['bakipjm'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp - + @php $temp_totalpay = $transaction_keuntungan['bayaran_pembiayaan'] + $transaction_keuntungan['bayaran_keuntungan']; @endphp - - - - - - - - - - - + @php $total = $temp_loan - $temp_totalpay; @endphp - + + + + + + + + + + From ff7237234e36a35ec4609c8523c95d94a1f93349 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Mon, 30 Dec 2024 15:17:37 +0800 Subject: [PATCH 29/40] add auth user di wakilController --- app/Http/Controllers/WakilController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/WakilController.php b/app/Http/Controllers/WakilController.php index 9f075cae..d8bb2a86 100644 --- a/app/Http/Controllers/WakilController.php +++ b/app/Http/Controllers/WakilController.php @@ -121,13 +121,13 @@ class WakilController extends Controller $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/' . $norujukan)->json(); $gadai_details = $gadai[0][0]; - + $noic = $gadai_details['nokp']; $customer_detail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/' . $noic)->json(); - - $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])->json(); + + $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/detail/' . $auth_user['cawangan'])->json(); $cawangan_detail = $cawangan[0]; - + $nosiri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/nosiri/wakil/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); // $nosiri = $getNoSiri[0]; @@ -166,6 +166,7 @@ class WakilController extends Controller 'no_surat' => $no_surat, 'norujukan' => $norujukan, 't_cetak' => $t_cetak, + 'nama' => Auth::user()->name, ]); @@ -257,6 +258,7 @@ class WakilController extends Controller 'no_surat' => $no_surat, 'norujukan' => $norujukan, 't_cetak' => $t_cetak, + 'nama' => Auth::user()->name, ]); From 3f9879b8159d17a4d6e02d4e19ecafde686f9150 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 30 Dec 2024 20:42:04 +0800 Subject: [PATCH 30/40] added tempblock and * for khazanah --- app/Http/Controllers/PenebusanController.php | 4 +- resources/views/customers/v2/info.blade.php | 17 ++++++++ resources/views/khazanah/index.blade.php | 43 ++++++++++++++------ 3 files changed, 50 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index bda33161..0e538aa0 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -519,7 +519,7 @@ class PenebusanController extends Controller 'tag_permata' => $array1['tag_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'], 'jenisAT' => $request->jenisAT, - 'kuantiti' => $array1['bil'] + 'kuantiti' => $array1['bil'] ])->json(); } @@ -687,7 +687,7 @@ class PenebusanController extends Controller 'tag_permata' => $array1['tag_permata'], 'berat_batu_permata' => $array1['berat_batu_permata'], 'nilai_marhun' => $array1['n_marhun'], - 'kuantiti' => $array1['bil'] + 'kuantiti' => $array1['bil'] ])->json(); } diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index fce96495..335ae2fd 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -600,6 +600,13 @@ var pinjaman = $(data).data("pinjaman"); var hargajualan = $(data).data("hargajualan"); + 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', + ]; + + Swal.fire({ title: 'Memuatkan...', allowEscapeKey : false, @@ -609,6 +616,16 @@ } }); + if (array_tempblock.includes(norujukan)) { + Swal.close(); + Swal.fire({ + icon: 'error', + title: 'Amaran', + text: 'Surat Pembiayaan Mengalami Masalah Sila Hubungi IT' + }); + return false; ++ } + if(hargajualan == pinjaman){ Swal.fire({ icon: 'error', diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php index 9423656e..ea440a0d 100644 --- a/resources/views/khazanah/index.blade.php +++ b/resources/views/khazanah/index.blade.php @@ -812,20 +812,39 @@ var nokp = $('#noic').val(); if(id_type=='nokp'){ if($.isNumeric(nokp) == false){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan' - }); - event.preventDefault(); - return false; + // Swal.fire({ + // icon: 'error', + // title: 'Amaran!', + // text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan' + // }); + // event.preventDefault(); + // return false; + if(nokp.substr(-1) != '*'){ + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Sila Masukkan Nombor Sahaja Pada No KP Pelanggan' + }); + event.preventDefault(); + return false; + } } if(nokp.length != 12){ - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Periksa No KP Pelanggan' - }); + // Swal.fire({ + // icon: 'error', + // title: 'Amaran!', + // text: 'Sila Periksa No KP Pelanggan' + // }); + if(nokp.substr(-1) != '*') + { + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Sila Periksa No KP Pelanggan' + }); + event.preventDefault(); + return false; + } event.preventDefault(); return false; } From d21b72b84f8e1281f9986356e5f0fa09c1105f76 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 30 Dec 2024 20:50:18 +0800 Subject: [PATCH 31/40] remove + --- resources/views/customers/v2/info.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 335ae2fd..c86a4001 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -624,7 +624,7 @@ text: 'Surat Pembiayaan Mengalami Masalah Sila Hubungi IT' }); return false; -+ } + } if(hargajualan == pinjaman){ Swal.fire({ From f9a43ac639e42be01c089da76efd837778235c41 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Mon, 30 Dec 2024 22:21:56 +0800 Subject: [PATCH 32/40] add auth user di barcodescannedtebus --- app/Http/Controllers/KhazanahController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 0e094468..8756e5b5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -388,7 +388,7 @@ class KhazanahController extends Controller { $auth_user = Auth::user(); - $update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json(); + $update=Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/updatetagterima/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode,['nama' => Auth::user()->name])->json(); if($update == 'success') { From 649de25f3190ac762a2fa2afc26823890516fea5 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Tue, 31 Dec 2024 10:17:03 +0800 Subject: [PATCH 33/40] fix nobaucer handle if null --- resources/views/khazanah/panjar.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index c3a35c5c..c144ae32 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -108,8 +108,8 @@ let yyyy = String(today.getFullYear()); let yy = yyyy.substring(2, 4); - - let baucerno = 'B' + yy + mm + dd + '-' + String(data.recno).padStart(4, '0'); + let recno = data.recno ?? 0; + let baucerno = 'B' + yy + mm + dd + '-' + String(recno).padStart(4, '0'); $('#' + e.currentTarget.id + ' .baucer').val(baucerno); } From 860b0dc8793f89e7849446e951384ab7f98bda53 Mon Sep 17 00:00:00 2001 From: BTMS2 Date: Mon, 6 Jan 2025 16:04:58 +0800 Subject: [PATCH 34/40] tutup whatsapp --- .../print/laporan_stokauditkhas.blade.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/views/print/laporan_stokauditkhas.blade.php b/resources/views/print/laporan_stokauditkhas.blade.php index de4b78f2..f0730119 100644 --- a/resources/views/print/laporan_stokauditkhas.blade.php +++ b/resources/views/print/laporan_stokauditkhas.blade.php @@ -399,22 +399,22 @@ } }, - { - className: 'btn btn-outline-info pl-4 pr-4 btn-sm export', - target: "_blank", - titleAttr: 'Blast Whatsapp', - text: 'WHATSAPP & SMS', - action: function ( e, dt, node, config ) { - // $('#typedonwload').val('whatsapp'); - // $("#exportpdf").submit(); - $("#exportpdf").click(function() { - $('[data-toggle="tooltip"]').tooltip() - alert("ADAKAH ANDA PASTI?"); - $('#typedonwload').val('whatsapp'); - $("#exportpdf").submit(); -}); - } - } + // { + // className: 'btn btn-outline-info pl-4 pr-4 btn-sm export', + // target: "_blank", + // titleAttr: 'Blast Whatsapp', + // text: 'WHATSAPP & SMS', + // action: function ( e, dt, node, config ) { + // // $('#typedonwload').val('whatsapp'); + // // $("#exportpdf").submit(); + // $("#exportpdf").click(function() { + // $('[data-toggle="tooltip"]').tooltip() + // alert("ADAKAH ANDA PASTI?"); + // $('#typedonwload').val('whatsapp'); + // $("#exportpdf").submit(); + // }); + // } + // } From 90b8df1519cb0663d8de0827d1e824a32a09a0bc Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Tue, 14 Jan 2025 23:40:20 +0800 Subject: [PATCH 35/40] restore 2025-01-14 --- app/Http/Controllers/KhazanahController.php | 8 ++------ public/js/notification.js | 19 ++++++++++--------- resources/views/customers/v2/info.blade.php | 4 +++- resources/views/layouts/app.blade.php | 2 +- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 2f056fd9..3a4b4557 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -724,17 +724,13 @@ class KhazanahController extends Controller $api_url = config('api.url'); $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $bakiperubatan = 0; - - - if($request->jenismodal === 'perubatan') { $listUser=User::where('name','=',$request->tuntutan)->get(); if(floatval($request->bayaran) > floatval($listUser[0]->perubatan)) { - return redirect('/panjar')->with('messageinformation','Baki perubatan tidak mencukupi.'); + return redirect('/panjar')->with('messageinformation',['status' => 'error','message' => 'Baki perubatan tidak mencukupi.']); } } @@ -1768,7 +1764,7 @@ class KhazanahController extends Controller 'endDate' => $endDate, ])->json(); - $laporan = $laporan_ringkasan[0]; + $laporan = $laporan_ringkasan['reportRingkasanHarian'][0]; $kawalanstok = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/reports/kawalan-stok/' . $kod_cawangan, [ 'startDate' => $startDate, diff --git a/public/js/notification.js b/public/js/notification.js index 5655959f..58dc2537 100644 --- a/public/js/notification.js +++ b/public/js/notification.js @@ -24,14 +24,16 @@ notify.channel_subscribe((data) => { }); const currentPath = window.location.pathname; - if (currentPath === "/home") { - notify_main(); - } else if (currentPath === "/menu") { - notify_khazanah_main(); - }else if(currentPath === '/pendahuluan'){ - notify_pendahuluan(); - }else if(currentPath === '/serahan'){ - notify_serahan(); + if(window.kodcaw == data.cawangan){ + if (currentPath === "/home") { + notify_main(); + } else if (currentPath === "/menu") { + notify_khazanah_main(); + }else if(currentPath === '/pendahuluan'){ + notify_pendahuluan(); + }else if(currentPath === '/serahan'){ + notify_serahan(); + } } }); @@ -59,7 +61,6 @@ let notify_main = () =>{ } button.classList.add('btn-danger'); - button.classList.add('heartbeat'); } let notify_khazanah_main = () =>{ diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index d57aa224..ebef8f57 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -640,11 +640,13 @@ if (array_tempblock.includes(norujukan)) { Swal.close(); + setTimeout(() => { Swal.fire({ icon: 'error', title: 'Amaran', - text: 'Surat Pembiayaan Mengalami Masalah Sila Hubungi IT' + html: 'SAG - Kes Marhun Tiada Dalam Peti Besi' }); + }, 100); return false; } diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cc68dc2b..cfdcc626 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -55,7 +55,7 @@ window.kodcaw = "{{ Auth::user()->cawangan }}"; window.apikey = "{{ env('PUSHER_APP_KEY') }}"; - + @endif @endsection diff --git a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php index ae8f4977..0ba00966 100644 --- a/resources/views/modal/denominasimodalpendahuluanserahan.blade.php +++ b/resources/views/modal/denominasimodalpendahuluanserahan.blade.php @@ -132,6 +132,7 @@ +
diff --git a/resources/views/modal/pendahuluanserahan.blade.php b/resources/views/modal/pendahuluanserahan.blade.php index f6a52775..ef4ff2c8 100644 --- a/resources/views/modal/pendahuluanserahan.blade.php +++ b/resources/views/modal/pendahuluanserahan.blade.php @@ -41,6 +41,11 @@
+ + + + +
From a9d27e10130cfccdbdc3a03dda48ff59b2de9aaa Mon Sep 17 00:00:00 2001 From: BTMS3 Date: Thu, 23 Jan 2025 14:40:49 +0800 Subject: [PATCH 37/40] update sag v2.2 --- app/Http/Controllers/GadaianController.php | 3 +- resources/views/print/sag_ujrah_3.blade.php | 69 ++++++++++----------- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 19f81135..16dd9100 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -353,7 +353,8 @@ class GadaianController extends Controller 'kodcaw' => $cawangan_detail['kodcaw'] ])->json(); - $pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera"; + // $pembayaran_segera = "https://spare.arrahn.com.my/pembayaransegera"; + $pembayaran_segera = "https://pay.arrahn.com.my"; $komoditi = Http::withOptions(['verify' => config('app.api_verify')]) ->get($api_url . '/api/komuditi/check') diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index ff47d3b6..9eb4dccc 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -656,29 +656,20 @@
- + + + - - - - + kepada Pelanggan seperti dinyatakan dalam SAG ini. @@ -696,13 +687,16 @@
Baki Pembiayaan : RM {{ number_format($gadai['bakipjm'],2) }}
(+) Keuntungan (Semasa)B. Pembiayaan + Keuntungan : RM {{ number_format($transaction_keuntungan['bayaran_keuntungan'],2) }} : RM {{ number_format($temp_loan,2) }}
(-) Bayaran Pelanggan : RM {{ number_format($temp_totalpay,2) }}
Jumlah BayaranJumlah Bayaran : RM {{ number_format($total,2) }}: RM {{ number_format($total,2) }}
Pembiayaan BaruTRANSAKSI PEMBIAYAAN AR-RAHN
AKAD JUALAN - MURABAHAH (JUAL BELI SECARA TANGGUH): - Saya bersetuju dan dengan ini membeli komoditi daripada KoPKB - pada Harga - Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana yang dinyatakan di + AKAD JUALAN MURABAHAH (JUAL BELI SECARA TANGGUH)
KoPKB dengan ini menjual dan Pelanggan dengan ini membeli + komoditi pada Harga Jualan dengan bayaran tangguh. Komoditi adalah sebagaimana + yang dinyatakan di dalam nombor sijil - komoditi mengikut Jumlah Pembiayaan yang diberikan kepada saya. + komoditi mengikut Jumlah Pembiayaan yang diberikan kepada Pelanggan.
*Saya dengan ini bersetuju untuk menerima komoditi yang telah + *Pelanggan dengan ini bersetuju untuk menerima komoditi yang telah dijualkan - kepada saya seperti dinyatakan dalam SAG ini.
AKAD RAHN - (GADAIAN): Saya - bersetuju dan dengan ini menggadaikan Marhun sebagai cagaran kepada Jumlah - Pembiayaan - termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul mengikut - syarat-syarat pembiayaan dalam SAG ini.
Saya bersetuju - melantik KoPKB sebagai wakil saya yang sempurna tanpa boleh dibatal untuk + class="hidden">tickbox Pelanggan dengan ini + melantik KoPKB sebagai wakil dan KoPKB dengan ini menerima perlantikan + tersebut untuk menjual komoditi kepada pihak ketiga secara tunai yang bersamaan dengan - Jumlah Pembiayaan diberikan kepada saya. Saya dengan ini mengaku janji untuk + Jumlah Pembiayaan diberikan kepada Pelanggan. Pelanggan dengan ini mengaku janji untuk menanggung rugi - rugi KoPKB atas segala kerugian, kos, perbelanjaan atau + KoPKB atas segala kerugian, kos, perbelanjaan atau kerosakan yang mungkin + dialami atau ditanggung oleh KoPKB akibat memenuhi fungsinya sebagai wakil Pelanggan; + Atau,
@@ -710,30 +704,33 @@ - - - + + + + + + - @@ -1640,7 +1637,7 @@
@php echo 'barcode'; @endphp
From 8d05c1a12147a2b538897464b8430893f9ce4eb8 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Mon, 27 Jan 2025 08:50:46 +0800 Subject: [PATCH 38/40] feat audit --- app/Http/Controllers/KhazanahController.php | 7 ++++--- app/Http/Controllers/LelongController.php | 5 ++++- resources/views/customers/v2/info.blade.php | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index a5414110..bad1b2e8 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2879,7 +2879,8 @@ class KhazanahController extends Controller // $kodnegeridandaerah = $request->negeriagh .'|' . $request->daerahagh; - $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json(); + // $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan']])->json(); + $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $request->norujukanhidden,'kodcaw' => $auth_user['cawangan'],['name' => $auth_user['name']]])->json(); $daftar = 0; if(sizeof($polis) > 0) @@ -2915,7 +2916,7 @@ class KhazanahController extends Controller }else{ event(new NotifikasiAGH($auth_user['cawangan'],'Mengalami masalah dalam menjana.','error',$auth_user['name'])); - // return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error'); + return redirect()->route('khazanah.customer_info')->with('aghinformation','Mengalami masalah dalam menjana.|error'); } return response($daftarpolis); @@ -2986,7 +2987,7 @@ class KhazanahController extends Controller $customers = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/customers/'.$gad['nokp'])->json(); } $polis = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/polis/get/',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan']])->json(); - + $log_ulangcetakagh = Http::withOptions(['verify' => config('app.api_verify')])->put(config('api.url').'/api/polis/agh',['norujukan' => $norujukan,'kodcaw' => $auth_user['cawangan'],'teller' => $auth_user['name']])->json(); return view('print.suratgadaianhilang', compact('polis','gadai','customers','cawangan_detail','api_url')); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 82f4b405..0f2f558b 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -69,7 +69,10 @@ class LelongController extends Controller $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + // $lelong=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/TuntutBaki/resit/' . $auth_user['cawangan'] . '/' . $norujukan, [ + 'name' => $auth_user['name']])->json(); + $wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $lelong['nowakil'])->json(); diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php index 34c97cd5..b91e22a5 100644 --- a/resources/views/customers/v2/info.blade.php +++ b/resources/views/customers/v2/info.blade.php @@ -994,7 +994,7 @@ urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); var tuntutan = 'Pelanggan'; - + console.log(gadai_detail['norujukan'],kodcaw,api_url); $.ajax({ method:"GET", async:false, @@ -1004,6 +1004,7 @@ "kodcaw" : kodcaw }, success: function(response){ + console.log(response); if(response[0].teller == 'DM') { tuntutan = 'WTD'; From 00007a6f4fbc3146461d80645b7badcff2cb45e0 Mon Sep 17 00:00:00 2001 From: Ain Izazi Date: Mon, 27 Jan 2025 14:27:04 +0800 Subject: [PATCH 39/40] remove command --- app/Http/Controllers/KhazanahController.php | 41 --------------------- 1 file changed, 41 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index bad1b2e8..ad081f8c 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -218,47 +218,6 @@ class KhazanahController extends Controller return view('khazanah.pendahuluanserahanmain',compact('cawangan_info','listgldetail','denominasi')); } -// public function pendahuluanserahandaftar(Request $request) -// { -// // Get authenticated user -// $auth_user = Auth::user(); - -// // Retrieve hidden input data if necessary -// $submitted_user_id = $request->input('auth_user'); - -// // API URL from config -// $api_url = config('api.url'); - -// // Fetch branch information -// $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')]) -// ->get($api_url . '/api/cawangan/' . $auth_user['cawangan']) -// ->json(); - -// // Fetch GL details -// $listgldetail = Http::withOptions(['verify' => config('app.api_verify')]) -// ->get($api_url . '/api/listgldetail/' . $auth_user['cawangan'], [ -// 'name' => $auth_user['name'] -// ]) -// ->json(); -// // dd($listgldetail); - -// // Fetch or create denominasi data -// $denominasi = Http::withOptions(['verify' => config('app.api_verify')]) -// ->get($api_url . '/api/DenominasiController/' . $auth_user['cawangan']) -// ->json(); - -// if (sizeof($denominasi) == 0) { -// $denominasi = Http::withOptions(['verify' => config('app.api_verify')]) -// ->post($api_url . '/api/DenominasiCreate/' . $auth_user['cawangan']) -// ->json(); -// } else { -// $denominasi = $denominasi[0]; -// } - -// // Return the view with compacted data -// return view('khazanah.pendahuluanserahanmain', compact('cawangan_info', 'listgldetail', 'denominasi')); -// } - public function dashboard() { From f6e7321a093c2b17fc64df19b06be7304efd41e8 Mon Sep 17 00:00:00 2001 From: BTMS3 Date: Tue, 28 Jan 2025 11:00:04 +0800 Subject: [PATCH 40/40] newupdatesagv2.2 --- resources/views/print/sag_ujrah_3.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index 9eb4dccc..5ec2a794 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -1637,7 +1637,7 @@
@php echo 'barcode'; @endphp
@@ -1650,7 +1650,7 @@
kerosakan yang mungkin - dialami atau ditanggung oleh KoPKB akibat memenuhi fungsinya sebagai wakil saya; - Atau, -
- Saya bersetuju + Pelanggan bersetuju mengambil komoditi tersebut dan menanggung segala kos dan caj yang berkaitan dan dengan mengambil komoditi tersebut, Jumlah Pembiayaan tidak akan dikreditkan ke dalam - akaun saya atau - dibayar tunai kepada saya. + akaun Pelanggan atau + dibayar tunai kepada Pelanggan. +
AKAD RAHN (GADAIAN)
+ Pelanggan bersetuju dan dengan ini menggadaikan Marhun sebagai cagaran kepada + Jumlah Pembiayaan termasuk Jumlah Keuntungan dan Lain-Lain Caj Terkumpul mengikut + syarat-syarat pembiayaan dalam SAG ini. KoPKB dengan ini menerima gadaian Marhun + tersebut.
AKAD (SIMPAN MARHUN)
Akad Simpan - Marhun: - Saya bersetuju marhun disimpan oleh KoPKB dan bersetuju membayar lain-lain caj + + Pelanggan dengan ini bersetuju marhun disimpan oleh KoPKB dan bersetuju membayar lain-lain caj sebagaimana jadual dibawah bagi setiap RM100.00 Jumlah Marhun Keseluruhan:
- +
No SAG{{ $gadai_detail['norujukan'] }}{{ $gadai_detail['norujukan'] }}
Nama