Merge branch 'pipiv2' into 'master'

Pipiv2

See merge request online-sistem1/kaunter!109

app/Http/Controllers/AliranTunaiController.php

@@ -105,8 +105,10 @@ class AliranTunaiController extends Controller
 
         $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'])->json();
 
+        $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
+        $advansur = Http::get(config('api.url').'/api/AnsuranByTarikh/'.$auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
         
-
+        // dd($advansur);
            //******************* INITIALIZE LEJER AM START HERE****************************//
 
 
@@ -1052,16 +1054,7 @@ class AliranTunaiController extends Controller
           //************************  END LEJER AM**********************************
 
 
-
+        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur'));
-
-
-
-
-
-
-
-
-        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki'));
     }
 
     public function alirantunaiGadai(Request $request){
@@ -1217,15 +1210,72 @@ class AliranTunaiController extends Controller
 
         $requestkodlaluan = Http::get(config('api.url').'/api/get/pengguna/'.$auth_user['cawangan'],["namateller" => Auth::user()->name ])->json();
 
-        $requestupah = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+        $perbezaan = 0;
+
+        if(Session::has('upahsemasa'))
+        {
+            $upah = Session::get('upahsemasa');
+
+            $requestupah = Http::get(config('api.url') . '/api/ansuranupah/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+
+
+            if($upah !== $requestupah)
+            {
+                $perbezaan = $requestupah - $upah;
+
+                Session::put('upahsemasa', $requestupah);
+
                 $requestalirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
                 
-        $upah = $requestupah['baki'];
+                $masuk = $requestalirantunai['masuk'];
-        $alirantunaisemasa = $requestalirantunai['baki'];
+                $keluar = $requestalirantunai['keluar'];
+                $baki = $requestalirantunai['baki'];
 
-        $totalalirantunai = floatval($upah) + floatval($alirantunaisemasa);
+                $total = floatval($baki) + $perbezaan;
 
-        return response($totalalirantunai);
+                // masuk dalam tunai aliran
+                $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+                    'kodlaluan' => Auth::user()->name,
+                    'keluar' => $keluar,
+                    'masuk' => $masuk,
+                    'bakiakhir' => $total
+                ])->json();
+
+                $updateTunai = 1;
+            }else{
+                $updateTunai = 0;
+            }
+
+        }else{
+            $requestupah = Http::get(config('api.url') . '/api/ansuranupah/' . $auth_user['cawangan'],['kodlaluan' => $requestkodlaluan[0]['kodlaluan']])->json();
+
+            if($requestupah !== 0)
+            {
+                Session::put('upahsemasa', $requestupah);
+
+                $requestalirantunai = Http::get(config('api.url') . '/api/GetCurrentTunai/' . $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
+                $masuk = $requestalirantunai['masuk'];
+                $keluar = $requestalirantunai['keluar'];
+                
+                $baki = $requestalirantunai['baki'];
+    
+                $total = floatval($baki) + floatval($requestupah);
+
+                // masuk dalam tunai aliran
+                $updateTunai=Http::put( config('api.url').'/api/updateTunaiGT/'.$auth_user['cawangan'], [
+                    'kodlaluan' => Auth::user()->name,
+                    'keluar' => $keluar,
+                    'masuk' => $masuk,
+                    'bakiakhir' => $total
+                ])->json();
+
+                $updateTunai = 1;
+            }else{
+                $updateTunai = 0;
+            }
+        }
+
+        return response($updateTunai);
     }
 
 

app/Http/Controllers/KhazanahController.php

@@ -1553,11 +1553,11 @@ class KhazanahController extends Controller
       if(sizeof($peti_besi_terkini) == 0)
       {
           $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
-          $baki_awal=$peti_besi_terkini["bakiawal"];
+          $baki_awal=$peti_besi_terkini["bakiakhir"];
       }
       else
       {
-        $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+        $baki_awal=$peti_besi_terkini[0]["bakiakhir"];
       }
 
       $amount = $request->amt;
