From 637b35c63f258985ca53aed6a9a91a036a21376d Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Thu, 13 Nov 2025 13:27:54 +0700 Subject: [PATCH] fix(user): menghapus status suspend - menyesuaikan logika resign date - memperbaiki select data untuk resign date dan view nya --- app/Enums/UserStatus.php | 4 ---- app/Livewire/Forms/Studio/Master/UserForm.php | 7 ++++--- app/Livewire/Studio/Master/User/Index.php | 8 ++++---- .../views/livewire/studio/master/user/index.blade.php | 10 +++++----- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/Enums/UserStatus.php b/app/Enums/UserStatus.php index e9546fb..89858a5 100644 --- a/app/Enums/UserStatus.php +++ b/app/Enums/UserStatus.php @@ -11,14 +11,12 @@ enum UserStatus: int case ACTIVE = 1; case INACTIVE = 2; - case SUSPENDED = 3; public function label() { return match ($this) { self::ACTIVE => 'Aktif', self::INACTIVE => 'Tidak Aktif', - self::SUSPENDED => 'Suspend', }; } @@ -27,7 +25,6 @@ public function color() return match ($this) { self::ACTIVE => 'emerald', self::INACTIVE => 'yellow', - self::SUSPENDED => 'red', }; } @@ -36,7 +33,6 @@ public function gradient(): string return match ($this) { self::ACTIVE => 'bg-gradient-to-b from-emerald-800 to-emerald-400', self::INACTIVE => 'bg-gradient-to-b from-yellow-800 to-yellow-400', - self::SUSPENDED => 'bg-gradient-to-b from-red-800 to-red-400', }; } } diff --git a/app/Livewire/Forms/Studio/Master/UserForm.php b/app/Livewire/Forms/Studio/Master/UserForm.php index a426dc8..4864e5b 100644 --- a/app/Livewire/Forms/Studio/Master/UserForm.php +++ b/app/Livewire/Forms/Studio/Master/UserForm.php @@ -149,10 +149,10 @@ public function update() $data = $this->all(); - if ($data['status'] == UserStatus::SUSPENDED->value) { - $data['closed_date'] = now()->toDateString(); + if ($data['status'] == UserStatus::INACTIVE->value) { + $data['resign_date'] = now(); } else { - $data['closed_date'] = null; + $data['resign_date'] = null; } DB::transaction(function () use ($data) { @@ -170,6 +170,7 @@ public function update() 'hire_date' => $data['hire_date'], 'address' => $data['address'], 'gender' => $data['gender'], + 'resign_date' => $data['resign_date'], ]); $this->user->outlets()->sync($this->outlet_ids); diff --git a/app/Livewire/Studio/Master/User/Index.php b/app/Livewire/Studio/Master/User/Index.php index 1a353ba..8965988 100644 --- a/app/Livewire/Studio/Master/User/Index.php +++ b/app/Livewire/Studio/Master/User/Index.php @@ -52,6 +52,10 @@ protected function loadEmployees() ], 'birthdate' => formatDate($employee->birthdate), 'birth_age' => getAge($employee->birthdate), + 'hire_date' => formatDate($employee->hire_date), + 'hire_ago' => timeAgo($employee->hire_date), + 'resign_date' => formatDate($employee->resign_date), + 'resign_ago' => timeAgo($employee->resign_date), 'user' => [ 'id' => $employee->user?->id, 'hash' => $employee->user?->hash, @@ -60,10 +64,6 @@ protected function loadEmployees() 'status' => [ 'gradient' => $employee->user?->status->gradient(), ], - 'hire_date' => formatDate($employee->user?->hire_date), - 'hire_ago' => timeAgo($employee->user?->hire_date), - 'resign_date' => formatDate($employee->user?->resign_date), - 'resign_ago' => timeAgo($employee->user?->resign_date), ], 'referral_code' => $employee->user?->referralCode?->code, 'outlets' => $employee->user?->outlets?->pluck('name')->toArray() ?? [], diff --git a/resources/views/livewire/studio/master/user/index.blade.php b/resources/views/livewire/studio/master/user/index.blade.php index b48d6a2..8fdb06c 100644 --- a/resources/views/livewire/studio/master/user/index.blade.php +++ b/resources/views/livewire/studio/master/user/index.blade.php @@ -137,16 +137,16 @@ class="text-gray-700 dark:text-gray-300">{{ $employee['birthdate'] }} Tgl Bergabung: {{ $employee['user']['hire_date'] }} - ({{ $employee['user']['hire_ago'] }}) + class="text-gray-700 dark:text-gray-300">{{ $employee['hire_date'] }} + ({{ $employee['hire_ago'] }}) - @if ($employee['user']['resign_date']) + @if ($employee['resign_date'])
Tgl Resign: {{ $employee['user']['resign_date'] }} - ({{ $employee['user']['resign_ago'] }}) + class="text-gray-700 dark:text-gray-300">{{ $employee['resign_date'] }} + ({{ $employee['resign_ago'] }})
@endif