diff --git a/resources/views/dashboard/History/Peminjaman/index.blade.php b/resources/views/dashboard/History/Peminjaman/index.blade.php
index d5f5345..5fdeb32 100644
--- a/resources/views/dashboard/History/Peminjaman/index.blade.php
+++ b/resources/views/dashboard/History/Peminjaman/index.blade.php
@@ -13,7 +13,7 @@
         <div class="card-header py-3">
             <div class="row">
                 <div class="col-6">
-                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Peminjaman</h5>
+                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Peti Out</h5>
                 </div>
             </div>
         </div>
diff --git a/resources/views/dashboard/History/Pengembalian/index.blade.php b/resources/views/dashboard/History/Pengembalian/index.blade.php
index f02c05c..5566aa7 100644
--- a/resources/views/dashboard/History/Pengembalian/index.blade.php
+++ b/resources/views/dashboard/History/Pengembalian/index.blade.php
@@ -13,7 +13,7 @@
         <div class="card-header py-3">
             <div class="row">
                 <div class="col-6">
-                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Pengembalian</h5>
+                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Peti In</h5>
                 </div>
             </div>
         </div>
diff --git a/resources/views/dashboard/History/Transfer/index.blade.php b/resources/views/dashboard/History/Transfer/index.blade.php
index 969b221..e08ca4c 100644
--- a/resources/views/dashboard/History/Transfer/index.blade.php
+++ b/resources/views/dashboard/History/Transfer/index.blade.php
@@ -13,7 +13,7 @@
         <div class="card-header py-3">
             <div class="row">
                 <div class="col-6">
-                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Transfer</h5>
+                    <h5 class="m-0 font-weight-bold text-primary mt-2">Histori Transfer Peti</h5>
                 </div>
             </div>
         </div>
diff --git a/resources/views/dashboard/Pengembalian/edit.blade.php b/resources/views/dashboard/Pengembalian/edit.blade.php
index 636f558..b654d5f 100644
--- a/resources/views/dashboard/Pengembalian/edit.blade.php
+++ b/resources/views/dashboard/Pengembalian/edit.blade.php
@@ -5,7 +5,7 @@
         <div class="card-header py-3">
             <div class="row">
                 <div class="col-6">
-                    <h5 class="m-0 font-weight-bold text-primary mt-2">Pengembalian Peti</h5>
+                    <h5 class="m-0 font-weight-bold text-primary mt-2">Edit Pengembalian Peti</h5>
                 </div>
             </div>
         </div>
diff --git a/resources/views/pages/user/Master_Data/Customer/index.blade.php b/resources/views/pages/user/Master_Data/Customer/index.blade.php
index a57ee09..a446365 100644
--- a/resources/views/pages/user/Master_Data/Customer/index.blade.php
+++ b/resources/views/pages/user/Master_Data/Customer/index.blade.php
@@ -1,14 +1,39 @@
 <div class="card shadow mb-4">
-    <div class="card-header py-3">
+    <nav class="navbar navbar-expand navbar-light bg-light py-3" style="border-bottom: 1px solid #ddd;">
+        <h5 class="m-0 font-weight-bold text-primary mt-2">Data Customer</h5>
+    </nav>
+    <div class="card-body">
         <div class="row">
             <div class="col-6">
