From b875a5bc7cd0fb3f93284f84a11ad40ae7c80b05 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Mon, 30 Aug 2021 16:34:56 +0800
Subject: [PATCH] editing the latest result

---
 .../Controllers/AliranTunaiController.php     |   6 +-
 app/Http/Controllers/KhazanahController.php   |  17 +--
 resources/views/aliran_tunai/index.blade.php  | 107 +++++++++++++++++-
 resources/views/customers/info.blade.php      |  53 +++++++--
 .../views/homepage/penilai/home.blade.php     |   2 +-
 .../views/khazanah/alirantunai.blade.php      |  92 +++++++--------
 6 files changed, 207 insertions(+), 70 deletions(-)

diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index 25b2ac8..c44ee73 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -109,8 +109,10 @@ class AliranTunaiController extends Controller
 
         $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' => Auth::user()->name])->json();
-        
-        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai'));
+
+        $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => Auth::user()->name])->json();
+
+        return view('aliran_tunai.index',compact('cawangan_info','alirantunai','api_url','GT','denominasi','gadai_tebus','tuntutbaki','advansur','addtunai','tunaipast'));
     }
 
     public function alirantunaiGadai(Request $request,$teller){
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 9c0f4c3..d5d32bf 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -317,16 +317,17 @@ class KhazanahController extends Controller
         $arraytuntutbaki = [];
         $arrayaddtunai = [];
 
-        $listUser = User::where([['cawangan', '=', $auth_user['cawangan']],['role_harian','=','teller']])->get();
 
-        foreach($listUser as $index1 => $ls)
+        $teller = Http::get( config('api.url') .'/api/get/tellerwork/'. $auth_user['cawangan'])->json();
+
+        foreach($teller as $index1 => $ls)
         {
-            $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
-            $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls->name])->json();
+            $tunai = Http::get( config('api.url') .'/api/GetCurrentTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls['kodlaluan']])->json();
+            $tunaipast = Http::get( config('api.url') .'/api/getPastTunai/'. $auth_user['cawangan'],['kodlaluan' => $ls['kodlaluan']])->json();
 
-            $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls->name])->json();
-            $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls->name])->json();
-            $addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls->name])->json();
+            $gadai_tebus = Http::get(config('api.url').'/api/gadaitebus/listharini/'.$auth_user['cawangan'].'/teller/',['tarikh' => $harini->toDateString(),'teller' => $ls['kodlaluan']])->json();
+            $tuntutbaki = Http::get(config('api.url').'/api/TuntutBaki/'.$auth_user['cawangan'].'/teller/',['teller' => $ls['kodlaluan']])->json();
+            $addtunai = Http::get(config('api.url').'/api/getAddTunai/'.$auth_user['cawangan'].'/kodlaluan/',['kodlaluan' => $ls['kodlaluan']])->json();
             
             array_push($arraygadaitebus,$gadai_tebus);
             array_push($arraytuntutbaki,$tuntutbaki);
@@ -340,7 +341,7 @@ class KhazanahController extends Controller
 
         $petibesi = Http::get(config('api.url') . '/api/VaultController/all/'. $auth_user['cawangan'])->json();
         
-        return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai'));
+        return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','teller','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai'));
     }
 
 
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 5cb1246..d4b11be 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -115,7 +115,7 @@
 
             <div class="row">
                 <div class="col-md-12 text-center">
-                    <input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="openuptambahdanserah(this)">
+                    <input type="button" class="btn btn-lg btn-primary" value="TAMBAH MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="tambahmodal" onclick="serahankemaskini(this)">
                     <input type="button" class="btn btn-lg btn-primary" value="SERAHAN MODAL" data-kodcaw="{{ $auth_user['cawangan'] }}" data-teller="{{ $auth_user['name'] }}" id="serahanmodal" onclick="serahankemaskini(this)">
                 </div>
             </div>
@@ -128,6 +128,7 @@
                         <button type="button" onclick="cetaklaporanalirantunai()" class="btn btn-primary float-right mr-1">Cetak</button>
                         <nav>
                             <div class="nav nav-tabs mb-4" id="nav-tab" role="tablist">
