diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index b785f13..d52f8cc 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -7,10 +7,11 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Carbon\Carbon; -use PDF; +use Barryvdh\DomPDF\Facade as PDF; use Maatwebsite\Excel\Excel; use App\Models\Lejeram; +use App\Models\Cawangan; class AkaunController extends Controller @@ -748,6 +749,45 @@ class AkaunController extends Controller return view('akaun.laporan_ringkasanterkumpul', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } + public function cetakPetiBesi(Request $request){ + + $api_url = $request->hostname; + + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datetarikh == null){ + $tebus_date = $current->toDateString(); + }else{ + $split_date = explode('-',$request->datetarikh); + $tebus_date = $request->datetarikh; + } + + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$request->kodcaw)->json(); + $cawangan_detail=$cawangan[0]; + + $petibesi = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/laporanpetibesi/'. $request->kodcaw .'/'. $tebus_date)->json(); + + if(!$petibesi) + { + return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.'); + } + + if(isset($request->jenis)) + { + if($request->jenis == 'pdf') + { + $pdf = PDF::loadView('akaun.laporan_petibesi', compact('petibesi','cawangan_detail','tarikh_cetak','tebus_date','api_url'))->setPaper('a4', 'potrait'); + return $pdf->download('laporan_petibesi' . $request->kodcaw .'_'. $tebus_date . '.pdf'); + }else{ + return view('akaun.laporan_petibesi', compact('petibesi','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + } + } + } + public function cetakLaporanStokAuditBackdate(Request $request){ $api_url = $request->hostname; @@ -907,7 +947,7 @@ class AkaunController extends Controller $hingga_date = $request->datehingga; } - $gadaiallcaw = Http::get(config('api.url'). '/api/laporanllcaw/gadai',['mula_date' => $mula_date,'hingga_date' => $hingga_date ])->json(); + $gadaiallcaw = Http::get(config('api.url'). '/admin/laporanllcaw/gadai',['mula_date' => $mula_date,'hingga_date' => $hingga_date ])->json(); if(isset($request->jenis)) @@ -923,4 +963,179 @@ class AkaunController extends Controller } + + public function cetakimbangdugaExtended(Request $request) + { + + $auth_user = Auth::user(); + $api_url = $request->hostname; + + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh_cetak = $current->toDateString(); + + $tarikh_imbangan= $current->toDateString(); + $tarikh_imbangan2= $current->toDateString(); + + + $tarikh_cetak = $current->toDateString(); + + + if($request->datetimepicker1 == null){ + $tarikh_cetak = $current->toDateString(); + }else + { + $split_date = explode('-',$request->datetimepicker1); + $tarikh_imbangan2 = $request->datetimepicker1; + } + + + $cawangan_info = Http::get($request->hostname . '/api/cawangan/'. $request->kodcaw)->json(); + $cawangan=Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json(); + $cawangan_detail=$cawangan[0]; + + //Calculation Imbang Duga + $imbangduga = Http::get($request->hostname.'/api/CalculationPendahuluanSerahan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + // $keuntungan = Http::get($request->hostname.'/api/KeuntunganArRahn/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + // $rebet = Http::get($request->hostname.'/api/RebetCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + + //Harta semasa + $pinjamandiberi = Http::get($request->hostname.'/api/PinjamanDiberi/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $pembiayaantawarruq = Http::get($request->hostname.'/api/PembiayaanDiberiTawarruq/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $tunaiditangan = Http::get($request->hostname.'/api/TunaiDiTangan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $penghutangkaki = Http::get($request->hostname.'/api/PenghutangKakitangan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $untungrugi = Http::get($request->hostname.'/api/UntungRugiCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $bayaranpendahuluan = Http::get($request->hostname.'/api/BayaranPendahuluan/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + + //Tanggungan Semasa + $panjar = Http::get($request->hostname.'/api/CalculationPanjar/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $bakilelong = Http::get($request->hostname.'/api/BakiLelongCalculation/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $wtd = Http::get($request->hostname.'/api/SerahBaki/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $cajlelong = Http::get($request->hostname.'/api/cajlelong/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $keuntungansebenar = Http::get($request->hostname.'/api/KeuntunganSebenar/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $cajperkhidmatan = Http::get($request->hostname.'/api/cajperkhidmatanterkumpul/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $hapuskira = Http::get($request->hostname.'/api/CalculationHapusKira/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $xtra = Http::get($request->hostname.'/api/Xtra/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + + + //Perubahan Terbaru + $keun_sebenar = Http::get($request->hostname.'/admin/ig/keuntungansebenar',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); + $pend_terakru = Http::get($request->hostname.'/admin/ig/pendapatanterakru',['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); + $keun_penggadai = Http::get($request->hostname.'/api/KeuntunganPenggadai/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + + $caw_penyelarasan = Cawangan::select('penyelarasan')->where('kodcaw',$request->kodcaw)->get()->toArray(); + + //TunaiDitangan Sementara Upah + if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') + { + $advansurharini = Http::get($request->hostname.'/api/advansurharini/' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $totaltunaiditangan = floatval($tunaiditangan) - floatval($advansurharini); + }else{ + $totaltunaiditangan = $tunaiditangan; + } + + $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; + //1Stop Special Case + if($request->kodcaw === '1STOP') + { + $jualan1stop = floatval(129857.00); + $belian1stop = floatval(122446.50); + $utgterkumpulxtra = floatval(6727.10); + $rugilelongxtra = floatval(10079.30); + $bakilelongxtra = floatval(123.20); + $cajlelongxtra = floatval(25.50); + $upahsimpanxtra = floatval(4894.40); + $peruntukanhapuskira = ($xtra['phapuskira']); + + }else{ + $upahsimpanxtra = $xtra['upahsimpan']; + $bakilelongxtra = $xtra['bakilelong']; + $utgterkumpulxtra = $xtra['untungrugiterkumpul']; + $rugilelongxtra = -($xtra['kerugianlelong']); + $peruntukanhapuskira = ($xtra['phapuskira']); + } + + //Terkumpul + $untungrugiterkumpul = Http::get($request->hostname. '/api/UntungRugiTerkumpul/'. $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + + $hartasemasa = []; + // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; + + if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); + if($pembiayaantawarruq > 0) array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); + if($penghutangkaki > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); + //array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); + // if($keuntungan > 0) array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); + if($bayaranpendahuluan > 0) array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); + // if($rebet > 0) array_push($hartasemasa,['glcode' => '5000/240','descpt' => 'Rebet 1','amaun' => ($rebet * -1)]); + if($imbangduga['serahan'] > 0) array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); + if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); + if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); + if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]); + if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]); + if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]); + if($keun_penggadai > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Keuntungan Terakru Penggadai', 'amaun' => $keun_penggadai]); + + $totalhartasemasa = 0; + foreach($hartasemasa as $index => $hs) + { + $totalhartasemasa += $hs['amaun']; + } + + $tanggungansemasa = []; + + // $tanggungansemasa = ['pendahuluan' => $imbangduga['pendahuluan'],'bds' => $panjar['bds'],'perubatan' => $panjar['perubatan'],'keraian' => $panjar['keraian'],'bakilelong' => $bakilelong['bakilelong'],'rugilelong' => $bakilelong['rugilelong'],'wtd' => $wtd,'cajlelong' => $cajlelong]; + + // if($keuntungan > 0) array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); + if($pend_terakru > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Pendapatan Terakru','amaun' => $pend_terakru]); + // if($keuntungansebenar > 0) array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); + // if($rebet > 0) array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet 2','amaun' => ($rebet * -1)]); + if($imbangduga['pendahuluan'] > 0) array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); + if($panjar['bds'] > 0) array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'Panjar - Baiki dan Selenggara','amaun' => -$panjar['bds']]); + if($panjar['perubatan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'Panjar - Belanja AM','amaun' => -$panjar['perubatan']]); + if($panjar['keraian'] > 0) array_push($tanggungansemasa,['glcode' => '3000/019','descpt' => 'Panjar - Keraian Dan Promosi','amaun' => -$panjar['keraian']]); + if($bakilelong['bakilelong'] != 0) array_push($tanggungansemasa,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + if($bakilelong['rugilelong'] != 0) array_push($tanggungansemasa,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); + if($wtd > 0) array_push($tanggungansemasa,['glcode' => '3000/021','descpt' => 'Wang Tak Dituntut','amaun' => $wtd]); + if($cajlelong > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Pendapatan Caj Lelong','amaun' => $cajlelong]); + if($untungrugiterkumpul > 0) array_push($tanggungansemasa,['glcode' => '7000/101','descpt' => 'Untung/Rugi Terkumpul','amaun' => $untungrugiterkumpul]); + if($cajperkhidmatan > 0) array_push($tanggungansemasa,['glcode' => '5000/213','descpt' => 'Caj Perkhidmatan Terkumpul','amaun' => $cajperkhidmatan]); + if($cajlelongxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/313','descpt' => 'Pendapatan Caj Lelong Xtra ','amaun' => $cajlelongxtra]); + if($upahsimpanxtra > 0) array_push($tanggungansemasa,['glcode' => '5000/413','descpt' => 'Upah Simpan Xtra - Koperasi PKB','amaun' => $upahsimpanxtra]); + if($bakilelongxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/190','descpt' => 'Baki Lelong Xtra','amaun' => $bakilelongxtra]); + if($rugilelongxtra != 0) array_push($tanggungansemasa,['glcode' => '7000/191','descpt' => 'Rugi Lelong Xtra','amaun' => -$rugilelongxtra]); + if($utgterkumpulxtra > 0) array_push($tanggungansemasa,['glcode' => '7000/201','descpt' => 'Untung/Rugi Terkumpul Xtra','amaun' => $utgterkumpulxtra]); + if($jualan1stop > 0) array_push($tanggungansemasa,['glcode' => '9000/501','descpt' => 'Jualan 1 Stop','amaun' => $jualan1stop]); + if($hapuskira > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Hapus Kira','amaun' => -$hapuskira]); + if($caw_penyelarasan[0]['penyelarasan'] > 0) array_push($tanggungansemasa,['glcode' => '3000/011','descpt' => 'Penyelarasan','amaun' => $caw_penyelarasan[0]['penyelarasan']]); + + + $totaltanggungansemasa = 0; + foreach($tanggungansemasa as $index => $ts) + { + $totaltanggungansemasa += $ts['amaun']; + } + + + $untungrugifield = []; + array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan Sebenar', 'amaun' => $keun_sebenar]); + + + $totaluntungrugi = 0; + $totaluntungrugi = $totaltanggungansemasa + $keun_sebenar; + + if(isset($request->jenis)) + { + if($request->jenis == 'pdf') + { + $pdf = PDF::loadView('akaun.laporan_imbangduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail'))->setPaper('a4', 'potrait'); + return $pdf->download('laporan_imbangduga_' . $request->kodcaw .'_'. $tarikh_imbangan2 . '.pdf'); + }else{ + return view('akaun.laporan_imbangduga-extended',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + } + } + + // return view('akaun.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + } } diff --git a/app/Http/Controllers/TetapanController.php b/app/Http/Controllers/TetapanController.php new file mode 100644 index 0000000..9af46b1 --- /dev/null +++ b/app/Http/Controllers/TetapanController.php @@ -0,0 +1,20 @@ +=3.0.0 <4.0.0", @@ -6856,6 +6964,21 @@ } } }, + "simple-update-notifier": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz", + "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==", + "requires": { + "semver": "~7.0.0" + }, + "dependencies": { + "semver": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz", + "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==" + } + } + }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -6888,8 +7011,7 @@ "source-map-js": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, "source-map-resolve": { "version": "0.5.3", @@ -7106,7 +7228,6 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, "requires": { "has-flag": "^3.0.0" } @@ -7122,7 +7243,7 @@ "svg.easing.js": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/svg.easing.js/-/svg.easing.js-2.0.0.tgz", - "integrity": "sha1-iqmUawqOJ4V6XEChDrpAkeVpHxI=", + "integrity": "sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA==", "requires": { "svg.js": ">=2.3.x" } @@ -7130,7 +7251,7 @@ "svg.filter.js": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/svg.filter.js/-/svg.filter.js-2.0.2.tgz", - "integrity": "sha1-kQCOFROJ3ZIwd5/L5uLJo2LRwgM=", + "integrity": "sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw==", "requires": { "svg.js": "^2.2.5" } @@ -7191,9 +7312,9 @@ } }, "sweetalert2": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.3.3.tgz", - "integrity": "sha512-10Keqbmjng/+XpkpSOQ6dttpztl7XNohjnpC6bX6XFgm0WpRXM81YE0wmonGYOP6uyzd76vpfnZS04PdVvO31Q==" + "version": "11.4.26", + "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.4.26.tgz", + "integrity": "sha512-YqH/C6IPudeWVK9R0x3pCOqP7m90Ae50tl98SQBpAwL3+UBl1WYD2+5OaKy0ybiVTKbYe76wwJ3PV+bITLjl+A==" }, "table2excel": { "version": "1.0.4", @@ -7313,6 +7434,26 @@ } } }, + "through2": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz", + "integrity": "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==", + "requires": { + "readable-stream": "3" + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "thunky": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", @@ -7359,7 +7500,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, "requires": { "is-number": "^7.0.0" } @@ -7370,6 +7510,14 @@ "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "requires": { + "nopt": "~1.0.10" + } + }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -7408,6 +7556,11 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==" }, + "undefsafe": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz", + "integrity": "sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==" + }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", @@ -7543,9 +7696,13 @@ "integrity": "sha512-BOuDjFFYvJdZO6e/N65AlaDItXo2TgyLjeyRYcqgAPkXpp5yTJcvkL2n+syO1r9Qc5g96tfBD2tuiMhYDmaGcA==" }, "vue": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", - "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" + "version": "2.7.8", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz", + "integrity": "sha512-ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ==", + "requires": { + "@vue/compiler-sfc": "2.7.8", + "csstype": "^3.1.0" + } }, "vue-apexcharts": { "version": "1.6.2", @@ -7613,9 +7770,9 @@ "dev": true }, "vue-loader": { - "version": "15.9.8", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz", - "integrity": "sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog==", + "version": "15.10.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz", + "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==", "dev": true, "requires": { "@vue/component-compiler-utils": "^3.1.0", @@ -7654,9 +7811,9 @@ } }, "vue-router": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz", - "integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==" + "version": "3.5.4", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.4.tgz", + "integrity": "sha512-x+/DLAJZv2mcQ7glH2oV9ze8uPwcI+H+GgTgTmb5I55bCgY3+vXWIsqbYUzbBSZnwFHEJku4eoaH/x98veyymQ==" }, "vue-spinner": { "version": "1.0.4", @@ -7679,21 +7836,21 @@ "integrity": "sha512-5gX2jLLKkZYzcbT6hRxmKRfGycIrZ+r8MTaV/uqZP5hhSKMGVLvUgiBbsXiSs2qZr3/XizE0xTQuFkCm33QJzA==" }, "vue-sweetalert2": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/vue-sweetalert2/-/vue-sweetalert2-5.0.2.tgz", - "integrity": "sha512-28pcpmvaFxwoXIUkOWwhZhmsV749jXxha8JicwPoSKyFKR5FhIaZU6UHO5WlUCLIVUI6sAWY6WngK2x/iXYwZg==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/vue-sweetalert2/-/vue-sweetalert2-5.0.5.tgz", + "integrity": "sha512-Q7+TjQxNwGruT2jfPaSKMz18HHWs81r4umEwlrrtOf/QL5Iwl1T+tUaNkcvKB7Rf9rYftubt7NnOMjfDMnDH3A==", "requires": { "sweetalert2": "11.x" } }, "vue-template-compiler": { - "version": "2.6.14", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz", - "integrity": "sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==", + "version": "2.7.8", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz", + "integrity": "sha512-eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw==", "dev": true, "requires": { "de-indent": "^1.0.2", - "he": "^1.1.0" + "he": "^1.2.0" } }, "vue-template-es2015-compiler": { diff --git a/package.json b/package.json index e59fc17..3740d8c 100644 --- a/package.json +++ b/package.json @@ -10,36 +10,36 @@ "production": "mix --production" }, "devDependencies": { - "autoprefixer": "^10.4.4", + "autoprefixer": "^10.4.8", "axios": "^0.21.4", - "bootstrap": "^4.6.0", + "bootstrap": "^4.6.2", "jquery": "^3.6", "laravel-mix": "^6.0.43", "lodash": "^4.17.19", "popper.js": "^1.16.1", - "postcss": "^8.4.12", + "postcss": "^8.4.16", "resolve-url-loader": "^3.1.2", - "sass": "^1.50.0", + "sass": "^1.54.4", "sass-loader": "^11.0.1", "tailwindcss": "^2.2.19", - "vue": "^2.6.12", + "vue": "^2.7.8", "vue-friendly-iframe": "^0.20.0", "vue-html5-editor": "^1.1.1", - "vue-loader": "^15.9.8", - "vue-template-compiler": "^2.6.12" + "vue-loader": "^15.10.0", + "vue-template-compiler": "^2.7.8" }, "dependencies": { - "@headlessui/vue": "^1.5.0", - "@popperjs/core": "^2.11.5", + "@headlessui/vue": "^1.6.7", + "@popperjs/core": "^2.11.6", "@vue-hero-icons/outline": "^1.7.2", "@vue-hero-icons/solid": "^1.7.2", "@vue/composition-api": "^1.4.9", - "alpinejs": "^3.9.6", - "apexcharts": "^3.35.0", + "alpinejs": "^3.10.3", + "apexcharts": "^3.35.4", "jw-vue-pagination": "^1.0.3", - "laravel-echo": "^1.11.4", + "laravel-echo": "^1.13.1", "npm-watch": "^0.11.0", - "pusher-js": "^7.0.6", + "pusher-js": "^7.3.0", "table2excel": "^1.0.4", "vue-apexcharts": "^1.6.2", "vue-axios": "^3.4.1", @@ -50,10 +50,10 @@ "vue-moment": "^4.1.0", "vue-property-decorator": "^9.1.2", "vue-pusher": "^1.1.0", - "vue-router": "^3.5.3", + "vue-router": "^3.5.4", "vue-spinner": "^1.0.4", "vue-swal2-loading-overlay": "^1.0.3", - "vue-sweetalert2": "^5.0.2", + "vue-sweetalert2": "^5.0.5", "vue-toastification": "^1.7.14", "vuejs-datetimepicker": "^1.1.13", "vuelidate": "^0.7.7", diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 1119ca7..75362d5 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -1,125 +1,134 @@ \ No newline at end of file + diff --git a/resources/js/Akaun/ImbangdugaExtended.vue b/resources/js/Akaun/ImbangdugaExtended.vue new file mode 100644 index 0000000..451cd45 --- /dev/null +++ b/resources/js/Akaun/ImbangdugaExtended.vue @@ -0,0 +1,167 @@ + + + \ No newline at end of file diff --git a/resources/js/Akaun/PetiBesi.vue b/resources/js/Akaun/PetiBesi.vue new file mode 100644 index 0000000..6993c28 --- /dev/null +++ b/resources/js/Akaun/PetiBesi.vue @@ -0,0 +1,83 @@ + + + \ No newline at end of file diff --git a/resources/js/Tetapan/index.vue b/resources/js/Tetapan/index.vue new file mode 100644 index 0000000..1d8519d --- /dev/null +++ b/resources/js/Tetapan/index.vue @@ -0,0 +1,222 @@ + + + diff --git a/resources/js/WTD/Rekod.vue b/resources/js/WTD/Rekod.vue index f1d6bdd..dbe479f 100644 --- a/resources/js/WTD/Rekod.vue +++ b/resources/js/WTD/Rekod.vue @@ -16,6 +16,12 @@
:
RM {{ formattext(sb.baki) }}
+
+
Tarikh WTD +
+
:
+
{{ (sb.t_jual) ? sb.t_jual : 'Tiada' }}
+
Diprocess
diff --git a/resources/js/app.js b/resources/js/app.js index c76cbaf..1667dbd 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -234,6 +234,9 @@ Vue.component('wtdindex-component', require('./WTD/index.vue').default) //Audit Vue.component('audit-component', require('./Audit/Home.vue').default) +//Tetapan +Vue.component('tetapan-component', require('./Tetapan/index.vue').default) + diff --git a/resources/js/pages/Detailspelanggan.vue b/resources/js/pages/Detailspelanggan.vue index 0cee67b..2d55b90 100644 --- a/resources/js/pages/Detailspelanggan.vue +++ b/resources/js/pages/Detailspelanggan.vue @@ -421,6 +421,9 @@ Bil + + Cawangan + Norujukan @@ -442,6 +445,9 @@ Caj Lelong + + Action + @@ -484,7 +490,7 @@
-

+

@@ -492,7 +498,7 @@
-

+

@@ -500,7 +506,7 @@
-

+

@@ -508,7 +514,23 @@
-

+

+

+
+
+ + +
+
+

+

+
+
+ + +
+
+

diff --git a/resources/js/routes.js b/resources/js/routes.js index a79e8d1..b5c47b6 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -2,6 +2,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Lejeram from './Akaun/Lejeram' import Imbangduga from './Akaun/Imbangduga' +import ImbangdugaExtended from './Akaun/ImbangdugaExtended' import Home from './Akaun/Home' import Laporan from './Akaun/Laporan' import Gadaian from './Akaun/Gadaian' @@ -18,6 +19,8 @@ import RingkasanHarian from './Akaun/RingkasanHarian' import RingkasanTerkumpul from './Akaun/RingkasanTerkumpul' import StokAuditBackdate from './Akaun/StokAuditBackdate' import Aging from './Akaun/Aging' +import PetiBesi from './Akaun/PetiBesi' + import Prestasi from './Akaun/Prestasi' @@ -56,6 +59,7 @@ export default new VueRouter({ { path: '/akaunhome', component: Home }, { path: '/akaunhome/lejeram', component: Lejeram }, { path: '/akaunhome/imbangduga', component: Imbangduga }, + { path: '/akaunhome/imbangduga/extended', component: ImbangdugaExtended }, { path: '/akaunhome/gadaian', component: Gadaian }, { path: '/akaunhome/penebusan', component: Penebusan }, { path: '/akaunhome/ansuran', component: Ansuran }, @@ -70,6 +74,7 @@ export default new VueRouter({ { path: '/akaunhome/RingkasanTerkumpul', component: RingkasanTerkumpul }, { path: '/akaunhome/StokAuditBackdate', component: StokAuditBackdate }, { path: '/akaunhome/Aging', component: Aging }, + { path: '/akaunhome/PetiBesi', component: PetiBesi }, { path: '/akaunhome/prestasi', component: Prestasi }, diff --git a/resources/views/akaun/laporan_imbangduga-extended.blade.php b/resources/views/akaun/laporan_imbangduga-extended.blade.php new file mode 100644 index 0000000..dabf58b --- /dev/null +++ b/resources/views/akaun/laporan_imbangduga-extended.blade.php @@ -0,0 +1,509 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
LAPORAN IMBANGAN DUGA CAWANGAN
+ + + + + + + + +
Tarikh Laporan {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} Tarikh Cetak {{$tarikh_cetak}}
+
+ + + + + + + + + + + + + + + + @foreach($hartasemasa as $index => $assets) + + + + + + @endforeach + + + + + + + +
Kod GL Keterangan Amaun
HARTA SEMASA
{{ $assets['glcode'] }}{{ $assets['descpt'] }}{{ number_format($assets['amaun'],2) }}
JUMLAH {{ number_format($totalhartasemasa,2) }}
+
+ + + + + + + + + @foreach($tanggungansemasa as $index => $liabilities) + + + + + + @endforeach + + + + + + + +
TANGGUNGAN SEMASA
{{ $liabilities['glcode'] }}{{ $liabilities['descpt'] }}{{ number_format($liabilities['amaun'],2) }}
JUMLAH {{ number_format($totaltanggungansemasa,2) }}
+
+ + + + + + + + + @foreach($untungrugifield as $index => $untungrugi) + + + + + + @endforeach + + + + + + + +
Untung Rugi
{{ $untungrugi['glcode'] }}{{ $untungrugi['descpt'] }}{{ number_format($untungrugi['amaun'],2) }}
JUMLAH {{ number_format($totaluntungrugi,2) }}
+
+
+ + + \ No newline at end of file diff --git a/resources/views/akaun/laporan_petibesi.blade copy.php b/resources/views/akaun/laporan_petibesi.blade copy.php new file mode 100644 index 0000000..ccea30e --- /dev/null +++ b/resources/views/akaun/laporan_petibesi.blade copy.php @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
LAPORAN BAKI PETI BESI Tarikh Cetak: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
TARIKH@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
BAKI AWAL
Baki Awal:RM {{ number_format($petibesi['bakiawal'],2) }}
TOLAK
Pendahuluan Kepada Teller:RM {{ number_format($petibesi['keluar'],2) }}
Serahan Kepada HQ:RM {{ number_format($petibesi['serahan'],2) }}
TAMBAH
Serahan Daripada Teller:RM {{ number_format($petibesi['masuk'],2) }}
Pendahuluan Daripada HQ:RM {{ number_format($petibesi['pendahuluan'],2) }}
BAKI AKHIR
Baki Akhir:RM {{ number_format($petibesi['bakiakhir'],2) }}
Baki Akhir Teller:RM 0.00
Baki Dibawa Kedepan :RM {{ number_format($petibesi['bakieod'],2) }}
+ +
+
+
+
+ + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
+ + + + + + diff --git a/resources/views/layouts/sidebar.blade.php b/resources/views/layouts/sidebar.blade.php index dba10b6..0a55a2a 100644 --- a/resources/views/layouts/sidebar.blade.php +++ b/resources/views/layouts/sidebar.blade.php @@ -20,10 +20,13 @@ @if(Auth::user()->roles == 'admin') - +
  • - + @@ -34,60 +37,76 @@
    • - -
  • -
    - - - - - - Tunai -
    -
    • -     - - -
  • -
    - - - - - Peti Besi -
    -
    • -     - - -
  • -
    - - - - - Pelanggan -
    -
    • -     - - +
  • - - - + + + + + + Tunai +
    +
    • +     + + +
  • +
    + + + + + Peti Besi +
    +
    • +     + + +
  • +
    + + + + + Pelanggan +
    +
    • +     + + +
  • +
    + + + Online
    • - - + +
  • - - + + Laporan
    @@ -95,23 +114,28 @@     {{-- -
  • -
    - - - - Permissions -
    -
    • +
  • +
    + + + + Permissions +
    +
    • --}} @elseif(Auth::user()->roles == 'operasi') - +
  • - + @@ -122,157 +146,210 @@
    • - - + +
  • - - - - Bajet + + + + Bajet
    • - +
  • - - - + + + Blacklist
    • - +
  • {{-- --}} - - - + + + Lelong
    • - +
  • - - + + WTD
    • - {{-- +
  • - - - - Kelulusan + + + + + Tetapan
    • +     + + + {{-- +
  • +
    + + + + Kelulusan +
    +
    • --}} - +
  • - - + + Laporan
    • - {{-- -
  • -
    - - - - Permohonan -
    -
    • -     --}} + +
  • +
    + + + + Permohonan +
    +
    • +     @elseif(Auth::user()->roles == 'akaun') - +
  • - - + + Audit
    • - +
  • - - + + Laporan
    • - {{-- -
  • -
    - - - - Permohonan -
    -
    • + {{--     +
  • +
    + + + + Permohonan +
    +
    • --}} @endif - +

    Profil

    -
  • -
    - - - - - Pengguna -
    -
    • +
  • +
    + + + + + Pengguna +
    +
    • -
  • -
    - - - - Arkib -
    -
    • +
  • +
    + + + + Arkib +
    +
    • - +
    -
    - \ No newline at end of file + diff --git a/resources/views/tetapan/index.blade.php b/resources/views/tetapan/index.blade.php new file mode 100644 index 0000000..1678963 --- /dev/null +++ b/resources/views/tetapan/index.blade.php @@ -0,0 +1,18 @@ + +@extends('layouts.app') + +@section('content') + +
    +
    + +
    + + + + + +
    +
    + @include('layouts.footer') +@endsection diff --git a/routes/web.php b/routes/web.php index 65a13b7..4eeb30b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -76,6 +76,7 @@ Route::get('/kelulusan',['as'=>'kelulusan','uses'=>'App\Http\Controllers\Kelulus //Akaun Route::get('/akaunhome/cetaklaporanlejeram',['as'=>'cetak.lejeram','uses'=>'App\Http\Controllers\AkaunController@viewlejeram'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetaklaporanimbangduga',['as'=>'cetak.imbangduga','uses'=>'App\Http\Controllers\AkaunController@cetakimbangduga'])->middleware(['roleChecker:admin,akaun,operasi']); +Route::get('/akaunhome/cetaklaporanimbangdugaextended',['as'=>'cetak.imbangdugaExtended','uses'=>'App\Http\Controllers\AkaunController@cetakimbangdugaExtended'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakgadaian',['as'=>'cetak.gadaian','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanGadai'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakpenebusan',['as'=>'cetak.penebusan','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPenebusan'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakansuran',['as'=>'cetak.ansuran','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanAnsuran'])->middleware(['roleChecker:admin,akaun,operasi']); @@ -90,6 +91,7 @@ Route::get('/akaunhome/cetakperbelanjaan',['as'=>'cetak.perbelanjaan','uses'=>'A Route::get('/akaunhome/cetakringkasanterkumpul',['as'=>'cetak.ringkasanterkumpul','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanRingkasanTerkumpul'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakstokauditbackdate',['as'=>'cetak.stokauditbackdate','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanStokAuditBackdate'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakaging',['as'=>'cetak.aging','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanAging'])->middleware(['roleChecker:admin,akaun,operasi']); +Route::get('/akaunhome/cetakpetibesi',['as'=>'cetak.petibesi','uses'=>'App\Http\Controllers\AkaunController@cetakPetiBesi'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/prestasi',['as'=>'cetak.prestasi','uses'=>'App\Http\Controllers\AkaunController@cetakLaporanPrestasi'])->middleware(['roleChecker:admin,akaun,operasi']); @@ -122,6 +124,11 @@ Route::get('/audit',['as'=>'audit.index','uses'=>'App\Http\Controllers\AkaunCont Route::get('/audit/cetakan', ['as'=>'audit.cetak','uses'=>'App\Http\Controllers\AkaunController@CetakSenarai']); +//Tetapan Server +Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanController@index'])->middleware(['roleChecker:null,null,operasi']); + + + Route::get('{any}', function () { return view('home');