diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index c0455bc..b78e0f9 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -493,7 +493,7 @@ class AliranTunaiController extends Controller if(number_format($penebusanbarcodescanned,2) !== number_format($masuk,2)) $errorpenebusan = true; - if(number_format(round($bakisemasa,1),2) !== number_format(round($baki,1),2)) + if(number_format(round($bakisemasa,2),2) !== number_format(round($baki,2),2)) $errorbaki = true; if(number_format($totalpendahuluan,2) != number_format($pendahuluan,2)) @@ -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/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index d7f1f83..7160a24 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -540,7 +540,7 @@ var urlroute = '{{ route("lelongan", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); tablelelong.row.add([ - counter, + '', '' + gadai_detail['norujukan'] + '', gadai_detail['t_lelong'], gadai_detail['trkhtuntut'], @@ -697,12 +697,18 @@ var koddaerah = $(e).data('koddaerah'); var noruj = $(e).data('histid'); - console.log(kodnegeri); - if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '') { - if($("input[name='options']:checked").val() == 'belum_tebus'){ - let histid = $('input[name="belum"]:checked').val(); + if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){ + + let histid = ''; + if($("input[name='options']:checked").val() == 'belum_tebus'){ + histid = $('input[name="belum"]:checked').val(); + } + else{ + histid = $('input[name="lelong"]:checked').val(); + } + if(histid == null){ Swal.fire({ icon: 'error', @@ -728,7 +734,15 @@ function saghilangfunc() { if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){ - let histid = $('input[name="belum"]:checked').val(); + + let histid = ''; + if($("input[name='options']:checked").val() == 'belum_tebus'){ + histid = $('input[name="belum"]:checked').val(); + } + else{ + histid = $('input[name="lelong"]:checked').val(); + } + if(histid == null){ Swal.fire({ icon: 'error', @@ -744,7 +758,7 @@ { var count = Object.keys(data).length; - + console.log(histid); if(count > 0) { Swal.fire({ @@ -778,7 +792,7 @@ title: 'Amaran', text: 'Cetakan Surat Akuan Hilang tidak dibenarkan' }); - } + } // }else if($("input[name='options']:checked").val() == 'lelong'){ diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index bafbf38..5082370 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -335,17 +335,31 @@ Not Applicable - {{ $upahlama['bil'] }} + {{ $upahlama['bilkaunter'] }} Bayaran Upah Not Applicable - {{ number_format($upahlama['total'],2) }} + {{ number_format($upahlama['totalkaunter'],2) }} Not Applicable - {{ $ansuran['bilangan'] }} + {{ $upahlama['bilonline'] }} + Bayaran Upah Online + Not Applicable + {{ number_format($upahlama['totalonline'],2) }} + Not Applicable + + + {{ $ansuran['bilangankaunter'] }} Ansuran Pembiayaan - {{ number_format($ansuran['totalpendahuluan'],2) }} - {{ number_format($ansuran['totalkeuntungan'],2) }} + {{ number_format($ansuran['totalpendahuluankaunter'],2) }} + {{ number_format($ansuran['totalkeuntungankaunter'],2) }} + Not Applicable + + + {{ $ansuran['bilanganonline'] }} + Ansuran Pembiayaan Online + {{ number_format($ansuran['totalpendahuluanonline'],2) }} + {{ number_format($ansuran['totalkeuntunganonline'],2) }} Not Applicable diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php index 4c6316b..2344569 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) }}