diff --git a/resources/views/callcenter/v1/info.blade.php b/resources/views/callcenter/v1/info.blade.php
index f8dc06f..b483019 100644
--- a/resources/views/callcenter/v1/info.blade.php
+++ b/resources/views/callcenter/v1/info.blade.php
@@ -211,7 +211,7 @@
 
                     <div class="text-center">
                         <button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button>
-                        <button class="btn btn-primary" onclick="saghilangfunc()">Surat Akuan Hilang</button>
+                        {{-- <button class="btn btn-primary" onclick="saghilangfunc()">Surat Akuan Hilang</button> --}}
                     </div>
 
                 </div>
@@ -410,44 +410,20 @@
 </div>
 
 <script>
+    var api_arrahnbid = "<?php echo config('app.api_arrahnbid') ?>";
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
-    var ppc = "{{ Auth::user()->name }}";
     var tagarrahnbid = "{{ $cawangan_info['tagarrahnbid'] }}";
-    var api_arrahnbid = "<?php echo config('app.api_arrahnbid') ?>";
 
 
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        // here is the new selected tab id
+        var selectedTabId = e.target.id;
 
-    //Pusher for AGH
-
-        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                            cluster: 'ap1',
-                            encrypted: true
-                        });
-
-        var channel = pusher.subscribe('notice-agh');
-        channel.bind('my-agh', function(data) {
-
-            if(data.kodcaw.toUpperCase() === kodcaw.toUpperCase() && data.pc.toUpperCase() === ppc.toUpperCase())
-            {
-                Swal.fire({
-                    icon: data.typeerror,
-                    title: data.message
-                }).then(function(){
-                    $('#AGHModal').hide();
-                    location.reload();
-                });
-            }
-
-        });
-
-
-    //End Pusher for AGH
-
-
+    });
 
     var tablegadai = $('#myTable').DataTable({
-        "scrollX": true,
+        "scrollX": false,
         order: [[1,'desc']]
     });
 
@@ -459,7 +435,7 @@
     });
 
     var tablelelong = $('#lelongTable').DataTable({
-        "scrollX": true
+        "scrollX": false
     });
 
     var historybayarandatatable = $('#tablehistorybayaran').DataTable({
@@ -474,29 +450,248 @@
         minimumFractionDigits: 2
     });
 
+    function checkCanChangeGadaianDetail(norujukan){
+        let gadai_tawarruq = fetch(api_url + '/api/gadai/norujukan/' + norujukan );
+
+        gadai_tawarruq
+            .then(response => response.json())
+            .then(response => response[0][0])
+            .then(gadaian => {
+               return gadaian.historygadaian;
+            })
+            .then(historygadaian => {
+                let button_edit_gadaian = document.querySelector('#button-edit-gadaian');
+
+                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+                    button_edit_gadaian.disabled = false;
+                    return;
+                }
+
+                button_edit_gadaian.disabled = true;
+            })
+    }
+
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
         var norujukan = $(data).data("norujukan");
+        var pinjaman = $(data).data("pinjaman");
+        var hargajualan = $(data).data("hargajualan");
+
+        if(hargajualan == pinjaman){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Gadaian Mengalami Masalah Sila Hubungi IT'
+            });
+            return false;
+        }
         $.ajax({
             method:'get',
-            url: api_url + '/api/check/serah/gadai',
+            url: api_url + '/api/check/serah/lelong',
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
                 'norujukan': norujukan
             },
             success:function(data){
-                if(data == 'true'){
-                    window.location = urlpenebusan;
-                }else if(data == 'false'){
+                if(data == 0){
+                    $.ajax({
+                        method:'get',
+                        url: api_url + '/api/polis/get',
+                        datatype:'json',
+                        data:{
+                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                            'norujukan': norujukan
+                        },
+                        success:function(data){
+
+                            var count = Object.keys(data).length;
+
+                            if(count > 0)
+                            {
+                                if(data[0].tebus === 0)
+                                {
+                                    const swalWithBootstrapButtons = Swal.mixin({
+                                        customClass: {
+                                            confirmButton: 'btn btn-success',
+                                            cancelButton: 'btn btn-danger mr-1'
+                                        },
+                                        buttonsStyling: false
+                                    });
+
+                                    swalWithBootstrapButtons.fire({
+                                        title: 'Dapatkan Pengesahan Khazanah',
+                                        text: "Surat Akuan Gadaian Hilang!",
+                                        icon: 'info',
+                                        showCancelButton: true,
+                                        confirmButtonText: 'Hantar',
+                                        cancelButtonText: 'Batal',
+                                        reverseButtons: true
+                                    }).then((result) => {
+                                        if (result.isConfirmed) {
+
+                                            // let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' +  "|" + '-';
+                                            let status = "Surat Akuan Gadaian Hilang";
+                                            let marg = 0;
+                                            let ber = 0;
+                                            let nm = 0;
+                                            let teller = "{{ Auth::user()->name }}";
+
+                                            Swal.fire({
+                                                title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                                icon: 'info',
+                                                width: 600,
+                                                padding: '3em',
+                                                background: '#fffff',
+                                                showCancelButton: false,
+                                                showConfirmButton: false,
+                                                allowOutsideClick: false,
+                                                allowEscapeKey: false,
+                                                allowEnterKey: false
+                                            })
+                                            let siricreated = 0;
+                                            $.ajax({
+                                                method:'post',
+                                                url: "{{ route('khazanah.createkelulusan') }}",
+                                                data: {
+                                                    "_token": "{{ csrf_token() }}",
+                                                    "norujukan" : norujukan,
+                                                    "komen" : '',
+                                                    "margin" : marg,
+                                                    "berat" : ber,
+                                                    "nilaimarhun" : nm,
+                                                    "status" : status,
+                                                    "jumpinjam" : '0.00',
+                                                    "teller" : teller
+                                                },
+                                                success:function(data){
+                                                    siricreated = data;
+                                                },
+                                                error: function(xhr, status, error) {
+                                                    var err = eval("(" + xhr.responseText + ")");
+                                                    alert(xhr.responseText);
+                                                }
+                                            });
+
+                                            var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                                cluster: 'ap1',
+                                                                encrypted: true
+                                                            });
+
+                                            var channel = pusher.subscribe('notice-kelulusan');
+                                            channel.bind('my-kelulusan', function(data) {
+
+
+                                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
+                                                {
+                                                    if(data.kelulusan == 'lulus')
+                                                    {
+                                                        Swal.fire({
+                                                            icon: 'success',
+                                                            title: 'Telah Disahkan'
+                                                        }).then(function(){
+                                                            $.ajax({
+                                                                method:'put',
+                                                                url: api_url + '/api/polis/put/',
+                                                                data: {
+                                                                    'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                                                    'norujukan': norujukan,
+                                                                    'tebus' : 1
+                                                                },
+                                                                success:function(data){
+                                                                    location.reload();
+
+                                                                },
+                                                                error: function(xhr, status, error) {
+                                                                    var err = eval("(" + xhr.responseText + ")");
+                                                                    alert(xhr.responseText);
+                                                                }
+                                                            });
+                                                        });
+
+                                                    }
+                                                    else if(data.kelulusan == 'batal')
+                                                    {
+                                                        Swal.fire({
+                                                            icon: 'warning',
+                                                            title: 'Telah Dibatalkan',
+                                                            text: `Komen : ${data.komen}`
+                                                        }).then(function(){
+                                                            return false;
+                                                        });
+                                                    }
+                                                }
+
+                                            });
+
+
+                                        }
+                                        else if (result.dismiss === Swal.DismissReason.cancel) {
+                                            swalWithBootstrapButtons.fire(
+                                                'Gagal',
+                                                'Gagal mendapatkan kelulusan khazanah',
+                                                'error'
+                                            )
+                                        }
+                                    });
+                                }
+                                else
+                                {
+                                    $.ajax({
+                                        method:'get',
+                                        url: api_url + '/api/check/serah/gadai',
+                                        datatype:'json',
+                                        data:{
+                                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                            'norujukan': norujukan
+                                        },
+                                        success:function(data){
+                                            if(data == 'true'){
+                                                window.location = urlpenebusan;
+                                            }else if(data == 'false'){
+                                                Swal.fire({
+                                                    icon: 'error',
+                                                    title: 'Amaran',
+                                                    text: 'Gadaian Belum Scan Barcode'
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+                            }else{
+                                $.ajax({
+                                    method:'get',
+                                    url: api_url + '/api/check/serah/gadai',
+                                    datatype:'json',
+                                    data:{
+                                        'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                        'norujukan': norujukan
+                                    },
+                                    success:function(data){
+                                        if(data == 'true'){
+                                            window.location = urlpenebusan;
+                                        }else if(data == 'false'){
+                                            Swal.fire({
+                                                icon: 'error',
+                                                title: 'Amaran',
+                                                text: 'Gadaian Belum Scan Barcode'
+                                            });
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }else if(data == 1){
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran',
-                        text: 'Gadaian Belum Scan Barcode'
+                        text: 'Gadaian Sedang Dilelong..'
                     });
                 }
             }
         });
+
     }
 
     function gadaiTable(data,jenistebus){
@@ -507,19 +702,55 @@
         tablelelong.clear().draw();
         xtawarruq.clear().draw();
         $.each(data,function(index,gadai_detail){
+            let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
             $.ajax({
                 method:'get',
                 url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+                data: {
+                    'jeniskeuntungan' : jeniskeuntungan
+                },
                 success:function(upahsemasa){
                     if(jenistebus == "belum_tebus"){
-                        var urlroute = '{{ route("penebusan.khazanah", ":id") }}';
+                        var urlroute = '{{ route("penebusan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-                        var taglel = '';
-                        if(gadai_detail['taglel'] == 1){
+
+                        if(gadai_detail['lelong_tawarruq'] == 0){
+                            var tarikh_matang = gadai_detail['t_matang1'];
+                        }else{
+                            var tarikh_matang = gadai_detail['t_matang'];
+                        }
+
+                        if(gadai_detail["tagbaru"] == 0){
+                            $('#textnavsag').addClass('text-danger');
+                            if(gadai_detail['taglel'] == 1){
+                                var taglel = '<b class="text-danger">Akan Dilelong</b>';
+                            }else{
+                                var taglel = '';
+                            }
+
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+
+                            if(gadai_detail["percentpinj"] != 0)
+                            xtawarruq.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_gadai'],
+                                tarikh_matang,
+                                'RM '+ formatter.format(gadai_detail['bakihargajualan']),
+                                'RM '+formatter.format(gadai_detail['bakipjm']),
+                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                                gadai_detail['tempoh'],
+                                'RM '+ upahsemasa,
+                                '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
+                            ]).draw();
+                        }else{
+                            var taglel = '';
+                            if(gadai_detail['taglel'] == 1){
                                 if(tagarrahnbid == 1){
                                     $.ajax({
                                         method:"GET",
-                                        async:false,                                       
+                                        async:false,
                                         url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
 
                                         success: function(data){
@@ -542,33 +773,18 @@
                                 }
                             }
 
-                        if(gadai_detail["bakihargajualan"] == null){
-                            xtawarruq.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
-                                '<a data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                                gadai_detail['t_gadai'],
-                                gadai_detail['t_matang'],
-                                'RM '+formatter.format(gadai_detail['pinjaman']),
-                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                                gadai_detail['tempoh'],
-				                taglel
-                            ]).draw();
-                        }else{
-                            if(gadai_detail['lelong_tawarruq'] == 0){
-                                var tarikh_matang = gadai_detail['t_matang1'];
-                            }else{
-                                var tarikh_matang = gadai_detail['t_matang'];
-                            }
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
                             tablegadai.row.add([
-                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
-                                '<a data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
                                 gadai_detail['t_gadai'],
                                 tarikh_matang,
                                 'RM '+ formatter.format(gadai_detail['bakihargajualan']),
                                 'RM '+formatter.format(gadai_detail['bakipjm']),
                                 (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                                 gadai_detail['tempoh'],
-                                'RM '+ upahsemasa,
+                                'RM '+ upahsemasa['pendapatan'],
                                 '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
                             ]).draw();
                         }
@@ -585,17 +801,54 @@
                     }else if(jenistebus == "lelong"){
                         var urlroute = '{{ route("lelongan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-                        tablelelong.row.add([
-                            '<input type="radio" value='+ gadai_detail["norujukan"] +' name="lelong"/>',
-                            '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
-                            gadai_detail['t_lelong'],
-                            gadai_detail['trkhtuntut'],
-                            'RM '+ formatter.format(gadai_detail['pinjaman']),
-                            'RM '+formatter.format(gadai_detail['hargajual']),
-                            'RM '+formatter.format(gadai_detail['baki']),
-                            'RM '+formatter.format(gadai_detail['bakiupah']),
-                            'RM '+formatter.format(gadai_detail['cajlelong'])
-                        ]).draw();
+
+                        var tuntutan = 'Pelanggan';
+
+                        $.ajax({
+                            method:"GET",
+                            async:false,
+                            url: api_url + "/api/check/customer/",
+                            data:{
+                                "norujukan" : gadai_detail['norujukan'],
+                                "kodcaw" : kodcaw
+                            },
+                            success: function(response){
+                                if(response[0].teller == 'DM')
+                                {
+                                    tuntutan = 'WTD';
+                                }
+                            }
+                        });
+
+                        if(gadai_detail['trkhtuntut'] == null){
+                            tablelelong.row.add([
+                                counter,
+                                '<a data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_lelong'],
+                                gadai_detail['trkhtuntut'],
+                                'RM '+ formatter.format(gadai_detail['pinjaman']),
+                                'RM '+formatter.format(gadai_detail['hargajual']),
+                                'RM '+formatter.format(gadai_detail['baki']),
+                                'RM '+formatter.format(gadai_detail['bakiupah']),
+                                'RM '+formatter.format(gadai_detail['cajlelong']),
+                                '',
+                                '<button class="btn btn-info" disabled>Cetak</button>'
+                            ]).draw();
+                        }else{
+                            tablelelong.row.add([
+                                counter,
+                                '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_lelong'],
+                                gadai_detail['trkhtuntut'],
+                                'RM '+ formatter.format(gadai_detail['pinjaman']),
+                                'RM '+formatter.format(gadai_detail['hargajual']),
+                                'RM '+formatter.format(gadai_detail['baki']),
+                                'RM '+formatter.format(gadai_detail['bakiupah']),
+                                'RM '+formatter.format(gadai_detail['cajlelong']),
+                                tuntutan,
+                                '<button class="btn btn-info" onclick="cetaktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] +'>Cetak</button>'
+                            ]).draw();
+                        }
                     }
                     counter = counter + 1;
                 }
@@ -603,22 +856,105 @@
         });
     }
 
-    function checkAGH()
+    function cetaktuntutbaki(e)
     {
-        $('#AGHModalEdit').modal('hide');
-        var daerahagh = $('#daerahagh').val();
+        let norujukan = $(e).data('norujukan');
 
-        if(daerahagh == 'No-Data')
-        {
-            $('#errordaerah').addClass('visible');
-            $('#errordaerah').removeClass('invisible');
-            return false;
-        }else{
-            $('#errordaerah').addClass('invisible');
-            $('#errordaerah').removeClass('visible');
-            return true;
-        }
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success ml-1',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
 
+        swalWithBootstrapButtons.fire({
+        title: 'Dapatkan Pengesahan PC/PPC',
+        text: "Kelulusan Ulang Cetak Tuntut Baki Lelong",
+        icon: 'info',
+        showCancelButton: true,
+        confirmButtonText: 'Hantar',
+        cancelButtonText: 'Batal',
+        reverseButtons: true
+        }).then((result) => {
+            if(result.isConfirmed) {
+                Swal.fire({
+                    title: 'Tunggu Pengesahan Daripada PC/PPC.',
+                    icon: 'info',
+                    width: 600,
+                    padding: '3em',
+                    background: '#fffff',
+                    showCancelButton: false,
+                    showConfirmButton: false,
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
+                    allowEnterKey: false
+                })
+
+                let mohon = "Ulang Cetak Tuntut Baki";
+
+                $.ajax({
+                    method:'post',
+                    url: '{{ route("teller.createkelulusan") }}',
+                    data: {
+                        "_token": "{{ csrf_token() }}",
+                        "norujukan" : norujukan,
+                        "mohon" : mohon
+                    },
+                    success:function(data){
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+                let teller = "{{ Auth::user()->name }}";
+
+                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                });
+
+                var channel = pusher.subscribe('notice-ubahhapus');
+                channel.bind('my-ubahhapus', function(data) {
+
+                    if(data.norujukan == norujukan && data.teller == teller)
+                    {
+                        if(data.kelulusan == 'lulus')
+                        {
+                            Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                            }).then(function(){
+                                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                                urlroute = urlroute.replace(':id', norujukan);
+                                window.open(urlroute, '_blank');
+                            });
+
+                        }
+                        else if(data.kelulusan == 'batal')
+                        {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Telah Dibatalkan',
+                                text: `Komen : ${data.komen}`
+                            }).then(function(){
+                                location.reload();
+                                return false;
+                            });
+                        }
+                    }
+                });
+            }else if (result.dismiss === Swal.DismissReason.cancel){
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                    'error'
+                )
+            }
+
+        });
+        return;
     }
 
     function checktuntutbaki(e)
@@ -626,12 +962,121 @@
         let tarikhtuntut = $(e).data('tarikhtuntut');
         let norujukan = $(e).data('norujukan');
 
-        var urlroute = '{{ route("lelongan.khazanah", ":id") }}';
+        var urlroute = '{{ route("lelongan", ":id") }}';
         urlroute = urlroute.replace(':id', norujukan);
 
         if (tarikhtuntut == null)
         {
-            window.location.href = urlroute;
+            $.ajax({
+                method: 'GET',
+                url : api_url + '/api/check/wtd',
+                data:{
+                    'norujukan' : norujukan
+                },
+                success:function(data){
+                    if(data == 'yes'){
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Amaran',
+                            text: 'Lelongan dalam process WTD'
+                        });
+                    }else{
+
+                        const swalWithBootstrapButtons = Swal.mixin({
+                            customClass: {
+                                confirmButton: 'btn btn-success ml-1',
+                                cancelButton: 'btn btn-danger'
+                            },
+                            buttonsStyling: false
+                        });
+
+                        swalWithBootstrapButtons.fire({
+                        title: 'Dapatkan Pengesahan PC/PPC',
+                        text: "Kelulusan Tuntut Baki Lelong",
+                        icon: 'info',
+                        showCancelButton: true,
+                        confirmButtonText: 'Hantar',
+                        cancelButtonText: 'Batal',
+                        reverseButtons: true
+                        }).then((result) => {
+                            if(result.isConfirmed) {
+                                Swal.fire({
+                                    title: 'Tunggu Pengesahan Daripada PC/PPC.',
+                                    icon: 'info',
+                                    width: 600,
+                                    padding: '3em',
+                                    background: '#fffff',
+                                    showCancelButton: false,
+                                    showConfirmButton: false,
+                                    allowOutsideClick: false,
+                                    allowEscapeKey: false,
+                                    allowEnterKey: false
+                                })
+
+                                let mohon = "Tuntut Baki";
+
+                                $.ajax({
+                                    method:'post',
+                                    url: '{{ route("teller.createkelulusan") }}',
+                                    data: {
+                                        "_token": "{{ csrf_token() }}",
+                                        "norujukan" : norujukan,
+                                        "mohon" : mohon
+                                    },
+                                    success:function(data){
+                                    },error: function(xhr, status, error) {
+                                        var err = eval("(" + xhr.responseText + ")");
+                                        alert(xhr.responseText);
+                                    }
+                                });
+
+                                let teller = "{{ Auth::user()->name }}";
+
+                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                        cluster: 'ap1',
+                                                        encrypted: true
+                                });
+
+                                var channel = pusher.subscribe('notice-ubahhapus');
+                                channel.bind('my-ubahhapus', function(data) {
+
+                                    if(data.norujukan == norujukan && data.teller == teller)
+                                    {
+                                        if(data.kelulusan == 'lulus')
+                                        {
+                                            Swal.fire({
+                                                    icon: 'success',
+                                                    title: 'Telah Disahkan'
+                                            }).then(function(){
+                                                window.location.href = urlroute;
+                                            });
+                                        }
+                                        else if(data.kelulusan == 'batal')
+                                        {
+                                            Swal.fire({
+                                                icon: 'warning',
+                                                title: 'Telah Dibatalkan',
+                                                text: `Komen : ${data.komen}`
+                                            }).then(function(){
+                                                location.reload();
+                                                return false;
+                                            });
+                                        }
+                                    }
+                                });
+                            }else if (result.dismiss === Swal.DismissReason.cancel){
+                                swalWithBootstrapButtons.fire(
+                                    'Batal',
+                                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                                    'error'
+                                )
+                            }
+
+                        });
+
+                    }
+                }
+            });
         }else{
             Swal.fire({
                 icon: 'error',
@@ -644,6 +1089,7 @@
     }
 
 
+
     $(document).ready( function () {
 
         $('#myTable').parents('div.dataTables_wrapper').first().hide();
@@ -663,7 +1109,7 @@
         });
 
         $('#myTable td').click( function () {
-            alert('dasdsa');
+            // alert('dasdsa');
         });
 
         $("input[name='options']").click(function(){
@@ -681,33 +1127,56 @@
                     text: 'Sila pilih salah satu SAG'
                 });
             }else{
+
+                Swal.fire({
+                    title: 'Memuatkan...',
+                    allowEscapeKey : false,
+                    allowOutsideClick: false,
+                    didOpen: function () {
+                        Swal.showLoading()
+                    }
+                });
+
                 $.ajax({
                     method:'get',
-                    url:'{{ route("gadai.history.khazanah") }}',
+                    url:'{{ route("arcc.history") }}',
                     data:{ "norujukan" : histid},
                     success:function(data)
                     {
-                        $('#historytebusModal').modal();
+
                         historytebustable(data);
+                        $.ajax({
+                            method: 'get',
+                            url: api_url + '/api/transaction/' + histid,
+                            success: function(data){
+                                historybayarantable(data);
+
+                                $.ajax({
+                                    method:'get',
+                                    url: api_url + '/api/gadai/norujukan/'+histid,
+                                    success:function(gadai){
+                                        rekodasal(gadai);
+
+                                        $.ajax({
+                                            method:'get',
+                                            url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                                            success:function(ansuran){
+                                                rekodansuran(ansuran);
+
+                                                Swal.close();
+                                                $('#historytebusModal').modal();
+                                            }
+                                        });
+                                    }
+                                });
+
+                            }
+                        });
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
                         alert(xhr.responseText);
                     }
                 });
-                $.ajax({
-                    method: 'get',
-                    url: api_url + '/api/transaction/' + histid,
-                    success: function(data){
-                        historybayarantable(data);
-                    }
-                });
-                $.ajax({
-                    method:'get',
-                    url: api_url + '/api/gadai/norujukan/'+histid,
-                    success:function(gadai){
-                        rekodasal(gadai);
-                    }
-                });
             }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
             let histid = $('input[name="sudahtebus"]:checked').val();
@@ -719,123 +1188,47 @@
                     text: 'Sila pilih salah satu SAG'
                 });
             }else{
+
+                Swal.fire({
+                    title: 'Memuatkan...',
+                    allowEscapeKey : false,
+                    allowOutsideClick: false,
+                    didOpen: function () {
+                        Swal.showLoading()
+                    }
+                });
+
                 $.ajax({
                     method:'get',
-                    url:'{{ route("gadai.history.khazanah") }}',
-                    datatype:'json',
+                    url:'{{ route("arcc.history") }}',
                     data:{ "norujukan" : histid},
                     success:function(data){
-                        $('#historytebusModal').modal();
                         historytebustable(data);
-                    },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
-                    }
-                });
-                $.ajax({
-                    method: 'get',
-                    url: api_url + '/api/transaction/' + histid,
-                    success: function(data){
-                        historybayarantable(data);
-                    }
-                });
-                $.ajax({
-                    method:'get',
-                    url:api_url + '/api/gadai/norujukan/'+histid,
-                    success:function(gadai){
-                        rekodasal(gadai);
-                    }
-                });
-            }
-        }
-    }
 
