diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d36c132..3d26df5 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1493,21 +1493,16 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker1 == null){ - $tebus_date = $current->toDateString(); - }else{ - $split_date = explode('-',$request->datetimepicker1); - $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; - } - $marhun = Http::get(config('api.url'). '/api/gadai/laporan/ringkasanharian/'. $auth_user['cawangan'] .'/'. $tebus_date)->json(); - $marhun = $marhun[0]; - - $keseluruhanupahsimpan = $marhun['lelongupahsimpan'] + $marhun['tebus'][0]['upahsimpan'] + $marhun['advansur'][0]['upahsimpan']; $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan_detail=$cawangan[0]; - // dd($gadai); - return view('print.laporan_ringkasanharian', compact('keseluruhanupahsimpan', 'marhun','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + + $laporan_ringkasan = Http::get(config('api.url') . '/api/laporan/harian',[ + 'kodcaw'=>$auth_user['cawangan'], + 'tarikh'=>$tarikh_cetak + ])->json(); + $laporan = $laporan_ringkasan[0]; + return view('print.laporan_ringkasanharian', compact('cawangan_detail','tarikh_cetak','api_url','laporan')); } public function cetakLaporanRingkasanTerkumpul(Request $request){ diff --git a/resources/views/operasi/komuditi/rekod_transaksi.blade.php b/resources/views/operasi/komuditi/rekod_transaksi.blade.php index 1d2779b..cfc2ac7 100644 --- a/resources/views/operasi/komuditi/rekod_transaksi.blade.php +++ b/resources/views/operasi/komuditi/rekod_transaksi.blade.php @@ -34,6 +34,7 @@ Bil Cawangan + No Sijil Jumlah Nilai Komoditi @@ -90,6 +91,7 @@ tablerekod.row.add([ count, rekodkomoditi['cawangan'], + rekodkomoditi['nosijil'], formatter.format(rekodkomoditi['totalkomoditi']) ]).draw(); }) diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php index 4069c25..4b6c6fb 100644 --- a/resources/views/print/laporan_ringkasanharian.blade.php +++ b/resources/views/print/laporan_ringkasanharian.blade.php @@ -22,123 +22,14 @@ padding:4px; color:black; } - - - - - - - - - - - - - - - - + + + @@ -158,166 +49,213 @@ -
- - - - - - - - - - - - - - - - - - - -
LAPORAN RINGKASAN HARIAN Tarikh Cetak: - @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp -
TARIKH@php - $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp -
+
+
+
+
+

A) LAPORAN HARIAN

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

B) BIL TRANSAKSI

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

H) PERATUSAN PEMBIAYAAN

+
+
+
+
+
JUMLAHJUMLAH PENDAPATAN
GADAIBIL
- N. MARHUN
- PEMBIAYAAN - - 		{{ $marhun['gadai'][0]['bilangan'] }}
- {{ number_format($marhun['gadai'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['gadai'][0]['jumlahpinjaman'],2) }}
-
PENEBUSANBIL
- N. MARHUN
- PEMBIAYAAN
- KEUNTUNGAN - 		{{ $marhun['tebus'][0]['bilangan'] }}
- {{ number_format($marhun['tebus'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['tebus'][0]['jumlahpinjaman'],2) }}
- {{ number_format($marhun['tebus'][0]['upahsimpan'],2) }} - 		KEUNTUNGAN
- CAJ LELONG
- 		{{ number_format($keseluruhanupahsimpan,2) }}
- {{ number_format($marhun['cajlelong'],2) }}
-
ANSURANBIL
- N. MARHUN
- PEMBIAYAAN
- KEUNTUNGAN - 		{{ $marhun['advansur'][0]['bilangan'] }}
- {{ number_format($marhun['advansur'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['advansur'][0]['jumlahpinjaman'],2) }}
- {{ number_format($marhun['advansur'][0]['upahsimpan'],2) }} -
LELONGANBIL
- N. MARHUN
- PEMBIAYAAN
- KEUNTUNGAN
- CAJ LELONG
- LEBIHAN LELONG
- RUGI LELONG

- TERIMA RUGI LELONG

- BAYAR LEBIHAN LELONG - 		- - {{ $marhun['lelong'][0]['bilangan'] }}
- {{ number_format($marhun['lelong'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['lelong'][0]['jumlahpinjaman'],2) }}
- {{ number_format($marhun['lelongupahsimpan'],2) }}
- {{ number_format($marhun['cajlelong'],2) }}
- {{ number_format($marhun['lelongbaki'],2) }}
- {{ number_format($marhun['lelongrugi'],2) }}

- {{ number_format($marhun['terimarugilelong'],2) }}

- {{ number_format($marhun['bayarlebihanlelong'],2) }} - - 		- - - - - - - - +
+
+
+
+

C) WANG PETI BESI

+
+
1. SISTEM
+
+
2. IMBANG DUGA
+
+
3. DENOMINASI
+
+
+
+
+
+
+

D) PERBELANJAAN

+
+
1. HARI INI
+
{{ 'RM '. number_format($laporan['panjar_harian'],2) }}
+
2. BULANAN
+
{{ 'RM '. number_format($laporan['panjar_bulanan'],2) }}
+
3. TERKUMPUL
+
{{ 'RM '. number_format($laporan['panjar_tahunan'],2) }}
+
+
+
+ +
+
+
+
+

E) OUTSTANDING

+
+
+
+
+
..................................................................
-

DI SEMAK

- ..................................................................
-

DI SAHKAN

- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
PembiayaanNilai MarhunBil
1IMBANG DUGA
2STOK AUDIT
3KAWALAN STOK
+ + + + +
+
+
+
+

F) LELONG

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

G) BAYAR BAKI LELONG

+
+
RM
+
{{ 'RM '. number_format($laporan['bayar_baki_lelong'],2) }}
+
+
+
-
HAPUS KIRABIL
- N. MARHUN
- PEMBIAYAAN - 		- {{ $marhun['hapuskira'][0]['bilangan'] }}
- {{ number_format($marhun['hapuskira'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['hapuskira'][0]['jumlahpinjaman'],2) }}
-
SERAHAN WANG TAK DITUNTUTBIL
- N. MARHUN
- PEMBIAYAAN
- 		{{ $marhun['wtd'][0]['bilangan'] }}
- {{ number_format($marhun['wtd'][0]['jumlahmarhun'],2) }}
- {{ number_format($marhun['wtd'][0]['jumlahpinjaman'],2) }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
MARGIN70%75%80%
1PEMBIAYAAN{{ 'RM '. number_format($laporan['gadai_70'],2) }}{{ 'RM '. number_format($laporan['gadai_75'],2) }}{{ 'RM '. number_format($laporan['gadai_80'],2) }}
2NILAI MARHUN{{ 'RM '. number_format($laporan['nilaimarhun_70'],2) }}{{ 'RM '. number_format($laporan['nilaimarhun_75'],2) }}{{ 'RM '. number_format($laporan['nilaimarhun_80'],2) }}
3BILANGAN{{ $laporan['bilangan_70'] }}{{ $laporan['bilangan_75'] }}{{ $laporan['bilangan_80'] }}
+ + + + - - - - -
-
\ No newline at end of file +
+
+
+
DISEMAK
+
+
+
................................................
+
+
+
+
+
DISAHKAN
+
+
+
................................................
+
+
+
\ No newline at end of file