diff --git a/resources/views/gadaian/v2/edit.blade.php b/resources/views/gadaian/v2/edit.blade.php
index eb11ba1..f56f6a0 100644
--- a/resources/views/gadaian/v2/edit.blade.php
+++ b/resources/views/gadaian/v2/edit.blade.php
@@ -38,6 +38,8 @@
                                 <th>Berat</th>
                                 <th>Nota</th>
                                 <th>Harga</th>
+                                <th>Batu Permata</th>
+                                <th>Berat Permata</th>
                                 <th>Action</th>
                             </tr>
                         </thead>
@@ -46,7 +48,7 @@
                             <th id="totalnilaimarhuntable"></th>
                             <th></th>
                             <th id="totalberattable"></th>
-                            <th colspan="3"></th>
+                            <th colspan="5"></th>
                         </tfoot>
                     </table>
                 </div>
@@ -231,6 +233,19 @@
                                                 </select>
                                                 </div>
                                             </div>
+                                            <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%;">
+                                                        <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="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">
@@ -397,6 +412,14 @@
         closeOnSelect: false
     });
 
+    $(".select2_daftar_batu_permata").select2({
+        dropdownParent: $('#daftar_marhun'),
+        tags: true,
+        tokenSeparators: [',', ' '],
+        allowClear: true,
+        closeOnSelect: false
+    });
+
     $(".select2_nota").select2({
         dropdownParent: $('#editMarhunModal'),
         tags: true,
@@ -405,6 +428,14 @@
         closeOnSelect: false
     });
 
+    $(".select2_batupermata").select2({
+        dropdownParent: $('#editMarhunModal'),
+        tags: true,
+        tokenSeparators: [',', ' '],
+        allowClear: true,
+        closeOnSelect: false
+    });
+
     var total_nilai_marhun = 0;
     var total_berat = 0;
     var kadarupah = 0;
@@ -434,6 +465,8 @@
                     formatter.format(marhun_detail['berat']),
                     marhun_detail['nota'],
                     marhun_detail['harga'],