-    function ulangcetakagh(e)
-    {
-        var kodnegeri = $(e).data('kodnegeri');
-        var koddaerah = $(e).data('koddaerah');
-        var noruj = $(e).data('histid');
-
-        if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
-        {
-            if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
-
-                let histid = '';
-                if($("input[name='options']:checked").val() == 'belum_tebus'){
-                    histid = $('input[name="belum"]:checked').val();
-                }
-                else{
-                    histid = $('input[name="lelong"]:checked').val();
-                }
-
-                if(histid == null){
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Amaran',
-                        text: 'Sila pilih salah satu SAG'
-                    });
-                }else{
-                    let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
-                    urlroute = urlroute.replace(':id', histid);
-                    window.open(urlroute, '_blank');
-                    swal.close();
-                }
-            }
-        }else{
-            $('#AGHModalEdit').modal('show');
-            $('#norujukanhiddenedit').val(noruj);
-            swal.close();
-        }
-
-        return;
-    }
-
-    function saghilangfunc()
-    {
-        if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
-
-            let histid = '';
-            if($("input[name='options']:checked").val() == 'belum_tebus'){
-                histid = $('input[name="belum"]:checked').val();
-            }
-            else{
-                histid = $('input[name="lelong"]:checked').val();
-            }
-
-            if(histid == null){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Sila pilih salah satu SAG'
-                });
-            }else{
-                $.ajax({
-                    method:'get',
-                    url: api_url + '/api/polis/get',
-                    data:{ "norujukan" : histid,"kodcaw" : kodcaw},
-                    success:function(data)
-                    {
-
-                        var count = Object.keys(data).length;
-                        console.log(histid);
-                        if(count > 0)
-                        {
-                            Swal.fire({
-                                allowOutsideClick: false,
-                                allowEscapeKey: false,
-                                allowEnterKey: false,
-                                showConfirmButton: false,
-                                html:   "<br>" +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-koddaerah="' + data[0].koddaerah + '" data-kodnegeri="' + data[0].kodnegeri + '">' + 'Ulang Cetak' + '</button>',
-                                icon: 'error',
-                                title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
-                            });
-                        }else{
-                            $('#AGHModal').modal('show');
-                            $('#norujukanhidden').val(histid);
-                        }
+                        $.ajax({
+                            method: 'get',
+                            url: api_url + '/api/transaction/' + histid,
+                            success: function(data){
+                                historybayarantable(data);
+                            }
+                        });
+                        $.ajax({
+                            method:'get',
+                            url:api_url + '/api/gadai/norujukan/'+histid,
+                            success:function(gadai){
+                                rekodasal(gadai);
+                            }
+                        });
+                        $.ajax({
+                            method:'get',
+                            url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                            success:function(ansuran){
+                                rekodansuran(ansuran);
+                            }
+                        });
 
+                        $('#historytebusModal').modal();
+                        Swal.close();
 
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
@@ -843,88 +1236,32 @@
                     }
                 });
             }
-        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
-            let histid = $('input[name="sudahtebus"]:checked').val();
-
-            Swal.fire({
-                icon: 'error',
-                title: 'Amaran',
-                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-            });
         }
-
-
-//        }else if($("input[name='options']:checked").val() == 'lelong'){
-//            let histid = $('input[name="sudahtebus"]:checked').val();
-//
-//            Swal.fire({
-//                icon: 'error',
-//                title: 'Amaran',
-//                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-//            });
-//
-//        }
-
     }
 
-    $('#negeriagh').change(function(){
-
-        var daerahselect = document.getElementById("daerahagh");
-
-        $('#daerahagh').attr('disabled', false);
-        $(daerahagh).empty();
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/daerahkodnegeri/' + this.value,
-            success:function(data){
-                $.each(data, function( index, daerah ){
-                    addOption(daerah.koddaerah,daerah.namadaerah);
-                });
-            }
-        });
-
-    });
-
-    $('#negeriaghedit').change(function(){
-
-        var daerahselect = document.getElementById("daerahaghedit");
-
-        $('#daerahaghedit').attr('disabled', false);
-        $(daerahagh).empty();
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/daerahkodnegeri/' + this.value,
-            success:function(data){
-                $.each(data, function( index, daerah ){
-                    addOptionEdit(daerah.koddaerah,daerah.namadaerah);
-                });
-            }
-        });
-
-    });
-
-    function addOption(textopt,valueopt) {
-
-        optionText = textopt;
-        optionValue = valueopt;
-
-        $('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
-    }
-
-    function addOptionEdit(textopt,valueopt) {
-
-        optionText = textopt;
-        optionValue = valueopt;
-
-        $('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
-    }
-
-
-
     function rekodasal(gadaian){
         $('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan']));
         $('#pembiayaanmodal').text('RM ' + formatter.format(gadaian[0][0]['pinjaman']));
         $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun']));
+        $('#marhunmodal').text(gadaian[0][0]['marhun']);
+    }
+
+    function rekodansuran(data){
+        var counter = 1;
+
+        bayaranupah.clear().draw();
+        $.each(data,function(index,bayaran){
+
+            var urlroute = '{{ route("resit.advansur", ":id") }}';
+            urlroute = urlroute.replace(':id', bayaran['norujukan']);
+            bayaranupah.row.add([
+                    counter,
+                    bayaran['tarikh'],
+                    "RM " + bayaran['upahDibayar'],
+                    ''
+                ]).draw();
+                counter = counter + 1;
+        });
     }
 
     function historybayarantable(data){
@@ -933,13 +1270,13 @@
         historybayarandatatable.clear().draw();
         $.each(data,function(index,bayaran){
 
-            var urlroute = '{{ route("resit.khazanah.ansuran", ":id") }}';
+            var urlroute = '{{ route("resit.ansuran", ":id") }}';
             urlroute = urlroute.replace(':id', bayaran['id']);
             historybayarandatatable.row.add([
                     counter,
                     bayaran['created_at'],
                     "RM " + bayaran['duit_masuk'],
-                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                    ''
                 ]).draw();
                 counter = counter + 1;
         });
@@ -958,28 +1295,28 @@
 
             switch(tebusaz['jenistebus']) {
                 case 'P':
-                    var urlroute = '{{ route("resit.khazanah.tambahpinjam", ":id") }}';
+                    var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'T':
 
                     if(tebusaz['hargajualan'] === '')
                     {
-                        var urlroute = '{{ route("resit.khazanah.belumtebus", ":id") }}';
+                        var urlroute = '{{ route("resit.belumtebus", ":id") }}';
                         urlroute = urlroute.replace(':id', tebusaz['norujukan']);
 
                     }else{
-                        var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
+                        var urlroute = '{{ route("resit.tebus", ":id") }}';
                         urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     }
 
                     break;
                 case 'A':
-                    var urlroute = '{{ route("resit.khazanah.belumansurans", ":id") }}';
+                    var urlroute = '{{ route("resit.belumansurans", ":id") }}';
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'S':
-                var urlroute = '{{ route("resit.khazanah.tebusseparuh", ":id") }}';
+                var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
                 urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                 break;
                 }
@@ -991,7 +1328,7 @@
                 tebusaz['pinjaman'],
                 tebusaz['jbg'],
                 tebusaz['t_tebus'],
-                '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                ''
             ]).draw();
             counter = counter + 1;
         });
@@ -1124,34 +1461,730 @@
     }
 
 