+                              <a class="nav-item nav-link" id="nav-rekod-tab" data-toggle="tab" href="#nav-rekod" role="tab" aria-controls="nav-rekod" aria-selected="false">Rekod</a>
                               <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>
@@ -135,8 +136,58 @@
                             </div>
                           </nav>
                           <div class="tab-content" id="nav-tabContent">
+                            <div class="tab-pane fade" id="nav-rekod" role="tabpanel" aria-labelledby="nav-rekod-tab">
+
+                                {{-- <div class="row justify-content-end">
+                                    <div class="col-3 text-right" style="margin-bottom:-20px;">
+                                        <span class="font-weight-bold">Tarikh:</span>
+                                        <input type="text" class="col-9" id="tarikhaddtunai" name="tarikhaddtunai" autocomplete="off"  aria-describedby="basic-addon1">
+                                    </div>
+                                </div>
+                                <br>  --}}
+
+                                <table class="table table-striped table-hover  text-center" id="tablerekod">
+                                    <thead class="thead-dark">
+                                        <tr>
+                                            <th>Tarikh</th>
+                                            <th>C/F</th>
+                                            <th>Pendahuluan</th>
+                                            <th>Serahan</th>
+                                            <th>Gadaian</th>
+                                            <th>Penebusan</th>
+                                            <th>B/F</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @if(is_object($tunaipast) || is_array($tunaipast))
+                                        @foreach($tunaipast as $tp)
+                                        <tr>
+                                            <td>{{ $Tarikh = date("d-m-Y", strtotime($tp['tarikh']))  }}</td>
+                                            <td>{{ number_format($tp['bakiawal'],2) }}</td>
+                                            <td>{{ number_format($tp['tambah'],2) }}</td>
+                                            <td>{{ number_format($tp['kurang'],2) }}</td>
+                                            <td>{{ number_format($tp['keluar'],2) }}</td>
+                                            <td>{{ number_format($tp['masuk'],2) }}</td>
+                                            <td>{{ number_format($tp['baki'],2) }}</td>
+                                        </tr>
+                                        @endforeach
+                                        @endif
+                                    </tbody>
+                                </table>
+
+                            </div>
+
                             <div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab">
 
+                            
+                                <div class="row justify-content-end">
+                                    <div class="col-3 text-right" style="margin-bottom:-20px;">
+                                        <span class="font-weight-bold">Tarikh:</span>
+                                        <input type="text" class="col-9" id="tarikhaddtunai" name="tarikhaddtunai" autocomplete="off"  aria-describedby="basic-addon1">
+                                    </div>
+                                </div>
+                                <br> 
+
                                 <table class="table table-striped table-hover  text-center" id="tableaddtunai">
                                     <thead class="thead-dark">
                                         <tr>
@@ -275,9 +326,27 @@
 </div>
 <script>
 
+    var api_url = "<?php echo $api_url ?>";
+    var kodcaw = "<?php echo $cawangan_info['kodcaw'] ?>";
+
     var tableaddtunai = $('#tableaddtunai').DataTable({
-        //   "scrollX": true
-        });
+        "bPaginate": true,
+        "bLengthChange": false,
+        "bFilter": false,
+        "bInfo": true
+    });
+
+    var today = new Date();
+    $('#tarikhaddtunai').datepicker({
+        format: 'dd-mm-yyyy',
+        autoclose:true,
+        endDate: "today",
+        maxDate: today
+    });
+
+    var tablerekod = $('#tablerekod').DataTable({
+    //   "scrollX": true
+    });
 
     var tablegadaitebus = $('#tablegadaitebus').DataTable({
     //   "scrollX": true
@@ -476,6 +545,38 @@
 
     }
 
+    $('#tarikhaddtunai').change(function(){
+        var input_date = this.value;
+        var split_date = input_date.split('-');
+        var today_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0];
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/getAddTunaiDate/' + kodcaw,
+            data:{ 'tarikh' : today_date },
+            success: function(addtunai){
+                gadaitable(addtunai);
+            }
+        });
+    });
+
+    function gadaitable(data){
+        var counter = 1;
+
+        tableaddtunai.clear().draw();
+        $.each(data,function(index,addtunai){
+                 
+            tableaddtunai.row.add([
+                counter,
+                addtunai['tarikh'],
+                formatter.format(addtunai['tambah']),
+                formatter.format(addtunai['kurang']),
+                addtunai['nota']
+            ]).draw();
+            
+            counter = counter + 1;
+        });   
+    }
+
     let pusherenv = "{{ env('PUSHER_APP_KEY') }}";
     let laporanroute = "{{ route('laporan.serahanteller') }}";
 </script>
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 47ef3eb..a323411 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -205,6 +205,7 @@
                                 <th>Jum Tuntut/Bayar</th>
                                 <th>Keuntungan</th>
                                 <th>Caj Lelong</th>
