From cf767aec9d599e1a0819e8eb48d29500ea9578a1 Mon Sep 17 00:00:00 2001 From: fifi97 <46933637+fifi97@users.noreply.github.com> Date: Sun, 6 Mar 2022 11:06:41 +0800 Subject: [PATCH] fix skit2 --- app/Http/Controllers/AkaunController.php | 35 +++ resources/js/Akaun/Home.vue | 6 + resources/js/Akaun/RingkasanTerkumpul.vue | 86 +++++++ resources/js/pages/Detailspelanggan.vue | 38 ++- resources/js/routes.js | 3 + .../laporan_ringkasanterkumpul.blade copy.php | 194 ++++++++++++++ .../laporan_ringkasanterkumpul.blade.php | 236 ++++++++++++++++++ routes/web.php | 2 +- 8 files changed, 594 insertions(+), 6 deletions(-) create mode 100644 resources/js/Akaun/RingkasanTerkumpul.vue create mode 100644 resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php create mode 100644 resources/views/akaun/laporan_ringkasanterkumpul.blade.php diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index e49c1b3..29bb467 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -712,4 +712,39 @@ class AkaunController extends Controller } } } + + public function cetakLaporanRingkasanTerkumpul(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{ + $mula_date = $request->datemula; + } + + if($request->datehingga == null){ + $hingga_date = $current->toDateString(); + }else{ + $hingga_date = $request->datehingga; + } + + $laporan_ringkasan = Http::get($api_url . '/api/laporan/terkumpul',[ + 'kodcaw' => $auth_user['cawangan'], + 'mula' => $mula_date, + 'akhir' => $hingga_date + ])->json(); + + $laporan_ringkasan = $laporan_ringkasan[0]; + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$request->kodcaw)->json(); + $cawangan_detail=$cawangan[0]; + + return view('akaun.laporan_ringkasanterkumpul', compact('laporan_ringkasan','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url')); + } } diff --git a/resources/js/Akaun/Home.vue b/resources/js/Akaun/Home.vue index 7441378..34ee79f 100644 --- a/resources/js/Akaun/Home.vue +++ b/resources/js/Akaun/Home.vue @@ -84,6 +84,12 @@ +
+ +

Ringkasan Terkumpul

+
+
+ diff --git a/resources/js/Akaun/RingkasanTerkumpul.vue b/resources/js/Akaun/RingkasanTerkumpul.vue new file mode 100644 index 0000000..9945668 --- /dev/null +++ b/resources/js/Akaun/RingkasanTerkumpul.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/resources/js/pages/Detailspelanggan.vue b/resources/js/pages/Detailspelanggan.vue index 573b342..27a862f 100644 --- a/resources/js/pages/Detailspelanggan.vue +++ b/resources/js/pages/Detailspelanggan.vue @@ -163,6 +163,11 @@ +
+ + +
+
@@ -202,7 +207,7 @@

- Tiada Data Diperolehi + Tiada data yang diperolehi dalam carian

@@ -329,7 +334,7 @@

- Tiada Data Diperolehi + Tiada data yang diperolehi dalam carian

@@ -339,7 +344,7 @@
-

+

@@ -447,7 +452,7 @@

- Tiada Data Diperolehi + Tiada data yang diperolehi dalam carian

