naser
/
libra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kept the mark as show or complete and cacle button stay after the user chose

This commit is contained in:
Naser Mansour 2026-01-09 19:40:51 +02:00
parent 773e1d3f7f
commit 0aa1b7f675
4 changed files with 82 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Consultation.php
View File

@ -116,7 +116,7 @@ class Consultation extends Model
*/
public function markAsCompleted(): void
{
if ($this->status !== ConsultationStatus::Approved) {
if (! in_array($this->status, [ConsultationStatus::Approved, ConsultationStatus::NoShow])) {
throw new \InvalidArgumentException(
__('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'completed'])
);
@ -131,7 +131,7 @@ class Consultation extends Model
*/
public function markAsNoShow(): void
{
if ($this->status !== ConsultationStatus::Approved) {
if (! in_array($this->status, [ConsultationStatus::Approved, ConsultationStatus::Completed])) {
throw new \InvalidArgumentException(
__('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'no_show'])
);

8
resources/views/livewire/admin/consultations/index.blade.php
View File

@ -384,11 +384,12 @@ new class extends Component
{{ __('common.edit') }}
</flux:button>
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
@if(in_array($consultation->status, [\App\Enums\ConsultationStatus::Approved, \App\Enums\ConsultationStatus::Completed, \App\Enums\ConsultationStatus::NoShow]))
<flux:dropdown>
<flux:button variant="outline" size="sm" icon="ellipsis-vertical" />
<flux:menu>
@if($consultation->status !== \App\Enums\ConsultationStatus::Completed)
<flux:menu.item
wire:click="markCompleted({{ $consultation->id }})"
wire:confirm="{{ __('admin.confirm_mark_completed') }}"
@ -396,7 +397,9 @@ new class extends Component
>
{{ __('admin.mark_completed') }}
</flux:menu.item>
@endif
@if($consultation->status !== \App\Enums\ConsultationStatus::NoShow)
<flux:menu.item
wire:click="markNoShow({{ $consultation->id }})"
wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
@ -404,7 +407,9 @@ new class extends Component
>
{{ __('admin.mark_no_show') }}
</flux:menu.item>
@endif
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
<flux:menu.separator />
<flux:menu.item
@ -415,6 +420,7 @@ new class extends Component
>
{{ __('admin.cancel_consultation') }}
</flux:menu.item>
@endif
</flux:menu>
</flux:dropdown>
@endif

8
resources/views/livewire/admin/consultations/show.blade.php
View File

@ -574,11 +574,12 @@ new class extends Component
</div>
<!-- Status Actions -->
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
@if(in_array($consultation->status, [\App\Enums\ConsultationStatus::Approved, \App\Enums\ConsultationStatus::Completed, \App\Enums\ConsultationStatus::NoShow]))
<div class="bg-white rounded-lg p-6 border border-zinc-200">
<flux:heading size="lg" class="mb-4">{{ __('common.actions') }}</flux:heading>
<div class="space-y-2">
@if($consultation->status !== \App\Enums\ConsultationStatus::Completed)
<flux:button
wire:click="markCompleted"
wire:confirm="{{ __('admin.confirm_mark_completed') }}"
@ -588,7 +589,9 @@ new class extends Component
>
{{ __('admin.mark_completed') }}
</flux:button>
@endif
@if($consultation->status !== \App\Enums\ConsultationStatus::NoShow)
<flux:button
wire:click="markNoShow"
wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
@ -598,7 +601,9 @@ new class extends Component
>
{{ __('admin.mark_no_show') }}
</flux:button>
@endif
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
<flux:button
wire:click="cancel"
wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
@ -608,6 +613,7 @@ new class extends Component
>
{{ __('admin.cancel_consultation') }}
</flux:button>
@endif
</div>
</div>
@endif

18
tests/Feature/Admin/ConsultationManagementTest.php
View File

@ -189,14 +189,28 @@ test('admin can mark consultation as no-show', function () {
expect($consultation->fresh()->status)->toBe(ConsultationStatus::NoShow);
});
test('cannot mark completed consultation as no-show', function () {
test('admin can change completed consultation to no-show', function () {
$admin = User::factory()->admin()->create();
$consultation = Consultation::factory()->completed()->create();
$this->actingAs($admin);
Volt::test('admin.consultations.index')
->call('markNoShow', $consultation->id);
->call('markNoShow', $consultation->id)
->assertHasNoErrors();
expect($consultation->fresh()->status)->toBe(ConsultationStatus::NoShow);
});
test('admin can change no-show consultation to completed', function () {
$admin = User::factory()->admin()->create();
$consultation = Consultation::factory()->noShow()->create();
$this->actingAs($admin);
Volt::test('admin.consultations.index')
->call('markCompleted', $consultation->id)
->assertHasNoErrors();
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Completed);
});