-                <h5 class="m-0 font-weight-bold text-primary mt-2">Data Customer</h5>
+                <!-- Fitur page -->
+                <form method="GET" action="{{ route('dashboard.customer.index') }}">
+                    <label for="perPage">Tampilkan:</label>
+                    <select id="perPage" name="perPage" class="form-select" onchange="this.form.submit()">
+                        <option value="5" {{ request('perPage', 5) == '5' ? 'selected' : '' }}>5</option>
+                        <option value="10" {{ request('perPage', 5) == '10' ? 'selected' : '' }}>10</option>
+                        <option value="25" {{ request('perPage', 5) == '25' ? 'selected' : '' }}>25</option>
+                        <option value="50" {{ request('perPage', 5) == '50' ? 'selected' : '' }}>50</option>
+                        <option value="100" {{ request('perPage', 5) == '100' ? 'selected' : '' }}>100</option>
+                        <option value="{{ $customers->total() }}"
+                            {{ request('perPage', 5) == $customers->total() ? 'selected' : '' }}>Semua</option>
+                    </select>
+                    <input type="hidden" name="search" value="{{ $search }}">
+                    <input type="hidden" name="page" value="{{ request('page', 1) }}">
+                </form>
+            </div>
+            <div class="col-6 d-flex justify-content-end mb-3">
+                <!-- Fitur search -->
+                <form method="GET" action="{{ route('dashboard.customer.index') }}" class="form-inline">
+                    <input type="text" name="search" class="form-control mr-2" placeholder="Cari..."
+                        value="{{ $search }}">
+                    <input type="hidden" name="page" value="1">
+                    <input type="hidden" name="perPage" value="{{ request('perPage', 5) }}">
+                    <button type="submit" class="btn btn-primary">Cari</button>
+                </form>
             </div>
         </div>
-    </div>
-    <div class="card-body">
         <div class="table-responsive">
-            <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+            <table class="table table-bordered" width="100%" cellspacing="0">
                 <thead>
                     <tr>
                         <th class="text-center">No</th>
@@ -19,21 +44,54 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @php
-                        $nocustomer = 1;
-                    @endphp
-                    @forelse ($customer as $data_customer)
+                    @forelse ($customers as $data_customer)
                         <tr>
-                            <td class="text-center">{{ $nocustomer++ }}</td>
-                            <td>{{ $data_customer->name }}</td>
-                            <td>{{ $data_customer->code_customer }}</td>
-                            <td>{{ $data_customer->no_tlp }}</td>
-                            <td>{{ $data_customer->address }}</td>
+                            <td class="text-center">{{ $i++ }}</td>
+                            <td>{{ optional($data_customer)->name }}</td>
+                            <td>{{ optional($data_customer)->code_customer }}</td>
+                            <td>{{ optional($data_customer)->no_tlp }}</td>
+                            <td>{{ optional($data_customer)->address }}</td>
                         </tr>
                     @empty
+                        <tr>
+                            <td colspan="6" class="text-center">Data Kosong</td>
+                        </tr>
                     @endforelse
                 </tbody>
             </table>
         </div>
+        <div class="row mt-3">
+            <div class="col-4">
+                <!-- Tampilkan jumlah data yang ditampilkan -->
+                @if (!$customers->isEmpty())
+                    <p class="d-inline-block">Showing {{ $customers->firstItem() }} to
+                        {{ $customers->lastItem() }} of
+                        {{ $customers->total() }} entries</p>
+                @endif
+            </div>
+            <div class="col-8 d-flex justify-content-end">
+                @if ($customers->total() > $customers->perPage())
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination justify-content-center">
+                            <li class="page-item {{ $customers->onFirstPage() ? 'disabled' : '' }}">
+                                <a class="page-link"
+                                    href="{{ $customers->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                    aria-label="First">
+                                    <span aria-hidden="true">First</span>
+                                </a>
+                            </li>
+                            {{ $customers->appends(['perPage' => Request::get('perPage')])->links() }}
+                            <li class="page-item {{ $customers->hasMorePages() ? '' : 'disabled' }}">
+                                <a class="page-link"
+                                    href="{{ $customers->appends(['perPage' => Request::get('perPage')])->url($customers->lastPage()) }}"
+                                    aria-label="Last">
+                                    <span aria-hidden="true">Last</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </nav>
+                @endif
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/pages/user/Master_Data/Manajemen_Peti/kondisi_peti/index.blade.php b/resources/views/pages/user/Master_Data/Manajemen_Peti/kondisi_peti/index.blade.php
index b4f9b31..eaa4ae1 100644
--- a/resources/views/pages/user/Master_Data/Manajemen_Peti/kondisi_peti/index.blade.php
+++ b/resources/views/pages/user/Master_Data/Manajemen_Peti/kondisi_peti/index.blade.php
@@ -1,14 +1,39 @@
 <div class="card shadow mb-4">
