diff --git a/app/CawanganAR.php b/app/CawanganAR.php new file mode 100644 index 0000000..7521d5e --- /dev/null +++ b/app/CawanganAR.php @@ -0,0 +1,18 @@ +cawangan = $cawangan; + $this->status = $status; + $this->bakipetibesi = $bakipetibesi; + } + + public function broadcastOn() + { + return ['notice-notify']; + } + + public function broadcastAs() + { + return 'trigger-notify'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 64157ac..2ec148f 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -10,9 +10,11 @@ use App\Events\PendahuluanSerahan; use App\Events\NotifikasiKelulusan; use App\Events\NotifikasiUbahHapus; use App\Events\NotifikasiAGH; +use App\Events\NotifikasiPetiBesi; use App\User; use App\Cawangan; +use App\CawanganAR; use App\Lejeram; use Illuminate\Http\Request; @@ -1585,7 +1587,7 @@ class KhazanahController extends Controller } public function cetaklaporanLelongan(Request $request){ - // dd($request); + // dd($request->all()); $api_url = config('api.url'); $auth_user = Auth::user(); $current = Carbon::now(); @@ -1594,7 +1596,15 @@ class KhazanahController extends Controller if($request->jeniscetakan === 'cetak') { - $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json(); + if($request->fasa == 1) + { + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json(); + }else{ + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json(); + } + + // $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json(); + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; @@ -1603,7 +1613,12 @@ class KhazanahController extends Controller }else if($request->jeniscetakan === 'excel') { - $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json(); + if($request->fasa == 1) + { + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json(); + }else{ + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json(); + } $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; @@ -1611,7 +1626,14 @@ class KhazanahController extends Controller }else if($request->jeniscetakan === 'pdf'){ - $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'],['batchno' => $request->batchno])->json(); + if($request->fasa == 1) + { + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa1',['batchno' => $request->batchno])->json(); + $fasa = 'fasa1'; + }else{ + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/laporan/'. $auth_user['cawangan'] . '/' . 'fasa2',['batchno' => $request->batchno])->json(); + $fasa = 'fasa2'; + } $notislelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/details/notislelong/'. $auth_user['cawangan'])->json(); $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(); @@ -1619,8 +1641,8 @@ class KhazanahController extends Controller // return view('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak')); - $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','tarikh_cetak'))->setPaper('A4','potrait'); - return $pdf->download('notislelong_'.$tarikh_cetak.'.pdf'); + $pdf=PDF::loadView('print.notislelong', compact('cawangan_info','notislelong','api_url','cawangan_detail','lelong','fasa','tarikh_cetak'))->setPaper('A4','potrait'); + return $pdf->download('notislelong_'.$tarikh_cetak.'_'.$fasa.'.pdf'); // return $pdf->stream('notislelong_'.$tarikh_cetak.'.pdf'); // return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail','lelong','tarikh_cetak')); @@ -3481,5 +3503,80 @@ class KhazanahController extends Controller return view('print.notislelong', compact('cawangan_info','api_url','cawangan_detail')); } + public function PaparanPermohonan() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + $current = Carbon::now(); + $tarikhsemasa = $current->toDateString(); + + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $getVault = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikhsemasa])->json(); + + + + //Dashboardall + $dashboard=Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/Dashboard_all/'.$auth_user['cawangan'])->json(); + + $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'])->json(); + $bank = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/api/bank')->json(); + + return view('khazanah.permohonanwang', compact('bank','cawangan_info','api_url','getVault','tarikhsemasa','dashboard','permohonan')); + } + + public function RekodPermohonan() + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $current = Carbon::now(); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/rekod/'.$auth_user['cawangan'])->json(); + + return view('khazanah.rekodpermohonan', compact('cawangan_info','api_url','permohonan')); + } + + + public function SimpanPermohonan(Request $request){ + + // dd($request->all()); + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->post(config('api.url') . '/admin/permohonan/add/'. $auth_user['cawangan'],[ + 'jenismohon' => $request->radwang, + 'jumlahmohon' => $request->jumlahmohon, + 'tarikhmohon' => $request->tarikhmohon, + 'bakipetibesi' => $request->bakipetibesi, + 'outstanding' => $request->outstanding, + 'namapemohon' => $auth_user['name'] + ])->json(); + + if($permohonan == true) + { + return redirect()->back()->with('message', 'Permohonan Berjaya Disimpan!'); + }else{ + return redirect()->back()->with('error', 'Permohonan Tidak Berjaya!'); + } + } + + public function StatusPermohonan($mohonid){ + + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $permohonan = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/get/'.$auth_user['cawangan'] .'/' . $mohonid)->json(); + + $getdescription = Http::withOptions(['verify' => config('app.api_verify')])->get( config('api.url').'/admin/permohonan/description/' . $mohonid)->json(); + + return view('khazanah.status', compact('cawangan_info','api_url','permohonan','getdescription')); + + } + } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c988d21..d3cc344 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -41,9 +41,10 @@ class LelongController 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(); - $senaraibatch = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'])->json(); + $senaraibatchfasa1 = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'] . '/' . 'fasa1')->json(); + $senaraibatchfasa2 = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/senaraibatch/aktif/'. $auth_user['cawangan'] . '/' . 'fasa2')->json(); - return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatch')); + return view('khazanah.lelong',compact('cawangan_info','api_url','senaraibatchfasa1','senaraibatchfasa2')); } public function resittuntutbaki($norujukan){ diff --git a/public/img/approval.jpg b/public/img/approval.jpg new file mode 100644 index 0000000..c924cc6 Binary files /dev/null and b/public/img/approval.jpg differ diff --git a/public/img/batal.png b/public/img/batal.png new file mode 100644 index 0000000..410ac14 Binary files /dev/null and b/public/img/batal.png differ diff --git a/public/img/chequetick.png b/public/img/chequetick.png new file mode 100644 index 0000000..8655ac0 Binary files /dev/null and b/public/img/chequetick.png differ diff --git a/public/img/leaderapproval.png b/public/img/leaderapproval.png new file mode 100644 index 0000000..4325529 Binary files /dev/null and b/public/img/leaderapproval.png differ diff --git a/public/img/money.png b/public/img/money.png new file mode 100644 index 0000000..b9422d0 Binary files /dev/null and b/public/img/money.png differ diff --git a/public/img/operasicek.png b/public/img/operasicek.png new file mode 100644 index 0000000..e3450d5 Binary files /dev/null and b/public/img/operasicek.png differ diff --git a/public/img/proposal.png b/public/img/proposal.png new file mode 100644 index 0000000..7ba83aa Binary files /dev/null and b/public/img/proposal.png differ diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php index e3a2147..01d2769 100644 --- a/resources/views/homepage/khazanah/home.blade.php +++ b/resources/views/homepage/khazanah/home.blade.php @@ -155,6 +155,7 @@
| No. | Batch No. | +Fasa | Bilangan Aktif | Tarikh Lelong | Action |
|---|---|---|---|---|---|
| {{ $loop->iteration }} | {{ $sb['batchno'] }} | +Fasa 1 | {{ $sb['total'] }} | {{ $sb['t_lelong'] }} | - Cetak - Excel - PDF + Cetak + Excel + PDF |
| {{ $loop->iteration }} | +{{ $sb['batchno'] }} | +Fasa 2 | +{{ $sb['total'] }} | +{{ $sb['t_lelong'] }} | ++ Cetak + Excel + PDF + | +
+ Permohonan
Cawangan
+ Pengesahan
Operasi
+ Akaun
+ {!! ($permohonan['tagakaun'] === 2) ? '
+ Kelulusan
Pengurus Besar
+ Akaun
Deposit Ke Bank
Selesai
+ Cawangan
Terima Wang
+ Permohonan
Cawangan
+ CIT Selesai Deposit ke Bank
+
+ Pengesahan
Operasi
+ Akaun
+| # | +Tarikh | +Masa | +Penerangan | +
|---|---|---|---|
| {{ $loop->iteration }} | +{{ $desc[0]['tarikh'] }} | +{{ $desc[0]['masa'] }} | +@php
+
+ switch($desc['statusid']){
+ case 1: echo $desc['description'] . ' ' . 'NAMA PEMOHON :' . $desc[0]['nama_pemohon']; + break; + case 2: echo $desc['description'] . ' ' . 'NAMA OPERASI :' . $desc[0]['nama_operasi']; + break; + case 3: echo $desc['description'] . ' ' . 'NAMA AKAUN :' . $desc[0]['nama_akaun']; + break; + case 4: echo $desc['description'] . ' ' . 'JUMLAH DILULUSKAN :RM' . number_format($desc[0]['jumlah_diluluskan'],2); + break; + case 5: echo $desc['description'] . ' ' . 'JENIS BANK :' . $desc[0]['jenisbank'] . ' ' . 'NO RESIT :' . $desc[0]['noresit']; + break; + case 6: echo $desc['description'] . ' ' . 'NAMA PENERIMA :' . $desc[0]['nama_penerima']; + break; + case 7: echo $desc['description']; + break; + case 8: echo $desc['description'] . ' ' . 'JENIS BANK :' . $desc[0]['jenisbank']; + break; + } + + + + @endphp |
+