diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php
index 647b895..a3a9373 100644
--- a/resources/views/gadaian/v2/edit.blade.php
+++ b/resources/views/gadaian/v2/edit.blade.php
@@ -36,6 +36,7 @@
                                 <th>Nilai Marhun</th>
                                 <th>Karat</th>
                                 <th>Berat</th>
+                                <th>Kuantiti</th>
                                 <th>Nota</th>
                                 <th>Harga</th>
                                 <th>Batu Permata</th>
@@ -48,6 +49,7 @@
                             <th id="totalnilaimarhuntable"></th>
                             <th></th>
                             <th id="totalberattable"></th>
+                            <th id="totalkuantititable"></th>
                             <th colspan="5"></th>
                         </tfoot>
                     </table>
@@ -232,6 +234,12 @@
                                                 </select>
                                                 </div>
                                             </div>
+
+                                            <div class="col-md-4">Kuantiti</div>
+                                            <div class="col-md-8">
+                                                <input class="form-control" name="kuantiti" id="kuantiti" type="text" pattern="\d*" maxlength="2" disabled>
+                                            </div>
+
                                             <div class="col-md-4">Karat</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="karat" id="karat">
@@ -246,6 +254,8 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
                                             <div class="col-md-4">Bilangan Marhun</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="bilangan_marhun" id="bilangan_marhun" readonly></div>
+                                            <div class="col-md-4">Jumlah Kuantiti</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="bilangan_jumlah_kuantiti" id="bilangan_jumlah_kuantiti" readonly></div>
                                             <div class="col-md-4">Jumlah Nilai Marhun</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
                                         </div>
@@ -368,6 +378,26 @@
             $("#divanggaran").css("visibility", "hidden");
             $('#beratpermata').val("");        
         }
