diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index af124c2..c950b51 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -65,35 +65,37 @@
{{ 'RM '. number_format($laporan['total_gadai'],2) }}
{{ $laporan['bilangan_gadai'] }}
+ 2. PENYELESAIAN PEMBIAYAAN
- 2. PEMBIAYAAN PENEBUSAN
+ a. PEMBIAYAAN DIBAYAR
{{ 'RM '. number_format($laporan['total_tebus'],2) }}
{{ $laporan['bilangan_tebus'] }}
- 3. PEMBIAYAAN ANSURAN
+ b. KEUNTUNGAN DIBAYAR
+ {{ 'RM '. number_format($laporan['upahsimpankaunter'],2) }}
+
+
+ 3. ANSURAN PEMBIAYAAN
+
+ a. PEMBIAYAAN DIBAYAR
{{ 'RM '. number_format($laporan['total_ansuran'],2) }}
{{ $laporan['bilangan_ansuran'] }}
- 4. PEMBIAYAAN ONLINE
+ b. KEUNTUNGAN DIBAYAR
+ {{ 'RM '. number_format($laporan['keuntungansebenarkaunter'],2) }}
+
+
+ 4. BAYARAN ONLINE
+
+ a. PEMBIAYAAN DIBAYAR
{{ 'RM '. number_format($laporan['total_ansuranonline'],2) }}
{{ $laporan['bilangan_ansuranonline'] }}
-
- 5. KEUNTUNGAN PENEBUSAN
- {{ 'RM '. number_format($laporan['upahsimpankaunter'],2) }}
-
-
- 7. KEUNTUNGAN ANSURAN
- {{ 'RM '. number_format($laporan['keuntungansebenarkaunter'],2) }}
-
-
-
- 7. KEUNTUNGAN ONLINE
+ b. KEUNTUNGAN DIBAYAR
{{ 'RM '. number_format($laporan['total_keuntungan_online'],2) }}
-
+
-
- 8. PELANGGAN BARU
+ 5. PELANGGAN BARU
{{ $laporan['bilangan_customer_baru'] }}
@@ -111,7 +113,7 @@
2. SERAHAN
{{ 'RM '. number_format($laporan['totalserahan'],2) }}
- 2. SERAHAN ONLINE
+ 3. SERAHAN ONLINE
{{ 'RM '. number_format($laporan['serahanbayaranOnline'],2) }}
@@ -156,7 +158,7 @@
-
+
|
@@ -185,10 +187,10 @@
| 2 |
STOK AUDIT |
- {{ 'RM '. number_format($laporan['stokauditpembiayaan'],2) }} |
+ {{ number_format($laporan['stokauditpembiayaan'],2) }} |
|
|
- {{ 'RM '. number_format($laporan['stokauditnilaimarhun'],2) }} |
+ {{ number_format($laporan['stokauditnilaimarhun'],2) }} |
|
|
{{ number_format($laporan['stokauditcount']) }} |
@@ -196,9 +198,9 @@
| 3 |
KAWALAN STOK |
- {{ 'RM '. number_format($totalpinjkawalanstok,2) }} |
+ {{ number_format($totalpinjkawalanstok,2) }} |
Not Applicable |
- {{ number_format($totalbilkawalanstok) }} |
+ {{ number_format($totalbilkawalanstok,0) }} |
Not Applicable |
Not Applicable |
Not Applicable |
diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
index 2344569..ac3808d 100644
--- a/resources/views/print/laporan_upah.blade.php
+++ b/resources/views/print/laporan_upah.blade.php
@@ -228,7 +228,7 @@
@php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalsebenar = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
@foreach($advansur as $index=>$item)
- @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahSebenar'];@endphp
+ @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahsebenar'];@endphp
@if($index > 0)
@if($item['teller'] != $advansur[$index - 1]['teller'])
@@ -250,11 +250,11 @@
| {{ $item['teller'] }} |
{{ $item['jbg'] }} |
{{ number_format($item['pinjaman'],2) }} |
- {{ number_format($item['upahSebenar'],2) }} |
+ {{ number_format($item['upahsebenar'],2) }} |
{{ number_format($item['upahDibayar'],2) }} |
@php $counter++; @endphp
- @php $totalbayaranteller += $item['upahDibayar']; $totalsebenarteller += $item['upahSebenar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
+ @php $totalbayaranteller += $item['upahDibayar']; $totalsebenarteller += $item['upahsebenar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
@if($index+1 < sizeof($advansur))
@if($item['teller'] != $advansur[$index + 1]['teller'])