-    $('#poskod').change(function(){
-        var poskod = this.value;
-        console.log(poskod);
-        $.ajax({
-            method:'GET',
-            url:api_url+'/api/poskod/'+poskod,
-            success:function(poskod_detail){
-                var koddaerah = poskod_detail['koddaerah'];
-                var kodnegeri = poskod_detail['kodnegeri'];
-                $.ajax({
-                    url:api_url+'/api/negeri/'+kodnegeri,
-                    method:'GET',
-                    success:function(negeri){
-                        console.log(negeri);
-                        $('#kodnegeri').val(negeri['negeri']);
-                    }
+    function ubahfunc(e){
+
+        let ubahid = $('input[name="belum"]:checked').val();
+        let harini = new Date();harini.setHours(0, 0, 0, 0);
+
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
+            if(+harini !== +tarikhgadai2){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Ubah Gadai Tidak Dibenarkan'
                 });
-                $.ajax({
-                    url:api_url+'/api/daerah/'+koddaerah,
-                    method:'GET',
-                    success:function(daerah){
-                        $('#koddaerah').val(daerah['namadaerah']);
-                    }
+                return false;
+            }
+        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+
+            let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
+
+            if(+harini !== +tarikhgadai1){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Ubah Gadai Tidak Dibenarkan'
                 });
+                return false;
+            }
+        }
+
+        if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+
+            return false;
+        }
+
+        if($("input[name='options']:checked").val() == 'sudah_tebus'){
+
+                const swalWithBootstrapButtons = Swal.mixin({
+                    customClass: {
+                        confirmButton: 'btn btn-success ml-1',
+                        cancelButton: 'btn btn-danger'
+                    },
+                    buttonsStyling: false
+                });
+
+                swalWithBootstrapButtons.fire({
+                title: 'Dapatkan Pengesahan Khazanah',
+                text: "Ubah Maklumat Wakil",
+                icon: 'info',
+                showCancelButton: true,
+                confirmButtonText: 'Hantar',
+                cancelButtonText: 'Batal',
+                reverseButtons: true
+                }).then((result) => {
+                    if (result.isConfirmed) {
+
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Khazanah.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
+                        })
+
+                        let mohon = "Ubah Wakil";
+                        let norujukan = $('input[name="sudahtebus"]:checked').val();
+
+                        $.ajax({
+                            method:'post',
+                            url: '{{ route("teller.createkelulusan") }}',
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan,
+                                "mohon" : mohon
+                            },
+                            success:function(data){
+
+                            },error: function(xhr, status, error) {
+                                var err = eval("(" + xhr.responseText + ")");
+                                alert(xhr.responseText);
+                            }
+                        });
+
+
+                        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                        let teller = "{{ Auth::user()->name }}";
+
+                        var channel = pusher.subscribe('notice-ubahhapus');
+                        channel.bind('my-ubahhapus', function(data) {
+
+                            if(data.norujukan == norujukan && data.teller == teller)
+                            {
+                                if(data.kelulusan == 'lulus')
+                                {
+                                    Swal.fire({
+                                        icon: 'success',
+                                        title: 'Telah Disahkan'
+                                    }).then(async function(){
+
+                                        const { value: amaun } = await Swal.fire({
+                                        title: 'Kad Pengenalan Wakil',
+                                        input: 'text',
+                                        inputPlaceholder: 'Kad Pengenalan',
+                                        confirmButtonText: 'Terima',
+                                        showCancelButton:true,
+                                        cancelButtonText:'Batal',
+                                        allowOutsideClick: true,
+                                        inputValidator: (value) => {
+                                            if (!value) {
+                                                return 'Isikan tempat kosong diatas!'
+                                            }
+
+                                            if(value <= 0){
+                                                return 'Masukkan No Kad Pengenalan yang betul!';
+                                            }
+
+                                           // if(isNaN(value))
+                                           // {
+                                           //     return 'Kad Pengenalan hendaklah dalam bentuk nombor!'
+                                           // }
+                                        }
+                                    });
+
+                                        if(amaun)
+                                        {
+                                            $.ajax({
+                                                method:'get',
+                                                url: api_url + '/api/getwakil/' + kodcaw + '/' + amaun,
+                                                success:function(data){
+
+                                                        if(data.length > 0)
+                                                        {
+                                                            let namawakilsedia = data[0]['nama'];
+                                                            let nokpwakilsedia = data[0]['nokp'];
+                                                            let nowakilsedia = data[0]['nowakil'];
+
+                                                            const PengesahanAkhirWakil = Swal.mixin({
+                                                                customClass: {
+                                                                    confirmButton: 'btn btn-success ml-1',
+                                                                    cancelButton: 'btn btn-danger'
+                                                                },
+                                                                buttonsStyling: false
+                                                            });
+
+                                                            PengesahanAkhirWakil.fire({
+                                                            title: 'Pengesahan Akhir Wakil!',
+                                                            html: '<b class="text-danger">' + namawakilsedia + '</b><br><b class="text-danger">' + nokpwakilsedia + '</b>',
+                                                            icon: 'info',
+                                                            showCancelButton: true,
+                                                            confirmButtonText: 'Benar',
+                                                            cancelButtonText: 'Salah',
+                                                            reverseButtons: true
+                                                            }).then((result) => {
+                                                                if (result.isConfirmed) {
+
+                                                                    $.ajax({
+                                                                        method:'put',
+                                                                        async:false,
+                                                                        url: api_url + '/api/ubahwakil/' + kodcaw,
+                                                                        data:{ 'nowakil' : nowakilsedia,
+                                                                            'norujukan' : norujukan},
+                                                                        success:function(data){
+
+                                                                            if(data === 1)
+                                                                            {
+                                                                                Swal.fire({
+                                                                                    icon: 'success',
+                                                                                    title: 'Berjaya!',
+                                                                                    text: 'Penukaran Wakil berjaya'
+                                                                                }).then(async function(){
+                                                                                    return true;
+                                                                                    location.reload();
+                                                                                    });
+                                                                            }else{
+                                                                                Swal.fire({
+                                                                                    icon: 'info',
+                                                                                    title: 'Pemberitahuan!',
+                                                                                    text: 'Wakil telah didaftarkan dengan IC tersebut!'
+                                                                                }).then(async function(){
+                                                                                    return true;
+                                                                                    location.reload();
+                                                                                });
+                                                                            }
+
+                                                                        }
+                                                                    });
+
+                                                                }else if (result.dismiss === Swal.DismissReason.cancel){
+                                                                    PengesahanAkhirWakil.fire(
+                                                                        'Batal',
+                                                                        'Tidak Berjaya Mengesahkan Wakil!',
+                                                                        'error'
+                                                                    )
+                                                                }
+                                                            });
+
+                                                        }else{
+                                                            Swal.fire({
+                                                                allowOutsideClick: false,
+                                                                allowEscapeKey: false,
+                                                                allowEnterKey: false,
+                                                                confirmButtonText: '<i class="fa fa-thumbs-up"></i> Daftar Wakil!',
+                                                                icon: 'info',
+                                                                title: 'Maklumat anda tiada dalam senarai wakil! Tekan button Daftar untuk mendaftar!'
+                                                                }).then(function(){
+                                                                    daftarwakilfunction(amaun,norujukan);
+                                                            });
+                                                        }
+                                                    },error: function(xhr, status, error) {
+                                                        var err = eval("(" + xhr.responseText + ")");
+                                                        alert(xhr.responseText);
+                                                    }
+                                            });
+                                        }
+                                    });
+                                }
+                                else if(data.kelulusan == 'batal')
+                                {
+                                    Swal.fire({
+                                        icon: 'warning',
+                                        title: 'Telah Dibatalkan',
+                                        text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        // $("#terima_gadai").prop('disabled', false);
+                                        return false;
+                                    });
+                                }
+                            }
+
+                        });
+
+
+                    }else if (result.dismiss === Swal.DismissReason.cancel){
+                        swalWithBootstrapButtons.fire(
+                            'Batal',
+                            'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                            'error'
+                        )
+                    }
+
+                });
+
+            return false;
+        }
+
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
+
+        swalWithBootstrapButtons.fire({
+            title: 'Dapatkan Pengesahan Khazanah',
+            text: "Ubah Maklumat Gadaian",
+            icon: 'info',
+            showCancelButton: true,
+            confirmButtonText: 'Hantar',
+            cancelButtonText: 'Batal',
+            reverseButtons: true
+            }).then((result) => {
+                if (result.isConfirmed) {
+
+                    Swal.fire({
+                        title: 'Tunggu Pengesahan Daripada Khazanah.',
+                        icon: 'info',
+                        width: 600,
+                        padding: '3em',
+                        background: '#fffff',
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false
+                    })
+
+                    let mohon = "Ubah Gadai";
+
+                    $.ajax({
+                        method:'post',
+                        url: '{{ route("teller.createkelulusan") }}',
+                        data: {
+                            "_token": "{{ csrf_token() }}",
+                            "norujukan" : ubahid,
+                            "mohon" : mohon
+                        },
+                        success:function(data){
+
+                        },error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                        }
+                    });
+
+                    var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                    let teller = "{{ Auth::user()->name }}";
+
+                    var channel = pusher.subscribe('notice-ubahhapus');
+                    channel.bind('my-ubahhapus', function(data) {
+
+                        if(data.norujukan == ubahid && data.teller == teller)
+                        {
+                            if(data.kelulusan == 'lulus')
+                            {
+                                Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                                }).then(function(){
+
+                                    var urlroute = '{{ route("gadaian.edit", ":id") }}';
+                                    urlroute = urlroute.replace(':id', ubahid);
+                                    window.location.replace(urlroute);
+                                    return true;
+                                });
+                            }
+                            else if(data.kelulusan == 'batal')
+                            {
+                                Swal.fire({
+                                    icon: 'warning',
+                                    title: 'Telah Dibatalkan',
+                                    text: `Komen : ${data.komen}`
+                                }).then(function(){
+                                    // $("#terima_gadai").prop('disabled', false);
+                                    return false;
+                                });
+                            }
+                        }
+
+
+
+                    });
+
+
+            }else if (result.dismiss === Swal.DismissReason.cancel){
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                    'error'
+                )
             }
         });
-    });
+    }
 
+    function hapusfunc(){
+
+        let kodcaw = "{{ $cawangan_info['kodcaw'] }}";
+        let hapusid = $('input[name="belum"]:checked').val();
+        let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
+        let harini = new Date();harini.setHours(0, 0, 0, 0);
+        if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+            return false;
+        }else if(hapusidsudah == null && $("input[name='options']:checked").val() == 'sudah_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+            return false;
+        }
+
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
+
+            // var id = $('.tab-content .active').attr('id');
+
+            var activeTab = $("#navtawarruqdannottawarruq.tab-content").find(".active");
+            var id = activeTab.attr('id');
+
+            if(id == "nav-tawarruq") {
+                if(+harini !== +tarikhgadai2){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Hapus Gadai Tidak Dibenarkan'
+                    });
+                    return false;
+                }
+            }
+            else {
+
+
+                $.ajax({
+                    method:'get',
+                    url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid,
+                    success:function(data){
+                        if(data == 1){
+
+                            const swalWithBootstrapButtons = Swal.mixin({
+                                customClass: {
+                                    confirmButton: 'btn btn-success',
+                                    cancelButton: 'btn btn-danger'
+                                },
+                                buttonsStyling: false
+                            });
+
+                            swalWithBootstrapButtons.fire({
+                                title: 'Dapatkan Pengesahan Khazanah',
+                                text: "Hapus Upah Lama!",
+                                icon: 'info',
+                                showCancelButton: true,
+                                confirmButtonText: 'Hantar',
+                                cancelButtonText: 'Batal',
+                                reverseButtons: true
+                            }).then((result) => {
+                                if(result.isConfirmed) {
+                                    Swal.fire({
+                                        title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                        icon: 'info',
+                                        width: 600,
+                                        padding: '3em',
+                                        background: '#fffff',
+                                        showCancelButton: false,
+                                        showConfirmButton: false,
+                                        allowOutsideClick: false,
+                                        allowEscapeKey: false,
+                                        allowEnterKey: false
+                                    })
+
+                                    let mohon = "Hapus Upah Lama";
+                                    let id = hapusid;
+
+                                    $.ajax({
+                                        method:'post',
+                                        url: '{{ route("teller.createkelulusan") }}',
+                                        data: {
+                                            "_token": "{{ csrf_token() }}",
+                                            "norujukan" : id,
+                                            "mohon" : mohon
+                                        },
+                                        success:function(data){
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            alert(xhr.responseText);
+                                        }
+                                    });
+
+                                    let teller = "{{ Auth::user()->name }}";
+
+                                    var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                    cluster: 'ap1',
+                                                    encrypted: true
+                                                });
+
+                                    var channel = pusher.subscribe('notice-ubahhapus');
+                                    channel.bind('my-ubahhapus', function(data) {
+
+                                        if(data.norujukan == id && data.teller == teller)
+                                        {
+                                            if(data.kelulusan == 'lulus')
+                                            {
+
+                                                Swal.fire({
+                                                        icon: 'success',
+                                                        title: 'Telah Disahkan'
+                                                }).then(function(){
+
+                                                        $.ajax({
+                                                            method:'post',
+                                                            url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id,
+                                                            data:{
+                                                                "teller" : "{{ Auth::user()->name }}"
+                                                            },
+                                                            success:function(data){
+
+                                                                if(data == 1)
+                                                                {
+                                                                    swalWithBootstrapButtons.fire(
+                                                                            'Hapus!',
+                                                                            'Maklumat upah lama telah dihapuskan.',
+                                                                            'success'
+                                                                    ).then(function(){
+                                                                        location.reload();
+                                                                    });
+                                                                }else{
+                                                                    swalWithBootstrapButtons.fire(
+                                                                            'Hapus!',
+                                                                            'Maklumat Upah lama tidak berjaya untuk dihapuskan.',
+                                                                            'error'
+                                                                    ).then(function(){
+                                                                        location.reload();
+                                                                    });
+                                                                }
+
+
+                                                            },error: function(xhr, status, error) {
+                                                                var err = eval("(" + xhr.responseText + ")");
+                                                                alert(xhr.responseText);
+                                                            }
+                                                        });
+                                                    return true;
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+                            });
+
+
+                            return false;
+                        }
+                        else{
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Amaran',
+                                text: 'Hapus Upah Tidak Dibenarkan'
+                            });
+                            return false;
+                        }
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+                return false;
+            }
+
+
+            // return false;
+
+        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+            let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
+
+            if(+harini !== +tarikhgadai1){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Hapus Tebus Tidak Dibenarkan'
+                });
+                return false;
+            }
+        }
+
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
+
+        swalWithBootstrapButtons.fire({
+            title: 'Dapatkan Pengesahan Khazanah',
+            text: "Hapus Rekod!",
+            icon: 'info',
+            showCancelButton: true,
+            confirmButtonText: 'Hantar',
+            cancelButtonText: 'Batal',
+            reverseButtons: true
+        }).then((result) => {
+            if(result.isConfirmed) {
+                Swal.fire({
+                    title: 'Tunggu Pengesahan Daripada Khazanah.',
+                    icon: 'info',
+                    width: 600,
+                    padding: '3em',
+                    background: '#fffff',
+                    showCancelButton: false,
+                    showConfirmButton: false,
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
+                    allowEnterKey: false
+                })
+
+                let mohon = "";
+                let id = 0;
+
+                if($("input[name='options']:checked").val() == 'belum_tebus'){
+                    id = hapusid;
+                    mohon = "Hapus Gadai";
+                }
+                else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+                    id = hapusidsudah;
+                    mohon = "Hapus Tebus";
+                }
+
+                $.ajax({
+                    method:'post',
+                    url: '{{ route("teller.createkelulusan") }}',
+                    data: {
+                        "_token": "{{ csrf_token() }}",
+                        "norujukan" : id,
+                        "mohon" : mohon
+                    },
+                    success:function(data){
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+                let teller = "{{ Auth::user()->name }}";
+
+                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                var channel = pusher.subscribe('notice-ubahhapus');
+                channel.bind('my-ubahhapus', function(data) {
+
+                    if(data.norujukan == id && data.teller == teller)
+                    {
+                        if(data.kelulusan == 'lulus')
+                        {
+
+                            Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                            }).then(function(){
+
+
+                                if($("input[name='options']:checked").val() == 'belum_tebus'){
+                                    $.ajax({
+                                        method:'put',
+                                        url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + id,
+                                        data: { 'kodlaluan' : teller },
+                                        success:function(data){
+                                            $.ajax({
+                                                method:'put',
+                                                url: api_url + '/api/komuditi/batal',
+                                                dataType:'json',
+                                                data:{
+                                                    norujukan: hapusid
+                                                },
+                                                success:function(batalkomuditi){
+                                                    swalWithBootstrapButtons.fire(
+                                                        'Hapus!',
+                                                        'Maklumat gadaian telah dihapuskan.',
+                                                        'success'
+                                                    ).then(function(){
+                                                        location.reload();
+                                                    });
+                                                }
+                                            })
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            alert(xhr.responseText);
+                                        }
+                                    });
+                                }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+                                    $.ajax({
+                                        method:'put',
+                                        url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + id,
+                                        data: { 'kodlaluan' : teller },
+                                        success:function(data){
+                                            if(data != "Bukan-Tebus"){
+                                                swalWithBootstrapButtons.fire(
+                                                    'Hapus!',
+                                                    'Maklumat tebus telah dihapuskan.',
+                                                    'success'
+                                                ).then(function () {
+                                                    location.reload();
+                                                });
+                                            }else{
+                                                swalWithBootstrapButtons.fire(
+                                                    'Amaran!',
+                                                    'Hapus Tebus Tidak Dibenarkan, Hanya untuk tebus sahaja!',
+                                                    'error'
+                                                )
+                                            }
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            console.log(xhr.responseText);
+                                        }
+                                    });
+                                }
+                                return true;
+                            });
+                        }
+                        else if(data.kelulusan == 'batal')
+                        {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Telah Dibatalkan',
+                                text: `Komen : ${data.komen}`
+                            }).then(function(){
+                                location.reload();
+                                return false;
+                            });
+                        }
+                    }
+
+
+
+                });
+
+
+            }else if (result.dismiss === Swal.DismissReason.cancel) {
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Maklumat Gadaian Tidak Berjaya Dihapuskan',
+                    'error'
+                )
+            }
+        });
+    }
 
     function gadaiOptionButton(noic){
         tablegadai.clear().draw();
@@ -1181,6 +2214,8 @@
                 method:"GET",
                 url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus/"+kodcaw,
                 success: function(data){
+                    sorted_data = [...data];
+                    sorted_data.sort((a, b) => new Date(b.date) - new Date(a.date));
                     gadaiTable(data,"sudah_tebus");
                 }
             });
