update pagenation peminjaman and histori peminjaman

app/Http/Controllers/HistoryController.php

@@ -6,15 +6,108 @@ use App\Models\Transfer;
 use App\Models\m_warehouse;
 use App\Models\asset_status;
 use Illuminate\Http\Request;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Log;
 
 class HistoryController extends Controller
 {
-    public function historyPeminjaman()
+    // public function historyPeminjaman()
+    // {
+
+
+    //     $data = [
+    //         'peminjaman' => asset_status::withTrashed()->orderBy('created_at', 'desc')->get(),
+    //         'warehouse' => m_warehouse::get(),
+    //         'active' => 'history-peminjaman',
+    //     ];
+
+    //     return view('dashboard.History.Peminjaman.index', $data);
+    // }
+    public function historyPeminjaman(Request $request)
     {
+        $perPage = $request->input('perPage', 5);
+
+        $query = asset_status::with(['customer', 'warehouseId', 'warehouse', 'warehouseEnter', 'kondisi_peti'])
+            ->orderBy('created_at', 'desc');
+
+        //logika pencarian
+        $search = $request->input('search') ?? '';
+        if ($search) {
+            $query->where(function ($q) use ($search) {
+                $q->where('mobile_id', 'like', "%$search%")
+                    ->orWhereHas('peti', function ($warehouseQuery) use ($search) {
+                        $warehouseQuery->where('fix_lot', 'like', "%$search%");
+                    })
+                    ->orWhereHas('customer', function ($warehouseQuery) use ($search) {
+                        $warehouseQuery->where('name', 'like', "%$search%");
+                    })
+                    // ->orWhereHas('peti.customer', function ($customerQuery) use ($search) {
+                    //     $customerQuery->where('code_customer', 'like', "%$search%");
+                    // })
+                    // ->orWhereHas('peti.tipe_peti', function ($tipePetiQuery) use ($search) {
+                    //     $tipePetiQuery->where('type', 'like', "%$search%");
+                    // })
+                    // ->orWhere(function ($combinedQuery) use ($search) {
+                    //     // Pisahkan code customer dan tipe peti dari pencarian
+                    //     list($codeCustomer, $typePeti) = explode(' - ', $search);
 
+                    //     // Cek kesamaan code customer dan tipe peti
+                    //     $combinedQuery->whereHas('peti.customer', function ($customerQuery) use ($codeCustomer) {
+                    //         $customerQuery->where('code_customer', 'like', "%$codeCustomer%");
+                    //     })->whereHas('peti.tipe_peti', function ($tipePetiQuery) use ($typePeti) {
+                    //         $tipePetiQuery->where('type', 'like', "%$typePeti%");
+                    //     });
+                    // })
+                    ->orWhere(function ($dateQuery) use ($search) {
+                        try {
+                            // Format tanggal yang diharapkan dari input pengguna
+                            $formattedDate = \Carbon\Carbon::createFromFormat('d-m-Y', $search)->format('Y-m-d');
+
+                            // Cek kesamaan tanggal
+                            $dateQuery->whereDate('exit_at', $formattedDate);
+                        } catch (\Exception $e) {
+                            Log::error('Error parsing date: ' . $e->getMessage());
+                        }
+                    })
+                    ->orWhere(function ($dateQuery) use ($search) {
+                        try {
+                            // Format tanggal yang diharapkan dari input pengguna
+                            $formattedDate = \Carbon\Carbon::createFromFormat('d-m-Y', $search)->format('Y-m-d');
+
+                            // Cek kesamaan tanggal
+                            $dateQuery->whereDate('est_pengembalian', $formattedDate);
+                        } catch (\Exception $e) {
+                            Log::error('Error parsing date: ' . $e->getMessage());
+                        }
+                    })
+                    ->orWhere('exit_pic', 'like', "%$search%")
+                    ->orWhereHas('warehouse', function ($warehouseQuery) use ($search) {
+                        $warehouseQuery->where('name', 'like', "%$search%")
+                            ->orWhere('address', 'like', "%$search%");
+                    });
+            });
+        }
+
+        if ($perPage == 'Semua') {
+            $chunkSize = 100;
+            $stores = new Collection();
+            $currentPage = 1;
+
+            $query->chunk($chunkSize, function ($storesChunk) use ($stores, &$currentPage) {
+                foreach ($storesChunk as $store) {
+                    $store->setAttribute('i', ($currentPage - 1) * $storesChunk->perPage() + 1);
+                    $stores->push($store);
+                    $currentPage++;
+                }
+            });
+        } else {
+            $stores = $query->paginate($perPage);
+        }
         $data = [
-            'peminjaman' => asset_status::withTrashed()->orderBy('created_at', 'desc')->get(),
+            'peminjaman' => $stores,
             'warehouse' => m_warehouse::get(),
+            'i' => ($stores->currentPage() - 1) * $stores->perPage() + 1,
+            'search' => $search,
             'active' => 'history-peminjaman',
         ];
 

app/Http/Controllers/PeminjamanController.php

@@ -40,29 +40,6 @@ class PeminjamanController extends Controller
                     ->orWhereHas('customer', function ($warehouseQuery) use ($search) {
                         $warehouseQuery->where('name', 'like', "%$search%");
                     })
-                    ->orWhereHas('peti.customer', function ($customerQuery) use ($search) {
-                        $customerQuery->where('code_customer', 'like', "%$search%");
-                    })
-                    ->orWhereHas('peti.tipe_peti', function ($tipePetiQuery) use ($search) {
-                        $tipePetiQuery->where('type', 'like', "%$search%");
-                    })
-                    ->orWhere(function ($combinedQuery) use ($search) {
-                        // Pisahkan code customer dan tipe peti dari pencarian
-                        list($codeCustomer, $typePeti) = explode(' - ', $search);
-
-                        // Cek kesamaan code customer dan tipe peti
-                        $combinedQuery->whereHas('peti.customer', function ($customerQuery) use ($codeCustomer) {
-                            $customerQuery->where('code_customer', 'like', "%$codeCustomer%");
-                        })->whereHas('peti.tipe_peti', function ($tipePetiQuery) use ($typePeti) {
-                            $tipePetiQuery->where('type', 'like', "%$typePeti%");
-                        });
-                    })
-                    ->orWhere('exit_pic', 'like', "%$search%")
-                    ->orWhereHas('warehouse', function ($warehouseQuery) use ($search) {
-                        $warehouseQuery->where('name', 'like', "%$search%")
-                            ->orWhere('address', 'like', "%$search%");
-                    })
-
                     ->orWhere(function ($dateQuery) use ($search) {
                         try {
                             // Format tanggal yang diharapkan dari input pengguna

resources/views/dashboard/History/Peminjaman/index.blade.php

@@ -18,8 +18,44 @@
             </div>
         </div>
         <div class="card-body">
+            <div class="row mb-3">
+                <div class="col-6">
+                    <!-- Fitur page -->
+                    <form method="GET" action="{{ route('dashboard.history.historyPeminjaman') }}">
+                        <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="500" {{ request('perPage', 5) == '500' ? 'selected' : '' }}>500</option>
+                            <option value="1000" {{ request('perPage', 5) == '1000' ? 'selected' : '' }}>1000</option>
+                            <option value="2500" {{ request('perPage', 5) == '2500' ? 'selected' : '' }}>2500
+                            </option>
+                            <option value="5000" {{ request('perPage', 5) == '5000' ? 'selected' : '' }}>5000
+                            </option>
+                            <option value="{{ $peminjaman->total() }}"
+                                {{ request('perPage', 5) == $peminjaman->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.history.historyPeminjaman') }}" 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>
@@ -32,12 +68,9 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @php
-                            $no_peminjaman = 1;
-                        @endphp
                         @forelse ($peminjaman as $data_peminjaman)
                             <tr>
-                                <td class="text-center">{{ $no_peminjaman++ }}</td>
+                                <td class="text-center">{{ $i++ }}</td>
                                 <td>{{ $data_peminjaman->peti->fix_lot }}</td>
                                 <td>{{ $data_peminjaman->peti->customer->name }}</td>
                                 <td>{{ $data_peminjaman->peti->customer->code_customer }} -
@@ -47,10 +80,46 @@
                                 <td>{{ $data_peminjaman->warehouse->name }}</td>
                             </tr>
                         @empty
+                            <tr>
+                                <td colspan="7" 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 (!$peminjaman->isEmpty())
+                        <p class="d-inline-block">Showing {{ $peminjaman->firstItem() }} to
+                            {{ $peminjaman->lastItem() }} of
+                            {{ $peminjaman->total() }} entries</p>
+                    @endif
+                </div>
+                <div class="col-8 d-flex justify-content-end">
+                    @if ($peminjaman->total() > $peminjaman->perPage())
+                        <nav aria-label="Page navigation">
+                            <ul class="pagination justify-content-center">
+                                <li class="page-item {{ $peminjaman->onFirstPage() ? 'disabled' : '' }}">
+                                    <a class="page-link"
+                                        href="{{ $peminjaman->appends(['perPage' => Request::get('perPage')])->url(1) }}"
+                                        aria-label="First">
+                                        <span aria-hidden="true">First</span>
+                                    </a>
+                                </li>
+                                {{ $peminjaman->appends(['perPage' => Request::get('perPage')])->links() }}
+                                <li class="page-item {{ $peminjaman->hasMorePages() ? '' : 'disabled' }}">
+                                    <a class="page-link"
+                                        href="{{ $peminjaman->appends(['perPage' => Request::get('perPage')])->url($peminjaman->lastPage()) }}"
+                                        aria-label="Last">
+                                        <span aria-hidden="true">Last</span>
+                                    </a>
+                                </li>
+                            </ul>
+                        </nav>
+                    @endif
+                </div>
+            </div>
         </div>
     </div>
 @endsection

resources/views/layouts/sidebar.blade.php

@@ -22,22 +22,19 @@
         </li>
 
         <!-- Divider -->
-
         <hr class="sidebar-divider">
 
-        @php
-            $isTransaksiActive = in_array($active, ['menu-user', 'menu-role']);
-        @endphp
-
         <!-- Transaction -->
-        <li class="nav-item">
-            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsetransaktion"
-                aria-expanded="{{ $isTransaksiActive ? 'true' : 'false' }}" aria-controls="collapsetransaktion">
+        <li
+            class="nav-item {{ $active == 'menu-peminjaman' || $active == 'menu-pengembalian' || $active == 'menu-transfer' ? 'active' : '' }}">
+            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTransaksi"
+                aria-expanded="true" aria-controls="collapseTransaksi">
                 <i class="fas fa-fw fa-exchange-alt"></i>
                 <span>Transaksi</span>
             </a>
-            <div id="collapsetransaktion" class="collapse" aria-labelledby="headingTransaktion"
-                data-parent="#accordionSidebar">
+            <div id="collapseTransaksi"
+                class="collapse {{ $active == 'menu-peminjaman' || $active == 'menu-pengembalian' || $active == 'menu-transfer' ? 'show' : '' }}"
+                aria-labelledby="headingTransaksi" data-parent="#accordionSidebar">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item {{ $active == 'menu-peminjaman' ? 'active' : '' }}"
                         href="{{ route('dashboard.peminjaman.index') }}">Peminjaman</a>
@@ -49,6 +46,7 @@
             </div>
         </li>
 
+        <!-- Disposal -->
         <li class="nav-item {{ $active == 'menu-disposal' ? 'active' : '' }}">
             <a class="nav-link" href="{{ route('dashboard.disposal.index') }}">
                 <i class="fas fa-fw fa-trash"></i>
@@ -57,13 +55,16 @@
         </li>
 
         <!-- Histories -->
-        <li class="nav-item">
+        <li
+            class="nav-item {{ $active == 'history-peminjaman' || $active == 'history-pengembalian' || $active == 'history-transfer' ? 'active' : '' }}">
             <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsehistory"
-                aria-expanded="{{ $isTransaksiActive ? 'true' : 'false' }}" aria-controls="collapsehistory">
+                aria-controls="collapsehistory">
                 <i class="fas fa-history"></i>
                 <span>History</span>
             </a>
-            <div id="collapsehistory" class="collapse" aria-labelledby="headingHistory" data-parent="#accordionSidebar">
+            <div id="collapsehistory"
+                class="collapse {{ $active == 'history-peminjaman' || $active == 'history-pengembalian' || $active == 'history-transfer' ? 'show' : '' }}"
+                aria-labelledby="headingHistory" data-parent="#accordionSidebar">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item {{ $active == 'history-peminjaman' ? 'active' : '' }}"
                         href="{{ route('dashboard.history.historyPeminjaman') }}">Peminjaman</a>
@@ -83,17 +84,16 @@
             Master Data
         </div>
 
-        @php
-            $isUserActive = in_array($active, ['menu-user', 'menu-role']);
-        @endphp
-
-        <li class="nav-item">
-            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo"
-                aria-expanded="{{ $isUserActive ? 'true' : 'false' }}" aria-controls="collapseTwo">
+        <!-- User -->
+        <li class="nav-item {{ $active == 'menu-user' || $active == 'menu-role' ? 'active' : '' }}">
+            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseUser"
+                aria-expanded="true" aria-controls="collapseUser">
                 <i class="fas fa-fw fa-users"></i>
                 <span>Manajemen User</span>
             </a>
-            <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
+            <div id="collapseUser"
+                class="collapse {{ $active == 'menu-user' || $active == 'menu-role' ? 'show' : '' }}"
+                aria-labelledby="headingUser" data-parent="#accordionSidebar">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item {{ $active == 'menu-user' ? 'active' : '' }}"
                         href="{{ route('dashboard.user.index') }}">User</a>
@@ -102,23 +102,26 @@
                 </div>
             </div>
         </li>
+
+        <!-- Customer -->
         <li class="nav-item {{ $active == 'menu-customer' ? 'active' : '' }}">
             <a class="nav-link" href="{{ route('dashboard.customer.index') }}">
                 <i class="fas fa-fw fa-user"></i>
                 <span>Customer</span>
             </a>
         </li>
-        @php
-            $isPetiActive = in_array($active, ['menu-user', 'menu-role']);
-        @endphp
 
-        <li class="nav-item">
-            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsepeti"
-                aria-expanded="{{ $isPetiActive ? 'true' : 'false' }}" aria-controls="collapsepeti">
+        <!-- Peti -->
+        <li
+            class="nav-item {{ $active == 'menu-typepeti' || $active == 'enu-kondisipeti' || $active == 'menu-peti' ? 'active' : '' }}">
+            <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsePeti"
+                aria-expanded="true" aria-controls="collapsePeti">
                 <i class="fas fa-fw fa-box"></i>
                 <span>Manajemen Peti</span>
             </a>
-            <div id="collapsepeti" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
+            <div id="collapsePeti"
+                class="collapse {{ $active == 'menu-typepeti' || $active == 'menu-kondisipeti' || $active == 'menu-peti' ? 'show' : '' }}"
+                aria-labelledby="headingPeti" data-parent="#accordionSidebar">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item {{ $active == 'menu-typepeti' ? 'active' : '' }}"
                         href="{{ route('dashboard.typepeti.index') }}">Tipe Peti</a>
@@ -130,6 +133,8 @@
                 </div>
             </div>
         </li>
+
+        <!-- Warehouse -->
         <li class="nav-item {{ $active == 'menu-warehouse' ? 'active' : '' }}">
             <a class="nav-link" href="{{ route('dashboard.warehouse.index') }}">
                 <i class="fas fa-fw fa-warehouse"></i>
@@ -137,13 +142,16 @@
             </a>
         </li>
 
-        <li class="nav-item">
+        <li
+            class="nav-item {{ $active == 'menu-Pettern_Lot_Peti' || $active == 'menu-Stok_Opname' || $active == 'menu-ReportCustomer' || $active == 'menu-ReportWarehouse' || $active == 'menu-ReportKondisiPeti' || $active == 'menu-ReportTypePeti' ? 'active' : '' }}">
             <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsereport"
-                aria-expanded="{{ $isUserActive ? 'true' : 'false' }}" aria-controls="collapseTwo">
+                aria-expanded="true" aria-controls="collapsereport">
                 <i class="fas fa-fw fa-file-alt"></i>
                 <span>Report</span>
             </a>
-            <div id="collapsereport" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
+            <div id="collapsereport"
+                class="collapse {{ $active == 'menu-Pettern_Lot_Peti' || $active == 'menu-Stok_Opname' || $active == 'menu-ReportCustomer' || $active == 'menu-ReportWarehouse' || $active == 'menu-ReportKondisiPeti' || $active == 'menu-ReportTypePeti' ? 'show' : '' }}"
+                aria-labelledby="headingreport" data-parent="#accordionSidebar">
                 <div class="bg-white py-2 collapse-inner rounded">
                     <a class="collapse-item {{ $active == 'menu-Pettern_Lot_Peti' ? 'active' : '' }}"
                         href="{{ route('dashboard.Pettern_Lot_Peti.index') }}">PATTERN LOT
@@ -161,12 +169,6 @@
                 </div>
             </div>
         </li>
-        {{-- <li class="nav-item {{ $active == 'menu-Recycle_Data' ? 'active' : '' }}">
-            <a class="nav-link" href="{{ route('dashboard.recycle_data.index') }}">
-                <i class="fas fa-fw fa-recycle"></i>
-                <span>Recycle Data</span>
-            </a>
-        </li> --}}
     @else
         @include('pages.layouts.sidebar_user')
     @endif

resources/views/pages/layouts/sidebar_user.blade.php

@@ -22,18 +22,17 @@
 
 <hr class="sidebar-divider">
 
-@php
-    $isTransaksiActive = in_array($active, ['menu-user', 'menu-role']);
-@endphp
-
 <!-- Transaction -->
-<li class="nav-item">
-    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsetransaktion"
-        aria-expanded="{{ $isTransaksiActive ? 'true' : 'false' }}" aria-controls="collapsetransaktion">
+<li
+    class="nav-item {{ $active == 'menu-peminjaman' || $active == 'menu-pengembalian' || $active == 'menu-transfer' ? 'active' : '' }}">
+    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTransaksi"
+        aria-expanded="true" aria-controls="collapseTransaksi">
         <i class="fas fa-fw fa-exchange-alt"></i>
         <span>Transaksi</span>
     </a>
-    <div id="collapsetransaktion" class="collapse" aria-labelledby="headingTransaktion" data-parent="#accordionSidebar">
+    <div id="collapseTransaksi"
+        class="collapse {{ $active == 'menu-peminjaman' || $active == 'menu-pengembalian' || $active == 'menu-transfer' ? 'show' : '' }}"
+        aria-labelledby="headingTransaksi" data-parent="#accordionSidebar">
         <div class="bg-white py-2 collapse-inner rounded">
             <a class="collapse-item {{ $active == 'menu-peminjaman' ? 'active' : '' }}"
                 href="{{ route('dashboard.peminjaman.index') }}">Peminjaman</a>
@@ -45,6 +44,7 @@
     </div>
 </li>
 
+<!-- Disposal -->
 <li class="nav-item {{ $active == 'menu-disposal' ? 'active' : '' }}">
     <a class="nav-link" href="{{ route('dashboard.disposal.index') }}">
         <i class="fas fa-fw fa-trash"></i>
@@ -53,13 +53,16 @@
 </li>
 
 <!-- Histories -->
-<li class="nav-item">
+<li
+    class="nav-item {{ $active == 'history-peminjaman' || $active == 'history-pengembalian' || $active == 'history-transfer' ? 'active' : '' }}">
     <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsehistory"
-        aria-expanded="{{ $isTransaksiActive ? 'true' : 'false' }}" aria-controls="collapsehistory">
+        aria-controls="collapsehistory">
         <i class="fas fa-history"></i>
         <span>History</span>
     </a>
-    <div id="collapsehistory" class="collapse" aria-labelledby="headingHistory" data-parent="#accordionSidebar">
+    <div id="collapsehistory"
+        class="collapse {{ $active == 'history-peminjaman' || $active == 'history-pengembalian' || $active == 'history-transfer' ? 'show' : '' }}"
+        aria-labelledby="headingHistory" data-parent="#accordionSidebar">
         <div class="bg-white py-2 collapse-inner rounded">
             <a class="collapse-item {{ $active == 'history-peminjaman' ? 'active' : '' }}"
                 href="{{ route('dashboard.history.historyPeminjaman') }}">Peminjaman</a>
@@ -79,42 +82,25 @@
     Master Data
 </div>
 
-@php
-    $isUserActive = in_array($active, ['menu-user', 'menu-role']);
-@endphp
-
-{{-- <li class="nav-item">
-    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapseTwo"
-        aria-expanded="{{ $isUserActive ? 'true' : 'false' }}" aria-controls="collapseTwo">
-        <i class="fas fa-fw fa-users"></i>
-        <span>Manajemen User</span>
-    </a>
-    <div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
-        <div class="bg-white py-2 collapse-inner rounded">
-            <a class="collapse-item {{ $active == 'menu-user' ? 'active' : '' }}"
-                href="{{ route('dashboard.user.index') }}">User</a>
-            <a class="collapse-item {{ $active == 'menu-role' ? 'active' : '' }}"
-                href="{{ route('dashboard.role.index') }}">Role</a>
-        </div>
-    </div>
-</li> --}}
+<!-- Customer -->
 <li class="nav-item {{ $active == 'menu-customer' ? 'active' : '' }}">
     <a class="nav-link" href="{{ route('dashboard.customer.index') }}">
         <i class="fas fa-fw fa-user"></i>
         <span>Customer</span>
     </a>
 </li>
-@php
-    $isPetiActive = in_array($active, ['menu-user', 'menu-role']);
-@endphp
 
-<li class="nav-item">
-    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsepeti"
-        aria-expanded="{{ $isPetiActive ? 'true' : 'false' }}" aria-controls="collapsepeti">
+<!-- Peti -->
+<li
+    class="nav-item {{ $active == 'menu-typepeti' || $active == 'enu-kondisipeti' || $active == 'menu-peti' ? 'active' : '' }}">
+    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsePeti" aria-expanded="true"
+        aria-controls="collapsePeti">
         <i class="fas fa-fw fa-box"></i>
         <span>Manajemen Peti</span>
     </a>
-    <div id="collapsepeti" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
+    <div id="collapsePeti"
+        class="collapse {{ $active == 'menu-typepeti' || $active == 'menu-kondisipeti' || $active == 'menu-peti' ? 'show' : '' }}"
+        aria-labelledby="headingPeti" data-parent="#accordionSidebar">
         <div class="bg-white py-2 collapse-inner rounded">
             <a class="collapse-item {{ $active == 'menu-typepeti' ? 'active' : '' }}"
                 href="{{ route('dashboard.typepeti.index') }}">Tipe Peti</a>
@@ -126,26 +112,11 @@
         </div>
     </div>
 </li>
+
+<!-- Warehouse -->
 <li class="nav-item {{ $active == 'menu-warehouse' ? 'active' : '' }}">
     <a class="nav-link" href="{{ route('dashboard.warehouse.index') }}">
         <i class="fas fa-fw fa-warehouse"></i>
         <span>Warehouse</span>
     </a>
 </li>
-
-{{-- <li class="nav-item">
-    <a class="nav-link collapsed" href="#" data-toggle="collapse" data-target="#collapsereport"
-        aria-expanded="{{ $isUserActive ? 'true' : 'false' }}" aria-controls="collapseTwo">
-        <i class="fas fa-fw fa-file-alt"></i>
-        <span>Report</span>
-    </a>
-    <div id="collapsereport" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionSidebar">
-        <div class="bg-white py-2 collapse-inner rounded">
-            <a class="collapse-item {{ $active == 'menu-Pettern_Lot_Peti' ? 'active' : '' }}"
-                href="{{ route('dashboard.Pettern_Lot_Peti.index') }}">PATTERN LOT
-                PETI</a>
-            <a class="collapse-item {{ $active == 'menu-Stok_Opname' ? 'active' : '' }}"
-                href="{{ route('dashboard.StokOpname.index') }}">Stok Opname</a>
-        </div>
-    </div>
-</li> --}}