From 556985f35fd897bee6921670db45607c33556ee5 Mon Sep 17 00:00:00 2001 From: Arya Dwi Putra Date: Tue, 2 Dec 2025 08:30:09 +0700 Subject: [PATCH] Apply settings-driven pagination/QR behavior and update landing/menu routes --- app/Http/Controllers/AssetController.php | 2 +- .../AssetTransactionPageController.php | 6 +- app/Http/Controllers/ReportController.php | 8 +- app/Services/Asset/AssetService.php | 8 +- .../landingpage/main-sidebar.blade.php | 89 +++++++++++-------- .../layouts/components/main-header1.blade.php | 11 ++- 6 files changed, 77 insertions(+), 47 deletions(-) diff --git a/app/Http/Controllers/AssetController.php b/app/Http/Controllers/AssetController.php index 4364b68..1c6aae2 100644 --- a/app/Http/Controllers/AssetController.php +++ b/app/Http/Controllers/AssetController.php @@ -54,7 +54,7 @@ class AssetController extends Controller ->when($filters['person_in_charge_id'] ?? null, fn($q, $v) => $q->where('person_in_charge_id', $v)) ->when($filters['warranty_id'] ?? null, fn($q, $v) => $q->where('warranty_id', $v)) ->orderBy('created_at', 'desc') - ->paginate(15) + ->paginate(config('system.ui.table_page_size', 15)) ->withQueryString(); return view('assets.index', [ diff --git a/app/Http/Controllers/AssetTransactionPageController.php b/app/Http/Controllers/AssetTransactionPageController.php index d12fcbb..12a21dc 100644 --- a/app/Http/Controllers/AssetTransactionPageController.php +++ b/app/Http/Controllers/AssetTransactionPageController.php @@ -13,7 +13,7 @@ class AssetTransactionPageController extends Controller { $items = AssetMovement::with(['asset', 'fromLocation', 'toLocation', 'fromDepartment', 'toDepartment', 'fromUser', 'toUser']) ->latest() - ->paginate(20); + ->paginate(config('system.ui.table_page_size', 20)); return view('assets.movements', compact('items')); } @@ -22,7 +22,7 @@ class AssetTransactionPageController extends Controller { $items = AssetDisposal::with(['asset', 'previousStatus', 'previousLocation', 'previousDepartment']) ->latest() - ->paginate(20); + ->paginate(config('system.ui.table_page_size', 20)); return view('assets.disposals', compact('items')); } @@ -31,7 +31,7 @@ class AssetTransactionPageController extends Controller { $items = AssetAudit::with(['asset', 'location']) ->latest() - ->paginate(20); + ->paginate(config('system.ui.table_page_size', 20)); return view('assets.audits', compact('items')); } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 8e100b7..27cd9d8 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -40,7 +40,7 @@ class ReportController extends Controller ->when($filters['person_in_charge_id'] ?? null, fn($q, $v) => $q->where('person_in_charge_id', $v)) ->when($filters['warranty_id'] ?? null, fn($q, $v) => $q->where('warranty_id', $v)); - $assets = $query->paginate(20)->withQueryString(); + $assets = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString(); if ($request->get('export') === 'excel') { $assetsCollection = $query->get(); @@ -150,7 +150,7 @@ class ReportController extends Controller ->when($filters['department_id'] ?? null, fn($q, $v) => $q->where('to_department_id', $v)) ->when($filters['asset_user_id'] ?? null, fn($q, $v) => $q->where('to_asset_user_id', $v)); - $items = $query->paginate(20)->withQueryString(); + $items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString(); if ($request->get('export') === 'excel') { $rows = $query->get()->map(fn($m) => [ @@ -196,7 +196,7 @@ class ReportController extends Controller $v === 'reversed' ? $q->whereNotNull('reversed_at') : $q->whereNull('reversed_at'); }); - $items = $query->paginate(20)->withQueryString(); + $items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString(); if ($request->get('export') === 'excel') { $rows = $query->get()->map(fn($d) => [ @@ -234,7 +234,7 @@ class ReportController extends Controller ->when($filters['status'] ?? null, fn($q, $v) => $q->where('status', $v)) ->when($filters['location_id'] ?? null, fn($q, $v) => $q->where('location_id', $v)); - $items = $query->paginate(20)->withQueryString(); + $items = $query->paginate(config('system.ui.table_page_size', 20))->withQueryString(); if ($request->get('export') === 'excel') { $rows = $query->get()->map(fn($a) => [ diff --git a/app/Services/Asset/AssetService.php b/app/Services/Asset/AssetService.php index 1ddfac3..ebfbf78 100644 --- a/app/Services/Asset/AssetService.php +++ b/app/Services/Asset/AssetService.php @@ -39,7 +39,9 @@ class AssetService $asset = Asset::create($data); - $this->generateQr($asset); + if ($this->settings->get('asset.qr_enabled', true)) { + $this->generateQr($asset); + } $this->logHistory($asset, 'created', 'Aset dibuat', $data); return $asset; @@ -53,7 +55,9 @@ class AssetService { return DB::transaction(function () use ($asset, $data) { $asset->update($data); - $this->generateQr($asset); + if ($this->settings->get('asset.qr_enabled', true)) { + $this->generateQr($asset); + } $this->logHistory($asset, 'updated', 'Aset diperbarui', $data); return $asset; diff --git a/resources/views/layouts/components/landingpage/main-sidebar.blade.php b/resources/views/layouts/components/landingpage/main-sidebar.blade.php index 2477794..2ea080d 100644 --- a/resources/views/layouts/components/landingpage/main-sidebar.blade.php +++ b/resources/views/layouts/components/landingpage/main-sidebar.blade.php @@ -1,24 +1,28 @@ + diff --git a/resources/views/layouts/components/main-header1.blade.php b/resources/views/layouts/components/main-header1.blade.php index af98747..122bae7 100644 --- a/resources/views/layouts/components/main-header1.blade.php +++ b/resources/views/layouts/components/main-header1.blade.php @@ -577,7 +577,14 @@ -
  • Log Out
    • +
  • +
    + @csrf + +
    +
    • @@ -590,4 +597,4 @@ - \ No newline at end of file +