+                                <th>Cetak</th>
                             </tr>
                         </thead>
                     </table>
@@ -750,17 +751,34 @@
                     }else if(jenistebus == "lelong"){
                         var urlroute = '{{ route("lelongan", ":id") }}';
                         urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-                        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'])
-                        ]).draw();
+
+                        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']),
+                                '<button class="btn btn-info" onclick="cetaktuntutbaki(this)" data-norujukan=' + gadai_detail['norujukan'] +'>Cetak</button>'
+                            ]).draw();
+                        }
                     }
                     counter = counter + 1;
                 }
@@ -768,6 +786,19 @@
         });
     }
 
+    function cetaktuntutbaki(e)
+    {
+        let norujukan = $(e).data('norujukan');
+
+        console.log(norujukan);
+        let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+        urlroute = urlroute.replace(':id', norujukan);
+
+        window.open(urlroute, '_blank');
+
+        return;
+    }
+
     function checktuntutbaki(e)
     {
         let tarikhtuntut = $(e).data('tarikhtuntut');
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 46706ee..332fb00 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -264,7 +264,7 @@
         setTimeout("location.reload(true);",timeoutPeriod);
     }
 
-    // window.onload = timedRefresh(100000);
+    window.onload = timedRefresh(100000);
     //Pusher
 
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php
index 26e754b..f70fc1e 100644
--- a/resources/views/khazanah/alirantunai.blade.php
+++ b/resources/views/khazanah/alirantunai.blade.php
@@ -64,6 +64,10 @@
                   <li class="breadcrumb-item"><a href="{{ route('home') }}">Home</a></li>
                   <li class="breadcrumb-item active" aria-current="page">Aliran Tunai</li>
                 </ol>
+
+                <button type="button" class="btn btn-danger float-right mr-3" data-toggle="modal" data-target="#exampleModalCenter">
+                  Peti Besi
+                </button>
               </nav>
 
                 {{-- {{ dd($tunai) }} --}}
@@ -92,9 +96,6 @@
                     </div>
 
                      <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-danger float-right mr-3" data-toggle="modal" data-target="#exampleModalCenter">
-                      Peti Besi
-                    </button>
 
 
                     <div class="tab-content" id="pills-tabContent">
@@ -106,29 +107,30 @@
                           {{-- {{ dd($arraytunai) }} --}}
 
                           <ul class="nav nav-pills mb-3" id="pills-tab" role="tablist">  
-                          <script> let listu = [];</script>
-                          @foreach($listUser as $index1=>$ls)
-                          <script> listu.push("{{ $ls->id }}"); </script>
-                          
-                            @if($index1 == 0)
-                              <li class="nav-item">
-                                <a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-home" aria-selected="true">{{ $ls->name }}</a>
-                              </li>
-                            @else
-                              <li class="nav-item">
-                                <a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-{{ $ls->id }}" role="tab" aria-controls="pills-profile" aria-selected="false">{{ $ls->name }}</a>
-                              </li>
-                            @endif
+                            <script> let listu = [];</script>
+                            @foreach($teller as $index1=>$ls)
+                            <script> listu.push("{{ $loop->iteration }}"); </script>
+                            
+                              @if($index1 == 0)
+                                <li class="nav-item">
+                                  <a class="nav-link active" id="pills-home-tab" data-toggle="pill" href="#pills-{{ $loop->iteration }}" role="tab" aria-controls="pills-home" aria-selected="true">{{ $ls['kodlaluan'] }}</a>
+                                </li>
+                              @else
+                                <li class="nav-item">
+                                  <a class="nav-link" id="pills-profile-tab" data-toggle="pill" href="#pills-{{ $loop->iteration }}" role="tab" aria-controls="pills-profile" aria-selected="false">{{ $ls['kodlaluan'] }}</a>
+                                </li>
+                              @endif
+  
+                            @endforeach
+                            </ul>
 
