From dafa28e155bcfa9f08d9b1a10d04d21f1c9e7ae4 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Wed, 31 Jan 2024 08:53:01 +0800 Subject: [PATCH 01/15] Update page index and edit for gadaian v2 --- resources/views/gadaian/v2/edit.blade.php | 85 ++++++++++++++++++++-- resources/views/gadaian/v2/index.blade.php | 84 +++++++++++++++++++-- 2 files changed, 158 insertions(+), 11 deletions(-) diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index eb11ba1..f56f6a0 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -38,6 +38,8 @@ Berat Nota Harga + Batu Permata + Berat Permata Action @@ -46,7 +48,7 @@ - + @@ -231,6 +233,19 @@ +
+
+ + +
+
+
Anggaran Berat Permata
+
Karat
+
+
+ + +
+
+
Anggaran Berat Permata
+
Karat
+
+
+ + +
+
+
Anggaran Berat Permata
+
Karat
+
+
Karat
+
+
Karat
- - - - + + + + + + + + +
From 61861b836e3cc8c1246fad2e6ce13de84701f204 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 19 Feb 2024 09:58:09 +0800 Subject: [PATCH 07/15] Split modal daftar marhun to 2 sides --- resources/views/gadaian/v2/edit.blade.php | 38 ++++++++++---------- resources/views/gadaian/v2/index.blade.php | 40 ++++++++++++---------- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 0b79c78..75b0906 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -233,24 +233,6 @@ -
-
- - -
-
-
Anggaran Berat Permata
-
Karat
+
+
+
+ + +
+
+
Anggaran Berat Permata
+
+
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index fdc77fc..a217e5d 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -225,24 +225,6 @@
-
-
- - -
-
-
Anggaran Berat Permata
-
Karat
+
+
+
+
+ + +
+
+
Anggaran Berat Permata
+
+
+
From 4e0731a9c6e9baf9704e30d8cfde5b98dab9d5d3 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 19 Feb 2024 12:19:54 +0800 Subject: [PATCH 08/15] Validate value < 0 and 2 decimal places for input berat permata --- resources/views/gadaian/v2/edit.blade.php | 59 +++++++++++++++++++++- resources/views/gadaian/v2/index.blade.php | 57 +++++++++++++++++++++ 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 75b0906..4995915 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -1031,6 +1031,19 @@ }); function validateBatuPermata(permata, berat) { + function countDecimalPlaces(value) { + const match = value.match(/(?:\.(\d+))?$/); + if (!match || !match[1]) { + return 0; + } + return match[1].length; + } + + function validateInput(inputValue) { + const decimalPlaces = countDecimalPlaces(inputValue); + return decimalPlaces <= 2; + } + if(permata != '') { if(berat == '') { $("#tambah_marhun").prop('disabled', false); @@ -1052,7 +1065,27 @@ }); event.preventDefault(); return false; - } else { + } else if(berat <= 0) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Nilai berat permata mesti lebih besar daripada ' + berat, + }); + event.preventDefault(); + return false; + } else if(!validateInput(berat)) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Hanya 2 titik perpuluhan dibenarkan untuk berat batu permata' + }); + event.preventDefault(); + return false; + }else { return true; } } else if(berat != '') { @@ -1068,6 +1101,30 @@ return false; } + if(berat <= 0) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Nilai berat permata ' + berat + ' tidak dibenarkan' + }); + event.preventDefault(); + return false; + } + + if(!validateInput(berat)) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Hanya 2 titik perpuluhan dibenarkan untuk berat batu permata' + }); + event.preventDefault(); + return false; + } + if(permata == '') { $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index a217e5d..863a4cf 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -850,6 +850,19 @@ }); function validateBatuPermata(permata, berat) { + function countDecimalPlaces(value) { + const match = value.match(/(?:\.(\d+))?$/); + if (!match || !match[1]) { + return 0; + } + return match[1].length; + } + + function validateInput(inputValue) { + const decimalPlaces = countDecimalPlaces(inputValue); + return decimalPlaces <= 2; + } + if(permata != '') { if(berat == '') { $("#tambah_marhun").prop('disabled', false); @@ -871,6 +884,26 @@ }); event.preventDefault(); return false; + } else if(berat <= 0) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Nilai berat permata mesti lebih besar daripada ' + berat, + }); + event.preventDefault(); + return false; + } else if(!validateInput(berat)) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Hanya 2 titik perpuluhan dibenarkan untuk berat batu permata' + }); + event.preventDefault(); + return false; } else { return true; } @@ -887,6 +920,30 @@ return false; } + if(berat <= 0) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Nilai berat permata mesti lebih besar daripada ' + berat, + }); + event.preventDefault(); + return false; + } + + if(!validateInput(berat)) { + $("#tambah_marhun").prop('disabled', false); + $("#terima_marhun").prop('disabled', false); + Swal.fire({ + icon: 'error', + title: 'Amaran!', + text: 'Hanya 2 titik perpuluhan dibenarkan untuk berat batu permata' + }); + event.preventDefault(); + return false; + } + if(permata == '') { $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); From a074b5d94e3de844e612c95d289abf07aae4a33c Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 19 Feb 2024 12:48:54 +0800 Subject: [PATCH 09/15] Update sag remove batu permata details and align text for Akad Wakalah --- resources/views/print/sag_ujrah_3.blade.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index 6c7b2f7..4909916 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -1282,8 +1282,6 @@ BIL JENIS MARHUN NOTA - BATU PERMATA - BERAT PERMATA(g) KUANTITI KARAT HARGA(RM/g) @@ -1303,8 +1301,6 @@ @endphp {{ $marhun_detail[$i]['nota'] }} - {{ $marhun_detail[$i]['batu_permata'] }} - {{ $marhun_detail[$i]['berat_batu_permata'] }} {{ $marhun_detail[$i]['bil'] }} {{ $marhun_detail[$i]['karat'] }} {{ $marhun_detail[$i]['harga'] }} @@ -1321,13 +1317,11 @@ - - @endif @endfor - JUMLAH MARHUN KESELURUHAN + JUMLAH MARHUN KESELURUHAN {{ $gadai_detail['kuantiti'] }} From 9486d9b8e51fe97de2cadbe5ebfbbc84a2b91fda Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 19 Feb 2024 12:50:47 +0800 Subject: [PATCH 10/15] Add ternary operator for value batu permata at view home penilai and khazanah gadaian --- resources/views/homepage/penilai/home.blade.php | 6 ++++-- resources/views/khazanah/gadaian.blade.php | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 77daf54..bb6948b 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -501,7 +501,8 @@ }, success:function(marhun_ajax){ bil_count++; - $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + marhun_detail['berat_batu_permata'] +""); + var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; + $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + valBatuPermata +""); } }); }); @@ -534,7 +535,8 @@ }, success:function(marhun_ajax){ bil_count++; - $("#belum_serah").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + marhun_detail['berat_batu_permata'] +""); + var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; + $("#belum_serah").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + valBatuPermata +""); } }); }); diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index 4a0576b..1e4e04c 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -289,6 +289,7 @@ }, success: function (marhun_ajax) { bil_count++; + var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] + "" + marhun_detail['berat'] + "" + @@ -298,7 +299,7 @@ minimumFractionDigits: 2 }) + "" + marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + - "" + marhun_detail['berat_batu_permata'] + + "" + valBatuPermata + ""); } }); From 9a6cdba39af0c89d62ec36db553c7af160d38684 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Tue, 20 Feb 2024 15:21:37 +0800 Subject: [PATCH 11/15] Add info batu permata if exist when tuntut baki --- app/Http/Controllers/LelongController.php | 28 +++++++++- resources/views/lelongan/index.blade.php | 31 +++++++++++ .../views/print/resit_tuntutbaki.blade.php | 51 +++++++++++++++++++ 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 548d66a..fe48372 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -25,6 +25,18 @@ class LelongController extends Controller $customerdetail = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $noic)->json(); $nama = $customerdetail['nama']; + $marhuns = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $batuPermataExist = false; + + foreach($marhuns[0] as $marhun) + { + if($marhun['batu_permata'] != null) + { + $batuPermataExist = true; + } + } + $lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/lelong/cawangan/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); if(sizeof($lelong) > 0) @@ -34,7 +46,7 @@ class LelongController extends Controller $gadai = $gadaidetail[0]; - return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong')); + return view('lelongan.index',compact('cawangan_info','api_url','gadai','nama','lelong', 'marhuns', 'batuPermataExist')); } public function lelong(){ @@ -65,7 +77,19 @@ class LelongController extends Controller if(sizeof($wakil) != 0) $wakil = $wakil[0]; - return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong','wakil')); + $marhuns = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/'. $norujukan)->json(); + + $batuPermataExist = false; + + foreach($marhuns[0] as $marhun) + { + if($marhun['batu_permata'] != null) + { + $batuPermataExist = true; + } + } + + return view('print.resit_tuntutbaki', compact('cawangan_detail','api_url','lelong','wakil', 'marhuns', 'batuPermataExist')); } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index aa5b71f..a66a410 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -81,6 +81,37 @@
+
+
+
*Surat ini direkod mengandungi batu permata. Sila serahkan batu permata kepada pelanggan semasa membuat tuntutan.
+ + + + + + + + + + + + + + @foreach ($marhuns[0] as $marhun) + + + + + + + + + + @endforeach + +
BilMarhunKaratBerat(g)NotaBatu PermataBerat Permata(g)
{{ $loop->iteration }}{{ $marhun['marhun'] }}{{ $marhun['karat'] }}{{ $marhun['berat'] }}{{ $marhun['nota'] }}{{ $marhun['batu_permata'] }}{{ $marhun['berat_batu_permata'] }}
+
+
diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php index 40ffc24..81da10a 100644 --- a/resources/views/print/resit_tuntutbaki.blade.php +++ b/resources/views/print/resit_tuntutbaki.blade.php @@ -147,6 +147,27 @@ padding:4px; color:black; } + +.main-table { + border-collapse: collapse; + width: 100%; +} + +.main-table td, +.main-table th { + border: 1px solid #ddd; + padding: 2px; + font-size: 9px; +} + +.main-table th { + padding-top: 12px; + padding-bottom: 12px; + text-align: center; + background-color: #d0d2d063; + color: black; + padding: 5px; +} @@ -265,6 +286,36 @@ RM {{ number_format($lelong['jumlah'],2) }} + + Jumlah Bayaran + RM {{ number_format($lelong['jumlah'],2) }} + + + + + + + + + + + + + + @foreach($marhuns[0] as $marhun) + + + + + + + + + + @endforeach +
BilMarhunKaratBerat(g)NotaBatu PermataBerat Permata(g)
{{ $loop->iteration }}{{ $marhun['marhun'] }}{{ $marhun['karat'] }}{{ $marhun['berat'] }}{{ $marhun['nota'] }}{{ $marhun['batu_permata'] }}{{ $marhun['berat_batu_permata'] }}
+ +
*Sila semak batu permata.

From f9369ea14c420a5976852ad7d7ac92bd88a6c8c2 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Thu, 14 Mar 2024 08:53:06 +0800 Subject: [PATCH 12/15] Update request uat 24-03-03 --- resources/views/gadaian/v2/edit.blade.php | 170 +++++++++--------- resources/views/gadaian/v2/index.blade.php | 160 ++++++++--------- .../views/homepage/penilai/home.blade.php | 14 +- resources/views/khazanah/gadaian.blade.php | 8 +- .../khazanah/laporan/marhunharian.blade.php | 7 +- resources/views/modal/editmarhun.blade.php | 31 ++-- .../print/laporan_marhunharian.blade.php | 8 +- resources/views/print/sag_ujrah_3.blade.php | 2 +- 8 files changed, 195 insertions(+), 205 deletions(-) diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php index 4995915..f64353d 100644 --- a/resources/views/gadaian/v2/edit.blade.php +++ b/resources/views/gadaian/v2/edit.blade.php @@ -239,7 +239,7 @@
-
Berat
+
Berat Bersih
Harga
@@ -251,25 +251,24 @@
-
-
-
- - +
@@ -363,26 +362,45 @@ var marhun = this.value; if (!arrayBatuPermata.includes(marhun)) { - $("#batupermata, #beratpermata").prop("disabled", false); + $("#col_right").css("display", "block"); } else { - $("#batupermata, #beratpermata").prop("disabled", true); - $('#batupermata').val('').trigger("change"); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $("#divanggaran").css("visibility", "hidden"); $('#beratpermata').val(""); } }); + $('#tagpermata').change(function () { + if($('#tagpermata').is(':checked')) { + $("#divanggaran").css("visibility", "visible"); + } else { + $("#divanggaran").css("visibility", "hidden"); + $('#beratpermata').val(""); + } + }); + + $('#tagpermataedit').change(function () { + if($('#tagpermataedit').is(':checked')) { + $(".div_anggaran_edit").css("display", "block"); + } else { + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); + } + }); $('#marhun_edit').change(function(){ var marhun = this.value; if (!arrayBatuPermata.includes(marhun)) { - console.log(true); - $("#batupermataedit, #beratpermataedit").prop("disabled", false); + $(".col_edit_permata").css("display", "block"); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); } else { - console.log(false); - $("#batupermataedit, #beratpermataedit").prop("disabled", true); - $('#batupermataedit').val('').trigger("change"); - $('#beratpermataedit').val(""); + $(".col_edit_permata").css("display", "none"); + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); } }); @@ -403,7 +421,9 @@ $('#batal_marhun').click(function(){ $('#nota').val('').trigger("change"); - $('#batupermata').val('').trigger("change"); + $('#tagpermata').prop("checked", false); + $("#col_right").css("display", "none"); + $("#divanggaran").css("visibility", "hidden"); $('#beratpermata').val(""); $('#marhun').val(0); $('#karat').val(0); @@ -499,6 +519,7 @@ total_berat = total_berat + Number(marhun_detail['berat']); marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); + status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; tablemarhun.row.add([ counter, marhun_detail['recno'], @@ -508,7 +529,7 @@ formatter.format(marhun_detail['berat']), marhun_detail['nota'], marhun_detail['harga'], - marhun_detail['batu_permata'], + status_tag_permata, marhun_detail['berat_batu_permata'], "
" ]).draw(); @@ -630,17 +651,26 @@ let berat = recno[5]; let harga = recno[7]; let nota = recno[6]; - let batupermata = recno[8]; + let tag_permata_edit = recno[8]; let beratpermata = recno[9]; let jenismarhun = recno[2]; var res = nota.split(","); - var resbatupermata = batupermata.split(","); if (!arrayBatuPermata.includes(jenismarhun)) { - $("#batupermataedit, #beratpermataedit").prop("disabled", false); + $(".col_edit_permata").css("display", "block"); + if(beratpermata != null) { + $('#tagpermataedit').prop('checked', true); + $(".div_anggaran_edit").css("display", "block"); + $('#beratpermataedit').val(beratpermata); + } else { + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); + } } else { - $("#batupermataedit, #beratpermataedit").prop("disabled", true); - $('#batupermataedit').val('').trigger("change"); + $(".col_edit_permata").css("display", "none"); + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); $('#beratpermataedit').val(""); } @@ -652,8 +682,6 @@ $.each(data,function(index,jemas){ $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun'])); $('#nota_edit').val(res).trigger('change'); - $('#batupermataedit').val(resbatupermata).trigger('change'); - $('#beratpermataedit').val(beratpermata); $('#sltkarat').val(karat); $('#marhun_edit').val(jenismarhun); @@ -690,7 +718,7 @@ $('#terima_edit').on('click',function(){ var nota_edit = $('#nota_edit').val(); - var batupermata_edit = $('#batupermataedit').val(); + var tagpermata_edit = $('input[id=tagpermataedit]').is(':checked') ? 1 : 0; var beratpermata_edit = $('#beratpermataedit').val(); var norujukedit = $('#norujukedit').val(); var recnoedit = $('#recnoedit').val(); @@ -707,13 +735,7 @@ var nota = ''; } - if(batupermata_edit != null){ - var batupermata = batupermata_edit.toString(); - }else{ - var batupermata = ''; - } - - var resultValidation = validateBatuPermata(batupermata, beratpermata_edit); + var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit); if(resultValidation == false) { return false; } @@ -739,7 +761,7 @@ 'n_marhun' : nilai_marhun_edit, 'marhun' : marhun_edit, 'nota' : nota, - 'batu_permata' : batupermata, + 'tag_permata' : tagpermata_edit, 'berat_batu_permata' : beratpermata_edit, "teller": "{{ Auth::user()->name }}" }, @@ -803,8 +825,8 @@ var bilangan_marhun_daftar = Number($('#bilangan_marhun').val()); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); - var batu_permata_array = $('#batupermata').val(); var berat_permata = $('#beratpermata').val(); + var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; if(nota_array != null){ var nota = nota_array.toString(); @@ -812,13 +834,6 @@ var nota = ''; } - if(batu_permata_array != null){ - var batu_permata = batu_permata_array.toString(); - }else{ - var batu_permata = ''; - } - - if(marhun == null && karat == null && berat_emas == ''){ $('#daftar_marhun').modal('hide'); } @@ -850,7 +865,7 @@ event.preventDefault(); return false; }else{ - var resultValidation = validateBatuPermata(batu_permata, berat_permata); + var resultValidation = validateBatuPermata(tag_permata, berat_permata); if(resultValidation == false) { return false; } @@ -864,7 +879,7 @@ 'norujukan': norujukan, 'marhun' : marhun, 'nota':nota, - 'batu_permata':batu_permata, + 'tag_permata':tag_permata, 'berat_batu_permata':berat_permata, 'karat' : karat, 'berat_emas' :berat_emas, @@ -874,7 +889,6 @@ }), success:function(data){ $('#nota').val('').trigger("change"); - $('#batupermata').val('').trigger("change"); $('#beratpermata').val(""); $('#marhun').val(0); $('#karat').val(0); @@ -882,9 +896,10 @@ $('#harga').val(""); $('#nilai_marhun').val(""); $('#daftar_marhun').modal('hide'); - $("#batupermata, #beratpermata").prop("disabled", true); - $('#batupermata').val('').trigger("change"); - $('#beratpermata').val(""); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $('#beratpermata').val(""); + $("#divanggaran").css("visibility", "hidden"); jumlah_marhun += 1; jumlah_nilai_marhun += Number(nilai_marhun); @@ -926,8 +941,8 @@ var bilangan_marhun_daftar = Number($('#bilangan_marhun').val()); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); - var batu_permata_array = $('#batupermata').val(); var beratpermata = $('#beratpermata').val(); + var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; if(nota_array != null){ var nota = nota_array.toString(); @@ -935,12 +950,6 @@ var nota = ''; } - if(batu_permata_array != null){ - var batu_permata = batu_permata_array.toString(); - }else{ - var batu_permata = ''; - } - if(marhun == null){ Swal.fire({ icon: 'error', @@ -968,7 +977,7 @@ event.preventDefault(); return false; }else{ - var resultValidation = validateBatuPermata(batu_permata, beratpermata); + var resultValidation = validateBatuPermata(tag_permata, beratpermata); if(resultValidation == false) { return false; } @@ -982,7 +991,7 @@ 'norujukan': norujukan, 'marhun' : marhun, 'nota':nota, - 'batu_permata':batu_permata, + 'tag_permata':tag_permata, 'berat_batu_permata':beratpermata, 'karat' : karat, 'berat_emas' :berat_emas, @@ -999,9 +1008,10 @@ $('#berat_emas').val(""); $('#harga').val(""); $('#nilai_marhun').val(""); - $("#batupermata, #beratpermata").prop("disabled", true); - $('#batupermata').val('').trigger("change"); - $('#beratpermata').val(""); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $('#beratpermata').val(""); + $("#divanggaran").css("visibility", "hidden"); jumlah_marhun += 1; jumlah_nilai_marhun += Number(nilai_marhun); @@ -1030,7 +1040,7 @@ } }); - function validateBatuPermata(permata, berat) { + function validateBatuPermata(tag, berat) { function countDecimalPlaces(value) { const match = value.match(/(?:\.(\d+))?$/); if (!match || !match[1]) { @@ -1044,7 +1054,7 @@ return decimalPlaces <= 2; } - if(permata != '') { + if(tag == 1) { if(berat == '') { $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); @@ -1124,20 +1134,6 @@ event.preventDefault(); return false; } - - if(permata == '') { - $("#tambah_marhun").prop('disabled', false); - $("#terima_marhun").prop('disabled', false); - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Pilih Permata' - }); - event.preventDefault(); - return false; - } else { - return true; - } } else { return true; } diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index 863a4cf..e3c8907 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -231,7 +231,7 @@
-
Berat
+
Berat Bersih
Harga
@@ -243,26 +243,23 @@
-
+
@@ -344,26 +341,45 @@ var marhun = this.value; if (!arrayBatuPermata.includes(marhun)) { - $("#batupermata, #beratpermata").prop("disabled", false); + $("#col_right").css("display", "block"); } else { - $("#batupermata, #beratpermata").prop("disabled", true); - $('#batupermata').val('').trigger("change"); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $("#divanggaran").css("visibility", "hidden"); $('#beratpermata').val(""); } }); + $('#tagpermata').change(function () { + if($('#tagpermata').is(':checked')) { + $("#divanggaran").css("visibility", "visible"); + } else { + $("#divanggaran").css("visibility", "hidden"); + $('#beratpermata').val(""); + } + }); + + $('#tagpermataedit').change(function () { + if($('#tagpermataedit').is(':checked')) { + $(".div_anggaran_edit").css("display", "block"); + } else { + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); + } + }); $('#marhun_edit').change(function(){ var marhun = this.value; if (!arrayBatuPermata.includes(marhun)) { - console.log(true); - $("#batupermataedit, #beratpermataedit").prop("disabled", false); + $(".col_edit_permata").css("display", "block"); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); } else { - console.log(false); - $("#batupermataedit, #beratpermataedit").prop("disabled", true); - $('#batupermataedit').val('').trigger("change"); - $('#beratpermataedit').val(""); + $(".col_edit_permata").css("display", "none"); + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); } }); @@ -384,7 +400,9 @@ $('#batal_marhun').click(function(){ $('#nota').val('').trigger("change"); - $('#batupermata').val('').trigger("change"); + $('#tagpermata').prop("checked", false); + $("#col_right").css("display", "none"); + $("#divanggaran").css("visibility", "hidden"); $('#beratpermata').val(""); $('#marhun').val(0); $('#karat').val(0); @@ -474,6 +492,7 @@ total_berat = total_berat + Number(marhun_detail['berat']); marhun_details = marhun_details + marhun_detail['bil'] + " " + marhun_detail['marhun'] +","; jumlah_nilai_marhun += Number(marhun_detail['n_marhun']); + status_tag_permata = marhun_detail['tag_permata'] == 1 ? 'Ada' : ''; tablemarhun.row.add([ counter, marhun_detail['recno'], @@ -483,7 +502,7 @@ formatter.format(marhun_detail['berat']), marhun_detail['nota'], marhun_detail['harga'], - marhun_detail['batu_permata'], + status_tag_permata, marhun_detail['berat_batu_permata'], "
" ]).draw(); @@ -598,8 +617,8 @@ var bilangan_marhun_daftar = Number($('#bilangan_marhun').val()); var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); - var batu_permata_array = $('#batupermata').val(); var berat_permata = $('#beratpermata').val(); + var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; if(nota_array != null){ var nota = nota_array.toString(); @@ -607,12 +626,6 @@ var nota = ''; } - if(batu_permata_array != null){ - var batu_permata = batu_permata_array.toString(); - }else{ - var batu_permata = ''; - } - if(marhun == null && karat == null && berat_emas == ''){ $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); @@ -652,7 +665,7 @@ event.preventDefault(); return false; }else{ - var resultValidation = validateBatuPermata(batu_permata, berat_permata); + var resultValidation = validateBatuPermata(tag_permata, berat_permata); if(resultValidation == false) { return false; } @@ -666,7 +679,7 @@ 'norujukan': norujukan, 'marhun' : marhun, 'nota':nota, - 'batu_permata':batu_permata, + 'tag_permata':tag_permata, 'berat_batu_permata':berat_permata, 'karat' : karat, 'berat_emas' :berat_emas, @@ -678,7 +691,6 @@ $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); $('#nota').val('').trigger("change"); - $('#batupermata').val('').trigger("change"); $('#beratpermata').val(""); $('#marhun').val(0); $('#karat').val(0); @@ -686,9 +698,10 @@ $('#harga').val(""); $('#nilai_marhun').val(""); $('#daftar_marhun').modal('hide'); - $("#batupermata, #beratpermata").prop("disabled", true); - $('#batupermata').val('').trigger("change"); - $('#beratpermata').val(""); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $('#beratpermata').val(""); + $("#divanggaran").css("visibility", "hidden"); jumlah_marhun += 1; jumlah_nilai_marhun += Number(nilai_marhun); @@ -737,6 +750,8 @@ var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,"")); var nota_array = $('#nota').val(); var batu_permata_array = $('#batupermata').val(); + var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0; + var beratpermata = $('#beratpermata').val(); if(nota_array != null){ @@ -745,12 +760,6 @@ var nota = ''; } - if(batu_permata_array != null){ - var batu_permata = batu_permata_array.toString(); - }else{ - var batu_permata = ''; - } - if(marhun == null){ $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); @@ -784,7 +793,7 @@ event.preventDefault(); return false; }else{ - var resultValidation = validateBatuPermata(batu_permata, beratpermata); + var resultValidation = validateBatuPermata(tag_permata, beratpermata); if(resultValidation == false) { return false; } @@ -798,7 +807,7 @@ 'norujukan': norujukan, 'marhun' : marhun, 'nota':nota, - 'batu_permata':batu_permata, + 'tag_permata':tag_permata, 'berat_batu_permata':beratpermata, 'karat' : karat, 'berat_emas' :berat_emas, @@ -817,6 +826,10 @@ $('#berat_emas').val(""); $('#harga').val(""); $('#nilai_marhun').val(""); + $("#col_right").css("display", "none"); + $('#tagpermata').prop('checked', false); + $('#beratpermata').val(""); + $("#divanggaran").css("visibility", "hidden"); jumlah_marhun += 1; jumlah_nilai_marhun += Number(nilai_marhun); @@ -849,7 +862,7 @@ } }); - function validateBatuPermata(permata, berat) { + function validateBatuPermata(tag, berat) { function countDecimalPlaces(value) { const match = value.match(/(?:\.(\d+))?$/); if (!match || !match[1]) { @@ -863,7 +876,7 @@ return decimalPlaces <= 2; } - if(permata != '') { + if(tag == 1) { if(berat == '') { $("#tambah_marhun").prop('disabled', false); $("#terima_marhun").prop('disabled', false); @@ -943,20 +956,6 @@ event.preventDefault(); return false; } - - if(permata == '') { - $("#tambah_marhun").prop('disabled', false); - $("#terima_marhun").prop('disabled', false); - Swal.fire({ - icon: 'error', - title: 'Amaran!', - text: 'Sila Pilih Permata' - }); - event.preventDefault(); - return false; - } else { - return true; - } } else { return true; } @@ -1387,17 +1386,26 @@ let berat = recno[5]; let harga = recno[7]; let nota = recno[6]; - let batupermata = recno[8]; + let tag_permata_edit = recno[8]; let beratpermata = recno[9]; let jenismarhun = recno[2]; var res = nota.split(","); - var resbatupermata = batupermata.split(","); if (!arrayBatuPermata.includes(jenismarhun)) { - $("#batupermataedit, #beratpermataedit").prop("disabled", false); + $(".col_edit_permata").css("display", "block"); + if(beratpermata != null) { + $('#tagpermataedit').prop('checked', true); + $(".div_anggaran_edit").css("display", "block"); + $('#beratpermataedit').val(beratpermata); + } else { + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); + $('#beratpermataedit').val(""); + } } else { - $("#batupermataedit, #beratpermataedit").prop("disabled", true); - $('#batupermataedit').val('').trigger("change"); + $(".col_edit_permata").css("display", "none"); + $('#tagpermataedit').prop('checked', false); + $(".div_anggaran_edit").css("display", "none"); $('#beratpermataedit').val(""); } @@ -1408,8 +1416,6 @@ $.each(data,function(index,jemas){ $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun'])); $('#nota_edit').val(res).trigger('change'); - $('#batupermataedit').val(resbatupermata).trigger('change'); - $('#beratpermataedit').val(beratpermata); $('#sltkarat').val(karat); $('#marhun_edit').val(jenismarhun); @@ -1428,7 +1434,7 @@ $('#terima_edit').on('click',function(){ var nota_edit = $('#nota_edit').val(); - var batupermata_edit = $('#batupermataedit').val(); + var tagpermata_edit = $('input[id=tagpermataedit]').is(':checked') ? 1 : 0; var beratpermata_edit = $('#beratpermataedit').val(); var norujukedit = $('#norujukedit').val(); var recnoedit = $('#recnoedit').val(); @@ -1445,13 +1451,7 @@ var nota = ''; } - if(batupermata_edit != null){ - var batupermata = batupermata_edit.toString(); - }else{ - var batupermata = ''; - } - - var resultValidation = validateBatuPermata(batupermata, beratpermata_edit); + var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit); if(resultValidation == false) { return false; } @@ -1477,7 +1477,7 @@ 'n_marhun' : nilai_marhun_edit, 'marhun' : marhun_edit, 'nota' : nota, - 'batu_permata' : batupermata, + 'tag_permata' : tagpermata_edit, 'berat_batu_permata' : beratpermata_edit, "teller": "{{ Auth::user()->name }}" }, diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index bb6948b..efe6f81 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -19,11 +19,10 @@ Bil Jenis Marhun - Berat + Berat Bersih Karat Nilai Marhun Nota - Batu Permata Berat Permata @@ -70,11 +69,10 @@ Bil Jenis Marhun - Berat + Berat Bersih Karat Nilai Marhun Nota - Batu Permata Berat Permata @@ -502,7 +500,9 @@ success:function(marhun_ajax){ bil_count++; var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; - $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + valBatuPermata +""); + var valTagPermata = marhun_detail['tag_permata'] == 1 ? '(PMT) ' : ''; + var notaDanTag = valTagPermata + marhun_detail['nota']; + $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ notaDanTag + "" + valBatuPermata +""); } }); }); @@ -536,7 +536,9 @@ success:function(marhun_ajax){ bil_count++; var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; - $("#belum_serah").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] + "" + marhun_detail['batu_permata'] + "" + valBatuPermata +""); + var valTagPermata = marhun_detail['tag_permata'] == 1 ? '(PMT) ' : ''; + var notaDanTag = valTagPermata + marhun_detail['nota']; + $("#belum_serah").append("" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ notaDanTag + "" + valBatuPermata +""); } }); }); diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index 1e4e04c..d1f56cc 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -21,11 +21,10 @@ Bil Jenis Marhun - Berat + Berat Bersih Karat Nilai Marhun Nota - Batu Permata Berat Permata @@ -290,6 +289,8 @@ success: function (marhun_ajax) { bil_count++; var valBatuPermata = marhun_detail['berat_batu_permata'] != null ? marhun_detail['berat_batu_permata'] : ''; + var valTagPermata = marhun_detail['tag_permata'] == 1 ? '(PMT) ' : ''; + var notaDanTag = valTagPermata + marhun_detail['nota']; $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] + "" + marhun_detail['berat'] + "" + @@ -297,8 +298,7 @@ marhun_detail['n_marhun'].toLocaleString( undefined, { minimumFractionDigits: 2 - }) + "" + marhun_detail['nota'] + - "" + marhun_detail['batu_permata'] + + }) + "" + notaDanTag + "" + valBatuPermata + ""); } diff --git a/resources/views/khazanah/laporan/marhunharian.blade.php b/resources/views/khazanah/laporan/marhunharian.blade.php index 84e39e9..422e6f3 100644 --- a/resources/views/khazanah/laporan/marhunharian.blade.php +++ b/resources/views/khazanah/laporan/marhunharian.blade.php @@ -45,9 +45,8 @@ Nama Marhun Nota - Batu Permata Berat Permata - Berat + Berat Bersih Karat Harga N.Marhun @@ -111,6 +110,7 @@ var counter = 1; tablecustomers.clear().draw(); $.each(data,function(index,customers){ + var valTagPermata = customers['tag_permata'] == 1 ? '(PMT) ' : ''; tablecustomers.row.add([ counter, @@ -118,8 +118,7 @@ customers['nokp'], customers['nama'], customers['marhun'], - customers['nota'], - customers['batu_permata'], + valTagPermata + customers['nota'], customers['berat_batu_permata'], customers['berat'], customers['karat'], diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php index e102e12..ab692e2 100644 --- a/resources/views/modal/editmarhun.blade.php +++ b/resources/views/modal/editmarhun.blade.php @@ -38,24 +38,19 @@ -
-
- - -
-
-
Anggaran Berat Permata
-
+
+
+
+ Ada Batu Permata? +
+ + +
+
+
+
+
Anggaran Berat Permata
+
Karat
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index e3c8907..dae569f 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -220,7 +220,6 @@ - From ea54e26f973f9435a6f54308f8cc463835235543 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Sun, 17 Mar 2024 09:17:11 +0800 Subject: [PATCH 14/15] Update feature tuntut baki lelong read tag permata --- app/Http/Controllers/LelongController.php | 4 ++-- resources/views/lelongan/index.blade.php | 4 +--- resources/views/print/resit_tuntutbaki.blade.php | 6 ++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index fe48372..82f4b40 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -31,7 +31,7 @@ class LelongController extends Controller foreach($marhuns[0] as $marhun) { - if($marhun['batu_permata'] != null) + if($marhun['tag_permata'] == 1) { $batuPermataExist = true; } @@ -83,7 +83,7 @@ class LelongController extends Controller foreach($marhuns[0] as $marhun) { - if($marhun['batu_permata'] != null) + if($marhun['tag_permata'] == 1) { $batuPermataExist = true; } diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index a66a410..0e953b0 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -92,7 +92,6 @@ Karat Berat(g) Nota - Batu Permata Berat Permata(g) @@ -103,8 +102,7 @@ {{ $marhun['marhun'] }} {{ $marhun['karat'] }} {{ $marhun['berat'] }} - {{ $marhun['nota'] }} - {{ $marhun['batu_permata'] }} + {{ $marhun['tag_permata'] == 1 ? '(PMT) ' : '' }}{{ $marhun['nota'] }} {{ $marhun['berat_batu_permata'] }} @endforeach diff --git a/resources/views/print/resit_tuntutbaki.blade.php b/resources/views/print/resit_tuntutbaki.blade.php index 81da10a..c44db96 100644 --- a/resources/views/print/resit_tuntutbaki.blade.php +++ b/resources/views/print/resit_tuntutbaki.blade.php @@ -299,7 +299,6 @@ Karat Berat(g) Nota - Batu Permata Berat Permata(g) @foreach($marhuns[0] as $marhun) @@ -308,9 +307,8 @@ {{ $marhun['marhun'] }} {{ $marhun['karat'] }} {{ $marhun['berat'] }} - {{ $marhun['nota'] }} - {{ $marhun['batu_permata'] }} - {{ $marhun['berat_batu_permata'] }} + {{ $marhun['tag_permata'] == 1 ? '(PMT) ' : '' }}{{ $marhun['nota'] }} + {{ $marhun['tag_permata'] == 1 ? $marhun['berat_batu_permata'] : '-' }} @endforeach From 85eb338258be9dc84fbab4bdca9e84cd35618a70 Mon Sep 17 00:00:00 2001 From: amirhassan Date: Mon, 25 Mar 2024 05:46:43 +0800 Subject: [PATCH 15/15] Update onchange function for modal gadaian v2, & fix sag --- resources/views/gadaian/v2/index.blade.php | 2 -- resources/views/modal/editmarhun.blade.php | 1 - resources/views/print/sag_ujrah_3.blade.php | 8 ++++---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php index dae569f..71f221d 100644 --- a/resources/views/gadaian/v2/index.blade.php +++ b/resources/views/gadaian/v2/index.blade.php @@ -372,8 +372,6 @@ if (!arrayBatuPermata.includes(marhun)) { $(".col_edit_permata").css("display", "block"); - $(".div_anggaran_edit").css("display", "none"); - $('#beratpermataedit').val(""); } else { $(".col_edit_permata").css("display", "none"); $('#tagpermataedit').prop('checked', false); diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php index ab692e2..c292397 100644 --- a/resources/views/modal/editmarhun.blade.php +++ b/resources/views/modal/editmarhun.blade.php @@ -33,7 +33,6 @@ - diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php index 0b1a3b5..ae517bb 100644 --- a/resources/views/print/sag_ujrah_3.blade.php +++ b/resources/views/print/sag_ujrah_3.blade.php @@ -317,9 +317,9 @@ @@ -473,7 +473,7 @@ echo $marhun['descpt']; @endphp - {{ $marhun_detail[$i]['nota'] }} + {{ $marhun_detail[$i]['tag_permata'] == 1 ? '(P) ' : '' }}{{ $marhun_detail[$i]['nota'] }} {{ $marhun_detail[$i]['bil'] }} {{ $marhun_detail[$i]['karat'] }} {{ $marhun_detail[$i]['harga'] }}