From 877d3e5aeca560e4e75004eb1c4d824f27450df6 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 31 May 2022 00:29:22 +0800 Subject: [PATCH] fix senarai backdate stokaudit --- app/Http/Controllers/AkaunController.php | 49 ++++ resources/js/Akaun/Home.vue | 17 +- resources/js/Akaun/StokAuditBackdate.vue | 83 ++++++ resources/js/Permohonan/SenaraiMohon.vue | 4 +- resources/js/components/util/PBmodal.vue | 20 +- resources/js/routes.js | 2 + .../akaun/laporan_stokauditbackdate.blade.php | 259 ++++++++++++++++++ routes/web.php | 1 + 8 files changed, 423 insertions(+), 12 deletions(-) create mode 100644 resources/js/Akaun/StokAuditBackdate.vue create mode 100644 resources/views/akaun/laporan_stokauditbackdate.blade.php diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 29bb467..0a0a1ed 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -747,4 +747,53 @@ class AkaunController extends Controller return view('akaun.laporan_ringkasanterkumpul', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } + + public function cetakLaporanStokAuditBackdate(Request $request){ + + $api_url = $request->hostname; + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + $split_date = explode('-',$request->datestokauditbackdate); + $bulan = $split_date[1]; + $tahun = $split_date[0]; + + if($bulan == 1){ + $namabulan = 'Januari'; + }elseif($bulan == 2){ + $namabulan = 'Februari'; + }elseif($bulan == 3){ + $namabulan = 'Mac'; + }elseif($bulan == 4){ + $namabulan = 'April'; + }elseif($bulan == 5){ + $namabulan = 'Mei'; + }elseif($bulan == 6){ + $namabulan = 'Jun'; + }elseif($bulan == 7){ + $namabulan = 'Julai'; + }elseif($bulan == 8){ + $namabulan = 'Ogos'; + }elseif($bulan == 9){ + $namabulan = 'September'; + }elseif($bulan == 10){ + $namabulan = 'Oktober'; + }elseif($bulan == 11){ + $namabulan = 'November'; + }elseif($bulan == 12){ + $namabulan = 'Disember'; + } + + $tebus_date = $namabulan . ' ' . $tahun; + + $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $stokaudit = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/stokaudit/backdate',['kodcaw' => $auth_user['cawangan'],'tahun'=>$tahun,'bulan'=>$bulan])->json(); + + return view('akaun.laporan_stokauditbackdate', compact('stokaudit','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + + } } diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 34ee79f..0682f3e 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -84,12 +84,21 @@ -
- -

Ringkasan Terkumpul

- +
+
+ +

Ringkasan Terkumpul

+
+
+ +

Stok Audit Back-date