@@ -1202,6 +2237,34 @@
         }
     }
 
+
+
+    $('#poskod').change(function(){
+        var poskod = this.value;
+        $.ajax({
+            method:'GET',
+            url:api_url+'/api/poskod/'+poskod,
+            success:function(poskod_detail){
+                var koddaerah = poskod_detail['koddaerah'];
+                var kodnegeri = poskod_detail['kodnegeri'];
+                $.ajax({
+                    url:api_url+'/api/negeri/'+kodnegeri,
+                    method:'GET',
+                    success:function(negeri){
+                        $('#kodnegeri').val(negeri['negeri']);
+                    }
+                });
+                $.ajax({
+                    url:api_url+'/api/daerah/'+koddaerah,
+                    method:'GET',
+                    success:function(daerah){
+                        $('#koddaerah').val(daerah['namadaerah']);
+                    }
+                });
+            }
+        });
+    });
+
     function kemaskinifunc()
     {
         $('#btnkemaskini').addClass('btn-danger');
@@ -1216,9 +2279,9 @@
         $('#kodbank').attr('disabled', false);
         $('#noakaun').attr('readonly', false);
         $('#nota').attr('readonly', false);
-        $('#nama').attr('readonly', false);
         $('#alamat').attr('readonly', false);
         $('#poskod').attr('readonly', false);
+
     }
 
     function cancelbutton(){
@@ -1237,18 +2300,8 @@
         $('#kodbank').attr('disabled', true);
         $('#noakaun').attr('readonly', true);
         $('#nota').attr('readonly', true);
-        $('#nama').attr('readonly', true);
         $('#alamat').attr('readonly', true);
         $('#poskod').attr('readonly', true);
-
-        /* Error Telefon */
-        $('#errortelefon').hide();
-        $('#errortelefon').text("");
-        $('#telefon').removeClass('is-invalid');
-
-        $('#errortelefon2').hide();
-        $('#errortelefon2').text("");
-        $('#telefon2').removeClass('is-invalid');
     }
 
     $("#kemaskiniform").submit(function(event) {
@@ -1260,24 +2313,21 @@
         var kodbank = $('#kodbank').val();
         var noakaun = $('#noakaun').val();
         var nota = $('#nota').val();
-        var nama = $('#nama').val();
         var alamat = $('#alamat').val();
         var poskod = $('#poskod').val();
 
         $.ajax({
             method:"put",
-            url: api_url + "/api/customers/update/khazanah/" + nokp,
+            url: api_url + "/api/customers/update/kaunter/" + nokp,
             data:{
-                "namakhazanah" : ppc,
+                "namateller" : "{{ Auth::user()->name }}",
                 "telefon1": telefon1,
                 "telefon2": telefon2,
                 "kodbank":kodbank,
                 "noakaun":noakaun,
                 'nota':nota,
-                'nama':nama,
                 'alamat':alamat,
-                'poskod':poskod,
-                'kodcaw':kodcaw
+                'poskod':poskod
             },
             success: function(success){
                 $('#btnsave').css('display','none');
@@ -1286,7 +2336,9 @@
                     Swal.fire({
                         icon: 'success',
                         title: 'Berjaya',
-                        text: 'Berjaya mengemaskini maklumat pelanggan'
+                        text: 'Berjaya mengemaskini maklumat pelanggan',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
                     }).then((result) => {
                         if (result.isConfirmed) {
                             location.reload();
@@ -1301,7 +2353,6 @@
                         allowOutsideClick: false,
                     });
                 }
-                
 
             },
             error: function (request, status, error) {
@@ -1358,7 +2409,6 @@
             $('#noakaun').attr('readonly', true);
             $('#kodbank').attr('disabled', true);
             $('#nota').attr('readonly', true);
-            $('#nama').attr('readonly', true);
             $('#alamat').attr('readonly', true);
             $('#poskod').attr('readonly', true);
 
diff --git a/resources/views/callcenter/v2/info.blade.php b/resources/views/callcenter/v2/info.blade.php
index 8b8c0a5..29a9907 100644
--- a/resources/views/callcenter/v2/info.blade.php
+++ b/resources/views/callcenter/v2/info.blade.php
@@ -1,12 +1,14 @@
 @extends('layouts.app_operasi')
 
+<style>
+    #daftar_gadai{
+        color:#fff !important;
+    }
+</style>
 
 @section('content')
 @include('modal.historytebus')
 @include('modal.wakil')
-@include('modal.agh')
-
-
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
@@ -14,7 +16,7 @@
             <nav aria-label="breadcrumb">
                 <ol class="breadcrumb pb-3">
                   <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
-                  <li class="breadcrumb-item"><a href="{{ route('khazanah.pelanggan') }}">Pengenalan Diri</a></li>
+                  <li class="breadcrumb-item"><a href="{{ url('/pelanggan') }}">Pengenalan Diri</a></li>
                   <li class="breadcrumb-item active" aria-current="page">Pelanggan : {{$cawangan_info['details_caw']}}</li>
                 </ol>
               </nav>
@@ -54,7 +56,12 @@
                         </div>
                         <div class="col-md-8">
                             @php
-                                $outstanding_semasa = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/customers/'. $customer_info['kpbaru'] .'/outstandingsemasa/'.$cawangan_info['kodcaw'])->json();
+                                if($customer_info['kpbaru'] != null){
+                                    $noic = $customer_info['kpbaru'];
+                                }else{
+                                    $noic = $customer_info['kplama'];
+                                }
+                                $outstanding_semasa = Http::withOptions(['verify' => config('app.api_verify')])->get($api_url . '/api/gadai/customers/'. $noic .'/outstandingsemasa/'.$cawangan_info['kodcaw'])->json();
                             @endphp
                             <input type="text" class="form-control" name="outstanding_semasa" id="outstanding_semasa" readonly value="{{ number_format($outstanding_semasa,2) }}">
                         </div>
@@ -62,11 +69,11 @@
 
                     <div class="form-group row">
                         <div class="col-md-4">
-                            <b>Limit Pembiayaan </b>
+                            <b>Baki Limit Pembiayaan </b>
                         </div>
                         <div class="col-md-8">
                             @php
-                                $limit_pinjaman_semasa = 0;
+                                $limit_pinjaman_semasa = 300000 - $outstanding_semasa;
                             @endphp
                             <input type="text" class="form-control" name="limit_pinjaman" id="limit_pinjaman" readonly value="{{ number_format($limit_pinjaman_semasa,2) }}">
                         </div>
@@ -90,7 +97,7 @@
                             <b>No Telefon</b>
                         </div>
                         <div class="col-md-8">
-                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] }}">
+                            <input type="text" class="form-control" name="cust_telefon" id="cust_telefon" readonly value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}">
                         </div>
                     </div>
 
@@ -125,11 +132,11 @@
                             <input type="radio" name="options" id="option3" value="lelong" autocomplete="off">Lelong
                         </label>
                     </div>
-                    <div class='col-md-3 text-right'>
+                    <div class='col-md-3'>
+                        {{-- <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button> --}}
                     </div>
                     <div class="col-md-3 text-right">
-                        <button class='btn btn-primary' data-toggle="modal" style="margin-right:-50px" data-target="#customer_detail">Maklumat Pelanggan</button>
-
+                        <button class='btn btn-primary' data-toggle="modal" data-target="#customer_detail">Maklumat Pelanggan</button>
                     </div>
                 </div>
             </div>
@@ -138,19 +145,19 @@
                     <nav class="mb-3">
                         <div class="nav nav-tabs" id="nav-tab" role="tablist">
                             @php
-                            $activate_tab = request()->session()->pull('activate_tab', 'SAG_lama');
+                                $activate_tab = request()->session()->pull('activate_tab', 'SAG_lama');
 
-                            $activate_tab_SAG_baru = $activate_tab === 'SAG_baru' ? 'active' : '';
-                            $aria_selected_SAG_baru = $activate_tab === 'SAG_baru' ? 'true' : 'false';
-                            $activate_pane_SAG_baru = $activate_tab === 'SAG_baru' ? 'active show' : '';
+                                $activate_tab_SAG_baru = $activate_tab === 'SAG_baru' ? 'active' : '';
+                                $aria_selected_SAG_baru = $activate_tab === 'SAG_baru' ? 'true' : 'false';
+                                $activate_pane_SAG_baru = $activate_tab === 'SAG_baru' ? 'active show' : '';
 
-                            $activate_tab_SAG_lama = $activate_tab === 'SAG_lama' ? 'active' : '';
-                            $aria_selected_SAG_lama = $activate_tab === 'SAG_lama' ? 'true' : 'false';
-                            $activate_pane_SAG_lama = $activate_tab === 'SAG_lama' ? 'active show' : '';
+                                $activate_tab_SAG_lama = $activate_tab === 'SAG_lama' ? 'active' : '';
+                                $aria_selected_SAG_lama = $activate_tab === 'SAG_lama' ? 'true' : 'false';
+                                $activate_pane_SAG_lama = $activate_tab === 'SAG_lama' ? 'active show' : '';
 
-                        @endphp
+                            @endphp
                             <a class="nav-item nav-link {{ $activate_tab_SAG_baru }}" id="nav-tawarruq-tab" data-toggle="tab" href="#nav-tawarruq" role="tab" aria-controls="nav-tawarruq" aria-selected="{{ $aria_selected_SAG_baru }}">SAG Baru</a>
-                            <a class="nav-item nav-link {{ $activate_tab_SAG_lama }}" id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="{{ $aria_selected_SAG_lama }}"><span id="textnavsag">SAG Lama</span></a>
+                            <a class="nav-item nav-link {{ $activate_tab_SAG_lama }}" " id="nav-xtawarruq-tab" data-toggle="tab" href="#nav-xtawarruq" role="tab" aria-controls="nav-xtawarruq" aria-selected="{{ $aria_selected_SAG_lama }}"><span id="textnavsag">SAG Lama</span></a>
                         </div>
                     </nav>
                     <div class="tab-content" id="navtawarruqdannottawarruq">
@@ -229,13 +236,16 @@
                                 <th>Jum Tuntut/Bayar</th>
                                 <th>Keuntungan</th>
                                 <th>Caj Lelong</th>
+                                <th>Status Tuntutan</th>
+                                <th>Cetak</th>
                             </tr>
                         </thead>
                     </table>
 
                     <div class="text-center">
+                        {{-- <button class="btn btn-primary" onclick="ubahfunc(this)" id="button-edit-gadaian">Ubah</button> --}}
+                        {{-- <button class="btn btn-primary" onclick="hapusfunc()">Hapus</button> --}}
                         <button class="btn btn-primary" onclick="histfunc()">Rekod Gadaian</button>
-                        {{-- <button class="btn btn-primary" onclick="saghilangfunc()">Surat Akuan Hilang</button> --}}
                     </div>
 
                 </div>
@@ -243,6 +253,7 @@
         </div>
     </div>
 </div>
+
 <!-- Modal -->
 <div class="modal fade" id="customer_detail" tabindex="-1" aria-labelledby="customer_detailLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered modal-xl">
@@ -286,7 +297,7 @@
                                     No Telefon 1
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] }}" class='form-control'>
+                                    <input type="text" readonly name='' id='telefon' value="{{ $customer_info['telefon'] ? $customer_info['telefon'] : '' }}" class='form-control'>
                                     <span id="errortelefon" style="color:red;"></span>
                                 </div>
                             </div>
@@ -295,7 +306,7 @@
                                     No Telefon 2
                                 </div>
                                 <div class='col-md-7'>
-                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] }}" class='form-control'>
+                                    <input type="text" readonly name='telefon2' id='telefon2' value="{{ $customer_info['telefon2'] ? $customer_info['telefon2'] : '' }}" class='form-control'>
                                     <span id="errortelefon2" style="color:red;"></span>
                                 </div>
                             </div>
@@ -332,7 +343,7 @@
                                     Alamat
                                 </div>
                                 <div class='col-md-8'>
-                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] }}</textarea>
+                                    <textarea style="resize:none" name="alamat" id="alamat" cols="30" rows="3" readonly class='form-control'>{{ $customer_info['alamat1'] ? $customer_info['alamat1'] : 'NIL' }}</textarea>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -340,7 +351,7 @@
                                     Poskod
                                 </div>
                                 <div class='col-md-8'>
-                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] }}" class='form-control'>
+                                    <input type="text" readonly name='poskod' id='poskod' value="{{ $customer_info['poskod'] ? $customer_info['poskod'] : 'NIL' }}" class='form-control'>
                                 </div>
                             </div>
                             <div class='form-group row col-md-12'>
@@ -434,41 +445,17 @@
 </div>
 
 <script>
+    var api_arrahnbid = "<?php echo config('app.api_arrahnbid') ?>";
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
-    var ppc = "{{ Auth::user()->name }}";
     var tagarrahnbid = "{{ $cawangan_info['tagarrahnbid'] }}";
-    var api_arrahnbid = "<?php echo config('app.api_arrahnbid') ?>";
 
 
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        // here is the new selected tab id
+        var selectedTabId = e.target.id;
 
-    //Pusher for AGH
-
-        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
-                            cluster: 'ap1',
-                            encrypted: true
-                        });
-
-        var channel = pusher.subscribe('notice-agh');
-        channel.bind('my-agh', function(data) {
-
-            if(data.kodcaw.toUpperCase() === kodcaw.toUpperCase() && data.pc.toUpperCase() === ppc.toUpperCase())
-            {
-                Swal.fire({
-                    icon: data.typeerror,
-                    title: data.message
-                }).then(function(){
-                    $('#AGHModal').hide();
-                    location.reload();
-                });
-            }
-
-        });
-
-
-    //End Pusher for AGH
-
-
+    });
 
     var tablegadai = $('#myTable').DataTable({
         "scrollX": false,
@@ -483,7 +470,7 @@
     });
 
     var tablelelong = $('#lelongTable').DataTable({
-        "scrollX": true
+        "scrollX": false
     });
 
     var historybayarandatatable = $('#tablehistorybayaran').DataTable({
@@ -498,209 +485,511 @@
         minimumFractionDigits: 2
     });
 