@@ -590,7 +595,8 @@ export default { objlelong:{}, sudahtebuspaginate:{}, belumtebuspaginate:{}, - lelongpaginate:{} + lelongpaginate:{}, + search: '' } }, setup: (props, context) => { @@ -785,6 +791,28 @@ export default { this.$refs.modal.showModal = true; this.$refs.modal.getData(); + }, + searchsag: function(){ + this.axios.get('http://localhost:8000/admin/customers/' + this.icnoasal + '/gadai/' + this.selected,{params: { + page: 0, + search: this.search + }}).then(response => { + if(this.selected === 'belum_tebus') + { + this.objbelumtebus = response.data; + this.belumtebuspaginate = response.data; + } + else if(this.selected === 'sudah_tebus') + { + this.objsudahtebus = response.data; + this.sudahtebuspaginate = response.data; + } + else + { + this.objlelong = response.data; + this.lelongpaginate = response.data; + } + }); } }, validations: { diff --git a/resources/js/routes.js b/resources/js/routes.js index a41247e..462474c 100644 --- a/resources/js/routes.js +++ b/resources/js/routes.js @@ -15,6 +15,8 @@ import KawalanStok from './Akaun/KawalanStok' import StokAudit from './Akaun/StokAudit' import Perbelanjaan from './Akaun/Perbelanjaan' import RingkasanHarian from './Akaun/RingkasanHarian' +import RingkasanTerkumpul from './Akaun/RingkasanTerkumpul' + import OnlineHome from './Online/SearchSAG' @@ -46,6 +48,7 @@ export default new VueRouter({ { path: '/akaunhome/StokAudit', component: StokAudit }, { path: '/akaunhome/Perbelanjaan', component: Perbelanjaan }, { path: '/akaunhome/RingkasanHarian', component: RingkasanHarian }, + { path: '/akaunhome/RingkasanTerkumpul', component: RingkasanTerkumpul }, { path: '/bajet/kemaskini', component: SenaraiBajet }, diff --git a/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php b/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php new file mode 100644 index 0000000..97f8312 --- /dev/null +++ b/resources/views/akaun/laporan_ringkasanterkumpul.blade copy.php @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + +

+

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

+ +
+
+
+
+

A) LAPORAN TERKUMPUL

+
+
1. PEMBIAYAAN
+
RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}
+
2. PENEBUSAN
+
RM {{ number_format($laporan_ringkasan['total_tebus'],2) }}
+
3. ANSURAN PEMBIAYAAN
+
RM {{ number_format($laporan_ringkasan['total_ansuran'],2) }}
+
4. BAYARAN ONLINE
+
RM 0.00
+
5. KEUNTUNGAN
+
RM {{ number_format($laporan_ringkasan['total_keuntungan'],2) }}
+
6. KEUNTUNGAN ONLINE
+
RM 0.00
+
+
+
+
+
+

B) BIL TRANSAKSI

+
+
1. PEMBIAYAAN
+
{{ $laporan_ringkasan['bilangan_gadai'] }}
+
2. PENEBUSAN
+
{{ $laporan_ringkasan['bilangan_tebus'] }}
+
3. ANSURAN PEMBIAYAAN
+
{{ $laporan_ringkasan['bilangan_ansuran'] }}
+
4. BAYARAN ONLINE
+
0
+
5. PELANGGAN BARU
+
{{ $laporan_ringkasan['bilangan_customer_baru'] }}
+
+
+
+ +
+
+
+
+

F) LELONG

+
+
1. LELONG HARI INI
+
RM {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}
+
2. BAKI
+
RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}
+
3. RUGI
+
RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}
+
4. CAJ LELONG
+
RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}
+
5. BIL
+
{{ $laporan_ringkasan['bilangan_lelong'] }}
+
+
+
+
+
+

G) BAYAR BAKI LELONG

+
+
1. BAKI LELONG
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}
+
2. RUGI LELONG
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}
+
+
+
+ +
+
+
+
+

H) PERATUSAN PEMBIAYAAN

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MARGIN70%75%80%JUMLAH
1PEMBIAYAANRM {{ number_format($laporan_ringkasan['gadai_70'],2) }}RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}
2NILAI MARHUNRM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}RM {{ number_format($laporan_ringkasan['total_nm'],2) }}
3BILANGAN{{ $laporan_ringkasan['bilangan_70'] }}{{ $laporan_ringkasan['bilangan_75'] }}{{ $laporan_ringkasan['bilangan_80'] }}{{ number_format($laporan_ringkasan['total_bilangan']) }}
+
+
+
+
+

+
+
+
+
DISEMAK
+
+
+
................................................
+
+
+
+
+
DISAHKAN
+
+
+
................................................
+
+
+
\ No newline at end of file diff --git a/resources/views/akaun/laporan_ringkasanterkumpul.blade.php b/resources/views/akaun/laporan_ringkasanterkumpul.blade.php new file mode 100644 index 0000000..1ffb5a2 --- /dev/null +++ b/resources/views/akaun/laporan_ringkasanterkumpul.blade.php @@ -0,0 +1,236 @@ + + + + + {{-- + + + + + + + + + + + + + + + + + --}} + +
LAPORAN RINGKASAN TRANSAKSI TERKUMPUL - {{ $cawangan_detail['namacaw'] }}
+ +

Tarikh Mula: {{ $mula_date }} Tarikh Hingga : {{ $hingga_date }} Tarikh Cetak : {{ $tarikh_cetak }}

+ +
+
+
+
+

A) TRANSAKSI TERKUMPUL