+
+        $('#kuantiti').val('');
+
+        $('#karat').val('');
+        if(marhun == 'G/B' || marhun == 'WFR' || marhun == 'SYE' || marhun == 'DNR'){
+            if(marhun == 'DNR' || marhun == 'SYE'){
+                $('#karat option').show();
+                $('#karat option').not('[value="22.0K"]').not('[value="24.0Kgb"]').not(':first').hide();
+            }else{
+                $('#karat option').show();
+                $('#karat option').not('[value="24.0Kgb"]').not(':first').hide();
+            }
+
+            $('#text-berat').html('Berat Keseluruhan');
+            $('#kuantiti').attr('disabled', false);
+        }else{
+            $('#karat option').show();
+            $('#text-berat').html('Berat');
+            $('#kuantiti').attr('disabled', true);
+        }
     });
 
     $('#tagpermata').change(function () {
@@ -500,6 +530,7 @@
 
     var total_nilai_marhun = 0;
     var total_berat = 0;
+    var total_kuantiti = 0;
     var kadarupah = 0;
     var jumlah_marhun = 0;
     var jumlah_nilai_marhun = 0;
@@ -510,6 +541,7 @@
         var count = 0;
         total_nilai_marhun = 0;
         total_berat = 0;
+        total_kuantiti = 0;
         var marhun_details = '';
         tablemarhun.clear().draw();
         $.each(data,function(index,marhun){
@@ -519,6 +551,7 @@
                 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' : '';
+                total_kuantiti += Number(marhun_detail['bil']);
                 tablemarhun.row.add([
                     counter,
                     marhun_detail['recno'],
@@ -526,6 +559,7 @@
                     formatter.format(marhun_detail['n_marhun']),
                     marhun_detail['karat'],
                     formatter.format(marhun_detail['berat']),
+                    marhun_detail['bil'],
                     marhun_detail['nota'],
                     marhun_detail['harga'],
                     status_tag_permata,
@@ -537,8 +571,10 @@
             });
         });
         $('#totalberattable').text(formatter.format(total_berat));
+        $('#totalkuantititable').text(total_kuantiti);
         $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
         $('#bilangan_marhun').val(formatter.format(counter-1));
+        $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti));
         $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
         if (count == 1){
             $('.buttonpunya').html("<button onclick='editmarhun(this)' class='btn btn-primary'><i class='fas fa-edit'></i></button>");
@@ -652,9 +688,16 @@
         let nota = recno[6];
         let tag_permata_edit = recno[8];
         let beratpermata = recno[9];
+        let kuantiti = recno[10];
         let jenismarhun = recno[2];
         var res = nota.split(",");
 
+        if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
+            $('#kuantiti_modal').attr('disabled', false);
+        }else{
+            $('#kuantiti_modal').attr('disabled', true);
+        }
+
         if (!arrayBatuPermata.includes(jenismarhun)) {
             $(".col_edit_permata").css("display", "block");
             if(beratpermata != null) {
@@ -682,6 +725,8 @@
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
                     $('#nota_edit').val(res).trigger('change');
 
+                    $('#kuantiti_modal').val(kuantiti);
+
                     $('#sltkarat').val(karat);
                     $('#marhun_edit').val(jenismarhun);
                     $('#berat_edit').val(berat);
@@ -697,6 +742,27 @@
         
     }
 
+    $("#marhun_edit").change(function(e){
+        
+        var marh = $(this).find(':selected').val();
+        $('#kuantiti_modal').val('');
+
+        if(marh == 'G/B' || marh == 'WFR' || marh == 'SYE' || marh == 'DNR'){
+            if(marh == 'DNR' || marh == 'SYE'){
+                $('#sltkarat option').show();
+                $('#sltkarat option').not('[value="22.0K"]').not('[value="24.0Kgb"]').not(':first').hide();
+            }else{
+                $('#sltkarat option').show();
+                $('#sltkarat option').not('[value="24.0Kgb"]').not(':first').hide();
+            }
+            $('#text_berat_modal').html('Berat Keseluruhan');
+            $('#kuantiti_modal').attr('disabled', false);
+        }else{
+            $('#text_berat_modal').html('Berat');
+            $('#kuantiti_modal').attr('disabled', true);
+        }
+    });
+
     $("#sltkarat").change(function(e){
         let hargaref = $(this).find(':selected').data('harga');
         let ber = parseFloat($('#berat_edit').val());
@@ -727,6 +793,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();
 
         if(nota_edit != null){
             var nota = nota_edit.toString();
@@ -762,7 +829,8 @@
                     'nota' : nota,
                     'tag_permata' : tagpermata_edit,
                     'berat_batu_permata' : beratpermata_edit,
-                    "teller": "{{ Auth::user()->name }}"
+                    "teller": "{{ Auth::user()->name }}",
+                    "kuantiti" : (kuantiti) ? kuantiti : 1
                 },
                 success:function(data){
                     getMarhun(norujukedit);
@@ -826,6 +894,22 @@
         var nota_array = $('#nota').val();
         var berat_permata = $('#beratpermata').val();
         var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0;
+        var kuantiti = $('#kuantiti').val();
+        
+        if(kuantiti > 10)
+        {
+            $("#tambah_marhun").prop('disabled', false);
+            $("#terima_marhun").prop('disabled', false);
+
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+        }
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -884,7 +968,8 @@
                                     'berat_emas' :berat_emas,
                                     'harga' : harga,
                                     'nilai_marhun' : nilai_marhun,
-                                    'teller' : "{{ Auth::user()->name }}"
+                                    'teller' : "{{ Auth::user()->name }}",
+                                    'kuantiti' : (kuantiti) ? kuantiti : 1
                                 },
                                 success:function(data){
                                     $('#nota').val('').trigger("change");
@@ -900,6 +985,9 @@
                                     $('#beratpermata').val("");
                                     $("#divanggaran").css("visibility", "hidden");
 
+                                    $('#kuantiti').val("");
+                                    $('#kuantiti').attr('disabled', true);
+
                                     jumlah_marhun += 1;
                                     jumlah_nilai_marhun += Number(nilai_marhun);
                                     $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
@@ -942,6 +1030,22 @@
         var nota_array = $('#nota').val();
         var beratpermata = $('#beratpermata').val();
         var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0;
+        var kuantiti = $('#kuantiti').val();
+
+        if(kuantiti > 10)
+        {
+            $("#tambah_marhun").prop('disabled', false);
+            $("#terima_marhun").prop('disabled', false);
+
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+}
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -996,7 +1100,8 @@
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
                                 'nilai_marhun' : nilai_marhun,
-                                'teller' : "{{ Auth::user()->name }}"
+                                'teller' : "{{ Auth::user()->name }}",
+                                'kuantiti' : (kuantiti) ? kuantiti : 1
                             },
                             success:function(data){
                                 $('#nota').val('').trigger("change");
@@ -1011,7 +1116,9 @@
                                 $('#tagpermata').prop('checked', false);
                                 $('#beratpermata').val("");
                                 $("#divanggaran").css("visibility", "hidden");  
-                                
+                                $('#kuantiti').val("");
+                                $('#kuantiti').attr('disabled', true);
+
                                 jumlah_marhun += 1;
                                 jumlah_nilai_marhun += Number(nilai_marhun);
                                 $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index 1a062c1..176a2c7 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -72,6 +72,7 @@
                                 <th>Nilai Marhun</th>
                                 <th>Karat</th>
                                 <th>Berat</th>
+                                <th>Kuantiti</th>
                                 <th>Nota</th>
                                 <th>Harga</th>
                                 <th>Batu Permata</th>
@@ -84,6 +85,7 @@
                             <th id="totalnilaimarhuntable"></th>
                             <th></th>
                             <th id="totalberattable"></th>
+                            <th id="totalkuantititable"></th>
                             <th colspan="5"></th>
                         </tfoot>
                     </table>
@@ -224,6 +226,12 @@
                                                     </select>
                                                 </div>
                                             </div>
+
+                                            <div class="col-md-4">Kuantiti</div>
+                                            <div class="col-md-8">
+                                                <input class="form-control" name="kuantiti" id="kuantiti" type="text" pattern="\d*" maxlength="2" disabled>
+                                            </div>
+
                                             <div class="col-md-4">Karat</div>
                                             <div class="col-md-8">
                                                 <select class="form-control" name="karat" id="karat">
@@ -238,6 +246,8 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="nilai_marhun" id="nilai_marhun" readonly></div>
                                             <div class="col-md-4">Bilangan Marhun</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="bilangan_marhun" id="bilangan_marhun" readonly></div>
+                                            <div class="col-md-4">Jumlah Kuantiti</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="bilangan_jumlah_kuantiti" id="bilangan_jumlah_kuantiti" readonly></div>
                                             <div class="col-md-4">Jumlah Nilai Marhun</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="jumlah_nilai_marhun" id="jumlah_nilai_marhun" readonly></div>
                                         </div>
@@ -347,6 +357,29 @@
             $("#divanggaran").css("visibility", "hidden");
             $('#beratpermata').val("");        
         }
+
+        var marh = $(this).find(':selected').val();
+
+        $('#kuantiti').val('');
+
+        $('#karat').val('');
+        if(marh == 'G/B' || marh == 'WFR' || marh == 'SYE' || marh == 'DNR'){
+            if(marh == 'DNR' || marh == 'SYE'){
+                $('#karat option').show();
+                $('#karat option').not('[value="22.0K"]').not('[value="24.0Kgb"]').not(':first').hide();
+            }else{
+                $('#karat option').show();
+                $('#karat option').not('[value="24.0Kgb"]').not(':first').hide();
+            }
+
+            $('#text-berat').html('Berat Keseluruhan');
+            $('#kuantiti').attr('disabled', false);
+        }else{
+            $('#karat option').show();
+            $('#text-berat').html('Berat');
+            $('#kuantiti').attr('disabled', true);
+        }
+
     });
 
     $('#tagpermata').change(function () {
@@ -471,6 +504,7 @@
 
     var total_nilai_marhun = 0;
     var total_berat = 0;
+    total_kuantiti = 0;
     var kadarupah = 0;
     var jumlah_marhun = 0;
     var jumlah_nilai_marhun = 0;
@@ -490,6 +524,7 @@
                 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' : '';
+                total_kuantiti += Number(marhun_detail['bil']);
                 tablemarhun.row.add([
                     counter,
                     marhun_detail['recno'],
@@ -497,6 +532,7 @@
                     formatter.format(marhun_detail['n_marhun']),
                     marhun_detail['karat'],
                     formatter.format(marhun_detail['berat']),
+                    marhun_detail['bil'],
                     marhun_detail['nota'],
                     marhun_detail['harga'],
                     status_tag_permata,
@@ -507,8 +543,10 @@
             });
         });
         $('#totalberattable').text(formatter.format(total_berat));
+        $('#totalkuantititable').text(total_kuantiti);
         $('#totalnilaimarhuntable').text(formatter.format(jumlah_nilai_marhun));
         $('#bilangan_marhun').val(formatter.format(counter-1));
+        $('#bilangan_jumlah_kuantiti').val(formatter.format(total_kuantiti));
         $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
         // if(total_nilai_marhun > 0 && total_nilai_marhun < 401){
         //     kadarupah = 1.2/100;
@@ -616,6 +654,22 @@
         var nota_array = $('#nota').val();
         var berat_permata = $('#beratpermata').val();
         var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0;
+        var kuantiti = $('#kuantiti').val();
+
+        if(kuantiti > 10)
+        {
+            $("#tambah_marhun").prop('disabled', false);
+            $("#terima_marhun").prop('disabled', false);
+
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+        }
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -683,6 +737,7 @@
                                     'harga' : harga,
                                     'nilai_marhun' : nilai_marhun,
                                     'teller' : "{{ Auth::user()->name }}", 
+                                    'kuantiti' : (kuantiti) ? kuantiti : 1
                                 },
                                 success:function(data){
                                     $("#tambah_marhun").prop('disabled', false);
@@ -700,6 +755,9 @@
                                     $('#beratpermata').val("");
                                     $("#divanggaran").css("visibility", "hidden");
 
+                                    $('#kuantiti').val("");
+                                    $('#kuantiti').attr('disabled', true);
+
                                     jumlah_marhun += 1;
                                     jumlah_nilai_marhun += Number(nilai_marhun);
                                     $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
@@ -750,6 +808,22 @@
         var tag_permata = $('input[id=tagpermata]').is(':checked') ? 1 : 0;
 
         var beratpermata = $('#beratpermata').val();
+        var kuantiti = $('#kuantiti').val();
+
+        if(kuantiti > 10)
+        {
+            $("#tambah_marhun").prop('disabled', false);
+            $("#terima_marhun").prop('disabled', false);
+
+            Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran!',
+                    text: 'Kuantiti tidak boleh melebihi 10'
+            });
+
+            event.preventDefault();
+            return false;
+        }
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -810,7 +884,9 @@
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
                                 'nilai_marhun' : nilai_marhun,
