diff --git a/resources/views/gadaian/v1/index.blade.php b/resources/views/gadaian/v1/index.blade.php
index 901dba1..7f2aa97 100644
--- a/resources/views/gadaian/v1/index.blade.php
+++ b/resources/views/gadaian/v1/index.blade.php
@@ -507,47 +507,70 @@
                         return false;
                     }else{
                         if(bilangan_marhun_daftar<10){
+                            
+                            //new added 190624 filter if gadaian already exist pinjaman not null
                             $.ajax({
-                                method:'POST',
-                                url: api_url + '/api/marhun/'+kodcaw,
-                                dataType:'json',
-                                data:{
-                                    'norujukan': norujukan,
-                                    'marhun' : marhun,
-                                    'nota':nota,
-                                    '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");
-                                    $('#marhun').val(0);
-                                    $('#karat').val(0);
-                                    $('#berat_emas').val("");
-                                    $('#harga').val("");
-                                    $('#nilai_marhun').val("");
-                                    $('#daftar_marhun').modal('hide');
-
-                                    jumlah_marhun += 1;
-                                    jumlah_nilai_marhun += Number(nilai_marhun);
-                                    $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
-                                    $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
-                                    getMarhun(norujukan);
-                                },
-                                error: function(xhRequest, ErrorText, thrownError){
-                                    $("#tambah_marhun").prop('disabled', false);
-                                    $("#terima_marhun").prop('disabled', false);
-                                    Swal.fire({
-                                        icon: 'error',
-                                        title: 'Amaran!',
-                                        text: 'Tambah Marhun Tidak Berjaya'
-                                    });
-                                    console.log(xhRequest);
-                                }
+                                method:'get',
+                                             url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
+                                            success:function(data)
+                                             {
+                                                var checking = Object.keys(data[0]).length;
+                                                 
+                                                if (data[0]['pinjaman'] > 0) {
+                                                       $("#tambah_marhun").prop('disabled', false);
+                                                       $("#terima_marhun").prop('disabled', false);
+                                                        Swal.fire({
+                                                              icon: 'error',
+                                                              title: 'Tidak Berjaya',
+                                                              text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
+                                                        });
+                                                        event.preventDefault();
+                                                        return false;
+                                                } else {
+                                                    $.ajax({
+                                                        method:'POST',
+                                                        url: api_url + '/api/marhun/'+kodcaw,
+                                                        dataType:'json',
+                                                        data:{
+                                                            'norujukan': norujukan,
+                                                            'marhun' : marhun,
+                                                            'nota':nota,
+                                                            '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");
+                                                            $('#marhun').val(0);
+                                                            $('#karat').val(0);
+                                                            $('#berat_emas').val("");
+                                                            $('#harga').val("");
+                                                            $('#nilai_marhun').val("");
+                                                            $('#daftar_marhun').modal('hide');
+                                                            jumlah_marhun += 1;
+                                                            jumlah_nilai_marhun += Number(nilai_marhun);
+                                                            $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
+                                                            $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+                                                            getMarhun(norujukan);
+                                                        },
+                                                        error: function(xhRequest, ErrorText, thrownError){
+                                                            $("#tambah_marhun").prop('disabled', false);
+                                                            $("#terima_marhun").prop('disabled', false);
+                                                            Swal.fire({
+                                                                icon: 'error',
+                                                                title: 'Amaran!',
+                                                                text: 'Tambah Marhun Tidak Berjaya'
+                                                            });
+                                                            console.log(xhRequest);
+                                                        }
+                                                    });
+                                                                                                         
+                                                }  
+                                            }
                             });
                         }else{
                             $("#tambah_marhun").prop('disabled', false);
@@ -619,47 +642,71 @@
                     return false;
                 }else{
                     if(bilangan_marhun_daftar < 10){
+                        
+                        //new added 190624 filter if gadaian already registered pinjaman > 0
                         $.ajax({
-                            method:'POST',
-                            url: api_url + '/api/marhun/'+kodcaw,
-                            dataType:'json',
-                            data:{
-                                'norujukan': norujukan,
-                                'marhun' : marhun,
-                                'nota':nota,
-                                '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");
-                                $('#marhun').val(0);
-                                $('#karat').val(0);
-                                $('#berat_emas').val("");
-                                $('#harga').val("");
-                                $('#nilai_marhun').val("");
-
-                                jumlah_marhun += 1;
-                                jumlah_nilai_marhun += Number(nilai_marhun);
-                                $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
-                                $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
-                                getMarhun(norujukan);
-                            },
-                            error: function(xhRequest, ErrorText, thrownError){
-                                $("#tambah_marhun").prop('disabled', false);
-                                $("#terima_marhun").prop('disabled', false);
-                                Swal.fire({
-                                    icon: 'error',
-                                    title: 'Amaran!',
-                                    text: 'Tambah Marhun Tidak Berjaya'
-                                });
-                                console.log(xhRequest);
-                            }
-                        });
+                            method:'get',
+                                             url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
+                                            success:function(data)
+                                             {
+                                                var checking = Object.keys(data[0]).length;
+                                                 
+                                                if (data[0]['pinjaman'] > 0) {
+                                                       $("#tambah_marhun").prop('disabled', false);
+                                                       $("#terima_marhun").prop('disabled', false);
+                                                        Swal.fire({
+                                                              icon: 'error',
+                                                              title: 'Tidak Berjaya',
+                                                              text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
+                                                        });
+                                                        event.preventDefault();
+                                                        return false;
+                                                } else {
+                                                    $.ajax({
+                                                        method:'POST',
+                                                        url: api_url + '/api/marhun/'+kodcaw,
+                                                        dataType:'json',
+                                                        data:{
+                                                            'norujukan': norujukan,
+                                                            'marhun' : marhun,
+                                                            'nota':nota,
+                                                            '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");
+                                                            $('#marhun').val(0);
+                                                            $('#karat').val(0);
+                                                            $('#berat_emas').val("");
+                                                            $('#harga').val("");
+                                                            $('#nilai_marhun').val("");
+                                                            jumlah_marhun += 1;
+                                                            jumlah_nilai_marhun += Number(nilai_marhun);
+                                                            $('#bilangan_marhun').val(formatter.format(jumlah_marhun));
+                                                            $('#jumlah_nilai_marhun').val(formatter.format(jumlah_nilai_marhun));
+                                                            getMarhun(norujukan);
+                                                        },
+                                                        error: function(xhRequest, ErrorText, thrownError){
+                                                            $("#tambah_marhun").prop('disabled', false);
+                                                            $("#terima_marhun").prop('disabled', false);
+                                                            Swal.fire({
+                                                                icon: 'error',
+                                                                title: 'Amaran!',
+                                                                text: 'Tambah Marhun Tidak Berjaya'
+                                                            });
+                                                            console.log(xhRequest);
+                                                        }
+                                                    });
+                                                                                
+                                                                            }  
+                                                                        }
+                                                });
+                        //end new added 190624
                     }else{
                         $("#tambah_marhun").prop('disabled', false);
                         $("#terima_marhun").prop('disabled', false);
diff --git a/resources/views/gadaian/v2/index.blade.php b/resources/views/gadaian/v2/index.blade.php
index e3dffd6..c067ffc 100644
--- a/resources/views/gadaian/v2/index.blade.php
+++ b/resources/views/gadaian/v2/index.blade.php
@@ -723,7 +723,28 @@
                         }
 
                         if(bilangan_marhun_daftar<10){
+                            //new added 190624 filter if gadaian already exist pinjaman not null
                             $.ajax({
+                                method:'get',
+                                             url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
+
+                                            success:function(data)
+                                             {
+                                                var checking = Object.keys(data[0]).length;
+                                                 
+                                                if (data[0]['pinjaman'] > 0) {
+                                                       $("#tambah_marhun").prop('disabled', false);
+                                                       $("#terima_marhun").prop('disabled', false);
+                                                        Swal.fire({
+                                                              icon: 'error',
+                                                              title: 'Tidak Berjaya',
+                                                              text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
+                                                        });
+                                                        event.preventDefault();
+                                                        return false;
+
+                                                } else {
+                                                    $.ajax({
                                 method:'POST',
                                 url: api_url + '/api/marhun/'+kodcaw,
                                 dataType:'json',
@@ -776,6 +797,12 @@
                                     console.log(xhRequest);
                                 }
                             });
+                                                                                       
+                        }  
+                                            }
+                            });
+                            //end new added 190624
+                            
                         }else{
                             $("#tambah_marhun").prop('disabled', false);
                             $("#terima_marhun").prop('disabled', false);
@@ -871,7 +898,28 @@
                     }
 
                     if(bilangan_marhun_daftar < 10){
+                        //new added 190624 filter if gadaian already registered pinjaman > 0
                         $.ajax({
+                            method:'get',
+                                             url: api_url + '/api/gadai/norujukan/' + kodcaw + '/' + norujukan,
+
+                                            success:function(data)
+                                             {
+                                                var checking = Object.keys(data[0]).length;
+                                                 
+                                                if (data[0]['pinjaman'] > 0) {
+                                                       $("#tambah_marhun").prop('disabled', false);
+                                                       $("#terima_marhun").prop('disabled', false);
+                                                        Swal.fire({
+                                                              icon: 'error',
+                                                              title: 'Tidak Berjaya',
+                                                              text: 'Maklumat Gadaian Telah Wujud. Sila Tekan Batal.'
+                                                        });
+                                                        event.preventDefault();
+                                                        return false;
+
+                                                } else {
+                                                    $.ajax({
                             method:'POST',
                             url: api_url + '/api/marhun/'+kodcaw,
                             dataType:'json',
@@ -926,6 +974,12 @@
                                 console.log(xhRequest);
                             }
                         });
+                                                                               
+                    }  
+                                                                        }
+                                                });
+                        //end new added 190624
+                        
                     }else{
                         $("#tambah_marhun").prop('disabled', false);
                         $("#terima_marhun").prop('disabled', false);