+                    marhun_detail['batu_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();
                 count++;
@@ -554,8 +587,11 @@
         let berat = recno[5];
         let harga = recno[7];
         let nota = recno[6];
+        let batupermata = recno[8];
+        let beratpermata = recno[9];
         let jenismarhun = recno[2];
         var res = nota.split(",");
+        var resbatupermata = batupermata.split(",");
 
         $.ajax({
             method:'GET',
@@ -565,6 +601,8 @@
                 $.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);
@@ -601,6 +639,8 @@
 
     $('#terima_edit').on('click',function(){
         var nota_edit = $('#nota_edit').val();
+        var batupermata_edit = $('#batupermataedit').val();
+        var beratpermata_edit = $('#beratpermataedit').val();
         var norujukedit = $('#norujukedit').val();
         var recnoedit = $('#recnoedit').val();
         var marhun_edit = $('#marhun_edit').val();
@@ -616,6 +656,12 @@
             var nota = '';
         }
 
+        if(batupermata_edit != null){
+            var batupermata = batupermata_edit.toString();
+        }else{
+            var batupermata = '';
+        }
+
         if($.isNumeric(berat_edit) == false){
             Swal.fire({
                 icon: 'error',
@@ -637,6 +683,8 @@
                     'n_marhun' : nilai_marhun_edit,
                     'marhun' : marhun_edit,
                     'nota' : nota,
+                    'batu_permata' : batupermata,
+                    'berat_batu_permata' : beratpermata_edit,
                     "teller": "{{ Auth::user()->name }}"
                 },
                 success:function(data){
@@ -699,12 +747,22 @@
         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();
+
         if(nota_array != null){
             var nota = nota_array.toString();
         }else{
             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');
         }
@@ -741,18 +799,22 @@
                                 method:'POST',
                                 url: api_url + '/api/marhun/'+kodcaw,
                                 dataType:'json',
-                                data:{
+                                data:JSON.stringify({
                                     'norujukan': norujukan,
                                     'marhun' : marhun,
                                     'nota':nota,
+                                    'batu_permata':batu_permata,
+                                    'berat_batu_permata':berat_permata,
                                     'karat' : karat,
                                     'berat_emas' :berat_emas,
                                     'harga' : harga,
                                     'nilai_marhun' : nilai_marhun,
                                     'teller' : "{{ Auth::user()->name }}"
-                                },
+                                }),
                                 success:function(data){
                                     $('#nota').val('').trigger("change");
+                                    $('#batupermata').val('').trigger("change");
+                                    $('#beratpermata').val("");
                                     $('#marhun').val(0);
                                     $('#karat').val(0);
                                     $('#berat_emas').val("");
@@ -800,12 +862,21 @@
         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();
+
         if(nota_array != null){
             var nota = nota_array.toString();
         }else{
             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',
@@ -838,18 +909,22 @@
                             method:'POST',
                             url: api_url + '/api/marhun/'+kodcaw,
                             dataType:'json',
-                            data:{
+                            data: JSON.stringify({
                                 'norujukan': norujukan,
                                 'marhun' : marhun,
                                 'nota':nota,
+                                'batu_permata':batu_permata,
+                                'berat_batu_permata':beratpermata,
                                 'karat' : karat,
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
                                 'nilai_marhun' : nilai_marhun,
                                 'teller' : "{{ Auth::user()->name }}"
-                            },
+                            }),
                             success:function(data){
                                 $('#nota').val('').trigger("change");
+                                $('#batupermata').val('').trigger("change");
+                                $('#beratpermata').val("");
                                 $('#marhun').val(0);
                                 $('#karat').val(0);
                                 $('#berat_emas').val("");
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index 1acdd6f..1f7b8e8 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -74,6 +74,8 @@
                                 <th>Berat</th>
                                 <th>Nota</th>
                                 <th>Harga</th>
+                                <th>Batu Permata</th>
+                                <th>Berat Permata</th>
                                 <th>Tindakan</th>
                             </tr>
                         </thead>
@@ -82,7 +84,7 @@
                             <th id="totalnilaimarhuntable"></th>
                             <th></th>
                             <th id="totalberattable"></th>
-                            <th colspan="3"></th>
+                            <th colspan="5"></th>
                         </tfoot>
                     </table>
                 </div>
@@ -223,6 +225,19 @@
                                                     </select>
                                                 </div>
                                             </div>
+                                            <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%;">
+                                                        <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="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">
@@ -370,6 +385,14 @@
         closeOnSelect: false
     });
 
+    $(".select2_daftar_batu_permata").select2({
+        dropdownParent: $('#daftar_marhun'),
+        tags: true,
+        tokenSeparators: [',', ' '],
+        allowClear: true,
+        closeOnSelect: false
+    });
+
     $(".select2_nota").select2({
         dropdownParent: $('#editMarhunModal'),
         tags: true,
@@ -378,6 +401,14 @@
         closeOnSelect: false
     });
 
+    $(".select2_batupermata").select2({
+        dropdownParent: $('#editMarhunModal'),
+        tags: true,
+        tokenSeparators: [',', ' '],
+        allowClear: true,
+        closeOnSelect: false
+    });
+
     var total_nilai_marhun = 0;
     var total_berat = 0;
     var kadarupah = 0;
@@ -407,6 +438,8 @@
                     formatter.format(marhun_detail['berat']),
                     marhun_detail['nota'],
                     marhun_detail['harga'],
+                    marhun_detail['batu_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();
                 counter = counter + 1;
@@ -520,6 +553,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();
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -527,6 +562,12 @@
             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);
@@ -571,20 +612,24 @@
                                 method:'POST',
                                 url: api_url + '/api/marhun/'+kodcaw,
                                 dataType:'json',
-                                data:{
+                                data: JSON.stringify({
                                     'norujukan': norujukan,
                                     'marhun' : marhun,
                                     'nota':nota,
+                                    'batu_permata':batu_permata,
+                                    'berat_batu_permata':berat_permata,
                                     'karat' : karat,
                                     'berat_emas' :berat_emas,
                                     'harga' : harga,
                                     'nilai_marhun' : nilai_marhun,
-                                    'teller' : "{{ Auth::user()->name }}"
-                                },
+                                    'teller' : "{{ Auth::user()->name }}", 
+                                }),
                                 success:function(data){
                                     $("#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);
                                     $('#berat_emas').val("");
@@ -638,6 +683,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();
 
         if(nota_array != null){
             var nota = nota_array.toString();
@@ -645,6 +692,12 @@
             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);
@@ -683,20 +736,24 @@
                             method:'POST',
                             url: api_url + '/api/marhun/'+kodcaw,
                             dataType:'json',
-                            data:{
+                            data: JSON.stringify({
                                 'norujukan': norujukan,
                                 'marhun' : marhun,
                                 'nota':nota,
+                                'batu_permata':batu_permata,
+                                'berat_batu_permata':beratpermata,
                                 'karat' : karat,
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
                                 'nilai_marhun' : nilai_marhun,
                                 'teller' : "{{ Auth::user()->name }}"
-                            },
+                            }),
                             success:function(data){
                                 $("#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);
                                 $('#berat_emas').val("");
@@ -1159,8 +1216,11 @@
         let berat = recno[5];
         let harga = recno[7];
         let nota = recno[6];
+        let batupermata = recno[8];
+        let beratpermata = recno[9];
         let jenismarhun = recno[2];
         var res = nota.split(",");
+        var resbatupermata = batupermata.split(",");
         $.ajax({
             method:'GET',
             url: api_url + '/api/jemas',
@@ -1168,6 +1228,8 @@
                 $.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);
@@ -1186,6 +1248,8 @@
 
     $('#terima_edit').on('click',function(){
         var nota_edit = $('#nota_edit').val();
+        var batupermata_edit = $('#batupermataedit').val();
+        var beratpermata_edit = $('#beratpermataedit').val();
         var norujukedit = $('#norujukedit').val();
         var recnoedit = $('#recnoedit').val();
         var marhun_edit = $('#marhun_edit').val();
@@ -1201,6 +1265,12 @@
             var nota = '';
         }
 
+        if(batupermata_edit != null){
+            var batupermata = batupermata_edit.toString();
+        }else{
+            var batupermata = '';
+        }
+
         if($.isNumeric(berat_edit) == false){
             Swal.fire({
                 icon: 'error',
@@ -1222,6 +1292,8 @@
                     'n_marhun' : nilai_marhun_edit,
                     'marhun' : marhun_edit,
                     'nota' : nota,
+                    'batu_permata' : batupermata,
+                    'berat_batu_permata' : beratpermata_edit,
                     "teller": "{{ Auth::user()->name }}"
                 },
                 success:function(data){