diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 74a19ff..a9f8a96 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -374,6 +374,10 @@ + @if (request()->route()->getName() === 'penebusan') + @include('widgets.calculator') + @endif + @yield('footer') {{-- JS Stack--}} diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php index 2c750cb..884c25b 100644 --- a/resources/views/layouts/footer.blade.php +++ b/resources/views/layouts/footer.blade.php @@ -1,4 +1,5 @@ @extends('layouts.app') @section('footer') + @endsection \ No newline at end of file diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index df03ea3..1b29224 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -73,7 +73,7 @@ @else {{-- @if($gadai['tagbaru'] == 0) --}} - + @endif @@ -245,6 +245,14 @@
+
+
+ PERLU DIBAYAR(RM) +
+
+ +
+
BAYARAN PELANGGAN(RM) @@ -253,6 +261,14 @@
+
+
+ DUIT PELANGGAN(RM) +
+
+ +
+
TAMBAH PEMBIAYAAN(RM) @@ -272,6 +288,14 @@
+
+
+ BAKI (RM) +
+
+ +
+
BAYARAN MINIMA @@ -312,7 +336,7 @@
- PEMBIAYAAN BARU(RM) + PEMBIAYAAN BARU(RM)
@php if($gadai['bakipjm'] != 0){ @@ -321,38 +345,43 @@ $bakipjm = $gadai['pinjaman']; } $percent_hargaemassemasa = ($bakipjm / $nilaihargasemasa) * 100; + + $percentage = 80 / 100; + $pembiayaanbaru = $nilaihargasemasa * (80/100); + $rounded_value = round($nilaihargasemasa * $percentage, 1, PHP_ROUND_HALF_UP); + $rounded_value = (($rounded_value-$pembiayaanbaru) > 0) ? $rounded_value - 0.1 : $rounded_value; + $pembiayaanbaru = min($pembiayaanbaru, $rounded_value); + $bayaranlebihan = $bakipjm - $pembiayaanbaru; + + $pembiayaanbaru = ($percent_hargaemassemasa > 80) ? $pembiayaanbaru : $bakipjm; @endphp
- +
- {{ number_format($percent_hargaemassemasa,2) }} -
+ {{ number_format($percent_hargaemassemasa,2) }} + @if($percent_hargaemassemasa > 80) + {{ number_format($percent_hargaemassemasa,2) }} + @endif +
-
- @if($percent_hargaemassemasa > 80) -
-
+ @if($percent_hargaemassemasa > 80) +
- BAYARAN LEBIHAN MARGIN + BAYARAN LEBIHAN MARGIN
- @php - $pembiayaanbaru = $nilaihargasemasa * (80/100); - $bayaranlebihan = $bakipjm - $pembiayaanbaru; - @endphp
- +
{{ round($percent_hargaemassemasa - 80,2) }}
+ @endif
-
- -
- @endif + +
Harga Lama @@ -370,9 +399,22 @@
-
- - +
+ @if($percent_hargaemassemasa > 80) +
+ +
+
+
+ @else +
+ +
+ @endif +
+ + +
@@ -412,9 +454,12 @@ $('#divperludibayartawarruq').hide(); $('#divbayarantawarruq').hide(); $('#divbayaran').hide(); + $('#divbayaranAT').hide(); $("#divbayaranminima").hide(); $('.divlebihanmargin').hide(); $('#divjenisAT').hide(); + $('#divperludibayarAT').hide(); + $('#divbaki').hide(); var array_recno = []; @@ -792,7 +837,11 @@ $("#divbayaranminima").hide(); $('.divlebihanmargin').hide(); $('#divjenisAT').hide(); + $('#divperludibayarAT').hide(); + $('#divbaki').hide(); + $('#divbayaranAT').hide(); + $('#calcbayar').val($('#perludibayar').val().replace(/[^0-9.-]+/g,"")); $('#divtelahdibayar').show(); $('#divperludibayar').show(); @@ -930,20 +979,29 @@ $('#divbayaranditerima').hide(); $('#divhargaemassemasa').show(); $('#divbayarantawarruq').show(); - $("#bayaran").prop("disabled", true); - $("#perludibayartawarruq").prop("readonly", true); + $("#bayaranAT").prop("disabled", true); $("#bayarantawarruq").prop("readonly", false); - $("#bayaran").val(0); - $('#divperludibayartawarruq').show(); + // $("#bayaran").val(0); + $('#divperludibayarAT').show(); $('.divlebihanmargin').show(); + $('#divbaki').show(); + + // if(percenthargasemasa > 80){ + $("#perludibayarAT").prop("readonly", false); + // } $('#divbakipinjaman').hide(); $('#divtelahdibayar').hide(); - $('#divbayaran').hide(); + + $('#divbayaranAT').show(); + $("#bayaranAT").prop("disabled", false); + $('#divperludibayar').hide(); - $('#basic-addon2').text(percenthargasemasa); - $('#perludibayartawarruq').val(formatter.format(totalbayaran)); + + $('#basic-addon2').text((percenthargasemasa > 80) ? '80.00' : percenthargasemasa); + $('#perludibayarAT').val(formatter.format(totalbayaran)); + $('#calcbayar').val(totalbayaran); break; @@ -1047,6 +1105,15 @@ } } + }else if($('#sltjenistebus').find(":selected").val() == 'AT'){ + let total = 0; + let bayaran = $('#bayaranAT').val(); + let perludibayar = $('#perludibayarAT').val(); + + total = bayaran - perludibayar; + $('#baki').val((total > 0) ? formatter.format(total.toFixed(2)) : '0.00'); + + } } @@ -2414,7 +2481,8 @@ var pinjaman = parseFloat("{{ $gadai['pinjaman']}}"); var kuantiti_marhun = Number("{{sizeof($marhun)}}"); var nowakil = nw; - var perludibayar = parseFloat($('#perludibayartawarruq').val().replace(/[^0-9.-]+/g,"")); + var perludibayar = parseFloat($('#perludibayarAT').val().replace(/[^0-9.-]+/g,"")); + var bayaranpelanggan = parseFloat($('#bayaranAT').val()); var kadarupahbaru = 0; // if(nilai_marhun > 0 && nilai_marhun < 400.99){ @@ -2479,6 +2547,7 @@ "kuantiti_marhun" : kuantiti_marhun, "jenisAT" : jenisAT, "totalbayaran" : perludibayar, + "bayaran" : bayaranpelanggan, }, success:function(success_data){ @@ -3099,7 +3168,11 @@ function funcexcuse(){ $('#basic-addon2').text(percentasal); $('.divlebihanmargin').hide(); $('#divjenisAT').show(); - $('#perludibayartawarruq').val(formatter.format(jumupah)); + $('#perludibayarAT').val(formatter.format(jumupah)); + $('#divbayaranAT').hide(); + $('#calcbayar').val(jumupah); + $("#perludibayarAT").prop("readonly", true); + $('#divbaki').hide(); // gadaiautotawarruq(jenisAT); return; @@ -3215,6 +3288,108 @@ function funcexcuse(){ return false; } +function validateFloatKeyPress(el, evt) { + let hargamarhun = parseFloat("{{ $nilaihargasemasa }}"); + let tenpercent = hargamarhun * (10/100); + let pembiayaan = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); + var charCode = (evt.which) ? evt.which : event.keyCode; + var number = el.value; + let pembiayaanbaru = 0; + let keypress = evt.key; + + // let tot; + // if(!isNaN(evt.key)) + // { + // console.log(number,keypress); + // tot = +number + +keypress; + // } + // console.log(tot); + + pembiayaanbaru = pembiayaan - parseFloat(number); + + var number = el.value.split('.'); + if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) { + return false; + } + //just one dot + if(number.length>1 && charCode == 46){ + return false; + } + //get the carat position + var caratPos = getSelectionStart(el); + var dotPos = el.value.indexOf("."); + if( caratPos > dotPos && dotPos>-1 && (number[1].length > 1)){ + return false; + } + + if(pembiayaanbaru <= tenpercent){ + // console.log('ggwp'); + return false; + } + // console.log(pembiayaanbaru,tenpercent,parseFloat(keypress),pembiayaan); + + return true; +} + +function getSelectionStart(o) { + if (o.createTextRange) { + var r = document.selection.createRange().duplicate() + r.moveEnd('character', o.value.length) + if (r.text == '') return o.value.length + return o.value.lastIndexOf(r.text) + } else return o.selectionStart +} + +function bayaranATfunc(e){ + + let byr = $(e).val(); + let total = 0; + let pdbyr = 0; + let pembiayaanbaru = 0; + let upah = parseFloat($('#jumlahupah').val()); + let lebihanmargin = parseFloat($('#txtlebihanmargin').val()); + total = upah + lebihanmargin; + + let hargamarhun = parseFloat("{{ $nilaihargasemasa }}"); + let pembiayaan = parseFloat("{{ $pembiayaanbaru }}"); + let percenthargasemasa = parseFloat("{{ $percent_hargaemassemasa }}"); + + //algorithm untuk bayaran pelanggan dan baki + let baki = parseFloat($('#baki').val()); + let bayaranpelanggan = parseFloat($('#bayaranAT').val()); + + let totalpercent = 0; + if(byr == ''){ + // $('#perludibayarAT').val(total); + $('#pinjamanbaru').val(formatter.format(pembiayaan)); + totalpercent = (pembiayaan / hargamarhun) * 100; + + $('#basic-addon2').text(formatter.format(totalpercent.toFixed(2))); + }else{ + // pdbyr = parseFloat(byr) + parseFloat(total); + // $('#perludibayarAT').val(pdbyr); + pembiayaanbaru = pembiayaan - parseFloat(byr); + totalpercent = (pembiayaanbaru / hargamarhun) * 100; + + $('#pinjamanbaru').val(formatter.format(pembiayaanbaru)); + $('#basic-addon2').text(formatter.format(totalpercent.toFixed(2))); + // $('#perludibayar').val(total); + // if(baki) + } + +} + +function blockbayaranAT(event){ + let value = $(event).val(); + let upah = parseFloat($('#jumlahupah').val()); + let lebihanmargin = parseFloat($('#txtlebihanmargin').val()); + total = upah + lebihanmargin; + + if(value == '' || value <= 0 || value < total){ + $('#perludibayarAT').val(total); + } +} + // Restricts input for the set of matched elements to the given inputFilter function. (function($) { $.fn.inputFilter = function(inputFilter) { diff --git a/resources/views/widgets/calculator.blade.php b/resources/views/widgets/calculator.blade.php new file mode 100644 index 0000000..b63bd43 --- /dev/null +++ b/resources/views/widgets/calculator.blade.php @@ -0,0 +1,119 @@ + + + + + +
+
+

Calculator

+ + + + + + + + + + +
+
+ + \ No newline at end of file