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 @@
                                                     <option disabled selected value> -- Pilih Karat -- </option>
                                                 </select>
                                             </div>
-                                            <div class="col-md-4">Berat</div>
+                                            <div class="col-md-4">Berat Bersih</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas"></div>
                                             <div class="col-md-4">Harga</div>
                                             <div class="col-md-8"><input class="form-control .harga" type="text" name="harga" id="harga" readonly></div>
@@ -251,25 +251,24 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
                                         </div>
                                     </div>
-                                    <div class="col-md-6">
-                                        <div class="col-md-12">
-                                            <div class="form-group">
-                                                <label>Batu Permata</label>
-                                                <select name="batupermata" id="batupermata" disabled class="select2_daftar_batu_permata form-control" multiple="multiple" data-placeholder="Batu Permata" style="width: 100%;">
-                                                    <option value="Berlian Asli">Berlian Asli</option>
-                                                    <option value="Berlian Swiss">Berlian Swiss</option>
-                                                    <option value="Batu Akik">Batu Akik</option>
-                                                    <option value="Batu Nilam">Batu Nilam</option>
-                                                    <option value="Jed">Jed</option>
-                                                    <option value="Kaca">Kaca</option>
-                                                    <option value="Plastik">Plastik</option>
-                                                    <option value="Damar">Damar</option>
-                                                    <option value="Mutiara">Mutiara</option>
-                                                </select>
+                                    <div class="col-md-6" id="col_right" style="display: none">
+                                        <div class="form-group row">
+                                            <div class="col-md-12">
+                                                <div class="form-group">
+                                                    <div class="d-flex justify-content-between">
+                                                        <span>Ada Batu Permata?</span>
+                                                        <div>
+                                                            <label for="tagpermata">Ya</label>
+                                                            <input type="checkbox" id="tagpermata" name="tagpermata">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="d-flex" id="divanggaran" style="visibility: hidden">
+                                                <div class="col-8">Anggaran Berat Permata</div>
+                                                <div class="col-4"><input class="form-control" type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
                                             </div>
                                         </div>
-                                        <div class="col-md-12">Anggaran Berat Permata</div>
-                                        <div class="col-md-12"><input class="form-control" disabled type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
                                     </div>
                                 </div>
                         <div class="modal-footer">
@@ -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'],
                     "<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
                 ]).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 @@
                                                     <option disabled selected value> -- Pilih Karat -- </option>
                                                 </select>
                                             </div>
-                                            <div class="col-md-4">Berat</div>
+                                            <div class="col-md-4">Berat Bersih</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="berat_emas" id="berat_emas"></div>
                                             <div class="col-md-4">Harga</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="harga" id="harga" readonly></div>
@@ -243,26 +243,23 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
                                         </div>
                                     </div>
-                                    <div class="col-md-6">
+                                    <div class="col-md-6" id="col_right" style="display: none">
                                         <div class="form-group row">
                                             <div class="col-md-12">
                                                 <div class="form-group">
-                                                    <label>Batu Permata</label>
-                                                    <select name="batupermata" id="batupermata" disabled class="select2_daftar_batu_permata form-control" multiple="multiple" data-placeholder="Batu Permata" style="width: 100%;">
-                                                        <option value="Berlian Asli">Berlian Asli</option>
-                                                        <option value="Berlian Swiss">Berlian Swiss</option>
-                                                        <option value="Batu Akik">Batu Akik</option>
-                                                        <option value="Batu Nilam">Batu Nilam</option>
-                                                        <option value="Jed">Jed</option>
-                                                        <option value="Kaca">Kaca</option>
-                                                        <option value="Plastik">Plastik</option>
-                                                        <option value="Damar">Damar</option>
-                                                        <option value="Mutiara">Mutiara</option>
-                                                    </select>
+                                                    <div class="d-flex justify-content-between">
+                                                        <span>Ada Batu Permata?</span>
+                                                        <div>
+                                                            <label for="tagpermata">Ya</label>
+                                                            <input type="checkbox" id="tagpermata" name="tagpermata">
+                                                        </div>
+                                                    </div>
                                                 </div>
                                             </div>