+ +
+
+ +
diff --git a/resources/js/Akaun/StokAuditBackdate.vue b/resources/js/Akaun/StokAuditBackdate.vue new file mode 100644 index 0000000..f128f2f --- /dev/null +++ b/resources/js/Akaun/StokAuditBackdate.vue @@ -0,0 +1,83 @@ + + + \ No newline at end of file diff --git a/resources/js/Permohonan/SenaraiMohon.vue b/resources/js/Permohonan/SenaraiMohon.vue index df159cf..1d3ad97 100644 --- a/resources/js/Permohonan/SenaraiMohon.vue +++ b/resources/js/Permohonan/SenaraiMohon.vue @@ -346,7 +346,7 @@
- -
+
Pilih keputusan!
@@ -49,8 +50,8 @@ Amaun Lulus -
Field is required
-
Must be between {{$v.amaunlulus.$params.between.min}} and {{$v.amaunlulus.$params.between.max}}
+
Perlu ada dalam kotak
+
Mestilah dalam lingkungan {{$v.amaunlulus.$params.between.min}} dan {{$v.amaunlulus.$params.between.max}}
@@ -58,12 +59,12 @@
-
+ +
File perlu ada!
-
File melebihi had!
@@ -131,6 +132,9 @@ export default { } }, methods: { + testfunc: function (){ + return 10000; + }, onUpload: function (e) { const file = e.target.files[0] this.item.image = file @@ -190,7 +194,11 @@ export default { validations: { amaunlulus: { required, - between: between(20, 30) + // between: between(30, 30000) + between (value) { + let amaun = parseInt(this.amaun_dimohon.replace(/,/g, ''), 10) + return between(0, amaun)(value) + } }, imageFile: { required, diff --git a/resources/js/routes.js b/resources/js/routes.js index a45e220..c6be183 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -16,6 +16,7 @@ import StokAudit from './Akaun/StokAudit' import Perbelanjaan from './Akaun/Perbelanjaan' import RingkasanHarian from './Akaun/RingkasanHarian' import RingkasanTerkumpul from './Akaun/RingkasanTerkumpul' +import StokAuditBackdate from './Akaun/StokAuditBackdate' @@ -53,6 +54,7 @@ export default new VueRouter({ { path: '/akaunhome/Perbelanjaan', component: Perbelanjaan }, { path: '/akaunhome/RingkasanHarian', component: RingkasanHarian }, { path: '/akaunhome/RingkasanTerkumpul', component: RingkasanTerkumpul }, + { path: '/akaunhome/StokAuditBackdate', component: StokAuditBackdate }, { path: '/bajet/kemaskini', component: SenaraiBajet }, diff --git a/resources/views/akaun/laporan_stokauditbackdate.blade.php b/resources/views/akaun/laporan_stokauditbackdate.blade.php new file mode 100644 index 0000000..3d9017d --- /dev/null +++ b/resources/views/akaun/laporan_stokauditbackdate.blade.php @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + +
Laporan Stok Audit Tarikh Cetak: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp +
TARIKH{{ $tebus_date }} +
+ +
+ + + + + + + + + + + + + + + + @php $counter = 1;$totalpinjaman = 0; @endphp + @foreach($stokaudit['rekod'] as $index=>$item) + + + + + + + + + + + + + + + @php $counter++; @endphp + @endforeach + + + + + + + + + + + +
BilNorujukanJBGNo. KPBeratNilai Marhun (RM)Pembiayaan Asal (RM)Baki Pembiayaan (RM)Kadar UpahTempoh Belum BayarKeuntungan Belum Bayar (RM)Lanjutan
{{ $counter }}{{$item['norujukan']}}{{ $item['tempoh'] }}{{$item['nokp']}}{{ number_format($item['berat'],2) }}{{ number_format($item['nilaimarhun'],2) }}{{ number_format($item['pinjaman'],2) }}{{ number_format($item['bakipjm'],2) }}{{ number_format($item['kadarupah'],2) }}{{ number_format($item['tempohblmbyar'],2) }}{{ number_format($item['upahblmbyar'],2) }}{{$item['lanjutan']}}
Jumlah{{ number_format($stokaudit['totalberat'],2) }}{{ number_format($stokaudit['totalnilaimarhun'],2) }}{{ number_format($stokaudit['totalpinjaman'],2) }}{{ number_format($stokaudit['totalbakipjm'],2) }}{{ number_format($stokaudit['totaltunggakan'],2) }}
+ +
+
+ + + + + + + + + + + + + + + +
.................................................................. ..................................................................
DI SEMAK DI SAHKAN
diff --git a/routes/web.php b/routes/web.php index acfd366..bf76f7c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -88,6 +88,7 @@ Route::get('/akaunhome/cetakkawalanstok',['as'=>'cetak.kawalanstok','uses'=>'App Route::get('/akaunhome/cetaklelong',['as'=>'cetak.lelong','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_lelong'])->middleware(['roleChecker:admin,akaun,operasi']); Route::get('/akaunhome/cetakperbelanjaan',['as'=>'cetak.perbelanjaan','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_perbelanjaan'])->middleware(['roleChecker:admin,akaun,operasi']); 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']); //Resit