diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php
index 5d2ef2e..b2fef2c 100644
--- a/resources/views/gadaian/v2/edit.blade.php
+++ b/resources/views/gadaian/v2/edit.blade.php
@@ -685,7 +685,7 @@
         let karat = recno[4];
         let berat = recno[5];
         let harga = recno[8];
-        let nota = recno[6];
+        let nota = recno[7];
         let tag_permata_edit = recno[8];
         let beratpermata = recno[10];
         let kuantiti = recno[6];
@@ -694,8 +694,14 @@
 
         if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
             $('#kuantiti_modal').attr('disabled', false);
+            $(".div_kuantiti_edit").css("display", "block");
+            $(".div_column_kuantiti_edit").css("display", "block");
+            $('#kuantiti_edit').val(kuantiti);
         }else{
-            $('#kuantiti_modal').attr('disabled', true);
+            $('#kuantiti_modal').attr('disabled', false);
+            $(".div_kuantiti_edit").css("display", "none");
+            $(".div_column_kuantiti_edit").css("display", "none");
+            $('#kuantiti_edit').val(1);
         }
 
         if (!arrayBatuPermata.includes(jenismarhun)) {
@@ -725,7 +731,7 @@
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
                     $('#nota_edit').val(res).trigger('change');
 
-                    $('#kuantiti_modal').val(kuantiti);
+                    $('#kuantiti_edit').val(kuantiti);
 
                     $('#sltkarat').val(karat);
                     $('#marhun_edit').val(jenismarhun);
@@ -794,7 +800,7 @@
         var harga_edit = $('#harga_edit').val();
         var nilaimarhun_edit = $('#nilaimarhun_edit').val();
         var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
-        var kuantiti = $('#kuantiti_modal').val();
+        var kuantiti = $('#kuantiti_edit').val();
 
         if(nota_edit != null){
             var nota = nota_edit.toString();
@@ -802,6 +808,18 @@
             var nota = '';
         }
 
+        if(kuantiti > 10)
+        {
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+        }
+
         var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit);
         if(resultValidation == false) {
             return false;
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index a83d1e5..ffa9c4d 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -1600,7 +1600,7 @@
         let karat = recno[4];
         let berat = recno[5];
         let harga = recno[8];
-        let nota = recno[6];
+        let nota = recno[7];
         let tag_permata_edit = recno[8];
         let beratpermata = recno[10];
         let kuantiti = recno[6];
@@ -1609,8 +1609,14 @@
 
         if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
             $('#kuantiti_modal').attr('disabled', false);
+            $(".div_kuantiti_edit").css("display", "block");
+            $(".div_column_kuantiti_edit").css("display", "block");
+            $('#kuantiti_edit').val(kuantiti);
         }else{
-            $('#kuantiti_modal').attr('disabled', true);
+            $('#kuantiti_modal').attr('disabled', false);
+            $(".div_kuantiti_edit").css("display", "none");
+            $(".div_column_kuantiti_edit").css("display", "none");
+            $('#kuantiti_edit').val(1);
         }
 
         if (!arrayBatuPermata.includes(jenismarhun)) {
@@ -1639,7 +1645,7 @@
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
                     $('#nota_edit').val(res).trigger('change');
 
-                    $('#kuantiti_modal').val(kuantiti);
+                    $('#kuantiti_edit').val(kuantiti);
 
                     $('#sltkarat').val(karat);
                     $('#marhun_edit').val(jenismarhun);
@@ -1668,7 +1674,7 @@
         var harga_edit = $('#harga_edit').val();
         var nilaimarhun_edit = $('#nilaimarhun_edit').val();
         var nilai_marhun_edit = Number(nilaimarhun_edit.replace(/[^0-9.-]+/g,""));
-        var kuantiti = $('#kuantiti_modal').val();
+        var kuantiti = $('#kuantiti_edit').val();
 
         if(nota_edit != null){
             var nota = nota_edit.toString();
@@ -1676,6 +1682,18 @@
             var nota = '';
         }
 
+        if(kuantiti > 10)
+        {
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+        }
+
         var resultValidation = validateBatuPermata(tagpermata_edit, beratpermata_edit);
         if(resultValidation == false) {
             return false;
diff --git a/resources/views/modal/editmarhun.blade.php b/resources/views/modal/editmarhun.blade.php
index c292397..23b1955 100644
--- a/resources/views/modal/editmarhun.blade.php
+++ b/resources/views/modal/editmarhun.blade.php
@@ -50,6 +50,10 @@
                 </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 div_kuantiti_edit">Kuantiti</div>
+                <div class="col-md-8 div_column_kuantiti_edit">
+                    <input class="form-control" name="kuantiti_edit" id="kuantiti_edit" type="text" pattern="\d*" maxlength="2">
+                </div>
                 <div class="col-md-4">Karat</div>
                 <div class="col-md-8">
                   <select name="sltkarat" id="sltkarat" class="form-control">