+    function checkCanChangeGadaianDetail(norujukan){
+        let gadai_tawarruq = fetch(api_url + '/api/gadai/norujukan/' + norujukan );
+
+        gadai_tawarruq
+            .then(response => response.json())
+            .then(response => response[0][0])
+            .then(gadaian => {
+               return gadaian.historygadaian;
+            })
+            .then(historygadaian => {
+                let button_edit_gadaian = document.querySelector('#button-edit-gadaian');
+
+                if(historygadaian === '0' || historygadaian === null || historygadaian.length === 0) {
+                    button_edit_gadaian.disabled = false;
+                    return;
+                }
+
+                button_edit_gadaian.disabled = true;
+            })
+    }
+
     function checkserah(data){
         var urlpenebusan = $(data).data("url");
         var norujukan = $(data).data("norujukan");
+        var pinjaman = $(data).data("pinjaman");
+        var hargajualan = $(data).data("hargajualan");
+
+        if(hargajualan == pinjaman){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Gadaian Mengalami Masalah Sila Hubungi IT'
+            });
+            return false;
+        }
         $.ajax({
             method:'get',
-            url: api_url + '/api/check/serah/gadai',
+            url: api_url + '/api/check/serah/lelong',
             datatype:'json',
             data:{
                 'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
                 'norujukan': norujukan
             },
             success:function(data){
-                if(data == 'true'){
-                    window.location = urlpenebusan;
-                }else if(data == 'false'){
+                if(data == 0){
+                    $.ajax({
+                        method:'get',
+                        url: api_url + '/api/polis/get',
+                        datatype:'json',
+                        data:{
+                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                            'norujukan': norujukan
+                        },
+                        success:function(data){
+
+                            var count = Object.keys(data).length;
+
+                            if(count > 0)
+                            {
+                                if(data[0].tebus === 0)
+                                {
+                                    const swalWithBootstrapButtons = Swal.mixin({
+                                        customClass: {
+                                            confirmButton: 'btn btn-success',
+                                            cancelButton: 'btn btn-danger mr-1'
+                                        },
+                                        buttonsStyling: false
+                                    });
+
+                                    swalWithBootstrapButtons.fire({
+                                        title: 'Dapatkan Pengesahan Khazanah',
+                                        text: "Surat Akuan Gadaian Hilang!",
+                                        icon: 'info',
+                                        showCancelButton: true,
+                                        confirmButtonText: 'Hantar',
+                                        cancelButtonText: 'Batal',
+                                        reverseButtons: true
+                                    }).then((result) => {
+                                        if (result.isConfirmed) {
+
+                                            // let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' +  "|" + '-';
+                                            let status = "Surat Akuan Gadaian Hilang";
+                                            let marg = 0;
+                                            let ber = 0;
+                                            let nm = 0;
+                                            let teller = "{{ Auth::user()->name }}";
+
+                                            Swal.fire({
+                                                title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                                icon: 'info',
+                                                width: 600,
+                                                padding: '3em',
+                                                background: '#fffff',
+                                                showCancelButton: false,
+                                                showConfirmButton: false,
+                                                allowOutsideClick: false,
+                                                allowEscapeKey: false,
+                                                allowEnterKey: false
+                                            })
+                                            let siricreated = 0;
+                                            $.ajax({
+                                                method:'post',
+                                                url: "{{ route('khazanah.createkelulusan') }}",
+                                                data: {
+                                                    "_token": "{{ csrf_token() }}",
+                                                    "norujukan" : norujukan,
+                                                    "komen" : '',
+                                                    "margin" : marg,
+                                                    "berat" : ber,
+                                                    "nilaimarhun" : nm,
+                                                    "status" : status,
+                                                    "jumpinjam" : '0.00',
+                                                    "teller" : teller
+                                                },
+                                                success:function(data){
+                                                    siricreated = data;
+                                                },
+                                                error: function(xhr, status, error) {
+                                                    var err = eval("(" + xhr.responseText + ")");
+                                                    alert(xhr.responseText);
+                                                }
+                                            });
+
+                                            var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                                cluster: 'ap1',
+                                                                encrypted: true
+                                                            });
+
+                                            var channel = pusher.subscribe('notice-kelulusan');
+                                            channel.bind('my-kelulusan', function(data) {
+
+
+                                                if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
+                                                {
+                                                    if(data.kelulusan == 'lulus')
+                                                    {
+                                                        Swal.fire({
+                                                            icon: 'success',
+                                                            title: 'Telah Disahkan'
+                                                        }).then(function(){
+                                                            $.ajax({
+                                                                method:'put',
+                                                                url: api_url + '/api/polis/put/',
+                                                                data: {
+                                                                    'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                                                    'norujukan': norujukan,
+                                                                    'tebus' : 1
+                                                                },
+                                                                success:function(data){
+                                                                    location.reload();
+
+                                                                },
+                                                                error: function(xhr, status, error) {
+                                                                    var err = eval("(" + xhr.responseText + ")");
+                                                                    alert(xhr.responseText);
+                                                                }
+                                                            });
+                                                        });
+
+                                                    }
+                                                    else if(data.kelulusan == 'batal')
+                                                    {
+                                                        Swal.fire({
+                                                            icon: 'warning',
+                                                            title: 'Telah Dibatalkan',
+                                                            text: `Komen : ${data.komen}`
+                                                        }).then(function(){
+                                                            return false;
+                                                        });
+                                                    }
+                                                }
+
+                                            });
+
+
+                                        }
+                                        else if (result.dismiss === Swal.DismissReason.cancel) {
+                                            swalWithBootstrapButtons.fire(
+                                                'Gagal',
+                                                'Gagal mendapatkan kelulusan khazanah',
+                                                'error'
+                                            )
+                                        }
+                                    });
+                                }
+                                else
+                                {
+                                    $.ajax({
+                                        method:'get',
+                                        url: api_url + '/api/check/serah/gadai',
+                                        datatype:'json',
+                                        data:{
+                                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                            'norujukan': norujukan
+                                        },
+                                        success:function(data){
+                                            if(data == 'true'){
+                                                window.location = urlpenebusan;
+                                            }else if(data == 'false'){
+                                                Swal.fire({
+                                                    icon: 'error',
+                                                    title: 'Amaran',
+                                                    text: 'Gadaian Belum Scan Barcode'
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+                            }else{
+                                $.ajax({
+                                    method:'get',
+                                    url: api_url + '/api/check/serah/gadai',
+                                    datatype:'json',
+                                    data:{
+                                        'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                        'norujukan': norujukan
+                                    },
+                                    success:function(data){
+                                        if(data == 'true'){
+                                            window.location = urlpenebusan;
+                                        }else if(data == 'false'){
+                                            Swal.fire({
+                                                icon: 'error',
+                                                title: 'Amaran',
+                                                text: 'Gadaian Belum Scan Barcode'
+                                            });
+                                        }
+                                    }
+                                });
+                            }
+                        }
+                    });
+                }else if(data == 1){
                     Swal.fire({
                         icon: 'error',
                         title: 'Amaran',
-                        text: 'Gadaian Belum Scan Barcode'
+                        text: 'Gadaian Sedang Dilelong..'
                     });
                 }
             }
         });
+
     }
 
     function gadaiTable(data,jenistebus){
 
-var counter = 1;
-tablegadai.clear().draw();
-tabledahtebus.clear().draw();
-tablelelong.clear().draw();
-xtawarruq.clear().draw();
-$.each(data,function(index,gadai_detail){
-    let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
-    $.ajax({
-        method:'get',
-        url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
-        data: {
-            'jeniskeuntungan' : jeniskeuntungan
-        },
-        success:function(upahsemasa){
-            if(jenistebus == "belum_tebus"){
-                var urlroute = '{{ route("penebusan", ":id") }}';
-                urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+        var counter = 1;
+        tablegadai.clear().draw();
+        tabledahtebus.clear().draw();
+        tablelelong.clear().draw();
+        xtawarruq.clear().draw();
+        $.each(data,function(index,gadai_detail){
+            let jeniskeuntungan = (gadai_detail['tagbaru'] == 1) ? 'onepercent' : 'asal';
+            $.ajax({
+                method:'get',
+                url:api_url + '/api/upahtawarruq/'+ gadai_detail['kodcaw'] +'/' + gadai_detail['norujukan'],
+                data: {
+                    'jeniskeuntungan' : jeniskeuntungan
+                },
+                success:function(upahsemasa){
+                    if(jenistebus == "belum_tebus"){
+                        var urlroute = '{{ route("penebusan", ":id") }}';
+                        urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
 
-                if(gadai_detail['lelong_tawarruq'] == 0){
-                    var tarikh_matang = gadai_detail['t_matang1'];
-                }else{
-                    var tarikh_matang = gadai_detail['t_matang'];
-                }
+                        if(gadai_detail['lelong_tawarruq'] == 0){
+                            var tarikh_matang = gadai_detail['t_matang1'];
+                        }else{
+                            var tarikh_matang = gadai_detail['t_matang'];
+                        }
 
-                if(gadai_detail["tagbaru"] == 0){
-                    $('#textnavsag').addClass('text-danger');
-                    if(gadai_detail['taglel'] == 1){
-                        var taglel = '<b class="text-danger">Akan Dilelong</b>';
-                    }else{
-                        var taglel = '';
-                    }
+                        if(gadai_detail["tagbaru"] == 0){
+                            $('#textnavsag').addClass('text-danger');
+                            if(gadai_detail['taglel'] == 1){
+                                var taglel = '<b class="text-danger">Akan Dilelong</b>';
+                            }else{
+                                var taglel = '';
+                            }
 
-                    let table_norujukan = gadai_detail["norujukan"];
-                    let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
 
-                    if(gadai_detail["percentpinj"] != 0)
-                    xtawarruq.row.add([
-                        '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
-                        '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_gadai'],
-                        tarikh_matang,
-                        'RM '+ formatter.format(gadai_detail['bakihargajualan']),
-                        'RM '+formatter.format(gadai_detail['bakipjm']),
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        gadai_detail['tempoh'],
-                        'RM '+ upahsemasa,
-                        '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
-                    ]).draw();
-                }else{
-                    var taglel = '';
-                    if(gadai_detail['taglel'] == 1){
-                        if(tagarrahnbid == 1){
-                            $.ajax({
-                                method:"GET",
-                                async:false,
-                                url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
+                            if(gadai_detail["percentpinj"] != 0)
+                            xtawarruq.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_gadai'],
+                                tarikh_matang,
+                                'RM '+ formatter.format(gadai_detail['bakihargajualan']),
+                                'RM '+formatter.format(gadai_detail['bakipjm']),
+                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                                gadai_detail['tempoh'],
+                                'RM '+ upahsemasa,
+                                '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
+                            ]).draw();
+                        }else{
+                            var taglel = '';
+                            if(gadai_detail['taglel'] == 1){
+                                if(tagarrahnbid == 1){
+                                    $.ajax({
+                                        method:"GET",
+                                        async:false,
+                                        url:api_arrahnbid + 'portalApi?norujukan=' + gadai_detail['norujukan'],
 
-                                success: function(data){
-                                    taglel = data.lelong.t_lelong;
+                                        success: function(data){
+                                            taglel = data.lelong.t_lelong;
+                                        }
+                                    });
+                                } else {
+                                    $.ajax({
+                                        method:"GET",
+                                        async:false,
+                                        url:api_url + '/api/check/taglelong',
+                                        data: {
+                                            'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
+                                            'norujukan': gadai_detail['norujukan'],
+                                        },
+                                        success: function(v){
+                                            taglel = v.t_lelong;
+                                        }
+                                    });
                                 }
-                            });
-                        } else {
-                            $.ajax({
-                                method:"GET",
-                                async:false,
-                                url:api_url + '/api/check/taglelong',
-                                data: {
-                                    'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
-                                    'norujukan': gadai_detail['norujukan'],
-                                },
-                                success: function(v){
-                                    taglel = v.t_lelong;
+                            }
+
+                            let table_norujukan = gadai_detail["norujukan"];
+                            let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
+                            tablegadai.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
+                                '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_gadai'],
+                                tarikh_matang,
+                                'RM '+ formatter.format(gadai_detail['bakihargajualan']),
+                                'RM '+formatter.format(gadai_detail['bakipjm']),
+                                (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                                gadai_detail['tempoh'],
+                                'RM '+ upahsemasa['pendapatan'],
+                                '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
+                            ]).draw();
+                        }
+                    }else if(jenistebus == "sudah_tebus"){
+
+                        tabledahtebus.row.add([
+                                '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
+                            gadai_detail['norujukan'],
+                            gadai_detail['t_update'],
+                            'RM '+formatter.format(gadai_detail['bakipjm']),
+                            (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
+                            gadai_detail['tempoh']
+                        ]).draw();
+                    }else if(jenistebus == "lelong"){
+                        var urlroute = '{{ route("lelongan", ":id") }}';
+                        urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+
+                        var tuntutan = 'Pelanggan';
+
+                        $.ajax({
+                            method:"GET",
+                            async:false,
+                            url: api_url + "/api/check/customer/",
+                            data:{
+                                "norujukan" : gadai_detail['norujukan'],
+                                "kodcaw" : kodcaw
+                            },
+                            success: function(response){
+                                if(response[0].teller == 'DM')
+                                {
+                                    tuntutan = 'WTD';
                                 }
-                            });
+                            }
+                        });
+
+                        if(gadai_detail['trkhtuntut'] == null){
+                            tablelelong.row.add([
+                                counter,
+                                '<a data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_lelong'],
+                                gadai_detail['trkhtuntut'],
+                                'RM '+ formatter.format(gadai_detail['pinjaman']),
+                                'RM '+formatter.format(gadai_detail['hargajual']),
+                                'RM '+formatter.format(gadai_detail['baki']),
+                                'RM '+formatter.format(gadai_detail['bakiupah']),
+                                'RM '+formatter.format(gadai_detail['cajlelong']),
+                                '',
+                                '<button class="btn btn-info" disabled>Cetak</button>'
+                            ]).draw();
+                        }else{
+                            tablelelong.row.add([
+                                counter,
+                                '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
+                                gadai_detail['t_lelong'],
+                                gadai_detail['trkhtuntut'],
+                                'RM '+ formatter.format(gadai_detail['pinjaman']),
+                                'RM '+formatter.format(gadai_detail['hargajual']),
+                                'RM '+formatter.format(gadai_detail['baki']),
+                                'RM '+formatter.format(gadai_detail['bakiupah']),
+                                'RM '+formatter.format(gadai_detail['cajlelong']),
+                                tuntutan,
+                                '<button class="btn btn-info" onclick="cetaktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] +'>Cetak</button>'
+                            ]).draw();
                         }
                     }
-
-                    let table_norujukan = gadai_detail["norujukan"];
-                    let radio_action = "onclick=checkCanChangeGadaianDetail(" + "'" + table_norujukan + "'" + ")";
-                    tablegadai.row.add([
-                        '<input type="radio" value='+ gadai_detail["norujukan"] + ' ' + radio_action +' name="belum"/>',
-                        '<a data-pinjaman='+ gadai_detail['pinjaman'] +' data-hargajualan='+ gadai_detail['hargajualan'] +' data-norujukan='+ gadai_detail['norujukan'] +' data-url=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_gadai'],
-                        tarikh_matang,
-                        'RM '+ formatter.format(gadai_detail['bakihargajualan']),
-                        'RM '+formatter.format(gadai_detail['bakipjm']),
-                        (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                        gadai_detail['tempoh'],
-                        'RM '+ upahsemasa['pendapatan'],
-                        '<div style="white-space: nowrap; color:red; font-weight: bolder">' + taglel + '</div>',
-                    ]).draw();
+                    counter = counter + 1;
                 }
-            }else if(jenistebus == "sudah_tebus"){
+            });
+        });
+    }
 
-                tabledahtebus.row.add([
-                        '<input type="radio" value='+ gadai_detail["norujukan"] +' name="sudahtebus"/>',
-                    gadai_detail['norujukan'],
-                    gadai_detail['t_update'],
-                    'RM '+formatter.format(gadai_detail['bakipjm']),
-                    (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
-                    gadai_detail['tempoh']
-                ]).draw();
-            }else if(jenistebus == "lelong"){
-                var urlroute = '{{ route("lelongan", ":id") }}';
-                urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
+    function cetaktuntutbaki(e)
+    {
+        let norujukan = $(e).data('norujukan');
 
-                var tuntutan = 'Pelanggan';
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success ml-1',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
+
+        swalWithBootstrapButtons.fire({
+        title: 'Dapatkan Pengesahan PC/PPC',
+        text: "Kelulusan Ulang Cetak Tuntut Baki Lelong",
+        icon: 'info',
+        showCancelButton: true,
+        confirmButtonText: 'Hantar',
+        cancelButtonText: 'Batal',
+        reverseButtons: true
+        }).then((result) => {
+            if(result.isConfirmed) {
+                Swal.fire({
+                    title: 'Tunggu Pengesahan Daripada PC/PPC.',
+                    icon: 'info',
+                    width: 600,
+                    padding: '3em',
+                    background: '#fffff',
+                    showCancelButton: false,
+                    showConfirmButton: false,
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
+                    allowEnterKey: false
+                })
+
+                let mohon = "Ulang Cetak Tuntut Baki";
 
                 $.ajax({
-                    method:"GET",
-                    async:false,
-                    url: api_url + "/api/check/customer/",
-                    data:{
-                        "norujukan" : gadai_detail['norujukan'],
-                        "kodcaw" : kodcaw
+                    method:'post',
+                    url: '{{ route("teller.createkelulusan") }}',
+                    data: {
+                        "_token": "{{ csrf_token() }}",
+                        "norujukan" : norujukan,
+                        "mohon" : mohon
                     },
-                    success: function(response){
-                        if(response[0].teller == 'DM')
-                        {
-                            tuntutan = 'WTD';
-                        }
+                    success:function(data){
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
                     }
                 });
 
-                if(gadai_detail['trkhtuntut'] == null){
-                    tablelelong.row.add([
-                        counter,
-                        '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_lelong'],
-                        gadai_detail['trkhtuntut'],
-                        'RM '+ formatter.format(gadai_detail['pinjaman']),
-                        'RM '+formatter.format(gadai_detail['hargajual']),
-                        'RM '+formatter.format(gadai_detail['baki']),
-                        'RM '+formatter.format(gadai_detail['bakiupah']),
-                        'RM '+formatter.format(gadai_detail['cajlelong']),
-                        '',
-                        '<button class="btn btn-info" disabled>Cetak</button>'
-                    ]).draw();
-                }else{
-                    tablelelong.row.add([
-                        counter,
-                        '<a href="#" onclick="checktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] + ' data-tarikhtuntut=' + gadai_detail['trkhtuntut'] + '>' + gadai_detail['norujukan'] + '</a>',
-                        gadai_detail['t_lelong'],
-                        gadai_detail['trkhtuntut'],
-                        'RM '+ formatter.format(gadai_detail['pinjaman']),
-                        'RM '+formatter.format(gadai_detail['hargajual']),
-                        'RM '+formatter.format(gadai_detail['baki']),
-                        'RM '+formatter.format(gadai_detail['bakiupah']),
-                        'RM '+formatter.format(gadai_detail['cajlelong']),
-                        tuntutan,
-                        '<button class="btn btn-info" onclick="cetaktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] +'>Cetak</button>'
-                    ]).draw();
-                }
+                let teller = "{{ Auth::user()->name }}";
+
+                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                });
+
+                var channel = pusher.subscribe('notice-ubahhapus');
+                channel.bind('my-ubahhapus', function(data) {
+
+                    if(data.norujukan == norujukan && data.teller == teller)
+                    {
+                        if(data.kelulusan == 'lulus')
+                        {
+                            Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                            }).then(function(){
+                                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                                urlroute = urlroute.replace(':id', norujukan);
+                                window.open(urlroute, '_blank');
+                            });
+
+                        }
+                        else if(data.kelulusan == 'batal')
+                        {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Telah Dibatalkan',
+                                text: `Komen : ${data.komen}`
+                            }).then(function(){
+                                location.reload();
+                                return false;
+                            });
+                        }
+                    }
+                });
+            }else if (result.dismiss === Swal.DismissReason.cancel){
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                    'error'
+                )
             }
-            counter = counter + 1;
-        }
-    });
-});
-}
-
-    function checkAGH()
-    {
-        $('#AGHModalEdit').modal('hide');
-        var daerahagh = $('#daerahagh').val();
-
-        if(daerahagh == 'No-Data')
-        {
-            $('#errordaerah').addClass('visible');
-            $('#errordaerah').removeClass('invisible');
-            return false;
-        }else{
-            $('#errordaerah').addClass('invisible');
-            $('#errordaerah').removeClass('visible');
-            return true;
-        }
 
+        });
+        return;
     }
 
     function checktuntutbaki(e)
@@ -708,12 +997,121 @@ $.each(data,function(index,gadai_detail){
         let tarikhtuntut = $(e).data('tarikhtuntut');
         let norujukan = $(e).data('norujukan');
 
-        var urlroute = '{{ route("lelongan.khazanah", ":id") }}';
+        var urlroute = '{{ route("lelongan", ":id") }}';
         urlroute = urlroute.replace(':id', norujukan);
 
         if (tarikhtuntut == null)
         {
-            window.location.href = urlroute;
+            $.ajax({
+                method: 'GET',
+                url : api_url + '/api/check/wtd',
+                data:{
+                    'norujukan' : norujukan
+                },
+                success:function(data){
+                    if(data == 'yes'){
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Amaran',
+                            text: 'Lelongan dalam process WTD'
+                        });
+                    }else{
+
+                        const swalWithBootstrapButtons = Swal.mixin({
+                            customClass: {
+                                confirmButton: 'btn btn-success ml-1',
+                                cancelButton: 'btn btn-danger'
+                            },
+                            buttonsStyling: false
+                        });
+
+                        swalWithBootstrapButtons.fire({
+                        title: 'Dapatkan Pengesahan PC/PPC',
+                        text: "Kelulusan Tuntut Baki Lelong",
+                        icon: 'info',
+                        showCancelButton: true,
+                        confirmButtonText: 'Hantar',
+                        cancelButtonText: 'Batal',
+                        reverseButtons: true
+                        }).then((result) => {
+                            if(result.isConfirmed) {
+                                Swal.fire({
+                                    title: 'Tunggu Pengesahan Daripada PC/PPC.',
+                                    icon: 'info',
+                                    width: 600,
+                                    padding: '3em',
+                                    background: '#fffff',
+                                    showCancelButton: false,
+                                    showConfirmButton: false,
+                                    allowOutsideClick: false,
+                                    allowEscapeKey: false,
+                                    allowEnterKey: false
+                                })
+
+                                let mohon = "Tuntut Baki";
+
+                                $.ajax({
+                                    method:'post',
+                                    url: '{{ route("teller.createkelulusan") }}',
+                                    data: {
+                                        "_token": "{{ csrf_token() }}",
+                                        "norujukan" : norujukan,
+                                        "mohon" : mohon
+                                    },
+                                    success:function(data){
+                                    },error: function(xhr, status, error) {
+                                        var err = eval("(" + xhr.responseText + ")");
+                                        alert(xhr.responseText);
+                                    }
+                                });
+
+                                let teller = "{{ Auth::user()->name }}";
+
+                                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                        cluster: 'ap1',
+                                                        encrypted: true
+                                });
+
+                                var channel = pusher.subscribe('notice-ubahhapus');
+                                channel.bind('my-ubahhapus', function(data) {
+
+                                    if(data.norujukan == norujukan && data.teller == teller)
+                                    {
+                                        if(data.kelulusan == 'lulus')
+                                        {
+                                            Swal.fire({
+                                                    icon: 'success',
+                                                    title: 'Telah Disahkan'
+                                            }).then(function(){
+                                                window.location.href = urlroute;
+                                            });
+                                        }
+                                        else if(data.kelulusan == 'batal')
+                                        {
+                                            Swal.fire({
+                                                icon: 'warning',
+                                                title: 'Telah Dibatalkan',
+                                                text: `Komen : ${data.komen}`
+                                            }).then(function(){
+                                                location.reload();
+                                                return false;
+                                            });
+                                        }
+                                    }
+                                });
+                            }else if (result.dismiss === Swal.DismissReason.cancel){
+                                swalWithBootstrapButtons.fire(
+                                    'Batal',
+                                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                                    'error'
+                                )
+                            }
+
+                        });
+
+                    }
+                }
+            });
         }else{
             Swal.fire({
                 icon: 'error',
@@ -726,6 +1124,7 @@ $.each(data,function(index,gadai_detail){
     }
 
 
+
     $(document).ready( function () {
 
         $('#myTable').parents('div.dataTables_wrapper').first().hide();
@@ -745,7 +1144,7 @@ $.each(data,function(index,gadai_detail){
         });
 
         $('#myTable td').click( function () {
-            alert('dasdsa');
+            // alert('dasdsa');
         });
 
         $("input[name='options']").click(function(){
@@ -763,33 +1162,56 @@ $.each(data,function(index,gadai_detail){
                     text: 'Sila pilih salah satu SAG'
                 });
             }else{
+
+                Swal.fire({
+                    title: 'Memuatkan...',
+                    allowEscapeKey : false,
+                    allowOutsideClick: false,
+                    didOpen: function () {
+                        Swal.showLoading()
+                    }
+                });
+
                 $.ajax({
                     method:'get',
-                    url:'{{ route("gadai.history.khazanah") }}',
+                    url:'{{ route("arcc.history") }}',
                     data:{ "norujukan" : histid},
                     success:function(data)
                     {
-                        $('#historytebusModal').modal();
+
                         historytebustable(data);
+                        $.ajax({
+                            method: 'get',
+                            url: api_url + '/api/transaction/' + histid,
+                            success: function(data){
+                                historybayarantable(data);
+
+                                $.ajax({
+                                    method:'get',
+                                    url: api_url + '/api/gadai/norujukan/'+histid,
+                                    success:function(gadai){
+                                        rekodasal(gadai);
+
+                                        $.ajax({
+                                            method:'get',
+                                            url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                                            success:function(ansuran){
+                                                rekodansuran(ansuran);
+
+                                                Swal.close();
+                                                $('#historytebusModal').modal();
+                                            }
+                                        });
+                                    }
+                                });
+
+                            }
+                        });
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
                         alert(xhr.responseText);
                     }
                 });
-                $.ajax({
-                    method: 'get',
-                    url: api_url + '/api/transaction/' + histid,
-                    success: function(data){
-                        historybayarantable(data);
-                    }
-                });
-                $.ajax({
-                    method:'get',
-                    url: api_url + '/api/gadai/norujukan/'+histid,
-                    success:function(gadai){
-                        rekodasal(gadai);
-                    }
-                });
             }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
             let histid = $('input[name="sudahtebus"]:checked').val();
@@ -801,123 +1223,47 @@ $.each(data,function(index,gadai_detail){
                     text: 'Sila pilih salah satu SAG'
                 });
             }else{
+
+                Swal.fire({
+                    title: 'Memuatkan...',
+                    allowEscapeKey : false,
+                    allowOutsideClick: false,
+                    didOpen: function () {
+                        Swal.showLoading()
+                    }
+                });
+
                 $.ajax({
                     method:'get',
-                    url:'{{ route("gadai.history.khazanah") }}',
-                    datatype:'json',
+                    url:'{{ route("arcc.history") }}',
                     data:{ "norujukan" : histid},
                     success:function(data){
-                        $('#historytebusModal').modal();
                         historytebustable(data);
-                    },error: function(xhr, status, error) {
-                        var err = eval("(" + xhr.responseText + ")");
-                        alert(xhr.responseText);
-                    }
-                });
-                $.ajax({
-                    method: 'get',
-                    url: api_url + '/api/transaction/' + histid,
-                    success: function(data){
-                        historybayarantable(data);
-                    }
-                });
-                $.ajax({
-                    method:'get',
-                    url:api_url + '/api/gadai/norujukan/'+histid,
-                    success:function(gadai){
-                        rekodasal(gadai);
-                    }
-                });
-            }
-        }
-    }
 
-    function ulangcetakagh(e)
-    {
-        var kodnegeri = $(e).data('kodnegeri');
-        var koddaerah = $(e).data('koddaerah');
-        var noruj = $(e).data('histid');
-
-        if(kodnegeri !== null && koddaerah !== null && kodnegeri !== '' && koddaerah !== '')
-        {
-            if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
-
-                let histid = '';
-                if($("input[name='options']:checked").val() == 'belum_tebus'){
-                    histid = $('input[name="belum"]:checked').val();
-                }
-                else{
-                    histid = $('input[name="lelong"]:checked').val();
-                }
-
-                if(histid == null){
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Amaran',
-                        text: 'Sila pilih salah satu SAG'
-                    });
-                }else{
-                    let urlroute = '{{ route("agh.ulangcetak", ":id") }}';
-                    urlroute = urlroute.replace(':id', histid);
-                    window.open(urlroute, '_blank');
-                    swal.close();
-                }
-            }
-        }else{
-            $('#AGHModalEdit').modal('show');
-            $('#norujukanhiddenedit').val(noruj);
-            swal.close();
-        }
-
-        return;
-    }
-
-    function saghilangfunc()
-    {
-        if($("input[name='options']:checked").val() == 'belum_tebus' || $("input[name='options']:checked").val() == 'lelong'){
-
-            let histid = '';
-            if($("input[name='options']:checked").val() == 'belum_tebus'){
-                histid = $('input[name="belum"]:checked').val();
-            }
-            else{
-                histid = $('input[name="lelong"]:checked').val();
-            }
-
-            if(histid == null){
-                Swal.fire({
-                    icon: 'error',
-                    title: 'Amaran',
-                    text: 'Sila pilih salah satu SAG'
-                });
-            }else{
-                $.ajax({
-                    method:'get',
-                    url: api_url + '/api/polis/get',
-                    data:{ "norujukan" : histid,"kodcaw" : kodcaw},
-                    success:function(data)
-                    {
-
-                        var count = Object.keys(data).length;
-                        console.log(histid);
-                        if(count > 0)
-                        {
-                            Swal.fire({
-                                allowOutsideClick: false,
-                                allowEscapeKey: false,
-                                allowEnterKey: false,
-                                showConfirmButton: false,
-                                html:   "<br>" +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary mr-1" onclick="swal.close()">' + 'Okay' + '</button>' +
-                                        '<button type="button" role="button" tabindex="0" class="btn btn-primary" data-histid="' + histid + '" onclick="ulangcetakagh(this)" data-koddaerah="' + data[0].koddaerah + '" data-kodnegeri="' + data[0].kodnegeri + '">' + 'Ulang Cetak' + '</button>',
-                                icon: 'error',
-                                title: 'Surat Akuan Gadaian Hilang telah dikeluarkan!'
-                            });
-                        }else{
-                            $('#AGHModal').modal('show');
-                            $('#norujukanhidden').val(histid);
-                        }
+                        $.ajax({
+                            method: 'get',
+                            url: api_url + '/api/transaction/' + histid,
+                            success: function(data){
+                                historybayarantable(data);
+                            }
+                        });
+                        $.ajax({
+                            method:'get',
+                            url:api_url + '/api/gadai/norujukan/'+histid,
+                            success:function(gadai){
+                                rekodasal(gadai);
+                            }
+                        });
+                        $.ajax({
+                            method:'get',
+                            url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
+                            success:function(ansuran){
+                                rekodansuran(ansuran);
+                            }
+                        });
 
+                        $('#historytebusModal').modal();
+                        Swal.close();
 
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
@@ -925,88 +1271,32 @@ $.each(data,function(index,gadai_detail){
                     }
                 });
             }
-        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
-            let histid = $('input[name="sudahtebus"]:checked').val();
-
-            Swal.fire({
-                icon: 'error',
-                title: 'Amaran',
-                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-            });
         }
-
-
-//        }else if($("input[name='options']:checked").val() == 'lelong'){
-//            let histid = $('input[name="sudahtebus"]:checked').val();
-//
-//            Swal.fire({
-//                icon: 'error',
-//                title: 'Amaran',
-//                text: 'Cetakan Surat Akuan Hilang tidak dibenarkan'
-//            });
-//
-//        }
-
     }
 
-    $('#negeriagh').change(function(){
-
-        var daerahselect = document.getElementById("daerahagh");
-
-        $('#daerahagh').attr('disabled', false);
-        $(daerahagh).empty();
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/daerahkodnegeri/' + this.value,
-            success:function(data){
-                $.each(data, function( index, daerah ){
-                    addOption(daerah.koddaerah,daerah.namadaerah);
-                });
-            }
-        });
-
-    });
-
-    $('#negeriaghedit').change(function(){
-
-        var daerahselect = document.getElementById("daerahaghedit");
-
-        $('#daerahaghedit').attr('disabled', false);
-        $(daerahagh).empty();
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/daerahkodnegeri/' + this.value,
-            success:function(data){
-                $.each(data, function( index, daerah ){
-                    addOptionEdit(daerah.koddaerah,daerah.namadaerah);
-                });
-            }
-        });
-
-    });
-
-    function addOption(textopt,valueopt) {
-
-        optionText = textopt;
-        optionValue = valueopt;
-
-        $('#daerahagh').append(`<option value='${optionText}'>${optionValue}</option>`);
-    }
-
-    function addOptionEdit(textopt,valueopt) {
-
-        optionText = textopt;
-        optionValue = valueopt;
-
-        $('#daerahaghedit').append(`<option value='${optionText}'>${optionValue}</option>`);
-    }
-
-
-
     function rekodasal(gadaian){
         $('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan']));
         $('#pembiayaanmodal').text('RM ' + formatter.format(gadaian[0][0]['pinjaman']));
         $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun']));