-    <div class="card-header py-3">
+    <nav class="navbar navbar-expand navbar-light bg-light py-3" style="border-bottom: 1px solid #ddd;">
+        <h5 class="m-0 font-weight-bold text-primary mt-2">Data Kondisi Peti</h5>
+    </nav>
+    <div class="card-body">
         <div class="row">
             <div class="col-6">
-                <h5 class="m-0 font-weight-bold text-primary mt-2">Data Kondisi Peti</h5>
+                <!-- Fitur page -->
+                <form method="GET" action="{{ route('dashboard.kondisipeti.index') }}">
+                    <label for="perPage">Tampilkan:</label>
+                    <select id="perPage" name="perPage" class="form-select" onchange="this.form.submit()">
+                        <option value="5" {{ request('perPage', 5) == '5' ? 'selected' : '' }}>5</option>
+                        <option value="10" {{ request('perPage', 5) == '10' ? 'selected' : '' }}>10</option>
+                        <option value="25" {{ request('perPage', 5) == '25' ? 'selected' : '' }}>25</option>
+                        <option value="50" {{ request('perPage', 5) == '50' ? 'selected' : '' }}>50</option>
+                        <option value="100" {{ request('perPage', 5) == '100' ? 'selected' : '' }}>100</option>
+                        <option value="{{ $kondisiPetis->total() }}"
+                            {{ request('perPage', 5) == $kondisiPetis->total() ? 'selected' : '' }}>Semua</option>
+                    </select>
+                    <input type="hidden" name="search" value="{{ $search }}">
+                    <input type="hidden" name="page" value="{{ request('page', 1) }}">
+                </form>
+            </div>
+            <div class="col-6 d-flex justify-content-end mb-3">
+                <!-- Fitur search -->
+                <form method="GET" action="{{ route('dashboard.kondisipeti.index') }}" class="form-inline">
+                    <input type="text" name="search" class="form-control mr-2" placeholder="Cari..."
+                        value="{{ $search }}">
+                    <input type="hidden" name="page" value="1">
+                    <input type="hidden" name="perPage" value="{{ request('perPage', 5) }}">
+                    <button type="submit" class="btn btn-primary">Cari</button>
+                </form>
             </div>
         </div>
-    </div>
-    <div class="card-body">
         <div class="table-responsive">
-            <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+            <table class="table table-bordered" width="100%" cellspacing="0">
                 <thead>
                     <tr>
                         <th class="text-center" style="width: 20px">No</th>
@@ -17,18 +42,52 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @php
-                        $nokondisi = 1;
-                    @endphp
-                    @foreach ($kondisiPeti as $data_kondisiPeti)
+                    @forelse ($kondisiPetis as $data_kondisiPeti)
                         <tr>
-                            <td class="text-center">{{ $nokondisi++ }}</td>
-                            <td>{{ $data_kondisiPeti->nama_kondisi }}</td>
-                            <td>{{ $data_kondisiPeti->deskripsi_kondisi }}</td>
+                            <td class="text-center">{{ $i++ }}</td>
+                            <td>{{ optional($data_kondisiPeti)->nama_kondisi }}</td>
+                            <td>{{ optional($data_kondisiPeti)->deskripsi_kondisi }}</td>
                         </tr>
-                    @endforeach
+                    @empty
+                        <tr>
+                            <td colspan="4" class="text-center">Data Kosong</td>
+                        </tr>
+                    @endforelse
                 </tbody>
             </table>
         </div>
