From 2581adbc753da895d681d680ee99e079bb8404b6 Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Wed, 22 Sep 2021 00:53:12 +0800 Subject: [PATCH 1/2] bayaran lelong --- resources/views/customers/info.blade.php | 17 ++- resources/views/gadaian/index.blade.php | 6 +- resources/views/penebusan/index.blade.php | 153 +++++++++++++++------- 3 files changed, 122 insertions(+), 54 deletions(-) diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index a4d0f2f..54e5b99 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -172,6 +172,7 @@ Pembiayaan Margin Tempoh + Lelong @@ -716,6 +717,11 @@ var urlroute = '{{ route("penebusan", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); if(gadai_detail["bakihargajualan"] == null){ + if(gadai_detail['taglel'] == 1){ + var taglel = 'Akan Dilelong'; + }else{ + var taglel = ''; + } xtawarruq.row.add([ '', '' + gadai_detail['norujukan'] + '', @@ -723,7 +729,8 @@ gadai_detail['t_matang'], 'RM '+formatter.format(gadai_detail['pinjaman']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['tempoh'] + gadai_detail['tempoh'], + taglel, ]).draw(); }else{ tablegadai.row.add([ @@ -1596,7 +1603,7 @@ } else { - return false; + return false; $.ajax({ method:'get', @@ -1742,7 +1749,7 @@ Swal.fire({ icon: 'error', title: 'Amaran', - text: 'Hapus Gadai Tidak Dibenarkan' + text: 'Hapus Tebus Tidak Dibenarkan' }); return false; } @@ -1779,14 +1786,16 @@ allowEnterKey: false }) - let mohon = "Hapus Gadai"; + let mohon = ""; let id = 0; if($("input[name='options']:checked").val() == 'belum_tebus'){ id = hapusid; + mohon = "Hapus Gadai"; } else if($("input[name='options']:checked").val() == 'sudah_tebus'){ id = hapusidsudah; + mohon = "Hapus Tebus"; } $.ajax({ diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 08eea38..a664daf 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -769,7 +769,7 @@ return false; } else{ - if(pinjaman > Number(pembiyaan_max_pelulus)+10 || pinjaman >= 10000){ + if(pinjaman > Number(pembiyaan_max_pelulus) || pinjaman >= 10000){ const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -778,7 +778,7 @@ buttonsStyling: false }); - if(pinjaman > Number(pembiyaan_max_pelulus)+10){ + if(pinjaman > Number(pembiyaan_max_pelulus)){ var errortext = "Tetapan margin melebihi 75% untuk Operasi!"; } if(pinjaman >= 10000){ @@ -888,7 +888,7 @@ }); event.preventDefault(); return false; - }else if(pinjaman > Number(pembiayaan_max_teller)+10){ + }else if(pinjaman > Number(pembiayaan_max_teller)){ const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 91d1d5f..934f6ed 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -224,7 +224,7 @@
- +
@@ -255,6 +255,7 @@
+
@@ -283,6 +284,14 @@
+
+
+ BAYARAN MINIMA +
+
+ +
+
@@ -386,6 +395,7 @@ $('#divperludibayartawarruq').hide(); $('#divbayarantawarruq').hide(); $('#divbayaran').hide(); + $("#divbayaranminima").hide(); var array_recno = []; @@ -422,6 +432,7 @@ var jumlahperlu = 0; var jumlahminima = 0; + var percent_mora = 0; $( document ).ready(function() { @@ -435,6 +446,15 @@ return /^\d*\.?(?:\d{1,2})?$/.test(value); // Allow digits only, using a RegExp }); + $.ajax({ + method:'get', + datatype:'json', + url:api + '/api/moratorium/details', + success:function(data){ + percent_mora = data['percent_mora']; + } + }) + }); function tebusan(){ @@ -735,6 +755,7 @@ $('#divperludibayartawarruq').hide(); $('#divbayarantawarruq').hide(); $('#divbayaran').hide(); + $("#divbayaranminima").hide(); $('#divtelahdibayar').show(); $('#divperludibayar').show(); @@ -762,6 +783,7 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').hide(); + $("#divbayaranminima").hide(); $('#bayaran').val(formatter.format(jumupah)); @@ -787,6 +809,7 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); + $("#divbayaranminima").hide(); $('#perludibayar').val(formatter.format(jumupahrebet)); break; @@ -807,18 +830,29 @@ $('#divbayaran').hide(); $('#divperludibayar').hide(); $('#divbayarantawarruq').hide(); + $("#divbayaranminima").hide(); $("#bayaran").prop("disabled", false); $("#bayaran").val(0); break; case "U": - $("#terima_transaksi").prop('disabled', false); - + if(jumupah <= 0){ + $("#terima_transaksi").prop('disabled', true); + }else{ + $("#terima_transaksi").prop('disabled', false); + } $('input[type="checkbox"]').hide(); $('span.spannar').show(); - + var taglel = "{{ $gadai['taglel'] }}"; + var minimum_bayaran = (percent_mora/100)*jumupah; $("#bayaran").prop("disabled", false); - $("#perludibayar").prop("readonly", true); + if(taglel == 1){ + $("#perludibayar").prop("readonly", false); + $("#divbayaranminima").show(); + }else{ + $("#perludibayar").prop("readonly", true); + $("#divbayaranminima").hide(); + } $("#bayaran").val(0); $('#divtambahpinjaman').hide(); @@ -831,7 +865,7 @@ $('#divtelahdibayar').hide(); $('#divbayaran').hide(); $('#divperludibayar').show(); - + $('#minimabayaran').val(formatter.format(minimum_bayaran)); $('#perludibayar').val(formatter.format(jumupah)); break; case "AT": @@ -840,6 +874,7 @@ $('input[type="checkbox"]').hide(); $('span.spannar').show(); $('#divpinjaman').show(); + $("#divbayaranminima").hide(); $('#divtambahpinjaman').hide(); $('#divpinjamanbaru').show(); $('#divbayaranditerima').hide(); @@ -1786,53 +1821,77 @@ var marhun = "{{ $gadai['marhun'] }}"; var nowakil = nw; - $.ajax({ - method:'post', - url: api + '/api/ansuran/create/' + kodcaw, - datatype: 'json', - data:{ - 'norujukan' : norujukan, - 'nopelanggan' : nopelanggan, - 'nilaimarhun' : nilai_marhun, - 'pinjaman' : pinjaman, - 'kadarupah' : kadarupah, - 'glcode' : "1000/010", - 'upahsebenar' : bakipinjaman, - 'upahdibayar' : bakipinjaman, - 'teller' : teller, - 'prkod' : prkod, - 'jbg' : jbg, - 'nowakil' : 0, - 'hubungan' : 0, - 'historygadaian' : norujukan - }, - success:function(data){ + var minimum_bayaran = (percent_mora/100)*bakiupah; + if(bakipinjaman >= minimum_bayaran){ + if(bakipinjaman > bakiupah){ + $("#terima_transaksi").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Bayaran Melebihi Dari Maksima', + text: 'Bayaran Maksima Adalah Upah Semasa' + }); + event.preventDefault(); + return false; + }else{ $.ajax({ - method: 'put', - url: "{{ route('alirantunai.advansur') }}", - async:false, - data:{ + method:'post', + url: api + '/api/ansuran/create/' + kodcaw, + datatype: 'json', + data:{ 'norujukan' : norujukan, - "_token": "{{ csrf_token() }}" + 'nopelanggan' : nopelanggan, + 'nilaimarhun' : nilai_marhun, + 'pinjaman' : pinjaman, + 'kadarupah' : kadarupah, + 'glcode' : "1000/010", + 'upahsebenar' : bakiupah, + 'upahdibayar' : bakipinjaman, + 'teller' : teller, + 'prkod' : prkod, + 'jbg' : jbg, + 'nowakil' : 0, + 'hubungan' : 0, + 'historygadaian' : norujukan }, success:function(data){ - console.log(data); - }, error: function(xhr, status, error) { - var err = eval("(" + xhr.responseText + ")"); - alert(xhr.responseText); - } - }); + $.ajax({ + method: 'put', + url: "{{ route('alirantunai.advansur') }}", + async:false, + data:{ + 'norujukan' : norujukan, + "_token": "{{ csrf_token() }}" + }, + success:function(data){ + console.log(data); + }, error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); - Swal.fire({ - icon: 'success', - title: 'Berjaya!', - text: 'Pembayaran Upah Berjaya', - }).then(function() { - window.open(urlroute, '_blank'); - window.location.replace("{{ route('customer_info') }}"); + Swal.fire({ + icon: 'success', + title: 'Berjaya!', + text: 'Pembayaran Upah Berjaya', + }).then(function() { + window.open(urlroute, '_blank'); + window.location.replace("{{ route('customer_info') }}"); + }) + } }) } - }) + }else{ + $("#terima_transaksi").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Bayaran Kurang Dari Minimum', + text: 'Bayaran minimum adalah '+percent_mora+' %' + }); + event.preventDefault(); + return false; + } + }else if($('#sltjenistebus').find(":selected").val() == 'AT'){ @@ -1846,7 +1905,7 @@ var marginsemasa = pinjaman_baru/nmsemasa * 100; - $.ajax({ + $.ajax({ method:'get', url: api + '/api/komuditi/check', success:function(komoditi){ From a1290f7854fbd499eee8fc703f9a8ec6e8597e37 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 26 Sep 2021 12:58:48 +0800 Subject: [PATCH 2/2] fix laporan gadaian dan penebusan --- resources/views/print/laporan_gadaian.blade.php | 6 ++++-- resources/views/print/laporan_penebusan.blade.php | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index addd58a..a82dbc0 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -214,7 +214,7 @@ Keuntungan Peratus (%) - @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0;@endphp + @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0; $bil = 0;@endphp @foreach($gadai as $index=>$item) @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp @if($index > 0) @@ -250,6 +250,7 @@ @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat'];$totalupah12 += $item['upah12']; @endphp @if($index+1 < sizeof($gadai)) @if($item['teller'] != $gadai[$index + 1]['teller']) + @php if($item['teller'] != '')$bil += ($counter-1); @endphp {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }} {{ number_format($totalberatteller,2) }} @@ -261,6 +262,7 @@ @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp @endif @else + @php $bil += ($counter-1); @endphp {{ $counter-1 }} Jumlah surat bagi teller : {{ $item['teller'] }} {{ number_format($totalberatteller,2) }} @@ -275,7 +277,7 @@

- + diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index c7c3836..bafbf38 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -288,11 +288,13 @@

JUMLAH BILANGAN = {{ $bil }} Berat (g/m) Nilai Marhun (RM) Pembiayaan (RM)
- + + + @@ -300,7 +302,9 @@ + +
JUMLAH BILANGAN = {{ $tebuspengasingan['biltawarruq'] + $tebuspengasingan['bilarrahn'] }} Nilai Marhun (RM) Pembiayaan Asal(RM) B. Pembiayaan (RM)Keuntungan Rebet(RM) Upah/Keuntungan (RM)Keuntungan Sebenar(RM) Jumlah (RM)
{{ number_format($totalnm,2) }} {{ number_format($totalpinjamanasal,2) }} {{ number_format($totalpinjaman,2) }}@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;echo number_format($totalkeuntunganrebet,2); @endphp {{ number_format($totalupah,2) }}{{ number_format($totalupah - $totalkeuntunganrebet,2) }} {{ number_format($totalbayaran,2) }}