-                          @endforeach
-                          </ul>
                           
                           <div class="tab-content" id="pills-tabContent">
 
-                            @foreach($listUser as $index1=>$ls)
+                            @foreach($teller as $index1=>$ls)
 
                             @if($index1 == 0)
-                              <div class="tab-pane fade show active" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-home-tab">
+                              <div class="tab-pane fade show active" id="pills-{{ $loop->iteration }}" role="tabpanel" aria-labelledby="pills-home-tab">
 
                                 <fieldset class="border p-2">
                                   <legend  class="w-auto">Hari Ini</legend>
@@ -220,26 +222,26 @@
 
                                 <ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
                                   <li class="nav-item">
-                                    <a class="nav-link active" id="history-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-history" role="tab" aria-controls="home" aria-selected="true">Rekod Tunai</a>
+                                    <a class="nav-link active" id="history-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-history" role="tab" aria-controls="home" aria-selected="true">Rekod Tunai</a>
                                   </li>
                                   <li class="nav-item">
-                                    <a class="nav-link" id="addtunai-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-addtunai" role="tab" aria-controls="profile" aria-selected="false">Tunai</a>
+                                    <a class="nav-link" id="addtunai-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-addtunai" role="tab" aria-controls="profile" aria-selected="false">Tunai</a>
                                   </li>
                                   <li class="nav-item">
-                                    <a class="nav-link" id="gt-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-gt" role="tab" aria-controls="contact" aria-selected="false">Gadai/Tebus</a>
+                                    <a class="nav-link" id="gt-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-gt" role="tab" aria-controls="contact" aria-selected="false">Gadai/Tebus</a>
                                   </li>
                                   <li class="nav-item">
-                                    <a class="nav-link" id="tuntutbaki-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-tuntutbaki" role="tab" aria-controls="contact" aria-selected="false">Tuntut Baki</a>
+                                    <a class="nav-link" id="tuntutbaki-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-tuntutbaki" role="tab" aria-controls="contact" aria-selected="false">Tuntut Baki</a>
                                   </li>
                                 </ul>
 
                                 <div class="mt-3">
                                   <div class="tab-content" id="myTabContent">
-                                    <div class="tab-pane fade show active" id="nav-{{ $ls->id }}-history" role="tabpanel" aria-labelledby="history-tab">
+                                    <div class="tab-pane fade show active" id="nav-{{ $loop->iteration }}-history" role="tabpanel" aria-labelledby="history-tab">
                                     
                                       
 
-                                        <table class='table table-striped table-hover' id='table-{{ $ls->id }}' style="width:100%;">
+                                        <table class='table table-striped table-hover' id='table-{{ $loop->iteration }}' style="width:100%;">
                                           <thead class="thead-dark">
                                               <tr>
                                                   <th>Bil</th>
@@ -270,7 +272,7 @@
                                     
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
                                     
                                       {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
@@ -279,7 +281,7 @@
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
                                       </div> --}}
 
-                                      <table class="table table-striped table-hover text-center" id="tableaddtunai-{{ $ls->id }}">
+                                      <table class="table table-striped table-hover text-center" id="tableaddtunai-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>
@@ -305,7 +307,7 @@
                                       </table>
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-gt" role="tabpanel" aria-labelledby="gt-tab">
                                     
                                       {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
@@ -314,7 +316,7 @@
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
                                       </div> --}}
 
-                                      <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
+                                      <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>
@@ -345,7 +347,7 @@
                                       </table>
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
                                     
                                       {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
@@ -354,7 +356,7 @@
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
                                       </div> --}}
                                       