+        <div class="row mt-3">
+            <div class="col-4">
+                <!-- Tampilkan jumlah data yang ditampilkan -->
+                @if (!$kondisiPetis->isEmpty())
+                    <p class="d-inline-block">Showing {{ $kondisiPetis->firstItem() }} to
+                        {{ $kondisiPetis->lastItem() }} of
+                        {{ $kondisiPetis->total() }} entries</p>
+                @endif
+            </div>
+            <div class="col-8 d-flex justify-content-end">
+                @if ($kondisiPetis->total() > $kondisiPetis->perPage())
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination justify-content-center">
+                            <li class="page-item {{ $kondisiPetis->onFirstPage() ? 'disabled' : '' }}">
+                                <a class="page-link"
+                                    href="{{ $kondisiPetis->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                    aria-label="First">
+                                    <span aria-hidden="true">First</span>
+                                </a>
+                            </li>
+                            {{ $kondisiPetis->appends(['perPage' => Request::get('perPage')])->links() }}
+                            <li class="page-item {{ $kondisiPetis->hasMorePages() ? '' : 'disabled' }}">
+                                <a class="page-link"
+                                    href="{{ $kondisiPetis->appends(['perPage' => Request::get('perPage')])->url($kondisiPetis->lastPage()) }}"
+                                    aria-label="Last">
+                                    <span aria-hidden="true">Last</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </nav>
+                @endif
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/pages/user/Master_Data/Manajemen_Peti/tipe_peti/index.blade.php b/resources/views/pages/user/Master_Data/Manajemen_Peti/tipe_peti/index.blade.php
index 0b88324..4b32982 100644
--- a/resources/views/pages/user/Master_Data/Manajemen_Peti/tipe_peti/index.blade.php
+++ b/resources/views/pages/user/Master_Data/Manajemen_Peti/tipe_peti/index.blade.php
@@ -1,14 +1,39 @@
 <div class="card shadow mb-4">
-    <div class="card-header py-3">
+    <nav class="navbar navbar-expand navbar-light bg-light py-3" style="border-bottom: 1px solid #ddd;">
+        <h5 class="m-0 font-weight-bold text-primary mt-2">Data Tipe Peti</h5>
+    </nav>
+    <div class="card-body">
         <div class="row">
             <div class="col-6">
-                <h5 class="m-0 font-weight-bold text-primary mt-2">Data Tipe Peti</h5>
+                <!-- Fitur page -->
+                <form method="GET" action="{{ route('dashboard.typepeti.index') }}">
+                    <label for="perPage">Tampilkan:</label>
+                    <select id="perPage" name="perPage" class="form-select" onchange="this.form.submit()">
+                        <option value="5" {{ request('perPage', 5) == '5' ? 'selected' : '' }}>5</option>
+                        <option value="10" {{ request('perPage', 5) == '10' ? 'selected' : '' }}>10</option>
+                        <option value="25" {{ request('perPage', 5) == '25' ? 'selected' : '' }}>25</option>
+                        <option value="50" {{ request('perPage', 5) == '50' ? 'selected' : '' }}>50</option>
+                        <option value="100" {{ request('perPage', 5) == '100' ? 'selected' : '' }}>100</option>
+                        <option value="{{ $TipePetis->total() }}"
+                            {{ request('perPage', 5) == $TipePetis->total() ? 'selected' : '' }}>Semua</option>
+                    </select>
+                    <input type="hidden" name="search" value="{{ $search }}">
+                    <input type="hidden" name="page" value="{{ request('page', 1) }}">
+                </form>
+            </div>
+            <div class="col-6 d-flex justify-content-end mb-3">
+                <!-- Fitur search -->
+                <form method="GET" action="{{ route('dashboard.typepeti.index') }}" class="form-inline">
+                    <input type="text" name="search" class="form-control mr-2" placeholder="Cari..."
+                        value="{{ $search }}">
+                    <input type="hidden" name="page" value="1">
+                    <input type="hidden" name="perPage" value="{{ request('perPage', 5) }}">
+                    <button type="submit" class="btn btn-primary">Cari</button>
+                </form>
             </div>
         </div>
-    </div>
-    <div class="card-body">
         <div class="table-responsive">
-            <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+            <table class="table table-bordered" width="100%" cellspacing="0">
                 <thead>
                     <tr>
                         <th class="text-center" style="width: 20px">No</th>
@@ -18,20 +43,53 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @php
-                        $notype = 1;
-                    @endphp
-                    @forelse ($typepeti as $data_typepeti)
+                    @forelse ($TipePetis as $data_typepeti)
                         <tr>