+        $('#marhunmodal').text(gadaian[0][0]['marhun']);
+    }
+
+    function rekodansuran(data){
+        var counter = 1;
+
+        bayaranupah.clear().draw();
+        $.each(data,function(index,bayaran){
+
+            var urlroute = '{{ route("resit.advansur", ":id") }}';
+            urlroute = urlroute.replace(':id', bayaran['norujukan']);
+            bayaranupah.row.add([
+                    counter,
+                    bayaran['tarikh'],
+                    "RM " + bayaran['upahDibayar'],
+                    ''
+                ]).draw();
+                counter = counter + 1;
+        });
     }
 
     function historybayarantable(data){
@@ -1015,13 +1305,13 @@ $.each(data,function(index,gadai_detail){
         historybayarandatatable.clear().draw();
         $.each(data,function(index,bayaran){
 
-            var urlroute = '{{ route("resit.khazanah.ansuran", ":id") }}';
+            var urlroute = '{{ route("resit.ansuran", ":id") }}';
             urlroute = urlroute.replace(':id', bayaran['id']);
             historybayarandatatable.row.add([
                     counter,
                     bayaran['created_at'],
                     "RM " + bayaran['duit_masuk'],
-                    '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                    ''
                 ]).draw();
                 counter = counter + 1;
         });
@@ -1040,28 +1330,28 @@ $.each(data,function(index,gadai_detail){
 
             switch(tebusaz['jenistebus']) {
                 case 'P':
-                    var urlroute = '{{ route("resit.khazanah.tambahpinjam", ":id") }}';
+                    var urlroute = '{{ route("resit.tambahpinjam", ":id") }}';
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'T':
 
                     if(tebusaz['hargajualan'] === '')
                     {
-                        var urlroute = '{{ route("resit.khazanah.belumtebus", ":id") }}';
+                        var urlroute = '{{ route("resit.belumtebus", ":id") }}';
                         urlroute = urlroute.replace(':id', tebusaz['norujukan']);
 
                     }else{
-                        var urlroute = '{{ route("resit.khazanah.tebus", ":id") }}';
+                        var urlroute = '{{ route("resit.tebus", ":id") }}';
                         urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     }
 
                     break;
                 case 'A':
-                    var urlroute = '{{ route("resit.khazanah.belumansurans", ":id") }}';
+                    var urlroute = '{{ route("resit.belumansurans", ":id") }}';
                     urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                     break;
                 case 'S':
-                var urlroute = '{{ route("resit.khazanah.tebusseparuh", ":id") }}';
+                var urlroute = '{{ route("resit.tebusseparuh", ":id") }}';
                 urlroute = urlroute.replace(':id', tebusaz['norujukan']);
                 break;
                 }
@@ -1073,7 +1363,7 @@ $.each(data,function(index,gadai_detail){
                 tebusaz['pinjaman'],
                 tebusaz['jbg'],
                 tebusaz['t_tebus'],
-                '<a class="btn btn-info" target="_blank" href='+ urlroute +'>Cetak</a>'
+                ''
             ]).draw();
             counter = counter + 1;
         });
@@ -1206,34 +1496,730 @@ $.each(data,function(index,gadai_detail){
     }
 
 
-    $('#poskod').change(function(){
-        var poskod = this.value;
-        console.log(poskod);
-        $.ajax({
-            method:'GET',
-            url:api_url+'/api/poskod/'+poskod,
-            success:function(poskod_detail){
-                var koddaerah = poskod_detail['koddaerah'];
-                var kodnegeri = poskod_detail['kodnegeri'];
-                $.ajax({
-                    url:api_url+'/api/negeri/'+kodnegeri,
-                    method:'GET',
-                    success:function(negeri){
-                        console.log(negeri);
-                        $('#kodnegeri').val(negeri['negeri']);
-                    }
+    function ubahfunc(e){
+
+        let ubahid = $('input[name="belum"]:checked').val();
+        let harini = new Date();harini.setHours(0, 0, 0, 0);
+
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
+            if(+harini !== +tarikhgadai2){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Ubah Gadai Tidak Dibenarkan'
                 });
-                $.ajax({
-                    url:api_url+'/api/daerah/'+koddaerah,
-                    method:'GET',
-                    success:function(daerah){
-                        $('#koddaerah').val(daerah['namadaerah']);
-                    }
+                return false;
+            }
+        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+
+            let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
+
+            if(+harini !== +tarikhgadai1){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Ubah Gadai Tidak Dibenarkan'
                 });
+                return false;
+            }
+        }
+
+        if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+
+            return false;
+        }
+
+        if($("input[name='options']:checked").val() == 'sudah_tebus'){
+
+                const swalWithBootstrapButtons = Swal.mixin({
+                    customClass: {
+                        confirmButton: 'btn btn-success ml-1',
+                        cancelButton: 'btn btn-danger'
+                    },
+                    buttonsStyling: false
+                });
+
+                swalWithBootstrapButtons.fire({
+                title: 'Dapatkan Pengesahan Khazanah',
+                text: "Ubah Maklumat Wakil",
+                icon: 'info',
+                showCancelButton: true,
+                confirmButtonText: 'Hantar',
+                cancelButtonText: 'Batal',
+                reverseButtons: true
+                }).then((result) => {
+                    if (result.isConfirmed) {
+
+                        Swal.fire({
+                            title: 'Tunggu Pengesahan Daripada Khazanah.',
+                            icon: 'info',
+                            width: 600,
+                            padding: '3em',
+                            background: '#fffff',
+                            showCancelButton: false,
+                            showConfirmButton: false,
+                            allowOutsideClick: false,
+                            allowEscapeKey: false,
+                            allowEnterKey: false
+                        })
+
+                        let mohon = "Ubah Wakil";
+                        let norujukan = $('input[name="sudahtebus"]:checked').val();
+
+                        $.ajax({
+                            method:'post',
+                            url: '{{ route("teller.createkelulusan") }}',
+                            data: {
+                                "_token": "{{ csrf_token() }}",
+                                "norujukan" : norujukan,
+                                "mohon" : mohon
+                            },
+                            success:function(data){
+
+                            },error: function(xhr, status, error) {
+                                var err = eval("(" + xhr.responseText + ")");
+                                alert(xhr.responseText);
+                            }
+                        });
+
+
+                        var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                        let teller = "{{ Auth::user()->name }}";
+
+                        var channel = pusher.subscribe('notice-ubahhapus');
+                        channel.bind('my-ubahhapus', function(data) {
+
+                            if(data.norujukan == norujukan && data.teller == teller)
+                            {
+                                if(data.kelulusan == 'lulus')
+                                {
+                                    Swal.fire({
+                                        icon: 'success',
+                                        title: 'Telah Disahkan'
+                                    }).then(async function(){
+
+                                        const { value: amaun } = await Swal.fire({
+                                        title: 'Kad Pengenalan Wakil',
+                                        input: 'text',
+                                        inputPlaceholder: 'Kad Pengenalan',
+                                        confirmButtonText: 'Terima',
+                                        showCancelButton:true,
+                                        cancelButtonText:'Batal',
+                                        allowOutsideClick: true,
+                                        inputValidator: (value) => {
+                                            if (!value) {
+                                                return 'Isikan tempat kosong diatas!'
+                                            }
+
+                                            if(value <= 0){
+                                                return 'Masukkan No Kad Pengenalan yang betul!';
+                                            }
+
+                                           // if(isNaN(value))
+                                           // {
+                                           //     return 'Kad Pengenalan hendaklah dalam bentuk nombor!'
+                                           // }
+                                        }
+                                    });
+
+                                        if(amaun)
+                                        {
+                                            $.ajax({
+                                                method:'get',
+                                                url: api_url + '/api/getwakil/' + kodcaw + '/' + amaun,
+                                                success:function(data){
+
+                                                        if(data.length > 0)
+                                                        {
+                                                            let namawakilsedia = data[0]['nama'];
+                                                            let nokpwakilsedia = data[0]['nokp'];
+                                                            let nowakilsedia = data[0]['nowakil'];
+
+                                                            const PengesahanAkhirWakil = Swal.mixin({
+                                                                customClass: {
+                                                                    confirmButton: 'btn btn-success ml-1',
+                                                                    cancelButton: 'btn btn-danger'
+                                                                },
+                                                                buttonsStyling: false
+                                                            });
+
+                                                            PengesahanAkhirWakil.fire({
+                                                            title: 'Pengesahan Akhir Wakil!',
+                                                            html: '<b class="text-danger">' + namawakilsedia + '</b><br><b class="text-danger">' + nokpwakilsedia + '</b>',
+                                                            icon: 'info',
+                                                            showCancelButton: true,
+                                                            confirmButtonText: 'Benar',
+                                                            cancelButtonText: 'Salah',
+                                                            reverseButtons: true
+                                                            }).then((result) => {
+                                                                if (result.isConfirmed) {
+
+                                                                    $.ajax({
+                                                                        method:'put',
+                                                                        async:false,
+                                                                        url: api_url + '/api/ubahwakil/' + kodcaw,
+                                                                        data:{ 'nowakil' : nowakilsedia,
+                                                                            'norujukan' : norujukan},
+                                                                        success:function(data){
+
+                                                                            if(data === 1)
+                                                                            {
+                                                                                Swal.fire({
+                                                                                    icon: 'success',
+                                                                                    title: 'Berjaya!',
+                                                                                    text: 'Penukaran Wakil berjaya'
+                                                                                }).then(async function(){
+                                                                                    return true;
+                                                                                    location.reload();
+                                                                                    });
+                                                                            }else{
+                                                                                Swal.fire({
+                                                                                    icon: 'info',
+                                                                                    title: 'Pemberitahuan!',
+                                                                                    text: 'Wakil telah didaftarkan dengan IC tersebut!'
+                                                                                }).then(async function(){
+                                                                                    return true;
+                                                                                    location.reload();
+                                                                                });
+                                                                            }
+
+                                                                        }
+                                                                    });
+
+                                                                }else if (result.dismiss === Swal.DismissReason.cancel){
+                                                                    PengesahanAkhirWakil.fire(
+                                                                        'Batal',
+                                                                        'Tidak Berjaya Mengesahkan Wakil!',
+                                                                        'error'
+                                                                    )
+                                                                }
+                                                            });
+
+                                                        }else{
+                                                            Swal.fire({
+                                                                allowOutsideClick: false,
+                                                                allowEscapeKey: false,
+                                                                allowEnterKey: false,
+                                                                confirmButtonText: '<i class="fa fa-thumbs-up"></i> Daftar Wakil!',
+                                                                icon: 'info',
+                                                                title: 'Maklumat anda tiada dalam senarai wakil! Tekan button Daftar untuk mendaftar!'
+                                                                }).then(function(){
+                                                                    daftarwakilfunction(amaun,norujukan);
+                                                            });
+                                                        }
+                                                    },error: function(xhr, status, error) {
+                                                        var err = eval("(" + xhr.responseText + ")");
+                                                        alert(xhr.responseText);
+                                                    }
+                                            });
+                                        }
+                                    });
+                                }
+                                else if(data.kelulusan == 'batal')
+                                {
+                                    Swal.fire({
+                                        icon: 'warning',
+                                        title: 'Telah Dibatalkan',
+                                        text: `Komen : ${data.komen}`
+                                    }).then(function(){
+                                        // $("#terima_gadai").prop('disabled', false);
+                                        return false;
+                                    });
+                                }
+                            }
+
+                        });
+
+
+                    }else if (result.dismiss === Swal.DismissReason.cancel){
+                        swalWithBootstrapButtons.fire(
+                            'Batal',
+                            'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                            'error'
+                        )
+                    }
+
+                });
+
+            return false;
+        }
+
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
+
+        swalWithBootstrapButtons.fire({
+            title: 'Dapatkan Pengesahan Khazanah',
+            text: "Ubah Maklumat Gadaian",
+            icon: 'info',
+            showCancelButton: true,
+            confirmButtonText: 'Hantar',
+            cancelButtonText: 'Batal',
+            reverseButtons: true
+            }).then((result) => {
+                if (result.isConfirmed) {
+
+                    Swal.fire({
+                        title: 'Tunggu Pengesahan Daripada Khazanah.',
+                        icon: 'info',
+                        width: 600,
+                        padding: '3em',
+                        background: '#fffff',
+                        showCancelButton: false,
+                        showConfirmButton: false,
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false
+                    })
+
+                    let mohon = "Ubah Gadai";
+
+                    $.ajax({
+                        method:'post',
+                        url: '{{ route("teller.createkelulusan") }}',
+                        data: {
+                            "_token": "{{ csrf_token() }}",
+                            "norujukan" : ubahid,
+                            "mohon" : mohon
+                        },
+                        success:function(data){
+
+                        },error: function(xhr, status, error) {
+                            var err = eval("(" + xhr.responseText + ")");
+                            alert(xhr.responseText);
+                        }
+                    });
+
+                    var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                    let teller = "{{ Auth::user()->name }}";
+
+                    var channel = pusher.subscribe('notice-ubahhapus');
+                    channel.bind('my-ubahhapus', function(data) {
+
+                        if(data.norujukan == ubahid && data.teller == teller)
+                        {
+                            if(data.kelulusan == 'lulus')
+                            {
+                                Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                                }).then(function(){
+
+                                    var urlroute = '{{ route("gadaian.edit", ":id") }}';
+                                    urlroute = urlroute.replace(':id', ubahid);
+                                    window.location.replace(urlroute);
+                                    return true;
+                                });
+                            }
+                            else if(data.kelulusan == 'batal')
+                            {
+                                Swal.fire({
+                                    icon: 'warning',
+                                    title: 'Telah Dibatalkan',
+                                    text: `Komen : ${data.komen}`
+                                }).then(function(){
+                                    // $("#terima_gadai").prop('disabled', false);
+                                    return false;
+                                });
+                            }
+                        }
+
+
+
+                    });
+
+
+            }else if (result.dismiss === Swal.DismissReason.cancel){
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Tidak Berjaya Mendapatkan Pengesahan Khazanah',
+                    'error'
+                )
             }
         });
-    });
+    }
 
+    function hapusfunc(){
+
+        let kodcaw = "{{ $cawangan_info['kodcaw'] }}";
+        let hapusid = $('input[name="belum"]:checked').val();
+        let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
+        let harini = new Date();harini.setHours(0, 0, 0, 0);
+        if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+            return false;
+        }else if(hapusidsudah == null && $("input[name='options']:checked").val() == 'sudah_tebus'){
+            Swal.fire({
+                icon: 'error',
+                title: 'Amaran',
+                text: 'Sila pilih salah satu SAG!'
+            });
+            return false;
+        }
+
+        if($("input[name='options']:checked").val() == 'belum_tebus'){
+            let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
+
+            // var id = $('.tab-content .active').attr('id');
+
+            var activeTab = $("#navtawarruqdannottawarruq.tab-content").find(".active");
+            var id = activeTab.attr('id');
+
+            if(id == "nav-tawarruq") {
+                if(+harini !== +tarikhgadai2){
+                    Swal.fire({
+                        icon: 'error',
+                        title: 'Amaran',
+                        text: 'Hapus Gadai Tidak Dibenarkan'
+                    });
+                    return false;
+                }
+            }
+            else {
+
+
+                $.ajax({
+                    method:'get',
+                    url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid,
+                    success:function(data){
+                        if(data == 1){
+
+                            const swalWithBootstrapButtons = Swal.mixin({
+                                customClass: {
+                                    confirmButton: 'btn btn-success',
+                                    cancelButton: 'btn btn-danger'
+                                },
+                                buttonsStyling: false
+                            });
+
+                            swalWithBootstrapButtons.fire({
+                                title: 'Dapatkan Pengesahan Khazanah',
+                                text: "Hapus Upah Lama!",
+                                icon: 'info',
+                                showCancelButton: true,
+                                confirmButtonText: 'Hantar',
+                                cancelButtonText: 'Batal',
+                                reverseButtons: true
+                            }).then((result) => {
+                                if(result.isConfirmed) {
+                                    Swal.fire({
+                                        title: 'Tunggu Pengesahan Daripada Khazanah.',
+                                        icon: 'info',
+                                        width: 600,
+                                        padding: '3em',
+                                        background: '#fffff',
+                                        showCancelButton: false,
+                                        showConfirmButton: false,
+                                        allowOutsideClick: false,
+                                        allowEscapeKey: false,
+                                        allowEnterKey: false
+                                    })
+
+                                    let mohon = "Hapus Upah Lama";
+                                    let id = hapusid;
+
+                                    $.ajax({
+                                        method:'post',
+                                        url: '{{ route("teller.createkelulusan") }}',
+                                        data: {
+                                            "_token": "{{ csrf_token() }}",
+                                            "norujukan" : id,
+                                            "mohon" : mohon
+                                        },
+                                        success:function(data){
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            alert(xhr.responseText);
+                                        }
+                                    });
+
+                                    let teller = "{{ Auth::user()->name }}";
+
+                                    var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                                    cluster: 'ap1',
+                                                    encrypted: true
+                                                });
+
+                                    var channel = pusher.subscribe('notice-ubahhapus');
+                                    channel.bind('my-ubahhapus', function(data) {
+
+                                        if(data.norujukan == id && data.teller == teller)
+                                        {
+                                            if(data.kelulusan == 'lulus')
+                                            {
+
+                                                Swal.fire({
+                                                        icon: 'success',
+                                                        title: 'Telah Disahkan'
+                                                }).then(function(){
+
+                                                        $.ajax({
+                                                            method:'post',
+                                                            url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id,
+                                                            data:{
+                                                                "teller" : "{{ Auth::user()->name }}"
+                                                            },
+                                                            success:function(data){
+
+                                                                if(data == 1)
+                                                                {
+                                                                    swalWithBootstrapButtons.fire(
+                                                                            'Hapus!',
+                                                                            'Maklumat upah lama telah dihapuskan.',
+                                                                            'success'
+                                                                    ).then(function(){
+                                                                        location.reload();
+                                                                    });
+                                                                }else{
+                                                                    swalWithBootstrapButtons.fire(
+                                                                            'Hapus!',
+                                                                            'Maklumat Upah lama tidak berjaya untuk dihapuskan.',
+                                                                            'error'
+                                                                    ).then(function(){
+                                                                        location.reload();
+                                                                    });
+                                                                }
+
+
+                                                            },error: function(xhr, status, error) {
+                                                                var err = eval("(" + xhr.responseText + ")");
+                                                                alert(xhr.responseText);
+                                                            }
+                                                        });
+                                                    return true;
+                                                });
+                                            }
+                                        }
+                                    });
+                                }
+                            });
+
+
+                            return false;
+                        }
+                        else{
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Amaran',
+                                text: 'Hapus Upah Tidak Dibenarkan'
+                            });
+                            return false;
+                        }
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+                return false;
+            }
+
+
+            // return false;
+
+        }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+            let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+            let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
+
+            if(+harini !== +tarikhgadai1){
+                Swal.fire({
+                    icon: 'error',
+                    title: 'Amaran',
+                    text: 'Hapus Tebus Tidak Dibenarkan'
+                });
+                return false;
+            }
+        }
+
+        const swalWithBootstrapButtons = Swal.mixin({
+            customClass: {
+                confirmButton: 'btn btn-success',
+                cancelButton: 'btn btn-danger'
+            },
+            buttonsStyling: false
+        });
+
+        swalWithBootstrapButtons.fire({
+            title: 'Dapatkan Pengesahan Khazanah',
+            text: "Hapus Rekod!",
+            icon: 'info',
+            showCancelButton: true,
+            confirmButtonText: 'Hantar',
+            cancelButtonText: 'Batal',
+            reverseButtons: true
+        }).then((result) => {
+            if(result.isConfirmed) {
+                Swal.fire({
+                    title: 'Tunggu Pengesahan Daripada Khazanah.',
+                    icon: 'info',
+                    width: 600,
+                    padding: '3em',
+                    background: '#fffff',
+                    showCancelButton: false,
+                    showConfirmButton: false,
+                    allowOutsideClick: false,
+                    allowEscapeKey: false,
+                    allowEnterKey: false
+                })
+
+                let mohon = "";
+                let id = 0;
+
+                if($("input[name='options']:checked").val() == 'belum_tebus'){
+                    id = hapusid;
+                    mohon = "Hapus Gadai";
+                }
+                else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+                    id = hapusidsudah;
+                    mohon = "Hapus Tebus";
+                }
+
+                $.ajax({
+                    method:'post',
+                    url: '{{ route("teller.createkelulusan") }}',
+                    data: {
+                        "_token": "{{ csrf_token() }}",
+                        "norujukan" : id,
+                        "mohon" : mohon
+                    },
+                    success:function(data){
+                    },error: function(xhr, status, error) {
+                        var err = eval("(" + xhr.responseText + ")");
+                        alert(xhr.responseText);
+                    }
+                });
+
+                let teller = "{{ Auth::user()->name }}";
+
+                var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
+                                        cluster: 'ap1',
+                                        encrypted: true
+                                        });
+
+                var channel = pusher.subscribe('notice-ubahhapus');
+                channel.bind('my-ubahhapus', function(data) {
+
+                    if(data.norujukan == id && data.teller == teller)
+                    {
+                        if(data.kelulusan == 'lulus')
+                        {
+
+                            Swal.fire({
+                                    icon: 'success',
+                                    title: 'Telah Disahkan'
+                            }).then(function(){
+
+
+                                if($("input[name='options']:checked").val() == 'belum_tebus'){
+                                    $.ajax({
+                                        method:'put',
+                                        url: api_url + '/api/gadai/hapus/' + kodcaw + '/' + id,
+                                        data: { 'kodlaluan' : teller },
+                                        success:function(data){
+                                            $.ajax({
+                                                method:'put',
+                                                url: api_url + '/api/komuditi/batal',
+                                                dataType:'json',
+                                                data:{
+                                                    norujukan: hapusid
+                                                },
+                                                success:function(batalkomuditi){
+                                                    swalWithBootstrapButtons.fire(
+                                                        'Hapus!',
+                                                        'Maklumat gadaian telah dihapuskan.',
+                                                        'success'
+                                                    ).then(function(){
+                                                        location.reload();
+                                                    });
+                                                }
+                                            })
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            alert(xhr.responseText);
+                                        }
+                                    });
+                                }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
+                                    $.ajax({
+                                        method:'put',
+                                        url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + id,
+                                        data: { 'kodlaluan' : teller },
+                                        success:function(data){
+                                            if(data != "Bukan-Tebus"){
+                                                swalWithBootstrapButtons.fire(
+                                                    'Hapus!',
+                                                    'Maklumat tebus telah dihapuskan.',
+                                                    'success'
+                                                ).then(function () {
+                                                    location.reload();
+                                                });
+                                            }else{
+                                                swalWithBootstrapButtons.fire(
+                                                    'Amaran!',
+                                                    'Hapus Tebus Tidak Dibenarkan, Hanya untuk tebus sahaja!',
+                                                    'error'
+                                                )
+                                            }
+                                        },error: function(xhr, status, error) {
+                                            var err = eval("(" + xhr.responseText + ")");
+                                            console.log(xhr.responseText);
+                                        }
+                                    });
+                                }
+                                return true;
+                            });
+                        }
+                        else if(data.kelulusan == 'batal')
+                        {
+                            Swal.fire({
+                                icon: 'warning',
+                                title: 'Telah Dibatalkan',
+                                text: `Komen : ${data.komen}`
+                            }).then(function(){
+                                location.reload();
+                                return false;
+                            });
+                        }
+                    }
+
+
+
+                });
+
+
+            }else if (result.dismiss === Swal.DismissReason.cancel) {
+                swalWithBootstrapButtons.fire(
+                    'Batal',
+                    'Maklumat Gadaian Tidak Berjaya Dihapuskan',
+                    'error'
+                )
+            }
+        });
+    }
 
     function gadaiOptionButton(noic){
         tablegadai.clear().draw();
@@ -1263,6 +2249,8 @@ $.each(data,function(index,gadai_detail){
                 method:"GET",
                 url: api_url + "/api/customers/"+noic+"/gadai/sudah_tebus/"+kodcaw,
                 success: function(data){
+                    sorted_data = [...data];
+                    sorted_data.sort((a, b) => new Date(b.date) - new Date(a.date));
                     gadaiTable(data,"sudah_tebus");
                 }
             });
@@ -1284,6 +2272,34 @@ $.each(data,function(index,gadai_detail){
         }
     }
 
+
+
+    $('#poskod').change(function(){
+        var poskod = this.value;
+        $.ajax({
+            method:'GET',
+            url:api_url+'/api/poskod/'+poskod,
+            success:function(poskod_detail){
+                var koddaerah = poskod_detail['koddaerah'];
+                var kodnegeri = poskod_detail['kodnegeri'];
+                $.ajax({
+                    url:api_url+'/api/negeri/'+kodnegeri,
+                    method:'GET',
+                    success:function(negeri){
+                        $('#kodnegeri').val(negeri['negeri']);
+                    }
+                });
+                $.ajax({
+                    url:api_url+'/api/daerah/'+koddaerah,
+                    method:'GET',
+                    success:function(daerah){
+                        $('#koddaerah').val(daerah['namadaerah']);
+                    }
+                });
+            }
+        });
+    });
+
     function kemaskinifunc()
     {
         $('#btnkemaskini').addClass('btn-danger');
@@ -1298,9 +2314,9 @@ $.each(data,function(index,gadai_detail){
         $('#kodbank').attr('disabled', false);
         $('#noakaun').attr('readonly', false);
         $('#nota').attr('readonly', false);
-        $('#nama').attr('readonly', false);
         $('#alamat').attr('readonly', false);
         $('#poskod').attr('readonly', false);
+
     }
 
     function cancelbutton(){
@@ -1319,18 +2335,8 @@ $.each(data,function(index,gadai_detail){
         $('#kodbank').attr('disabled', true);
         $('#noakaun').attr('readonly', true);
         $('#nota').attr('readonly', true);
-        $('#nama').attr('readonly', true);
         $('#alamat').attr('readonly', true);
         $('#poskod').attr('readonly', true);
-
-        /* Error Telefon */
-        $('#errortelefon').hide();
-        $('#errortelefon').text("");
-        $('#telefon').removeClass('is-invalid');
-
-        $('#errortelefon2').hide();
-        $('#errortelefon2').text("");
-        $('#telefon2').removeClass('is-invalid');
     }
 
     $("#kemaskiniform").submit(function(event) {
@@ -1342,24 +2348,21 @@ $.each(data,function(index,gadai_detail){
         var kodbank = $('#kodbank').val();
         var noakaun = $('#noakaun').val();
         var nota = $('#nota').val();
-        var nama = $('#nama').val();
         var alamat = $('#alamat').val();
         var poskod = $('#poskod').val();
 
         $.ajax({
             method:"put",
-            url: api_url + "/api/customers/update/khazanah/" + nokp,
+            url: api_url + "/api/customers/update/kaunter/" + nokp,
             data:{
-                "namakhazanah" : ppc,
+                "namateller" : "{{ Auth::user()->name }}",
                 "telefon1": telefon1,
                 "telefon2": telefon2,
                 "kodbank":kodbank,
                 "noakaun":noakaun,
                 'nota':nota,
-                'nama':nama,
                 'alamat':alamat,
-                'poskod':poskod,
-                'kodcaw':kodcaw
+                'poskod':poskod
             },
             success: function(success){
                 $('#btnsave').css('display','none');
@@ -1368,7 +2371,9 @@ $.each(data,function(index,gadai_detail){
                     Swal.fire({
                         icon: 'success',
                         title: 'Berjaya',
-                        text: 'Berjaya mengemaskini maklumat pelanggan'
+                        text: 'Berjaya mengemaskini maklumat pelanggan',
+                        allowEscapeKey : false,
+                        allowOutsideClick: false,
                     }).then((result) => {
                         if (result.isConfirmed) {
                             location.reload();
@@ -1383,7 +2388,6 @@ $.each(data,function(index,gadai_detail){
                         allowOutsideClick: false,
                     });
                 }
-                
 
             },
             error: function (request, status, error) {
@@ -1440,7 +2444,6 @@ $.each(data,function(index,gadai_detail){
             $('#noakaun').attr('readonly', true);
             $('#kodbank').attr('disabled', true);
             $('#nota').attr('readonly', true);
-            $('#nama').attr('readonly', true);
             $('#alamat').attr('readonly', true);
             $('#poskod').attr('readonly', true);
 
diff --git a/resources/views/customers/v2/info.blade.php b/resources/views/customers/v2/info.blade.php
index 5038fdb..4e1c926 100644
--- a/resources/views/customers/v2/info.blade.php
+++ b/resources/views/customers/v2/info.blade.php
@@ -1333,6 +1333,7 @@
         $('#hargajualanmodal').text('RM ' + formatter.format(gadaian[0][0]['hargajualan']));
         $('#pembiayaanmodal').text('RM ' + formatter.format(gadaian[0][0]['pinjaman']));
         $('#nilaimarhunmodal').text('RM ' + formatter.format(gadaian[0][0]['nilaimarhun']));
+        $('#marhunmodal').text(gadaian[0][0]['marhun']);
     }
 
     function rekodansuran(data){
diff --git a/resources/views/modal/historytebus.blade.php b/resources/views/modal/historytebus.blade.php
index d1c0d8e..d5a27cf 100644
--- a/resources/views/modal/historytebus.blade.php
+++ b/resources/views/modal/historytebus.blade.php
@@ -10,22 +10,25 @@
         </div>
         <div class="modal-body">
           <div class="row">
-            <div class="col-4">
+            <div class="col-3">
               <div class="small-box bg-warning text-center"><div class="inner"><b>Harga Jualan : <span id="hargajualanmodal"></span></b></div></div>
             </div>
-            <div class="col-4">
+            <div class="col-3">
               <div class="small-box bg-warning text-center"><div class="inner"><b>Pembiayaan : <span id="pembiayaanmodal"></span></b></div></div>
             </div>
-            <div class="col-4">
+            <div class="col-3">
               <div class="small-box bg-warning text-center"><div class="inner"><b>Nilai Marhun : <span id="nilaimarhunmodal"></span></b></div></div>
             </div>
+            <div class="col-3">
+              <div class="small-box bg-warning text-center"><div class="inner"><b>Marhun : <span id="marhunmodal"></span></b></div></div>
+            </div>
           </div>
           <ul class="nav nav-tabs" id="custom-tabs-one-tab" role="tablist">
             <li class="nav-item">
               <a class="nav-link active" id="custom-tabs-one-home-tab" data-toggle="pill" href="#custom-tabs-one-home" role="tab" aria-controls="custom-tabs-one-home" aria-selected="true">Bayaran</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" id="custom-tabs-upah-tab" data-toggle="pill" href="#custom-tabs-upah" role="tab" aria-controls="custom-tabs-upah" aria-selected="false">Upah</a>
+              <a class="nav-link" id="custom-tabs-upah-tab" data-toggle="pill" href="#custom-tabs-upah" role="tab" aria-controls="custom-tabs-upah" aria-selected="false">Keuntungan</a>
             </li>
             <li class="nav-item">
               <a class="nav-link" id="custom-tabs-one-profile-tab" data-toggle="pill" href="#custom-tabs-one-profile" role="tab" aria-controls="custom-tabs-one-profile" aria-selected="false">Rekod</a>
@@ -54,7 +57,7 @@
                   <tr>
                     <th>Bil</th>
                     <th>Tarikh</th>
-                    <th>Upah</th>
+                    <th>Keuntungan</th>
                     <th>Action</th>
                   </tr>
                 </thead>
diff --git a/routes/web.php b/routes/web.php
index 22f6d4f..830fae0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -408,6 +408,9 @@ Route::post('/blastpertama/{kodcaw}/{notisid}',['as'=>'arcc.blastpertama','uses'
 Route::get('/arcc/pelanggan',['as'=>'arcc.pelanggan','uses'=>'CallCenterController@pelanggan'])->middleware('auth','callcenter');
 Route::get('/arcc/searchpelanggan',['as'=>'arcc.searchpelanggan','uses'=>'CallCenterController@search'])->middleware('auth','callcenter');
 Route::get('/arcc/customer_info',['as'=>'arcc.customer_info','uses'=>'CallCenterController@info'])->middleware('auth','callcenter');
+Route::get('/arcc/history',['as'=>'arcc.history','uses'=>'GadaianController@history'])->middleware('auth','callcenter');
+
+
 
 //surat wakil
 Route::get('/khazanah/indexwakil',['as'=>'khazanah.indexwakil','uses'=>'WakilController@indexwakil'])->middleware('auth','khazanah');