@@ -1565,7 +1565,8 @@ class KhazanahController extends Controller
       if($amount>$baki_awal)
       {
         //WI ERROR MESSAGE SKIT
-        dd($baki_awal);
+        // dd($baki_awal);
+        return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
       }
      else
      {
@@ -1618,7 +1619,8 @@ class KhazanahController extends Controller
 
             $kurang=$kurangT;
             $keluarT = $keluar;
-            $bakiAkhirT=$bakiAwal+$tambahT+$masukT-$keluarT-$kurang;
+            // $bakiAkhirT= $bakiAwal + $tambahT + $masukT - $keluarT - $kurang;
+            $bakiAkhirT = $baki + $tambah;
 
             $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
             'kodlaluan'=>$kodlaluan,
@@ -1689,20 +1691,18 @@ class KhazanahController extends Controller
       if(sizeof($peti_besi_terkini) == 0)
       {
           $peti_besi_terkini=Http::post(config('api.url').'/api/daftarVault/'.$auth_user['cawangan'])->json();
-          $baki_awal=$peti_besi_terkini["bakiawal"];
+          $baki_awal=$peti_besi_terkini["bakiakhir"];
       }
       else
       {
-        $baki_awal=$peti_besi_terkini[0]["bakiawal"];
+        $baki_awal=$peti_besi_terkini[0]["bakiakhir"];
       }
 
       $amount = $request->amt;
 
-      if($amount>$baki_awal)
+      if($amount>$baki_awal){
-        echo "Maaf, Serahan Lebih Besar Dari Baki Akhir Cash Box";
+        return redirect()>route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
-      
+      }else{
-      else
-      {
         $tarikh=$request->tarikh;
         $kodlaluan=$request->teller;
     
@@ -1735,8 +1735,7 @@ class KhazanahController extends Controller
             $kurangT=$getTunai2['kurang'];
             $masukT=$getTunai2['masuk'];
             
-            //dd($getTunai2);
+            $serahanakhir = $kurang;
-            
             $tambah_T=0;$kurang_T=0;$baki_AwalT=0.0;
         
             if($tambahT==0)
@@ -1761,8 +1760,8 @@ class KhazanahController extends Controller
                else
                 $baki_AwalT=$bakiAwalT;
     
-    
+                //$bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T; //untuk kegunaan urgent
-               $bakiAkhirT=$baki_AwalT+$tambah_T+$masukT-$keluarT-$kurang_T;
+                $bakiAkhirT = $baki - $serahanakhir;
 
                $updateTunai=Http::put( config('api.url').'/api/updateTunai/'.$auth_user['cawangan'], [
                     'kodlaluan'=>$kodlaluan,
@@ -1771,11 +1770,9 @@ class KhazanahController extends Controller
                     'bakiakhir'=>$bakiAkhirT
                  ]);
                  
-               //dd($baki_AwalT,$tambah_T,$masukT,$keluarT,$kurang_T,$bakiAkhirT);
                
                $latestVault=Http::get(config('api.url').'/api/VaultController/'.$auth_user['cawangan'])->json();
 
-               //dd($latestVault);
                $masukV=$latestVault[0]['masuk'];
                $keluarV=$latestVault[0]['keluar'];
                $pendahuluanV=$latestVault[0]['pendahuluan'];
@@ -1784,8 +1781,6 @@ class KhazanahController extends Controller
                $totpanjar = $latestVault[0]['totpanjar'];
 
     
-               //dd($latestVault);
-    
                $masuk_V = 0;$pendahuluan_V = 0;$keluar_V = 0;$serahan_V = 0;
                
                 if($masukV == 0)
@@ -1827,9 +1822,8 @@ class KhazanahController extends Controller
 
       $bakiAkhirV = $bakiAwalV - $keluar_V + $masuk_V + $pendahuluan_V - $serahan_V - $totpanjar;
 
-      //dd($bakiAkhirV,$bakiAwalV,$keluar_V,$masuk_V,$pendahuluan_V,$serahan_V);
       $BakiEOD=$bakiAkhirV;
-    //   $BakiEOD=$bakiAkhirV+$sumBaki;
+    //$BakiEOD=$bakiAkhirV+$sumBaki;
 
      $updateVault=Http::put( config('api.url').'/api/UpdateVault/'.$auth_user['cawangan'],[
          'masuk'=>$masuk_V,
@@ -1990,7 +1984,6 @@ class KhazanahController extends Controller
         $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
         $stokaudit = Http::get(config('api.url'). '/api/gadai/cawangan/'. $auth_user['cawangan'])->json();
 
-        dd($stokaudit);
         return view('khazanah.laporan.stokaudit',compact('cawangan_info','api_url'));
     }
 

app/Http/Controllers/PenebusanController.php

@@ -57,9 +57,8 @@ class PenebusanController extends Controller
  
         $totalmasuk = $request->bayaran + $masuk;
         
-        $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
+        // $bakiakhir = $bakiawal-$keluar+$totalmasuk+$pendahuluan-$serahan;
-
+        $bakiakhir = $baki + $request->bayaran;
-
         
         // Add on 20210411
         $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $request->kodcaw.'/'.$request->norujukan)->json();
@@ -110,12 +109,6 @@ class PenebusanController extends Controller
         $bayaran_latest_untung=$get_latest_bayarUntung[0]['bayaran_keuntungan'];
 
         
-
-
-
-
-                        
-                        
         //check sama ada jumlah bayaran melebihi keuntungan semasa..kalau lebih dia akan masuk dalam bayaran pendahuluan...
         if($jumbayaran<$bayaran_keuntungan)
         {
@@ -338,10 +331,6 @@ class PenebusanController extends Controller
 
             ]);
 
-    
-
-                    
-
             }
 
         //***************KIRAAN LEJER AM TAMAT*******************************

public/js/main.js

@@ -439,7 +439,7 @@ function tambahdanserahanfunc(e)
     var txt = $('#amaunkiraan').val();
     var txt2 = $('#amaundiminta').val();
 
-    if(txt != txt2)
+    if(Number(txt) != Number(txt2))
     {
         Swal.fire({
             icon: 'error',

resources/views/aliran_tunai/index.blade.php

@@ -124,12 +124,13 @@
                     <div class="card-body">
 
 
-                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right" disabled>Kemaskini</button>
+                        <button type="button" onclick="kemaskiniupah()" class="btn btn-primary float-right">Kemaskini</button>
                         <nav>
                             <div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
                               <a class="nav-item nav-link active" id="nav-home-tab" data-toggle="tab" href="#nav-home" role="tab" aria-controls="nav-home" aria-selected="true">Tunai</a>
                               <a class="nav-item nav-link" id="nav-profile-tab" data-toggle="tab" href="#nav-profile" role="tab" aria-controls="nav-profile" aria-selected="false">Gadai / Tebus</a>
                               <a class="nav-item nav-link" id="nav-contact-tab" data-toggle="tab" href="#nav-contact" role="tab" aria-controls="nav-contact" aria-selected="false">Tuntut Baki</a>
+                              <a class="nav-item nav-link" id="nav-upah-tab" data-toggle="tab" href="#nav-upah" role="tab" aria-controls="nav-upah" aria-selected="false">Upah Lama</a>
                             </div>
                           </nav>
                           <div class="tab-content" id="nav-tabContent">
@@ -214,6 +215,33 @@
                                 </table>
 
                             </div>
+                            <div class="tab-pane fade" id="nav-upah" role="tabpanel" aria-labelledby="nav-upah-tab">
+
+                                <table class="table table-striped table-hover  text-center" id="tableupahlama">
+                                    <thead class="thead-dark">
+                                        <tr>
+                                            <th>Bil</th>
+                                            <th>Tarikh</th>
+                                            <th>Norujukan</th>
+                                            <th>Upah Dibayar (RM)</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {{-- {{ dd($advansur) }} --}}
+                                        @if(is_object($advansur) || is_array($advansur))
+                                        @foreach($advansur as $ansur)
+                                        <tr>
+                                            <td> {{ $loop->iteration }} </td>
+                                            <td> {{ $ansur['tarikh'] }} </td>
+                                            <td> {{ $ansur['norujukan'] }} </td>
+                                            <td> {{ number_format($ansur['upahdibayar'],2) }} </td>
+                                        </tr>
+                                        @endforeach
+                                        @endif
+                                    </tbody>
+                                </table>
+
+                            </div>
                           </div>
 
                     </div>
@@ -235,6 +263,11 @@
     var tabletuntutbaki = $('#tabletuntutbaki').DataTable({
     //   "scrollX": true
     });
+
+    var tableupahlama = $('#tableupahlama').DataTable({
+    //   "scrollX": true
+    });
+
     var tele = "{{ $auth_user['name'] }}";
 
     $(document).ready( function () {
@@ -289,9 +322,26 @@
         $.ajax({
                 type: 'get',
                 url: "{{ route('kemaskini.upah') }}",
-                data: { "namateller" : tele },
+                // data: { "namateller" : tele },
                 success: function(data){
                     console.log(data);
+                    if(data == 1)
+                    {
+                        Swal.fire({
+                            icon: 'success',
+                            title: 'Kemaskini!',
+                            text: 'Proses Kemaskini!'
+                        }).then(function() {
+                            location.reload();
+                        });
+                        
+                    }else{
+                        Swal.fire({
+                            icon: 'warning',
+                            title: 'Peringatan',
+                            text: 'Telah Dikemaskini!'
+                        });
+                    }
                 }
             });
 

resources/views/customers/info.blade.php

@@ -8,6 +8,7 @@
 
 @section('content')
 @include('modal.historytebus')
+@include('modal.wakil')
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-12 col-lg-12">
@@ -756,8 +757,134 @@
         });
     }
 
+    function daftarwakil()
+    {
+        let nopelanggan = $('#nopelangganwakil').val();
+        let nowakil = $('#nowakil').val();
+        let nama = $('#namawakil').val();
+        let hubungan = $('#slthubungan').val();
+        let alamat = $('#alamatwakil').val();
+        let telefon = $('#notelwakil').val();
+        let nota = $('#notawakil').val();
+        let nokp = $('#nokpwakil').val();
+        let norujukan = $('#norujukanwakil').val();
 
-    async function ubahfunc(e){
+        
+        $.ajax({
+            method:'POST',
+            url: "{{ route('wakil.create') }}",
+            data:{ 
+                "_token": "{{ csrf_token() }}",
+                "nopelanggan" : nopelanggan,
+                "nowakil" : nowakil,
+                "nama" : nama,
+                "hubungan" : hubungan,
+                "alamat" : alamat,
+                "telefon" : telefon,
+                "nota" : nota,
+                "icno" : nokp
+                },
+            success:function(data){
+
+                if(data == 1)
+                {
+                    $('#WakilModal').hide();
+                    $('#WakilModal').modal('hide');
+                    nw = nowakil;
+                    Swal.fire({
+                        allowOutsideClick: false,
+                        allowEscapeKey: false,
+                        allowEnterKey: false,
+                        confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
+                        icon: 'success',
+                        title: 'Berjaya Mendaftar Wakil Pelanggan!'
+                    }).then(function(){
+                          
+                        $.ajax({
+                            method:'put',
+                            url: api_url + '/api/ubahwakil/' + kodcaw,
+                            data:{ 'nowakil' : nw,
+                                '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();
+                                    });
+                                }
+                            
+                            }
+                        });
+                    });
+                }
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+        });
+    }
+
+    function daftarwakilfunction(nokp,norujukan)
+    {
+        $('#nokpwakil').val(nokp);
+        $('#norujukanwakil').val(norujukan);
+
+        $.ajax({
+            method:'GET',
+            url: "{{ route('wakil.caricustomer') }}",
+            data:{ "icno" : nokp },
+            success:function(data){
+
+                $('#WakilModal').modal();
+                $('#namawakil').val('');
+                $('#alamatwakil').val(data['']);
+                $('#notelwakil').val(data['']);
+
+                //get first wakil
+                $.ajax({
+                    method:'GET',
+                    url: "{{ route('wakil.first') }}",
+                    success:function(getfirstwakil)
+                    {
+                        let firstwakil = parseInt(getfirstwakil);
+
+                        $('#nowakil').val(firstwakil+1);
+                    }
+                });
+
+                if(data != 'no-data')
+                {
+                    $('#namawakil').val(data['nama']);
+                    $('#alamatwakil').val(data['alamat1']);
+                    $('#notelwakil').val(data['telefon']);
+                    $('#nopelangganwakil').val(data['nopelanggan']);
+                }
+            
+
+            },error: function (request, status, error) {
+                console.log(request.responseText);
+            }
+
+        });
+    }
+
+
+    function ubahfunc(e){
 
         let ubahid = $('input[name="belum"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
@@ -775,17 +902,17 @@
             }
         }else if($("input[name='options']:checked").val() == 'sudah_tebus'){
 
-            let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
+            // let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
-            let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
+            // let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
 
-            if(+harini !== +tarikhgadai1){
+            // if(+harini !== +tarikhgadai1){
-                Swal.fire({
+            //     Swal.fire({
-                    icon: 'error',
+            //         icon: 'error',
-                    title: 'Amaran',
+            //         title: 'Amaran',
-                    text: 'Ubah Gadai Tidak Dibenarkan'
+            //         text: 'Ubah Gadai Tidak Dibenarkan'
-                });
+            //     });
-                return false;
+            //     return false;
-            }
+            // }
         }
 
         if(ubahid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
@@ -799,6 +926,78 @@
         }
 
         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();
+
+                        // console.log(mohon + ' ' + norujukan);
+
+                        $.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
+                                        });
+
+                        var channel = pusher.subscribe('notice-ubahhapus');
+                        channel.bind('my-ubahhapus', function(data) {
+
+                            if(data.norujukan == norujukan)
+                            {
+                                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',
@@ -825,8 +1024,123 @@
 
                                         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;
         }
 

resources/views/khazanah/laporan/index.blade.php

@@ -69,7 +69,7 @@
                                 <a href="{{ route('laporan.ansuran') }}" class="btn btn-dark btn-lg btn-block mb-3">Ansuran</a>
                             </div>
                             <div class="row">
-                                <a href="{{ route('stokaudit.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
+                                <a href="{{ route('laporan.stokaudit') }}" class="btn btn-dark btn-lg btn-block mb-3">Stok Audit</a>
                             </div>
                             <div class="row">
                                 <a href="{{ route('ringkasanharian.laporancetak') }}" class="btn btn-dark btn-lg btn-block mb-3">Ringkasan Harian</a>

resources/views/modal/wakil.blade.php

@@ -19,14 +19,15 @@
             </div>
           </div>
 
-          <input type="hidden" id="nopelanggan"/>
+          <input type="hidden" id="nopelangganwakil"/>
+          <input type="hidden" id="norujukanwakil"/>
 
           <div class="form-group row">
             <div class="col-4">
               <label>No KP</label>
             </div>
             <div class="col-7">
-              <input type="text" class="form-control" id="nokp" name="nokp" readonly/>
+              <input type="text" class="form-control" id="nokpwakil" name="nokpwakil" readonly/>
             </div>
           </div>
 
@@ -35,7 +36,7 @@
               <label>Nama</label>
             </div>
             <div class="col-8">
-              <input type="text" class="form-control" id="nama" name="nama"/>
+              <input type="text" class="form-control" id="namawakil" name="namawakil"/>
             </div>
           </div>
             
@@ -45,7 +46,7 @@
               <label>Alamat</label>
               </div>
             <div class="col-8">
-              <input type="text" class="form-control" id="alamat" name="alamat"/>
+              <input type="text" class="form-control" id="alamatwakil" name="alamatwakil"/>
             </div>
           </div>
 
@@ -54,7 +55,7 @@
               <label>No Tel</label>
             </div>
             <div class="col-6">
-              <input type="text" class="form-control" id="notel" name="notel"/>
+              <input type="text" class="form-control" id="notelwakil" name="notelwakil"/>
             </div>
           </div>
 
@@ -63,7 +64,7 @@
               <label>Nota</label>
             </div>
             <div class="col-8">
-              <input type="text" class="form-control" name="nota" id="nota"/>
+              <input type="text" class="form-control" name="notawakil" id="notawakil"/>
             </div>
           </div>
 

resources/views/penebusan/index.blade.php

@@ -1997,14 +1997,14 @@
 
     function daftarwakil()
     {
-        let nopelanggan = $('#nopelanggan').val();
+        let nopelanggan = $('#nopelangganwakil').val();
         let nowakil = $('#nowakil').val();
-        let nama = $('#nama').val();
+        let nama = $('#namawakil').val();
         let hubungan = $('#slthubungan').val();
-        let alamat = $('#alamat').val();
+        let alamat = $('#alamatwakil').val();
-        let telefon = $('#notel').val();
+        let telefon = $('#notelwakil').val();
-        let nota = $('#nota').val();
+        let nota = $('#notawakil').val();
-        let nokp = $('#nokp').val();
+        let nokp = $('#nokpwakil').val();
 
         
         $.ajax({
@@ -2052,7 +2052,7 @@
 
     function daftarfunction(id)
     {
-        $('#nokp').val(id);
+        $('#nokpwakil').val(id);
 
         $.ajax({
             method:'GET',
@@ -2061,9 +2061,9 @@
             success:function(data){
 
                 $('#WakilModal').modal();
-                $('#nama').val('');
+                $('#namawakil').val('');
-                $('#alamat').val(data['']);
+                $('#alamatwakil').val(data['']);
-                $('#notel').val(data['']);
+                $('#notelwakil').val(data['']);
 
                 //get first wakil
                 $.ajax({
@@ -2079,10 +2079,10 @@
 
                 if(data != 'no-data')
                 {
-                    $('#nama').val(data['nama']);
+                    $('#namawakil').val(data['nama']);
-                    $('#alamat').val(data['alamat1']);
+                    $('#alamatwakil').val(data['alamat1']);
-                    $('#notel').val(data['telefon']);
+                    $('#notelwakil').val(data['telefon']);
-                    $('#nopelanggan').val(data['nopelanggan']);
+                    $('#nopelangganwakil').val(data['nopelanggan']);
                 }