-                            <td class="text-center">{{ $notype++ }}</td>
-                            <td>{{ $data_typepeti->type }}</td>
-                            <td>{{ $data_typepeti->size_peti }}</td>
-                            <td>{{ $data_typepeti->description }}</td>
+                            <td class="text-center">{{ $i++ }}</td>
+                            <td>{{ optional($data_typepeti)->type }}</td>
+                            <td>{{ optional($data_typepeti)->size_peti }}</td>
+                            <td>{{ optional($data_typepeti)->description }}</td>
                         </tr>
                     @empty
+                        <tr>
+                            <td colspan="5" class="text-center">Data Kosong</td>
+                        </tr>
                     @endforelse
                 </tbody>
             </table>
         </div>
+        <div class="row mt-3">
+            <div class="col-4">
+                <!-- Tampilkan jumlah data yang ditampilkan -->
+                @if (!$TipePetis->isEmpty())
+                    <p class="d-inline-block">Showing {{ $TipePetis->firstItem() }} to
+                        {{ $TipePetis->lastItem() }} of
+                        {{ $TipePetis->total() }} entries</p>
+                @endif
+            </div>
+            <div class="col-8 d-flex justify-content-end">
+                @if ($TipePetis->total() > $TipePetis->perPage())
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination justify-content-center">
+                            <li class="page-item {{ $TipePetis->onFirstPage() ? 'disabled' : '' }}">
+                                <a class="page-link"
+                                    href="{{ $TipePetis->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                    aria-label="First">
+                                    <span aria-hidden="true">First</span>
+                                </a>
+                            </li>
+                            {{ $TipePetis->appends(['perPage' => Request::get('perPage')])->links() }}
+                            <li class="page-item {{ $TipePetis->hasMorePages() ? '' : 'disabled' }}">
+                                <a class="page-link"
+                                    href="{{ $TipePetis->appends(['perPage' => Request::get('perPage')])->url($TipePetis->lastPage()) }}"
+                                    aria-label="Last">
+                                    <span aria-hidden="true">Last</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </nav>
+                @endif
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/pages/user/Master_Data/Warehouse/index.blade.php b/resources/views/pages/user/Master_Data/Warehouse/index.blade.php
index 8f623f6..40241f0 100644
--- a/resources/views/pages/user/Master_Data/Warehouse/index.blade.php
+++ b/resources/views/pages/user/Master_Data/Warehouse/index.blade.php
@@ -1,16 +1,39 @@
 <div class="card shadow mb-4">
-    <div class="card-header py-3">
+    <nav class="navbar navbar-expand navbar-light bg-light py-3" style="border-bottom: 1px solid #ddd;">
+        <h5 class="m-0 font-weight-bold text-primary mt-2">Data Gudang</h5>
+    </nav>
+    <div class="card-body">
         <div class="row">
             <div class="col-6">
-                <h5 class="m-0 font-weight-bold text-primary mt-2">Data Gudang</h5>
+                <!-- Fitur page -->
+                <form method="GET" action="{{ route('dashboard.warehouse.index') }}">
+                    <label for="perPage">Tampilkan:</label>
+                    <select id="perPage" name="perPage" class="form-select" onchange="this.form.submit()">
+                        <option value="5" {{ request('perPage', 5) == '5' ? 'selected' : '' }}>5</option>
+                        <option value="10" {{ request('perPage', 5) == '10' ? 'selected' : '' }}>10</option>
+                        <option value="25" {{ request('perPage', 5) == '25' ? 'selected' : '' }}>25</option>
+                        <option value="50" {{ request('perPage', 5) == '50' ? 'selected' : '' }}>50</option>
+                        <option value="100" {{ request('perPage', 5) == '100' ? 'selected' : '' }}>100</option>
+                        <option value="{{ $warehouse->total() }}"
+                            {{ request('perPage', 5) == $warehouse->total() ? 'selected' : '' }}>Semua</option>
+                    </select>
+                    <input type="hidden" name="search" value="{{ $search }}">
+                    <input type="hidden" name="page" value="{{ request('page', 1) }}">
+                </form>
             </div>
