diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php
index f56f6a0..0b79c78 100644
--- a/resources/views/gadaian/v2/edit.blade.php
+++ b/resources/views/gadaian/v2/edit.blade.php
@@ -236,7 +236,12 @@
                                             <div class="col-md-12">
                                                 <div class="form-group">
                                                     <label>Batu Permata</label>
-                                                    <select name="batupermata" id="batupermata" class="select2_daftar_batu_permata form-control" multiple="multiple" data-placeholder="Batu Permata" style="width: 100%;">
+                                                    <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>
@@ -245,7 +250,7 @@
                                                 </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="beratpermata" id="beratpermata" autocomplete="off"></div>
+                                            <div class="col-md-4 mb-2"><input class="form-control" disabled type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
                                             <div class="col-md-4">Karat</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="karat" id="karat">
@@ -345,6 +350,40 @@
         });
     }
 
+    let arrayBatuPermata = [
+        'DNR',
+        'SYE',
+        'WFR',
+        'G/B',
+    ];
+
+    $('#marhun').change(function(){
+        var marhun = this.value;
+
+        if (!arrayBatuPermata.includes(marhun)) {
+            $("#batupermata, #beratpermata").prop("disabled", false);
+        } else {
+            $("#batupermata, #beratpermata").prop("disabled", true);
+            $('#batupermata').val('').trigger("change");
+            $('#beratpermata').val("");        
+        }
+    });
+
+    
+    $('#marhun_edit').change(function(){
+        var marhun = this.value;
+        
+        if (!arrayBatuPermata.includes(marhun)) {
+            console.log(true);
+            $("#batupermataedit, #beratpermataedit").prop("disabled", false);
+        } else {
+            console.log(false);
+            $("#batupermataedit, #beratpermataedit").prop("disabled", true);
+            $('#batupermataedit').val('').trigger("change");
+            $('#beratpermataedit').val("");        
+        }
+    });
+
     $('#karat').change(function(){
         var karat = this.value;
         karat = karat.replace(/\./g,'-');
@@ -362,6 +401,8 @@
     $('#batal_marhun').click(function(){
         
         $('#nota').val('').trigger("change");
+        $('#batupermata').val('').trigger("change");
+        $('#beratpermata').val("");
         $('#marhun').val(0);
         $('#karat').val(0);
         $('#berat_emas').val("");
@@ -593,6 +634,14 @@
         var res = nota.split(",");
         var resbatupermata = batupermata.split(",");
 
+        if (!arrayBatuPermata.includes(jenismarhun)) {
+            $("#batupermataedit, #beratpermataedit").prop("disabled", false);
+        } else {
+            $("#batupermataedit, #beratpermataedit").prop("disabled", true);
+            $('#batupermataedit').val('').trigger("change");
+            $('#beratpermataedit').val("");        
+        }
+
         $.ajax({
             method:'GET',
             url: api_url + '/api/jemas',
@@ -662,6 +711,11 @@
             var batupermata = '';
         }
 
+        var resultValidation = validateBatuPermata(batupermata, beratpermata_edit);
+        if(resultValidation == false) {
+            return false;
+        }
+
         if($.isNumeric(berat_edit) == false){
             Swal.fire({
                 icon: 'error',
@@ -794,6 +848,11 @@
                         event.preventDefault();
                         return false;
                     }else{
+                        var resultValidation = validateBatuPermata(batu_permata, berat_permata);
+                        if(resultValidation == false) {
+                            return false;
+                        }
+
                         if(bilangan_marhun_daftar<10){
                             $.ajax({
                                 method:'POST',
@@ -821,6 +880,9 @@
                                     $('#harga').val("");
                                     $('#nilai_marhun').val("");
                                     $('#daftar_marhun').modal('hide');
+                                    $("#batupermata, #beratpermata").prop("disabled", true);
+                                    $('#batupermata').val('').trigger("change");
+                                    $('#beratpermata').val(""); 
 
                                     jumlah_marhun += 1;
                                     jumlah_nilai_marhun += Number(nilai_marhun);
@@ -904,6 +966,11 @@
                     event.preventDefault();
                     return false;
                 }else{
+                    var resultValidation = validateBatuPermata(batu_permata, beratpermata);
+                    if(resultValidation == false) {
+                        return false;
+                    }
+
                     if(bilangan_marhun_daftar < 10){
                         $.ajax({
                             method:'POST',
@@ -930,6 +997,9 @@
                                 $('#berat_emas').val("");
                                 $('#harga').val("");
                                 $('#nilai_marhun').val("");
+                                $("#batupermata, #beratpermata").prop("disabled", true);
+                                $('#batupermata').val('').trigger("change");
+                                $('#beratpermata').val("");   
                                 
                                 jumlah_marhun += 1;
                                 jumlah_nilai_marhun += Number(nilai_marhun);
@@ -958,6 +1028,61 @@
         }
     });
 
+    function validateBatuPermata(permata, berat) {
+        if(permata != '') {
+            if(berat == '') {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Isi Anggaran Berat Permata'
+                });
+                event.preventDefault();
+                return false;
+            } else if($.isNumeric(berat) == false) {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Semak Semula Berat Permata'
+                });
+                event.preventDefault();
+                return false;
+            } else {
+                return true;
+            }
+        } else if(berat != '') {
+            if($.isNumeric(berat) == false) {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Semak Semula Berat Permata'
+                });
+                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;
+        }
+    }
 
     function verifyGadai(func){
         $("#terima_gadai").prop('disabled', true);
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index 1f7b8e8..fdc77fc 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -228,7 +228,12 @@
                                             <div class="col-md-12">
                                                 <div class="form-group">
                                                     <label>Batu Permata</label>
-                                                    <select name="batupermata" id="batupermata" class="select2_daftar_batu_permata form-control" multiple="multiple" data-placeholder="Batu Permata" style="width: 100%;">
+                                                    <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>
@@ -237,7 +242,7 @@
                                                 </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="beratpermata" id="beratpermata" autocomplete="off"></div>
+                                            <div class="col-md-4 mb-2"><input class="form-control" disabled type="text" name="beratpermata" id="beratpermata" autocomplete="off"></div>
                                             <div class="col-md-4">Karat</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="karat" id="karat">
@@ -324,6 +329,40 @@
         });
     }
 
+    let arrayBatuPermata = [
+        'DNR',
+        'SYE',
+        'WFR',
+        'G/B',
+    ];
+
+    $('#marhun').change(function(){
+        var marhun = this.value;
+
+        if (!arrayBatuPermata.includes(marhun)) {
+            $("#batupermata, #beratpermata").prop("disabled", false);
+        } else {
+            $("#batupermata, #beratpermata").prop("disabled", true);
+            $('#batupermata').val('').trigger("change");
+            $('#beratpermata').val("");        
+        }
+    });
+
+    
+    $('#marhun_edit').change(function(){
+        var marhun = this.value;
+        
+        if (!arrayBatuPermata.includes(marhun)) {
+            console.log(true);
+            $("#batupermataedit, #beratpermataedit").prop("disabled", false);
+        } else {
+            console.log(false);
+            $("#batupermataedit, #beratpermataedit").prop("disabled", true);
+            $('#batupermataedit').val('').trigger("change");
+            $('#beratpermataedit').val("");        
+        }
+    });
+
     $('#karat').change(function(){
         var karat = this.value;
         karat = karat.replace(/\./g,'-');
@@ -341,6 +380,8 @@
     $('#batal_marhun').click(function(){
 
         $('#nota').val('').trigger("change");
+        $('#batupermata').val('').trigger("change");
+        $('#beratpermata').val("");
         $('#marhun').val(0);
         $('#karat').val(0);
         $('#berat_emas').val("");
@@ -607,6 +648,11 @@
                         event.preventDefault();
                         return false;
                     }else{
+                        var resultValidation = validateBatuPermata(batu_permata, berat_permata);
+                        if(resultValidation == false) {
+                            return false;
+                        }
+
                         if(bilangan_marhun_daftar<10){
                             $.ajax({
                                 method:'POST',
@@ -636,6 +682,9 @@
                                     $('#harga').val("");
                                     $('#nilai_marhun').val("");
                                     $('#daftar_marhun').modal('hide');
+                                    $("#batupermata, #beratpermata").prop("disabled", true);
+                                    $('#batupermata').val('').trigger("change");
+                                    $('#beratpermata').val("");   
 
                                     jumlah_marhun += 1;
                                     jumlah_nilai_marhun += Number(nilai_marhun);
@@ -731,6 +780,11 @@
                     event.preventDefault();
                     return false;
                 }else{
+                    var resultValidation = validateBatuPermata(batu_permata, beratpermata);
+                    if(resultValidation == false) {
+                        return false;
+                    }
+
                     if(bilangan_marhun_daftar < 10){
                         $.ajax({
                             method:'POST',
@@ -791,6 +845,62 @@
         }
     });
 
+    function validateBatuPermata(permata, berat) {
+        if(permata != '') {
+            if(berat == '') {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Isi Anggaran Berat Permata'
+                });
+                event.preventDefault();
+                return false;
+            } else if($.isNumeric(berat) == false) {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Semak Semula Berat Permata'
+                });
+                event.preventDefault();
+                return false;
+            } else {
+                return true;
+            }
+        } else if(berat != '') {
+            if($.isNumeric(berat) == false) {
+                $("#tambah_marhun").prop('disabled', false);
+                $("#terima_marhun").prop('disabled', false);
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Sila Semak Semula Berat Permata'
+                });
+                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;
+        }
+    }
+
     function getDataCawangan(){
 
        let header = {
@@ -1221,6 +1331,15 @@
         let jenismarhun = recno[2];
         var res = nota.split(",");
         var resbatupermata = batupermata.split(",");
+
+        if (!arrayBatuPermata.includes(jenismarhun)) {
+            $("#batupermataedit, #beratpermataedit").prop("disabled", false);
+        } else {
+            $("#batupermataedit, #beratpermataedit").prop("disabled", true);
+            $('#batupermataedit').val('').trigger("change");
+            $('#beratpermataedit').val("");        
+        }
+        
         $.ajax({
             method:'GET',
             url: api_url + '/api/jemas',
@@ -1271,6 +1390,11 @@
             var batupermata = '';
         }
 
+        var resultValidation = validateBatuPermata(batupermata, beratpermata_edit);
+        if(resultValidation == false) {
+            return false;
+        }
+
         if($.isNumeric(berat_edit) == false){
             Swal.fire({
                 icon: 'error',
diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php
index adc9a14..e102e12 100644
--- a/resources/views/modal/editmarhun.blade.php
+++ b/resources/views/modal/editmarhun.blade.php
@@ -42,10 +42,15 @@
                     <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="Kaca">Kaca</option>
-                            <option value="Plastik">Plastik</option>
-                            <option value="Damar">Damar</option>
-                            <option value="Mutiara">Mutiara</option>
+                          <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>