-                                            <div class="col-md-12">Anggaran Berat Permata</div>
-                                            <div class="col-md-12"><input class="form-control" disabled type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
+                                            <div class="d-flex" id="divanggaran" style="visibility: hidden">
+                                                <div class="col-8">Anggaran Berat Permata</div>
+                                                <div class="col-4"><input class="form-control" type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -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'],
                     "<div class='buttonpunya text-center'><button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button> <button onclick='deletemarhun(this)' class='btn btn-danger'><i class='fas fa-trash-alt'></i></button></div>"
                 ]).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 @@
                         <tr>
                             <th>Bil</th>
                             <th>Jenis Marhun</th>
-                            <th>Berat</th>
+                            <th>Berat Bersih</th>
                             <th>Karat</th>
                             <th>Nilai Marhun</th>
                             <th>Nota</th>
-                            <th>Batu Permata</th>
                             <th>Berat Permata</th>
                         </tr>
                     </thead>
@@ -70,11 +69,10 @@
                         <tr>
                             <th>Bil</th>
                             <th>Jenis Marhun</th>
-                            <th>Berat</th>
+                            <th>Berat Bersih</th>
                             <th>Karat</th>
                             <th>Nilai Marhun</th>
                             <th>Nota</th>
-                            <th>Batu Permata</th>
                             <th>Berat Permata</th>
                         </tr>
                     </thead>
@@ -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("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] + "</td><td>" + marhun_detail['batu_permata'] + "</td><td>" + valBatuPermata +"</td></tr>");
+                        var valTagPermata = marhun_detail['tag_permata'] == 1 ? '(PMT) ' : '';
+                        var notaDanTag = valTagPermata + marhun_detail['nota'];
+                        $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ notaDanTag + "</td><td>" + valBatuPermata +"</td></tr>");
                     }
                 });
             });
@@ -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("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] + "</td><td>" + marhun_detail['batu_permata'] + "</td><td>" + valBatuPermata +"</td></tr>");
+                        var valTagPermata = marhun_detail['tag_permata'] == 1 ? '(PMT) ' : '';
+                        var notaDanTag = valTagPermata + marhun_detail['nota'];
+                        $("#belum_serah").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ notaDanTag + "</td><td>" + valBatuPermata +"</td></tr>");
                     }
                 });
             });
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 @@
                                 <tr>
                                     <th>Bil</th>
                                     <th>Jenis Marhun</th>
-                                    <th>Berat</th>
+                                    <th>Berat Bersih</th>
                                     <th>Karat</th>
                                     <th>Nilai Marhun</th>
                                     <th>Nota</th>
-                                    <th>Batu Permata</th>
                                     <th>Berat Permata</th>
                                 </tr>
                             </thead>
@@ -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("<tr><td>" + bil_count +
                             "</td><td>" + marhun_ajax['descpt'] + "</td><td>" +
                             marhun_detail['berat'] + "</td><td>" +
@@ -297,8 +298,7 @@
                             marhun_detail['n_marhun'].toLocaleString(
                                 undefined, {
                                     minimumFractionDigits: 2
-                                }) + "</td><td>" + marhun_detail['nota'] +
-                                    "</td><td>" + marhun_detail['batu_permata'] +
+                                }) + "</td><td>" + notaDanTag +
                                     "</td><td>" + valBatuPermata +
                             "</td></tr>");
                     }
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 @@
                                         <th>Nama</th>
                                         <th>Marhun</th>
                                         <th>Nota</th>
-                                        <th>Batu Permata</th>
                                         <th>Berat Permata</th>
-                                        <th>Berat</th>
+                                        <th>Berat Bersih</th>
                                         <th>Karat</th>
                                         <th>Harga</th>
                                         <th>N.Marhun</th>
@@ -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 @@
                     </select>
                   </div>
                 </div>