-            <div class="col-6 text-right">
+            <div class="col-6 d-flex justify-content-end mb-3">
+                <!-- Fitur search -->
+                <form method="GET" action="{{ route('dashboard.warehouse.index') }}" class="form-inline">
+                    <input type="text" name="search" class="form-control mr-2" placeholder="Cari..."
+                        value="{{ $search }}">
+                    <input type="hidden" name="page" value="1">
+                    <input type="hidden" name="perPage" value="{{ request('perPage', 5) }}">
+                    <button type="submit" class="btn btn-primary">Cari</button>
+                </form>
             </div>
         </div>
-    </div>
-    <div class="card-body">
         <div class="table-responsive">
-            <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+            <table class="table table-bordered" width="100%" cellspacing="0">
                 <thead>
                     <tr>
                         <th class="text-center" style="width: 50px;">No.</th>
@@ -20,19 +43,53 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @php
-                        $nowarehouses = 1;
-                    @endphp
-                    @foreach ($warehouses as $data)
+                    @forelse ($warehouse as $data)
+                        <tr>
+                            <td class="text-center" style="width: 50px;">{{ $i++ }}</td>
+                            <td>{{ optional($data)->name }}</td>
+                            <td>{{ optional($data)->description }}</td>
+                            <td>{{ optional($data)->address }}</td>
+                        </tr>
+                    @empty
                         <tr>
-                            <td class="text-center" style="width: 50px;">{{ $nowarehouses++ }}</td>
-                            <td>{{ $data->name }}</td>
-                            <td>{{ $data->description }}</td>
-                            <td>{{ $data->address }}</td>
+                            <td colspan="5" class="text-center">Data Kosong</td>
                         </tr>
-                    @endforeach
+                    @endforelse
                 </tbody>
             </table>
         </div>
+        <div class="row mt-3">
+            <div class="col-4">
+                <!-- Tampilkan jumlah data yang ditampilkan -->
+                @if (!$warehouse->isEmpty())
+                    <p class="d-inline-block">Showing {{ $warehouse->firstItem() }} to
+                        {{ $warehouse->lastItem() }} of
+                        {{ $warehouse->total() }} entries</p>
+                @endif
+            </div>
+            <div class="col-8 d-flex justify-content-end">
+                @if ($warehouse->total() > $warehouse->perPage())
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination justify-content-center">
+                            <li class="page-item {{ $warehouse->onFirstPage() ? 'disabled' : '' }}">
+                                <a class="page-link"
+                                    href="{{ $warehouse->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                    aria-label="First">
+                                    <span aria-hidden="true">First</span>
+                                </a>
+                            </li>
+                            {{ $warehouse->appends(['perPage' => Request::get('perPage')])->links() }}
+                            <li class="page-item {{ $warehouse->hasMorePages() ? '' : 'disabled' }}">
+                                <a class="page-link"
+                                    href="{{ $warehouse->appends(['perPage' => Request::get('perPage')])->url($warehouse->lastPage()) }}"
+                                    aria-label="Last">
+                                    <span aria-hidden="true">Last</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </nav>
+                @endif
+            </div>
+        </div>
     </div>
 </div>
diff --git a/resources/views/pages/user/dashboard/disposal/index.blade.php b/resources/views/pages/user/dashboard/disposal/index.blade.php
index 6b2888d..d6d6672 100644
--- a/resources/views/pages/user/dashboard/disposal/index.blade.php
+++ b/resources/views/pages/user/dashboard/disposal/index.blade.php
@@ -7,8 +7,37 @@
         </div>
     </div>
     <div class="card-body">
