From 88edd9587834a3f7d448b77d181d00b7078e7f5f Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 8 Feb 2023 11:16:12 +0800 Subject: [PATCH 1/2] update laporan tuntut rugi lelong (pdf/view) --- app/Http/Controllers/AkaunController.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index ead1732..6433b6c 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1370,7 +1370,21 @@ class AkaunController extends Controller $tuntutbaki = Http::get($request->hostname. '/admin/laporan/tuntutbaki',['kodcaw' => $request->kodcaw,'mula' => $mula_date,'hingga' => $hingga_date,'sort' => $request->radjenis,'jenistuntut' => $request->jenistuntutan])->json(); + if(isset($request->jenis)) + { + if($request->jenis == 'pdf'){ + + $pdf = PDF::loadView('akaun.laporan_lelongan',compact('tuntutbaki','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'potrait'); + return $pdf->download('laporan tuntut rugi lelong' . $request->kodcaw .'_'. $mula_date . ' hingga '. $hingga_date. '.pdf'); + + } + else { + + return view('akaun.laporan_lelongan',compact('tuntutbaki','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + + } + + } - return view('akaun.laporan_lelongan',compact('tuntutbaki','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); } } From 5c9772f4ae0ca6db4150b596d9d16a7abf3d48bb Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Thu, 16 Feb 2023 16:18:04 +0800 Subject: [PATCH 2/2] WTD dan Imbang duga Extend - tukar t_lelong kpd t_jual (WTD) - rename Imbang duga Extend kpd Imbang Duga Akru --- resources/js/Akaun/Home.vue | 2 +- resources/js/WTD/SelectWTD.vue | 3 ++- resources/js/WTD/SenaraiBakiLelong.vue | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index a91550c..fbbf96f 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -112,7 +112,7 @@
-

Imbang Duga Extend.

+

Imbang Duga Akru

diff --git a/resources/js/WTD/SelectWTD.vue b/resources/js/WTD/SelectWTD.vue index 4ee9b6a..c73a859 100644 --- a/resources/js/WTD/SelectWTD.vue +++ b/resources/js/WTD/SelectWTD.vue @@ -53,7 +53,7 @@ {{ bl.norujukan }} - {{ bl.t_lelong }} + {{ bl.t_jual }} {{ formattext(bl.pinjaman) }} @@ -98,6 +98,7 @@ export default { kodcaw: this.$kodcaw, } }).then(response => { + console.log(response); this.arraybakilelong = response.data; }) }, diff --git a/resources/js/WTD/SenaraiBakiLelong.vue b/resources/js/WTD/SenaraiBakiLelong.vue index 84db319..4d61f12 100644 --- a/resources/js/WTD/SenaraiBakiLelong.vue +++ b/resources/js/WTD/SenaraiBakiLelong.vue @@ -62,7 +62,7 @@ {{ bl.norujukan }} - {{ bl.t_lelong }} + {{ bl.t_jual }} {{ formattext(bl.pinjaman) }}