-                                'teller' : "{{ Auth::user()->name }}"
+                                'teller' : "{{ Auth::user()->name }}",
+                                'kuantiti' : (kuantiti) ? kuantiti : 1
+
                             },
                             success:function(data){
                                 $("#tambah_marhun").prop('disabled', false);
@@ -823,6 +899,10 @@
                                 $('#berat_emas').val("");
                                 $('#harga').val("");
                                 $('#nilai_marhun').val("");
+
+                                $('#kuantiti').val("");
+                                $('#kuantiti').attr('disabled', true);
+                                
                                 $("#col_right").css("display", "none");
                                 $('#tagpermata').prop('checked', false);
                                 $('#beratpermata').val("");
@@ -1385,9 +1465,16 @@
         let nota = recno[6];
         let tag_permata_edit = recno[8];
         let beratpermata = recno[9];
+        let kuantiti = recno[10];
         let jenismarhun = recno[2];
         var res = nota.split(",");
 
+        if(jenismarhun == 'G/B' || jenismarhun == 'WFR' || jenismarhun == 'SYE' || jenismarhun == 'DNR'){
+            $('#kuantiti_modal').attr('disabled', false);
+        }else{
+            $('#kuantiti_modal').attr('disabled', true);
+        }
+
         if (!arrayBatuPermata.includes(jenismarhun)) {
             $(".col_edit_permata").css("display", "block");
             if(beratpermata != null) {
@@ -1414,6 +1501,8 @@
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
                     $('#nota_edit').val(res).trigger('change');
 
+                    $('#kuantiti_modal').val(kuantiti);
+
                     $('#sltkarat').val(karat);
                     $('#marhun_edit').val(jenismarhun);
                     $('#berat_edit').val(berat);
@@ -1441,6 +1530,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();
 
         if(nota_edit != null){
             var nota = nota_edit.toString();
@@ -1476,7 +1566,8 @@
                     'nota' : nota,
                     'tag_permata' : tagpermata_edit,
                     'berat_batu_permata' : beratpermata_edit,
-                    "teller": "{{ Auth::user()->name }}"
+                    "teller": "{{ Auth::user()->name }}",
+                    "kuantiti" : (kuantiti) ? kuantiti : 1
                 },
                 success:function(data){
                     getMarhun(norujukedit);
@@ -1551,5 +1642,27 @@
         } else return o.selectionStart
     }
 
+    $("#marhun_edit").change(function(e){
+        
+        var marh = $(this).find(':selected').val();
+        $('#kuantiti_modal').val('');
+
+        if(marh == 'G/B' || marh == 'WFR' || marh == 'SYE' || marh == 'DNR'){
+            if(marh == 'DNR' || marh == 'SYE'){
+                $('#sltkarat option').show();
+                $('#sltkarat option').not('[value="22.0K"]').not('[value="24.0Kgb"]').not(':first').hide();
+            }else{
+                $('#sltkarat option').show();
+                $('#sltkarat option').not('[value="24.0Kgb"]').not(':first').hide();
+            }
+            
+            $('#text_berat_modal').html('Berat Keseluruhan');
+            $('#kuantiti_modal').attr('disabled', false);
+        }else{
+            $('#text_berat_modal').html('Berat');
+            $('#kuantiti_modal').attr('disabled', true);
+        }
+    });
+
 </script>
 @endsection