-                <div class="col-md-12">
-                    <div class="form-group">
-                        <label>Batu Permata</label>
-                        <select name="batupermataedit" id="batupermataedit" class="select2_batupermata form-control" multiple="multiple" data-placeholder="Batu Permata" style="width: 100%;">
-                          <option value="Berlian Asli">Berlian Asli</option>
-                          <option value="Berlian Swiss">Berlian Swiss</option>
-                          <option value="Batu Akik">Batu Akik</option>
-                          <option value="Batu Nilam">Batu Nilam</option>
-                          <option value="Jed">Jed</option>
-                          <option value="Kaca">Kaca</option>
-                          <option value="Plastik">Plastik</option>
-                          <option value="Damar">Damar</option>
-                          <option value="Mutiara">Mutiara</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="col-md-8">Anggaran Berat Permata</div>
-                <div class="col-md-4 mb-2"><input class="form-control" type="text" name="beratpermataedit" id="beratpermataedit" autocomplete="off"></div>
+                <div class="col-md-12 col_edit_permata">
+                  <div class="form-group">
+                      <div class="d-flex justify-content-between">
+                          <span>Ada Batu Permata?</span>
+                          <div>
+                              <label for="tagpermataedit">Ya</label>
+                              <input type="checkbox" id="tagpermataedit" name="tagpermataedit">
+                          </div>
+                      </div>
+                  </div>
+                </div> 
+                <div class="col-md-8 col_edit_permata div_anggaran_edit">Anggaran Berat Permata</div>
+                <div class="col-md-4 mb-2 col_edit_permata div_anggaran_edit"><input class="form-control" type="text" name="beratpermataedit" id="beratpermataedit" autocomplete="off"></div>
                 <div class="col-md-4">Karat</div>
                 <div class="col-md-8">
                   <select name="sltkarat" id="sltkarat" class="form-control">
diff --git a/resources/views/print/laporan_marhunharian.blade.php b/resources/views/print/laporan_marhunharian.blade.php
index 1438271..b89e86c 100644
--- a/resources/views/print/laporan_marhunharian.blade.php
+++ b/resources/views/print/laporan_marhunharian.blade.php
@@ -205,9 +205,8 @@
     <th>Nama</th>
     <th>Marhun</th>
     <th>Nota</th>
-    <th>Batu Permata</th>
     <th>Berat Permata</th>
-    <th>Berat</th>
+    <th>Berat Bersih</th>
     <th>Karat</th>
     <th>Harga</th>
     <th>N.Marhun</th>
@@ -221,8 +220,7 @@
       <td>{{$item['nokp']}}</td>
       <td>{{$item['nama']}}</td>
       <td>{{$item['marhun']}}</td>
-      <td>{{$item['nota']}}</td>
-      <td>{{$item['batu_permata']}}</td>
+      <td>{{$item['tag_permata'] == 1 ? '(PMT) ' : ''}}{{$item['nota']}}</td>
       <td>{{$item['berat_batu_permata']}}</td>
       <td>{{$item['berat']}}</td>
       <td>{{$item['karat']}}</td>
@@ -232,7 +230,7 @@
     @php $counter++;$totalberat += $item['berat'];$totalnm += $item['n_marhun'];@endphp
   @endforeach
     <tr>
-      <td colspan="3"><b>JUMLAH(RM)</b></td>
+      <td colspan="2"><b>JUMLAH(RM)</b></td>
       <td></td>
       <td></td>
       <td></td>
diff --git a/resources/views/print/sag_ujrah_3.blade.php b/resources/views/print/sag_ujrah_3.blade.php
index 4909916..0b1a3b5 100644
--- a/resources/views/print/sag_ujrah_3.blade.php
+++ b/resources/views/print/sag_ujrah_3.blade.php
@@ -1300,7 +1300,7 @@
                                         echo $marhun['descpt'];
                                     @endphp
                                 </td>
-                                <td>{{ $marhun_detail[$i]['nota'] }}</td>
+                                <td>{{ $marhun_detail[$i]['tag_permata'] == 1 ? '(P) ' : '' }}{{ $marhun_detail[$i]['nota'] }}</td>
                                 <td>{{ $marhun_detail[$i]['bil'] }}</td>
                                 <td>{{ $marhun_detail[$i]['karat'] }}</td>
                                 <td>{{ $marhun_detail[$i]['harga'] }}</td>