From 89f5fedfd6b4f260d2f1289adb697e021fc9b248 Mon Sep 17 00:00:00 2001 From: Sholahuddin Al Ayubi Date: Thu, 19 Jun 2025 16:26:45 +0700 Subject: [PATCH 1/2] FEAT: Add New Userstamps --- app/Models/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Base.php b/app/Models/Base.php index 6bd8a18..252e4b7 100644 --- a/app/Models/Base.php +++ b/app/Models/Base.php @@ -7,7 +7,7 @@ use Spatie\Activitylog\Facades\CauserResolver; use Spatie\Activitylog\LogOptions; use Spatie\Activitylog\Traits\LogsActivity; - use Mattiverse\Userstamps\Traits\Userstamps; + use Wildside\Userstamps\Userstamps; /** From 05ceb5ef01a949b317194642aada8c27d2b81f9d Mon Sep 17 00:00:00 2001 From: Sholahuddin Al Ayubi Date: Fri, 20 Jun 2025 14:59:19 +0700 Subject: [PATCH 2/2] FEAT: Fixed error permission on basic-data Module --- app/Http/Controllers/BranchController.php | 5 ++++- app/Http/Controllers/CurrencyController.php | 8 ++++++-- app/Http/Controllers/HolidayCalendarController.php | 8 ++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/BranchController.php b/app/Http/Controllers/BranchController.php index 343f053..390a88d 100644 --- a/app/Http/Controllers/BranchController.php +++ b/app/Http/Controllers/BranchController.php @@ -16,7 +16,10 @@ public function __construct() { - $this->user = auth()->user(); + $this->middleware(function ($request, $next) { + $this->user = auth()->user(); + return $next($request); + }); } public function index() diff --git a/app/Http/Controllers/CurrencyController.php b/app/Http/Controllers/CurrencyController.php index 4074920..a7afa91 100644 --- a/app/Http/Controllers/CurrencyController.php +++ b/app/Http/Controllers/CurrencyController.php @@ -14,8 +14,12 @@ { protected $user; - public function __construct(){ - $this->user = auth()->user(); + public function __construct() + { + $this->middleware(function ($request, $next) { + $this->user = auth()->user(); + return $next($request); + }); } public function index() diff --git a/app/Http/Controllers/HolidayCalendarController.php b/app/Http/Controllers/HolidayCalendarController.php index 1a1a85d..41e2d35 100644 --- a/app/Http/Controllers/HolidayCalendarController.php +++ b/app/Http/Controllers/HolidayCalendarController.php @@ -14,8 +14,12 @@ { protected $user; - public function __construct(){ - $this->user = auth()->user(); + public function __construct() + { + $this->middleware(function ($request, $next) { + $this->user = auth()->user(); + return $next($request); + }); } public function index()