diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index cd97c5c..3738a37 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -533,7 +533,7 @@ 'RM '+ formatter.format(gadai_detail['bakihargajualan']), 'RM '+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['jbg'], + gadai_detail['tempoh'], 'RM '+ formatter.format(upahsemasa) ]).draw(); } diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 2ee83e4..a5c3aaa 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -146,21 +146,21 @@ - - + {{-- --}} + {{-- --}} - + - + {{-- - + --}}
@@ -169,22 +169,25 @@ LAPORAN GADAIAN - 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', $gadai_date); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate) - @endphp + Tarikh: + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $gadai_date); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp + + + Tarikh Cetak + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $formattedweddingdate = $myDateTime->format('d-m-Y'); + echo($formattedweddingdate) + @endphp @@ -205,7 +208,6 @@ Alamat No K/P Masa - Marhun Berat N Marhun Pembiayaan @@ -217,17 +219,20 @@ @if($index > 0) @if($item['teller'] != $gadai[$index - 1]['teller']) - Teller : {{$item['teller']}} + Teller : {{ $item['teller'] }} + @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp @endif @else - Teller : {{$item['teller']}} + Teller : {{ $item['teller'] }} + @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp + @endif {{ $counter }} - {{$item['norujukan']}} + {{$item['norujukan']}} @php $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json(); @@ -237,29 +242,35 @@ {{$customer_detail[0]['alamat1']}} {{ $item['nokp'] }} {{ $item['masa'] }} - {{ $item['marhun'] }} {{ number_format($item['berat'],2) }} {{ number_format($item['nilaimarhun'],2) }} {{ number_format($item['pinjaman'],2) }} {{ $item['percentpinj'] }} @php $counter++; @endphp + @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat']; @endphp @if($index+1 < sizeof($gadai)) @if($item['teller'] != $gadai[$index + 1]['teller']) - {{ $counter-1 }} Jumlah Surat Bagi Teller : {{$item['teller']}} + {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }} + {{ number_format($totalberatteller,2) }} + {{ number_format($totalnmteller,2) }} + {{ number_format($totalpinjamanteller,2) }} - @php $counter = 0; @endphp + @php $counter = 1; @endphp @endif @else - {{ $counter }} Jumlah Bagi Teller : {{$item['teller']}} + {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }} + {{ number_format($totalberatteller,2) }} + {{ number_format($totalnmteller,2) }} + {{ number_format($totalpinjamanteller,2) }} @endif @endforeach - JUMLAH - {{ number_format($totalpinjaman,2) }} + JUMLAH KESELURUHAN : + {{ number_format($totalpinjaman,2) }} diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index a3dcc86..5ca2f41 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -213,22 +213,22 @@ N Marhun Jenis Tebus - @php $counter = 0; $totalpembiayaan = 0;@endphp + @php $counter = 1; $totalpembiayaan = 0;@endphp @foreach($tebus as $index=>$item) @if($index > 0) @if($item['teller'] != $tebus[$index - 1]['teller']) - Teller : {{$item['teller']}} + Teller : {{ $item['teller'] }} @endif @else - Teller : {{$item['teller']}} + Teller : {{ $item['teller'] }} @endif - {{ $loop->iteration }} - {{$item['norujukan']}} + {{ $counter }} + {{ $item['norujukan'] }} @php $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); @@ -258,13 +258,13 @@ @if($index+1 < sizeof($tebus)) @if($item['teller'] != $tebus[$index + 1]['teller']) - {{ $counter }} Jumlah Bagi Teller : {{$item['teller']}} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} @php $counter = 0; @endphp @endif @else - {{ $counter }} Jumlah Bagi Teller : {{$item['teller']}} + {{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }} @endif @endforeach