-                                      <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
+                                      <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>
@@ -392,7 +394,7 @@
 
                               </div>
                             @else
-                              <div class="tab-pane fade" id="pills-{{ $ls->id }}" role="tabpanel" aria-labelledby="pills-profile-tab">
+                              <div class="tab-pane fade" id="pills-{{ $loop->iteration }}" role="tabpanel" aria-labelledby="pills-profile-tab">
 
                                 <fieldset class="border p-2">
                                   <legend  class="w-auto">Hari Ini</legend>
@@ -485,27 +487,27 @@
 
                                   <ul class="nav nav-tabs mt-4" id="myTab" role="tablist">
                                     <li class="nav-item">
-                                      <a class="nav-link active" id="history-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-history" role="tab" aria-controls="home" aria-selected="true">Rekod Tunai</a>
+                                      <a class="nav-link active" id="history-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-history" role="tab" aria-controls="home" aria-selected="true">Rekod Tunai</a>
                                     </li>
                                     <li class="nav-item">
-                                      <a class="nav-link" id="addtunai-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-addtunai" role="tab" aria-controls="profile" aria-selected="false">Tunai</a>
+                                      <a class="nav-link" id="addtunai-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-addtunai" role="tab" aria-controls="profile" aria-selected="false">Tunai</a>
                                     </li>
                                     <li class="nav-item">
-                                      <a class="nav-link" id="gt-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-gt" role="tab" aria-controls="contact" aria-selected="false">Gadai/Tebus</a>
+                                      <a class="nav-link" id="gt-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-gt" role="tab" aria-controls="contact" aria-selected="false">Gadai/Tebus</a>
                                     </li>
                                     <li class="nav-item">
-                                      <a class="nav-link" id="tuntutbaki-tab" data-toggle="tab" href="#nav-{{ $ls->id }}-tuntutbaki" role="tab" aria-controls="contact" aria-selected="false">Tuntut Baki</a>
+                                      <a class="nav-link" id="tuntutbaki-tab" data-toggle="tab" href="#nav-{{ $loop->iteration }}-tuntutbaki" role="tab" aria-controls="contact" aria-selected="false">Tuntut Baki</a>
                                     </li>
                                   </ul>
 
 
                                 <div class="mt-3">
                                   <div class="tab-content" id="myTabContent">
-                                    <div class="tab-pane fade show active" id="nav-{{ $ls->id }}-history" role="tabpanel" aria-labelledby="history-tab">
+                                    <div class="tab-pane fade show active" id="nav-{{ $loop->iteration }}-history" role="tabpanel" aria-labelledby="history-tab">
                                     
                                       
 
-                                        <table class='table table-striped table-hover' id='table-{{ $ls->id }}' style="width:100%;">
+                                        <table class='table table-striped table-hover' id='table-{{ $loop->iteration }}' style="width:100%;">
                                           <thead class="thead-dark">
                                               <tr>
                                                   <th>Bil</th>
@@ -536,7 +538,7 @@
                                     
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
                                     
                                      
                                         {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
@@ -547,7 +549,7 @@
                                         </div> --}}
                                    
 
-                                      <table class="table text-center table-striped table-hover" id="tableaddtunai-{{ $ls->id }}">
+                                      <table class="table text-center table-striped table-hover" id="tableaddtunai-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>
@@ -574,7 +576,7 @@
                                     
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-gt" role="tabpanel" aria-labelledby="gt-tab">
                                     
                                       {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
@@ -584,7 +586,7 @@
                                       </div> --}}
 
 
-                                      <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
+                                      <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>
@@ -615,7 +617,7 @@
                                       </table>
                                     
                                     </div>
-                                    <div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
+                                    <div class="tab-pane fade" id="nav-{{ $loop->iteration }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
                                     
                                       {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
@@ -625,7 +627,7 @@
                                       </div> --}}
 
 
-                                      <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
+                                      <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $loop->iteration }}">
                                         <thead class="thead-dark">
                                             <tr>
                                                 <th>Bil</th>