diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index c0455bc3..4b01f7a2 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -509,7 +509,7 @@ class AliranTunaiController extends Controller
{
return response('sama');
}else{
- $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,1)];
+ $arraykemaskini = ['pendahuluan' => round($totalpendahuluan,2),'serahan' => round($totalserahan,2), 'penebusan' => round($penebusanbarcodescanned,2), 'gadaian' => round($totalgadaibarcodescanned,2), 'bakisemasa' => round($bakisemasa,2)];
return response()->json($arraykemaskini);
}
}
diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
index 4c6316b2..23445696 100644
--- a/resources/views/print/laporan_upah.blade.php
+++ b/resources/views/print/laporan_upah.blade.php
@@ -223,23 +223,24 @@
Teller |
Tempoh |
Pembiayaan (RM) |
+ Upah Sebenar (RM) |
Upah Dibayar (RM) |
- @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+ @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']; @endphp
+ @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; $totalsebenar += $item['upahSebenar'];@endphp
@if($index > 0)
@if($item['teller'] != $advansur[$index - 1]['teller'])
| Teller : {{ $item['teller'] }} |
- @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+ @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
@endif
@else
| Teller : {{ $item['teller'] }} |
- @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
+ @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; $totalsebenarteller = 0; @endphp
@endif
@@ -249,15 +250,17 @@
| {{ $item['teller'] }} |
{{ $item['jbg'] }} |
{{ number_format($item['pinjaman'],2) }} |
+ {{ number_format($item['upahSebenar'],2) }} |
{{ number_format($item['upahDibayar'],2) }} |
@php $counter++; @endphp
- @php $totalbayaranteller += $item['upahDibayar']; $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'])
| {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} |
{{ number_format($totalpembiayaanteller,2) }} |
+ {{ number_format($totalsebenarteller,2) }} |
{{ number_format($totalbayaranteller,2) }} |
@php @endphp
@@ -266,6 +269,7 @@
| {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} |
{{ number_format($totalpembiayaanteller,2) }} |
+ {{ number_format($totalsebenarteller,2) }} |
{{ number_format($totalbayaranteller,2) }} |
@endif
@@ -276,11 +280,13 @@
|
Pembiayaan (RM) |
+ Upah Sebenar (RM) |
Upah Dibayar (RM) |
| JUMLAH KESELURUHAN |
{{ number_format($totalpembiayaan,2) }} |
+ {{ number_format($totalsebenar,2) }} |
{{ number_format($totalbayaran,2) }} |