diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index a107d80..d9f79b8 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -746,7 +746,7 @@ class AkaunController extends Controller } $laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[ - 'kodcaw' => $auth_user['cawangan'], + 'kodcaw' => $request->kodcaw, 'mula' => $mula_date, 'akhir' => $hingga_date ])->json(); @@ -1176,4 +1176,79 @@ class AkaunController extends Controller } } + + public function cetak_serahgadai(Request $request){ + $auth_user = Auth::user(); + + $api_url = config('api.url'); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datemula == null){ + $datemula = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + $datemula = $request->datemula; + } + + if($request->datehingga == null){ + $datehingga = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + $datehingga = $request->datehingga; + } + + + $serahbarcode = Http::get($request->hostname.'/admin/laporan/serahgadai/',[ + 'kodcaw' => $request->kodcaw, + 'mula' => $datemula, + 'hingga' => $datehingga, + ])->json(); + + + $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]; + + return view('akaun.laporan_serahpetibesigadai', compact('cawangan_detail','api_url','serahbarcode','cawangan_info','datemula','datehingga','tarikh_cetak')); + } + + public function cetak_serahtebus(Request $request){ + $auth_user = Auth::user(); + + $api_url = config('api.url'); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datemula == null){ + $datemula = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + $datemula = $request->datemula; + } + + if($request->datehingga == null){ + $datehingga = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + $datehingga = $request->datehingga; + } + + + $serahmarhun = Http::get($request->hostname.'/admin/laporan/serahmarhuntebus/',[ + 'kodcaw' => $request->kodcaw, + 'mula' => $datemula, + 'hingga' => $datehingga, + ])->json(); + + + $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]; + + return view('akaun.laporan_serahpetibesigadai', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak')); + + } } diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 388e986..4659957 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -128,6 +128,16 @@

Akru Bulanan

+
+ +

Serah Marhun Gadai

+
+
+
+ +

Serah Marhun Tebus

+
+
diff --git a/resources/js/Akaun/SerahGadai.vue b/resources/js/Akaun/SerahGadai.vue new file mode 100644 index 0000000..1eb0569 --- /dev/null +++ b/resources/js/Akaun/SerahGadai.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/resources/js/Akaun/SerahTebus.vue b/resources/js/Akaun/SerahTebus.vue new file mode 100644 index 0000000..7081b9d --- /dev/null +++ b/resources/js/Akaun/SerahTebus.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue index cccde1c..96dce51 100644 --- a/resources/js/Permohonan/SenaraiMohon.vue +++ b/resources/js/Permohonan/SenaraiMohon.vue @@ -608,7 +608,13 @@ export default { confirmButtonText: 'Hantar', showCancelButton: true, cancelButtonText: 'Batal', - allowOutsideClick: false + allowOutsideClick: false, + inputValidator: (value) => { + + if (!value) { + return 'Isikan tempat kosong diatas!' + } + } }) if (katalaluan !== undefined) @@ -626,6 +632,21 @@ export default { confirmButtonText: 'Muat Naik', input: 'file', allowOutsideClick: false, + inputValidator: (value) => { + + var fileTypes = ['jpg', 'jpeg', 'png']; + + if (value) { + var extension = value.name.split('.').pop().toLowerCase(), + isSuccess = fileTypes.indexOf(extension) > -1; + if(!isSuccess){ + return 'file hanya boleh diupload untuk jpg,jpeg,png dan pdf sahaja!' + } + }else{ + return 'masukkan file upload!' + + } + }, willOpen: () => { $(".swal2-file").change(function () { var reader = new FileReader(); @@ -719,7 +740,7 @@ export default { text: 'Kata Laluan Yang Dimasukkan Salah!!', allowOutsideClick: false }).then(function () { - getSenaraiMohon(this.currentPage); + refer.getSenaraiMohon(refer.currentPage); }); } }); @@ -729,7 +750,6 @@ export default { let refer = this; this.axios.get(this.$hostname + '/admin/permohonan/get/' + caw + '/' + mid).then(response => { - console.log(response.data.tagprint); if (response.data.tagprint !== 1) { this.axios.put(this.$hostname + '/admin/permohonan/updatecetak', { mohonid: mid, diff --git a/resources/js/Tetapan/index.vue b/resources/js/Tetapan/index.vue index 1d8519d..6fb5b7b 100644 --- a/resources/js/Tetapan/index.vue +++ b/resources/js/Tetapan/index.vue @@ -10,6 +10,8 @@ --> +

Tetapan Semakan Barcode

+
@@ -22,13 +24,13 @@ Norujukan
- Pembiayaan + Pembiayaan (RM) - Cetak + Tarikh Gadai - Serah + Cetakan Penilai Semak Barcode @@ -70,7 +72,7 @@
-

+

@@ -78,7 +80,7 @@
-

+

@@ -86,7 +88,7 @@
-

+

@@ -94,7 +96,7 @@
-

+

@@ -127,6 +129,10 @@