diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 078b42c..309c6ec 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -922,6 +922,47 @@ class AkaunController extends Controller // return view('akaun.laporan_aging', compact('aging','cawangan_detail','tarikh_cetak','tebus_date','api_url')); } + public function cetakLaporanPrestasi(Request $request) + { + $api_url = $request->hostname; + $auth_user = Auth::user(); + $current = Carbon::now(); + $current = new Carbon(); + $tarikh_cetak = $current->toDateString(); + + if($request->datemula == null){ + $mula_date = '2017-01-01'; + }else{ + $split_date = explode('-', $request->datemula); + // $mula_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $mula_date = $request->datemula; + } + + if($request->datehingga == null){ + $hingga_date = $current->toDateString(); + }else{ + $split_date = explode('-', $request->datehingga); + // $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; + $hingga_date = $request->datehingga; + } + + $gadaiallcaw = Http::get(config('api.url'). '/admin/laporanllcaw/gadai',['mula_date' => $mula_date,'hingga_date' => $hingga_date ])->json(); + + + if(isset($request->jenis)) + { + if($request->jenis == 'pdf') + { + $pdf = PDF::loadView('akaun.laporan_prestasi', compact('gadaiallcaw','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'landscape'); + return $pdf->download('laporan_prestasi-'. $mula_date . '.pdf'); + }else{ + return view('akaun.laporan_prestasi', compact('gadaiallcaw','tarikh_cetak','mula_date','hingga_date','api_url')); + } + } + + + } + public function cetakimbangdugaExtended(Request $request) { @@ -978,10 +1019,12 @@ class AkaunController extends Controller //Perubahan Terbaru - $keun_sebenar = Http::get($request->hostname.'/admin/ig/keuntungansebenar' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); - $pend_terakru = Http::get($request->hostname.'/admin/ig/pendapatanterakru' . $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); + $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(); - dd($keun_sebenar,$pend_terakru); + + dd($keun_sebenar,$pend_terakru,$keun_penggadai); //TunaiDitangan Sementara Upah if($tarikh_imbangan2 >= '2021-04-22' && $tarikh_imbangan2 < '2021-05-05') diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 472ab45..75362d5 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -114,6 +114,11 @@

Imbang Duga Extend.

+
+ +

PRESTASI AR-RAHN

+
+
diff --git a/resources/js/Akaun/Prestasi.vue b/resources/js/Akaun/Prestasi.vue new file mode 100644 index 0000000..0137d2f --- /dev/null +++ b/resources/js/Akaun/Prestasi.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file 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/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 9bae401..b5c47b6 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -21,6 +21,7 @@ import StokAuditBackdate from './Akaun/StokAuditBackdate' import Aging from './Akaun/Aging' import PetiBesi from './Akaun/PetiBesi' +import Prestasi from './Akaun/Prestasi' @@ -74,6 +75,7 @@ export default new VueRouter({ { path: '/akaunhome/StokAuditBackdate', component: StokAuditBackdate }, { path: '/akaunhome/Aging', component: Aging }, { path: '/akaunhome/PetiBesi', component: PetiBesi }, + { path: '/akaunhome/prestasi', component: Prestasi }, { path: '/bajet/kemaskini', component: SenaraiBajet }, diff --git a/resources/views/akaun/laporan_prestasi.blade.php b/resources/views/akaun/laporan_prestasi.blade.php new file mode 100644 index 0000000..0e46e8e --- /dev/null +++ b/resources/views/akaun/laporan_prestasi.blade.php @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + +
+ + + + + + + + + +
LAPORAN URUS NIAGA AR-RAHN PADA @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $mula_date); + $date = $myDateTime->format('d-m-Y'); + echo($date) + @endphp + + HINGGA @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $hingga_date); + $date = $myDateTime->format('d-m-Y'); + echo($date) + @endphp
Tarikh Cetak: @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $date_cetak = $myDateTime->format('d-m-Y'); + echo($date_cetak) + @endphp
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + @foreach($gadaiallcaw as $item) + + + + + + + + + + + + + + + + + + + + + + @endforeach +
Cawangan Bilangan OrangBilangan SuratJumlah (RM)Jumlah Pinjaman Semasa (RM)Baki Awal (RM)Baki Akhir (RM)Bilangan Pelanggan Baru
GadaiTebusGadaiTebusGadaianPenebusanUpah TebusUpah AnsuranJumlah Upah
{{$item['cawangan']}}{{$item['jum_org_gadai']}}{{$item['jum_org_tebus']}}{{$item['jum_surat_gadai']}}{{$item['jum_surat_t']}}{{number_format($item['jumlah_gadai'],2) }}{{number_format($item['jum_penebusan'],2) }}{{number_format($item['jumlah_upah'],2) }}{{number_format($item['jum_ansuranupah'],2) }}{{number_format($item['jum_keseluruhan_upah'],2) }}{{number_format($item['jum_pinjaman_semasa'],2) }}{{number_format($item['bakiawal'],2) }}{{number_format($item['bakiakhir'],2) }}{{$item['bil_pelanggan_baru']}}
+ + + + + + + + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 8b824d4..4eeb30b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -92,6 +92,7 @@ Route::get('/akaunhome/cetakringkasanterkumpul',['as'=>'cetak.ringkasanterkumpul 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']);