+
+ +
1. PEMBIAYAAN
+
RM {{ number_format($laporan_ringkasan['total_gadai'],2) }}
+
{{ $laporan_ringkasan['bilangan_gadai'] }}
+ +
2. PENYELESAIAN PEMBIAYAAN
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_tebus'],2) }}
+
{{ $laporan_ringkasan['bilangan_tebus'] + $laporan_ringkasan['bilangan_lelong'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
2
+
+ +
3. ANSURAN PEMBIAYAAN
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_ansuran'],2) }}
+
{{ $laporan_ringkasan['bilangan_ansuran'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['keuntungansebenarkaunter'],2) }}
+
+ +
4. BAYARAN ONLINE
+ +
a. PEMBIAYAAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_ansuranonline'],2) }}
+
{{ $laporan_ringkasan['bilangan_ansuranonline'] }}
+ +
b. KEUNTUNGAN DIBAYAR
+
{{ 'RM '. number_format($laporan_ringkasan['total_keuntungan_online'],2) }}
+
+ +
5. PELANGGAN BARU
+
+
{{ $laporan_ringkasan['bilangan_customer_baru'] }}
+ +
+
+
+
+
+

B) PENDAHULUAN/SERAHAN HQ

+
+ +
1. PENDAHULUAN
+
{{ 'RM '. number_format($laporan_ringkasan['totalpendahuluan'],2) }}
+ +
2. SERAHAN
+
{{ 'RM '. number_format($laporan_ringkasan['totalserahan'],2) }}
+ +
3. SERAHAN ONLINE
+
{{ 'RM '. number_format($laporan_ringkasan['serahanbayaranOnline'],2) }}
+ +
+
+
+ +
+
+ +
+
+

C) LELONG

+
+
+

D) BAYARAN LELONG

+
+
1. LELONG HARI INI
+
RM {{ number_format($laporan_ringkasan['jumlah_lelong'],2) }}
+
+
2. BAKI
+
RM {{ number_format($laporan_ringkasan['baki_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_baki_lelong'],2) }}
+
3. RUGI
+
RM {{ number_format($laporan_ringkasan['rugi_lelong'],2) }}
+
{{ 'RM '. number_format($laporan_ringkasan['bayar_rugi_lelong'],2) }}
+
4. CAJ LELONG
+
RM {{ number_format($laporan_ringkasan['cas_lelong'],2) }}
+
+
5. BIL
+
{{ $laporan_ringkasan['bilangan_lelong'] }}
+
+
+ +
+
+
+
+

E) PERBELANJAAN

+
+
1. BELANJA AM
+
{{ 'RM '. number_format($laporan_ringkasan['belanjaam'],2) }}
+
2. BAIKI DAN SELENGGARA
+
{{ 'RM '. number_format($laporan_ringkasan['baikidanselenggara'],2) }}
+
3. KERAIAN & PROMOSI
+
{{ 'RM '. number_format($laporan_ringkasan['keraian'],2) }}
+
4. JUMLAH
+
@php $total = $laporan_ringkasan['belanjaam'] + $laporan_ringkasan['baikidanselenggara'] + $laporan_ringkasan['keraian']; echo 'RM '. number_format($total,2); @endphp
+
+
+
+ +
+
+
+
+

F) PERATUSAN PEMBIAYAAN

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MARGIN70%75%80%JUMLAH
1PEMBIAYAANRM {{ number_format($laporan_ringkasan['gadai_70'],2) }}RM {{ number_format($laporan_ringkasan['gadai_75'],2) }}RM {{ number_format($laporan_ringkasan['gadai_80'],2) }}RM {{ number_format($laporan_ringkasan['total_gadaian'],2) }}
2NILAI MARHUNRM {{ number_format($laporan_ringkasan['nilaimarhun_70'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_75'],2) }}RM {{ number_format($laporan_ringkasan['nilaimarhun_80'],2) }}RM {{ number_format($laporan_ringkasan['total_nm'],2) }}
3BILANGAN{{ $laporan_ringkasan['bilangan_70'] }}{{ $laporan_ringkasan['bilangan_75'] }}{{ $laporan_ringkasan['bilangan_80'] }}{{ number_format($laporan_ringkasan['total_bilangan']) }}
+
+
+
+
+ +
+
+
+
DISEMAK
+
+
+
................................................
+
+
+
+
+
DISAHKAN
+
+
+
................................................
+
+
+
\ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 29a53a1..bdd1f0a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,7 +78,7 @@ Route::get('/akaunhome/cetakstokaudit',['as'=>'cetak.stokaudit','uses'=>'App\Htt Route::get('/akaunhome/cetakkawalanstok',['as'=>'cetak.kawalanstok','uses'=>'App\Http\Controllers\AkaunController@cetaklaporan_kawalanstok'])->middleware(['roleChecker:admin,akaun,operasi']); 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']); //Resit