+        <div class="row">
+            <div class="col-6">
+                <!-- Fitur page -->
+                <form method="GET" action="{{ route('dashboard.disposal.index') }}">
+                    <label for="perPage">Tampilkan:</label>
+                    <select id="perPage" name="perPage" class="form-select" onchange="this.form.submit()">
+                        <option value="5" {{ request('perPage', 5) == '5' ? 'selected' : '' }}>5</option>
+                        <option value="10" {{ request('perPage', 5) == '10' ? 'selected' : '' }}>10</option>
+                        <option value="25" {{ request('perPage', 5) == '25' ? 'selected' : '' }}>25</option>
+                        <option value="50" {{ request('perPage', 5) == '50' ? 'selected' : '' }}>50</option>
+                        <option value="100" {{ request('perPage', 5) == '100' ? 'selected' : '' }}>100</option>
+                        <option value="{{ $disposals->total() }}"
+                            {{ request('perPage', 5) == $disposals->total() ? 'selected' : '' }}>Semua</option>
+                    </select>
+                    <input type="hidden" name="search" value="{{ $search }}">
+                    <input type="hidden" name="page" value="{{ request('page', 1) }}">
+                </form>
+            </div>
+            <div class="col-6 d-flex justify-content-end mb-3">
+                <!-- Fitur search -->
+                <form method="GET" action="{{ route('dashboard.disposal.index') }}" class="form-inline">
+                    <input type="text" name="search" class="form-control mr-2" placeholder="Cari..."
+                        value="{{ $search }}">
+                    <input type="hidden" name="page" value="1">
+                    <input type="hidden" name="perPage" value="{{ request('perPage', 5) }}">
+                    <button type="submit" class="btn btn-primary">Cari</button>
+                </form>
+            </div>
+        </div>
         <div class="table-responsive">
-            <table class="table table-bordered" id="tablebarang" width="100%" cellspacing="0">
+            <table class="table table-bordered" width="100%" cellspacing="0">
                 <thead>
                     <tr>
                         <th class="text-center">No</th>
@@ -19,22 +48,54 @@
                     </tr>
                 </thead>
                 <tbody>
-                    @php
-                        $nodisposal = 1;
-                    @endphp
-                    @forelse ($disposal as $data_disposal)
+                    @forelse ($disposals as $data_disposal)
                         <tr>
-                            <td>{{ $nodisposal++ }}</td>
+                            <td>{{ $i++ }}</td>
                             <td>{{ optional($data_disposal->peti)->fix_lot }}</td>
                             <td>{{ optional($data_disposal->customer)->name }}</td>
                             <td>{{ \Carbon\Carbon::parse($data_disposal->date_disposal)->format('d-m-Y') }}</td>
-                            <td>{{ $data_disposal->description }}</td>
+                            <td>{{ optional($data_disposal)->description }}</td>
                         </tr>
                     @empty
+                        <tr>
+                            <td colspan="6" class="text-center">Data Kosong</td>
+                        </tr>
                     @endforelse
                 </tbody>
             </table>
-
+        </div>
+        <div class="row mt-3">
+            <div class="col-4">
+                <!-- Tampilkan jumlah data yang ditampilkan -->
+                @if (!$disposals->isEmpty())
+                    <p class="d-inline-block">Showing {{ $disposals->firstItem() }} to
+                        {{ $disposals->lastItem() }} of
+                        {{ $disposals->total() }} entries</p>
+                @endif
+            </div>
+            <div class="col-8 d-flex justify-content-end">
+                @if ($disposals->total() > $disposals->perPage())
+                    <nav aria-label="Page navigation">
+                        <ul class="pagination justify-content-center">
+                            <li class="page-item {{ $disposals->onFirstPage() ? 'disabled' : '' }}">
+                                <a class="page-link"
+                                    href="{{ $disposals->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                    aria-label="First">
+                                    <span aria-hidden="true">First</span>
+                                </a>
+                            </li>
+                            {{ $disposals->appends(['perPage' => Request::get('perPage')])->links() }}
+                            <li class="page-item {{ $disposals->hasMorePages() ? '' : 'disabled' }}">
+                                <a class="page-link"
+                                    href="{{ $disposals->appends(['perPage' => Request::get('perPage')])->url($disposals->lastPage()) }}"
+                                    aria-label="Last">
+                                    <span aria-hidden="true">Last</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </nav>
+                @endif
+            </div>
         </div>
     </div>
 </div>