diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 20d15c6..107f500 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -203,6 +203,7 @@ class PenebusanController extends Controller $auth_user = Auth::user(); + //////////////////////// /// UPDATE TEBUS API//// /////////////////////// @@ -305,7 +306,12 @@ class PenebusanController extends Controller $marhunyangdiambil = $marhunsediada[0]; foreach($marhunyangdiambil as $index=>$marhunloop) { - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]); + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } foreach($arraymarhunbaru as $array1){ @@ -437,7 +443,12 @@ class PenebusanController extends Controller { if(!in_array($marhunloop['recno'], $arraydiola)) { - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]); + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 1b4403a..e7b1342 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -205,13 +205,12 @@
- PEMBIAYAAN HARGA SEMASA (RM) + PEMBIAYAAN H. SEMASA (RM)
@php - $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; @endphp -
+
{{ number_format($percent_hargaemassemasa,2) }} @@ -274,16 +273,6 @@
-
-
-
- PEMBIAYAAN BARU HARGA SEMASA (RM) -
-
- -
-
-
@@ -352,14 +341,13 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); var array_recno = []; var array_nm = []; var array_marhun = []; var array_berat = []; - var array_nmhs = []; + // var array_nmhs = []; //max bayaran let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}"); @@ -516,13 +504,15 @@ var marhun = $(this).data('marhun'); var berat = $(this).data('berat'); var nilaimarhunhargasemasa = $(this).data('nmhs'); + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); + if ($(this).is(':checked')) { array_recno.push(recno); - array_nm.push(nilaimarhun); + // array_nm.push(nilaimarhun); //nilai harga lama array_marhun.push(marhun); array_berat.push(berat); - array_nmhs.push(nilaimarhunhargasemasa); + array_nm.push(nilaimarhunhargasemasa); //nilai harga semasa totalmarhun = totalmarhun - parseFloat(nilaimarhun); @@ -530,27 +520,31 @@ }else{ var rm = array_recno.findIndex(x => x === recno); - var rmnilai = array_nm.findIndex(y => y == nilaimarhun); - var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); + // var rmnilai = array_nm.findIndex(y => y == nilaimarhun); // harga lama + var rmnilai = array_nm.findIndex(y => y == nilaimarhunhargasemasa); // harga lama + // var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); array_recno.splice(rm,1); - array_nm.splice(rmnilai,1); + // array_nm.splice(rmnilai,1); // yang lama array_marhun.splice(rmmarhun,1); array_berat.splice(rmberat,1); - array_nmhs.splice(rmhargasemasa,1); + array_nm.splice(rmnilai,1); //yang harga semasa totalmarhun = totalmarhun + parseFloat(nilaimarhun); totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa); } if(numbernotchecked != totalCheckboxes){ + + // console.log(nmsemasa); $.ajax({ method:'GET', url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan, dataType: 'json', data:{ - "array_recno" : array_recno + "array_recno" : array_recno, + "hargasemasa" : nmsemasa }, success:function(success){ let bayarz = $('#bayaran').val(formatter.format(success)); @@ -664,7 +658,6 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); @@ -688,7 +681,6 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); $('#divtelahdibayar').show(); @@ -717,7 +709,6 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); - $('#divpembiayaanseparuhhargasemasa').show(); @@ -734,7 +725,6 @@ $('#divhargaemassemasa').show(); $('#divtelahdibayar').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); $('#divbakipinjaman').hide(); $('#divbayaran').hide(); $('#divperludibayar').hide(); @@ -755,9 +745,9 @@ let pdbyr = 0; let totalseparuh = 0; - console.log($('#jumlahupah').val()); - console.log(bayaranseparuhasal); - console.log(byr); + // console.log($('#jumlahupah').val()); + // console.log(bayaranseparuhasal); + // console.log(byr); if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){ $('#bayaran').val(bayaranseparuhasal.toFixed(2)); @@ -810,8 +800,6 @@ const percentpinj = parseFloat("{{ $percent_asal }}"); const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru - console.log(percentpemb); - var totalpinjbaru=0; totalpinjbaru = pinjam + parseFloat(e.value); @@ -1152,7 +1140,7 @@ var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}"); - var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun; + var nilai_marhun = parseFloat("{{ $nilaihargasemasa }}") - sumnilaimarhun; var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); var ansuran = 0; var addpinjaman = 0; @@ -1166,7 +1154,6 @@ var marhun_detail = marhun_baru; var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length; var nowakil = nw; - var kadarupahbaru = 0; @@ -1228,7 +1215,6 @@ "_token": "{{ csrf_token() }}" }, success:function(data){ - console.log(data); }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); @@ -1535,9 +1521,6 @@ jenisbayarantebus = "tawarruq"; } - - return; - var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; @@ -1598,6 +1581,7 @@ }, success:function(success_data){ + var urlroute = '{{ route("resit.tambahpinjam", ":id") }}'; urlroute = urlroute.replace(':id', norujukan);