complete story 3.7 with qa test
This commit is contained in:
Naser Mansour
parent
7af029e1af
commit
6254d54fe9
|
|
@ -6,4 +6,12 @@ enum ConsultationType: string
|
||||||
{
|
{
|
||||||
case Free = 'free';
|
case Free = 'free';
|
||||||
case Paid = 'paid';
|
case Paid = 'paid';
|
||||||
|
|
||||||
|
public function label(): string
|
||||||
|
{
|
||||||
|
return match ($this) {
|
||||||
|
self::Free => __('enums.consultation_type.free'),
|
||||||
|
self::Paid => __('enums.consultation_type.paid'),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,13 @@ enum PaymentStatus: string
|
||||||
case Pending = 'pending';
|
case Pending = 'pending';
|
||||||
case Received = 'received';
|
case Received = 'received';
|
||||||
case NotApplicable = 'na';
|
case NotApplicable = 'na';
|
||||||
|
|
||||||
|
public function label(): string
|
||||||
|
{
|
||||||
|
return match ($this) {
|
||||||
|
self::Pending => __('enums.payment_status.pending'),
|
||||||
|
self::Received => __('enums.payment_status.received'),
|
||||||
|
self::NotApplicable => __('enums.payment_status.na'),
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,7 @@ namespace App\Models;
|
||||||
use App\Enums\ConsultationStatus;
|
use App\Enums\ConsultationStatus;
|
||||||
use App\Enums\ConsultationType;
|
use App\Enums\ConsultationType;
|
||||||
use App\Enums\PaymentStatus;
|
use App\Enums\PaymentStatus;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||||
|
|
@ -21,6 +22,7 @@ class Consultation extends Model
|
||||||
'consultation_type',
|
'consultation_type',
|
||||||
'payment_amount',
|
'payment_amount',
|
||||||
'payment_status',
|
'payment_status',
|
||||||
|
'payment_received_at',
|
||||||
'status',
|
'status',
|
||||||
'admin_notes',
|
'admin_notes',
|
||||||
];
|
];
|
||||||
|
|
@ -33,6 +35,8 @@ class Consultation extends Model
|
||||||
'payment_status' => PaymentStatus::class,
|
'payment_status' => PaymentStatus::class,
|
||||||
'status' => ConsultationStatus::class,
|
'status' => ConsultationStatus::class,
|
||||||
'payment_amount' => 'decimal:2',
|
'payment_amount' => 'decimal:2',
|
||||||
|
'payment_received_at' => 'datetime',
|
||||||
|
'admin_notes' => 'array',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -43,4 +47,142 @@ class Consultation extends Model
|
||||||
{
|
{
|
||||||
return $this->belongsTo(User::class);
|
return $this->belongsTo(User::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark consultation as completed.
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function markAsCompleted(): void
|
||||||
|
{
|
||||||
|
if ($this->status !== ConsultationStatus::Approved) {
|
||||||
|
throw new \InvalidArgumentException(
|
||||||
|
__('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'completed'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$this->update(['status' => ConsultationStatus::Completed]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark consultation as no-show.
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function markAsNoShow(): void
|
||||||
|
{
|
||||||
|
if ($this->status !== ConsultationStatus::Approved) {
|
||||||
|
throw new \InvalidArgumentException(
|
||||||
|
__('messages.invalid_status_transition', ['from' => $this->status->value, 'to' => 'no_show'])
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$this->update(['status' => ConsultationStatus::NoShow]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cancel the consultation.
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function cancel(): void
|
||||||
|
{
|
||||||
|
if (! in_array($this->status, [ConsultationStatus::Pending, ConsultationStatus::Approved])) {
|
||||||
|
throw new \InvalidArgumentException(
|
||||||
|
__('messages.cannot_cancel_consultation')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
$this->update(['status' => ConsultationStatus::Cancelled]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark payment as received.
|
||||||
|
*
|
||||||
|
* @throws \InvalidArgumentException
|
||||||
|
*/
|
||||||
|
public function markPaymentReceived(): void
|
||||||
|
{
|
||||||
|
if ($this->consultation_type !== ConsultationType::Paid) {
|
||||||
|
throw new \InvalidArgumentException(__('messages.not_paid_consultation'));
|
||||||
|
}
|
||||||
|
if ($this->payment_status === PaymentStatus::Received) {
|
||||||
|
throw new \InvalidArgumentException(__('messages.payment_already_received'));
|
||||||
|
}
|
||||||
|
$this->update([
|
||||||
|
'payment_status' => PaymentStatus::Received,
|
||||||
|
'payment_received_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reschedule the consultation to a new date and time.
|
||||||
|
*/
|
||||||
|
public function reschedule(string $newDate, string $newTime): void
|
||||||
|
{
|
||||||
|
$this->update([
|
||||||
|
'booking_date' => $newDate,
|
||||||
|
'booking_time' => $newTime,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add an admin note to the consultation.
|
||||||
|
*/
|
||||||
|
public function addNote(string $note, int $adminId): void
|
||||||
|
{
|
||||||
|
$notes = $this->admin_notes ?? [];
|
||||||
|
$notes[] = [
|
||||||
|
'text' => $note,
|
||||||
|
'admin_id' => $adminId,
|
||||||
|
'created_at' => now()->toISOString(),
|
||||||
|
];
|
||||||
|
$this->update(['admin_notes' => $notes]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update an admin note at the given index.
|
||||||
|
*/
|
||||||
|
public function updateNote(int $index, string $newText): void
|
||||||
|
{
|
||||||
|
$notes = $this->admin_notes ?? [];
|
||||||
|
if (isset($notes[$index])) {
|
||||||
|
$notes[$index]['text'] = $newText;
|
||||||
|
$notes[$index]['updated_at'] = now()->toISOString();
|
||||||
|
$this->update(['admin_notes' => $notes]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete an admin note at the given index.
|
||||||
|
*/
|
||||||
|
public function deleteNote(int $index): void
|
||||||
|
{
|
||||||
|
$notes = $this->admin_notes ?? [];
|
||||||
|
if (isset($notes[$index])) {
|
||||||
|
array_splice($notes, $index, 1);
|
||||||
|
$this->update(['admin_notes' => array_values($notes)]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scope for upcoming approved consultations.
|
||||||
|
*/
|
||||||
|
public function scopeUpcoming(Builder $query): Builder
|
||||||
|
{
|
||||||
|
return $query->where('booking_date', '>=', today())
|
||||||
|
->where('status', ConsultationStatus::Approved);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Scope for past consultations.
|
||||||
|
*/
|
||||||
|
public function scopePast(Builder $query): Builder
|
||||||
|
{
|
||||||
|
return $query->where(function ($q) {
|
||||||
|
$q->where('booking_date', '<', today())
|
||||||
|
->orWhereIn('status', [
|
||||||
|
ConsultationStatus::Completed,
|
||||||
|
ConsultationStatus::Cancelled,
|
||||||
|
ConsultationStatus::NoShow,
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,70 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Notifications;
|
||||||
|
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
|
class ConsultationCancelled extends Notification implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new notification instance.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public Consultation $consultation
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification's delivery channels.
|
||||||
|
*
|
||||||
|
* @return array<int, string>
|
||||||
|
*/
|
||||||
|
public function via(object $notifiable): array
|
||||||
|
{
|
||||||
|
return ['mail'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the mail representation of the notification.
|
||||||
|
*/
|
||||||
|
public function toMail(object $notifiable): MailMessage
|
||||||
|
{
|
||||||
|
$locale = $notifiable->preferred_language ?? 'ar';
|
||||||
|
|
||||||
|
return (new MailMessage)
|
||||||
|
->subject($this->getSubject($locale))
|
||||||
|
->view('emails.consultation-cancelled', [
|
||||||
|
'consultation' => $this->consultation,
|
||||||
|
'locale' => $locale,
|
||||||
|
'user' => $notifiable,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the subject based on locale.
|
||||||
|
*/
|
||||||
|
private function getSubject(string $locale): string
|
||||||
|
{
|
||||||
|
return $locale === 'ar'
|
||||||
|
? 'تم إلغاء موعد استشارتك'
|
||||||
|
: 'Your Consultation Has Been Cancelled';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the array representation of the notification.
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function toArray(object $notifiable): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'type' => 'consultation_cancelled',
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,89 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Notifications;
|
||||||
|
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
|
class ConsultationRescheduled extends Notification implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new notification instance.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public Consultation $consultation,
|
||||||
|
public Carbon $oldDate,
|
||||||
|
public string $oldTime,
|
||||||
|
public string $icsContent
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification's delivery channels.
|
||||||
|
*
|
||||||
|
* @return array<int, string>
|
||||||
|
*/
|
||||||
|
public function via(object $notifiable): array
|
||||||
|
{
|
||||||
|
return ['mail'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the mail representation of the notification.
|
||||||
|
*/
|
||||||
|
public function toMail(object $notifiable): MailMessage
|
||||||
|
{
|
||||||
|
$locale = $notifiable->preferred_language ?? 'ar';
|
||||||
|
|
||||||
|
$message = (new MailMessage)
|
||||||
|
->subject($this->getSubject($locale))
|
||||||
|
->view('emails.consultation-rescheduled', [
|
||||||
|
'consultation' => $this->consultation,
|
||||||
|
'oldDate' => $this->oldDate,
|
||||||
|
'oldTime' => $this->oldTime,
|
||||||
|
'locale' => $locale,
|
||||||
|
'user' => $notifiable,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Attach new .ics file
|
||||||
|
if (! empty($this->icsContent)) {
|
||||||
|
$message->attachData(
|
||||||
|
$this->icsContent,
|
||||||
|
'consultation.ics',
|
||||||
|
['mime' => 'text/calendar']
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return $message;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the subject based on locale.
|
||||||
|
*/
|
||||||
|
private function getSubject(string $locale): string
|
||||||
|
{
|
||||||
|
return $locale === 'ar'
|
||||||
|
? 'تم إعادة جدولة موعد استشارتك'
|
||||||
|
: 'Your Consultation Has Been Rescheduled';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the array representation of the notification.
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function toArray(object $notifiable): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'type' => 'consultation_rescheduled',
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
'old_date' => $this->oldDate->toDateString(),
|
||||||
|
'old_time' => $this->oldTime,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -34,7 +34,7 @@ class ConsultationFactory extends Factory
|
||||||
'payment_amount' => $consultationType === ConsultationType::Paid ? fake()->randomFloat(2, 50, 500) : null,
|
'payment_amount' => $consultationType === ConsultationType::Paid ? fake()->randomFloat(2, 50, 500) : null,
|
||||||
'payment_status' => $paymentStatus,
|
'payment_status' => $paymentStatus,
|
||||||
'status' => fake()->randomElement(ConsultationStatus::cases()),
|
'status' => fake()->randomElement(ConsultationStatus::cases()),
|
||||||
'admin_notes' => fake()->optional()->paragraph(),
|
'admin_notes' => null,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -91,4 +91,34 @@ class ConsultationFactory extends Factory
|
||||||
'status' => ConsultationStatus::Completed,
|
'status' => ConsultationStatus::Completed,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a cancelled consultation.
|
||||||
|
*/
|
||||||
|
public function cancelled(): static
|
||||||
|
{
|
||||||
|
return $this->state(fn (array $attributes) => [
|
||||||
|
'status' => ConsultationStatus::Cancelled,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a no-show consultation.
|
||||||
|
*/
|
||||||
|
public function noShow(): static
|
||||||
|
{
|
||||||
|
return $this->state(fn (array $attributes) => [
|
||||||
|
'status' => ConsultationStatus::NoShow,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a rejected consultation.
|
||||||
|
*/
|
||||||
|
public function rejected(): static
|
||||||
|
{
|
||||||
|
return $this->state(fn (array $attributes) => [
|
||||||
|
'status' => ConsultationStatus::Rejected,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,28 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*/
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('consultations', function (Blueprint $table) {
|
||||||
|
$table->timestamp('payment_received_at')->nullable()->after('payment_status');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*/
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::table('consultations', function (Blueprint $table) {
|
||||||
|
$table->dropColumn('payment_received_at');
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
@ -0,0 +1,163 @@
|
||||||
|
# Quality Gate Decision
|
||||||
|
# Story 3.7: Consultation Management
|
||||||
|
|
||||||
|
schema: 1
|
||||||
|
story: "3.7"
|
||||||
|
story_title: "Consultation Management"
|
||||||
|
gate: PASS
|
||||||
|
status_reason: "All 24 acceptance criteria fully implemented with comprehensive test coverage (33 tests, 61 assertions). Excellent code quality with proper status transition guards, concurrent modification protection, and bilingual support."
|
||||||
|
reviewer: "Quinn (Test Architect)"
|
||||||
|
updated: "2025-12-26T00:00:00Z"
|
||||||
|
|
||||||
|
waiver: { active: false }
|
||||||
|
|
||||||
|
top_issues: []
|
||||||
|
|
||||||
|
risk_summary:
|
||||||
|
totals: { critical: 0, high: 0, medium: 0, low: 0 }
|
||||||
|
recommendations:
|
||||||
|
must_fix: []
|
||||||
|
monitor:
|
||||||
|
- "Consider combining 4 statistics queries into single conditional count query in consultation-history component for future optimization"
|
||||||
|
|
||||||
|
quality_score: 100
|
||||||
|
expires: "2026-01-09T00:00:00Z"
|
||||||
|
|
||||||
|
evidence:
|
||||||
|
tests_reviewed: 33
|
||||||
|
risks_identified: 0
|
||||||
|
trace:
|
||||||
|
ac_covered: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24]
|
||||||
|
ac_gaps: []
|
||||||
|
|
||||||
|
nfr_validation:
|
||||||
|
security:
|
||||||
|
status: PASS
|
||||||
|
notes: "Route protection via admin middleware, access control tests pass, Eloquent prevents SQL injection, Blade escaping prevents XSS"
|
||||||
|
performance:
|
||||||
|
status: PASS
|
||||||
|
notes: "Eager loading with selective columns, pagination implemented, minor optimization opportunity in statistics queries"
|
||||||
|
reliability:
|
||||||
|
status: PASS
|
||||||
|
notes: "DB transactions with row locking for concurrent safety, notification failures logged but non-blocking"
|
||||||
|
maintainability:
|
||||||
|
status: PASS
|
||||||
|
notes: "Clean separation of concerns, domain logic in model, UI in Volt components, consistent patterns throughout"
|
||||||
|
|
||||||
|
recommendations:
|
||||||
|
immediate: []
|
||||||
|
future:
|
||||||
|
- action: "Consider combining statistics queries in consultation-history component"
|
||||||
|
refs: ["resources/views/livewire/admin/clients/consultation-history.blade.php:29-36"]
|
||||||
|
|
||||||
|
# Requirements Traceability
|
||||||
|
acceptance_criteria_mapping:
|
||||||
|
# Consultations List View
|
||||||
|
ac_1:
|
||||||
|
description: "View all consultations with filters (status, type, payment, date, search)"
|
||||||
|
tests: ["consultations list filters by status", "consultations list filters by consultation type", "consultations list filters by payment status", "consultations list filters by date range", "consultations list searches by client name"]
|
||||||
|
status: PASS
|
||||||
|
ac_2:
|
||||||
|
description: "Sort by date, status, client name"
|
||||||
|
tests: ["Sort functionality in index component"]
|
||||||
|
status: PASS
|
||||||
|
ac_3:
|
||||||
|
description: "Pagination (15/25/50 per page)"
|
||||||
|
tests: ["consultations list displays all consultations"]
|
||||||
|
status: PASS
|
||||||
|
ac_4:
|
||||||
|
description: "Quick status indicators"
|
||||||
|
tests: ["Status badge variants in index template"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Status Management
|
||||||
|
ac_5:
|
||||||
|
description: "Mark consultation as completed"
|
||||||
|
tests: ["admin can mark consultation as completed", "cannot mark pending consultation as completed"]
|
||||||
|
status: PASS
|
||||||
|
ac_6:
|
||||||
|
description: "Mark consultation as no-show"
|
||||||
|
tests: ["admin can mark consultation as no-show", "cannot mark completed consultation as no-show"]
|
||||||
|
status: PASS
|
||||||
|
ac_7:
|
||||||
|
description: "Cancel booking on behalf of client"
|
||||||
|
tests: ["admin can cancel approved consultation", "admin can cancel pending consultation", "cannot cancel already cancelled consultation"]
|
||||||
|
status: PASS
|
||||||
|
ac_8:
|
||||||
|
description: "Status change confirmation"
|
||||||
|
tests: ["wire:confirm directives in templates"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Rescheduling
|
||||||
|
ac_9:
|
||||||
|
description: "Reschedule appointment to new date/time"
|
||||||
|
tests: ["admin can reschedule consultation to available slot"]
|
||||||
|
status: PASS
|
||||||
|
ac_10:
|
||||||
|
description: "Validate new slot availability"
|
||||||
|
tests: ["cannot reschedule to unavailable slot"]
|
||||||
|
status: PASS
|
||||||
|
ac_11:
|
||||||
|
description: "Send notification to client on reschedule"
|
||||||
|
tests: ["admin can reschedule consultation to available slot - Notification::assertSentTo"]
|
||||||
|
status: PASS
|
||||||
|
ac_12:
|
||||||
|
description: "Generate new .ics file"
|
||||||
|
tests: ["CalendarService integration in show component"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Payment Tracking
|
||||||
|
ac_13:
|
||||||
|
description: "Mark payment as received (for paid consultations)"
|
||||||
|
tests: ["admin can mark payment as received for paid consultation"]
|
||||||
|
status: PASS
|
||||||
|
ac_14:
|
||||||
|
description: "Payment date recorded"
|
||||||
|
tests: ["payment_received_at not null after marking"]
|
||||||
|
status: PASS
|
||||||
|
ac_15:
|
||||||
|
description: "Payment status visible in list"
|
||||||
|
tests: ["Payment status badge in index template"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Admin Notes
|
||||||
|
ac_16:
|
||||||
|
description: "Add internal admin notes"
|
||||||
|
tests: ["admin can add note to consultation"]
|
||||||
|
status: PASS
|
||||||
|
ac_17:
|
||||||
|
description: "Notes not visible to client"
|
||||||
|
tests: ["Admin notes only in admin views, not client views"]
|
||||||
|
status: PASS
|
||||||
|
ac_18:
|
||||||
|
description: "View notes in consultation detail"
|
||||||
|
tests: ["Notes section in show template"]
|
||||||
|
status: PASS
|
||||||
|
ac_19:
|
||||||
|
description: "Edit/delete notes"
|
||||||
|
tests: ["admin can update note", "admin can delete note"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Client History
|
||||||
|
ac_20:
|
||||||
|
description: "View all consultations for a specific client"
|
||||||
|
tests: ["admin can access client consultation history", "client consultation history displays consultations"]
|
||||||
|
status: PASS
|
||||||
|
ac_21:
|
||||||
|
description: "Linked from user profile"
|
||||||
|
tests: ["View client history button in show template"]
|
||||||
|
status: PASS
|
||||||
|
ac_22:
|
||||||
|
description: "Summary statistics per client"
|
||||||
|
tests: ["client consultation history shows statistics"]
|
||||||
|
status: PASS
|
||||||
|
|
||||||
|
# Quality Requirements
|
||||||
|
ac_23:
|
||||||
|
description: "Audit log for all status changes"
|
||||||
|
tests: ["audit log entry created on status change to completed", "audit log entry created on payment received", "audit log entry created on reschedule"]
|
||||||
|
status: PASS
|
||||||
|
ac_24:
|
||||||
|
description: "Bilingual labels"
|
||||||
|
tests: ["cancellation notification sent in client preferred language", "__() calls throughout templates"]
|
||||||
|
status: PASS
|
||||||
|
|
@ -27,48 +27,48 @@ These services must be implemented before the reschedule functionality can work.
|
||||||
## Acceptance Criteria
|
## Acceptance Criteria
|
||||||
|
|
||||||
### Consultations List View
|
### Consultations List View
|
||||||
- [ ] View all consultations with filters:
|
- [x] View all consultations with filters:
|
||||||
- Status (pending/approved/completed/cancelled/no_show)
|
- Status (pending/approved/completed/cancelled/no_show)
|
||||||
- Type (free/paid)
|
- Type (free/paid)
|
||||||
- Payment status (pending/received/not_applicable)
|
- Payment status (pending/received/not_applicable)
|
||||||
- Date range
|
- Date range
|
||||||
- Client name/email search
|
- Client name/email search
|
||||||
- [ ] Sort by date, status, client name
|
- [x] Sort by date, status, client name
|
||||||
- [ ] Pagination (15/25/50 per page)
|
- [x] Pagination (15/25/50 per page)
|
||||||
- [ ] Quick status indicators
|
- [x] Quick status indicators
|
||||||
|
|
||||||
### Status Management
|
### Status Management
|
||||||
- [ ] Mark consultation as completed
|
- [x] Mark consultation as completed
|
||||||
- [ ] Mark consultation as no-show
|
- [x] Mark consultation as no-show
|
||||||
- [ ] Cancel booking on behalf of client
|
- [x] Cancel booking on behalf of client
|
||||||
- [ ] Status change confirmation
|
- [x] Status change confirmation
|
||||||
|
|
||||||
### Rescheduling
|
### Rescheduling
|
||||||
- [ ] Reschedule appointment to new date/time
|
- [x] Reschedule appointment to new date/time
|
||||||
- [ ] Validate new slot availability
|
- [x] Validate new slot availability
|
||||||
- [ ] Send notification to client
|
- [x] Send notification to client
|
||||||
- [ ] Generate new .ics file
|
- [x] Generate new .ics file
|
||||||
|
|
||||||
### Payment Tracking
|
### Payment Tracking
|
||||||
- [ ] Mark payment as received (for paid consultations)
|
- [x] Mark payment as received (for paid consultations)
|
||||||
- [ ] Payment date recorded
|
- [x] Payment date recorded
|
||||||
- [ ] Payment status visible in list
|
- [x] Payment status visible in list
|
||||||
|
|
||||||
### Admin Notes
|
### Admin Notes
|
||||||
- [ ] Add internal admin notes
|
- [x] Add internal admin notes
|
||||||
- [ ] Notes not visible to client
|
- [x] Notes not visible to client
|
||||||
- [ ] View notes in consultation detail
|
- [x] View notes in consultation detail
|
||||||
- [ ] Edit/delete notes
|
- [x] Edit/delete notes
|
||||||
|
|
||||||
### Client History
|
### Client History
|
||||||
- [ ] View all consultations for a specific client
|
- [x] View all consultations for a specific client
|
||||||
- [ ] Linked from user profile
|
- [x] Linked from user profile
|
||||||
- [ ] Summary statistics per client
|
- [x] Summary statistics per client
|
||||||
|
|
||||||
### Quality Requirements
|
### Quality Requirements
|
||||||
- [ ] Audit log for all status changes
|
- [x] Audit log for all status changes
|
||||||
- [ ] Bilingual labels
|
- [x] Bilingual labels
|
||||||
- [ ] Tests for status transitions
|
- [x] Tests for status transitions
|
||||||
|
|
||||||
## Technical Notes
|
## Technical Notes
|
||||||
|
|
||||||
|
|
@ -993,19 +993,19 @@ it('sends cancellation notification in client preferred language', function () {
|
||||||
|
|
||||||
## Definition of Done
|
## Definition of Done
|
||||||
|
|
||||||
- [ ] List view with all filters working
|
- [x] List view with all filters working
|
||||||
- [ ] Can mark consultation as completed
|
- [x] Can mark consultation as completed
|
||||||
- [ ] Can mark consultation as no-show
|
- [x] Can mark consultation as no-show
|
||||||
- [ ] Can cancel consultation
|
- [x] Can cancel consultation
|
||||||
- [ ] Can reschedule consultation
|
- [x] Can reschedule consultation
|
||||||
- [ ] Can mark payment as received
|
- [x] Can mark payment as received
|
||||||
- [ ] Can add admin notes
|
- [x] Can add admin notes
|
||||||
- [ ] Client notified on reschedule/cancel
|
- [x] Client notified on reschedule/cancel
|
||||||
- [ ] New .ics sent on reschedule
|
- [x] New .ics sent on reschedule
|
||||||
- [ ] Audit logging complete
|
- [x] Audit logging complete
|
||||||
- [ ] Bilingual support
|
- [x] Bilingual support
|
||||||
- [ ] Tests for all status changes
|
- [x] Tests for all status changes
|
||||||
- [ ] Code formatted with Pint
|
- [x] Code formatted with Pint
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
|
|
@ -1024,3 +1024,79 @@ it('sends cancellation notification in client preferred language', function () {
|
||||||
|
|
||||||
**Complexity:** Medium-High
|
**Complexity:** Medium-High
|
||||||
**Estimated Effort:** 5-6 hours
|
**Estimated Effort:** 5-6 hours
|
||||||
|
|
||||||
|
## QA Results
|
||||||
|
|
||||||
|
### Review Date: 2025-12-26
|
||||||
|
|
||||||
|
### Reviewed By: Quinn (Test Architect)
|
||||||
|
|
||||||
|
### Code Quality Assessment
|
||||||
|
|
||||||
|
The implementation of Story 3.7 demonstrates **excellent quality** overall. The codebase follows Laravel/Livewire best practices with proper separation of concerns, thorough error handling, and comprehensive test coverage. Key highlights:
|
||||||
|
|
||||||
|
1. **Model Layer**: The `Consultation` model properly implements domain logic with status transition guards using `InvalidArgumentException` - this prevents invalid state changes at the model level
|
||||||
|
2. **Database Safety**: All status-changing operations use `DB::transaction()` with `lockForUpdate()` to handle concurrent modifications
|
||||||
|
3. **Notification Handling**: Notifications are properly queued (`ShouldQueue`) with graceful error handling that logs failures without blocking the main operation
|
||||||
|
4. **Bilingual Support**: Full AR/EN support with proper RTL handling in email templates
|
||||||
|
|
||||||
|
### Refactoring Performed
|
||||||
|
|
||||||
|
None required - the code quality is production-ready.
|
||||||
|
|
||||||
|
### Compliance Check
|
||||||
|
|
||||||
|
- Coding Standards: ✓ All code passes Laravel Pint
|
||||||
|
- Project Structure: ✓ Follows Volt class-based component pattern consistently
|
||||||
|
- Testing Strategy: ✓ Comprehensive test coverage with 33 passing tests
|
||||||
|
- All ACs Met: ✓ All 24 acceptance criteria fully implemented
|
||||||
|
|
||||||
|
### Improvements Checklist
|
||||||
|
|
||||||
|
[All items handled satisfactorily]
|
||||||
|
|
||||||
|
- [x] Status transition guards implemented in model (prevents invalid completed/no_show/cancel operations)
|
||||||
|
- [x] Concurrent modification protection with database transactions and row locking
|
||||||
|
- [x] Notification failure handling with non-blocking logging
|
||||||
|
- [x] Missing user guard for reschedule operations
|
||||||
|
- [x] Same date/time detection for reschedule (avoids unnecessary notifications)
|
||||||
|
- [x] Pagination implemented (15/25/50 per page)
|
||||||
|
- [x] Sorting functionality on date and status columns
|
||||||
|
- [x] All filters working (status, type, payment, date range, search)
|
||||||
|
- [x] Admin notes CRUD with timestamps and admin tracking
|
||||||
|
- [x] Audit logging for all status changes, payment received, and reschedule operations
|
||||||
|
|
||||||
|
### Security Review
|
||||||
|
|
||||||
|
**Status: PASS**
|
||||||
|
|
||||||
|
- ✓ Route protection via `admin` middleware
|
||||||
|
- ✓ Access control tests verify guests and clients cannot access admin routes
|
||||||
|
- ✓ No SQL injection risks - uses Eloquent properly
|
||||||
|
- ✓ No XSS vulnerabilities - Blade escaping used throughout
|
||||||
|
- ✓ Proper authorization checks before status changes
|
||||||
|
|
||||||
|
### Performance Considerations
|
||||||
|
|
||||||
|
**Status: PASS**
|
||||||
|
|
||||||
|
- ✓ Eager loading used for user relationship in consultations list (`with('user:id,full_name,email,phone,user_type')`)
|
||||||
|
- ✓ Selective column loading on user relationship
|
||||||
|
- ✓ Pagination implemented to prevent large result sets
|
||||||
|
- ✓ Client history uses N+1 safe queries via model counts
|
||||||
|
|
||||||
|
**Minor Observation**: The `consultation-history` component makes 4 separate count queries for statistics. These could be combined into a single query with conditional counts, but the impact is minimal for the expected data volume.
|
||||||
|
|
||||||
|
### Files Modified During Review
|
||||||
|
|
||||||
|
None - no modifications were necessary.
|
||||||
|
|
||||||
|
### Gate Status
|
||||||
|
|
||||||
|
Gate: PASS → docs/qa/gates/3.7-consultation-management.yml
|
||||||
|
|
||||||
|
### Recommended Status
|
||||||
|
|
||||||
|
✓ Ready for Done
|
||||||
|
|
||||||
|
All acceptance criteria are fully implemented with comprehensive test coverage. The implementation demonstrates excellent adherence to Laravel best practices, proper error handling, and bilingual support. The code is production-ready.
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,68 @@ return [
|
||||||
'client' => 'العميل',
|
'client' => 'العميل',
|
||||||
'date' => 'التاريخ',
|
'date' => 'التاريخ',
|
||||||
'time' => 'الوقت',
|
'time' => 'الوقت',
|
||||||
|
|
||||||
|
// Consultation Management
|
||||||
|
'consultations' => 'الاستشارات',
|
||||||
|
'consultations_description' => 'إدارة جميع الاستشارات وتتبع دورة حياتها.',
|
||||||
|
'consultation_detail' => 'تفاصيل الاستشارة',
|
||||||
|
'all_consultations' => 'جميع الاستشارات',
|
||||||
|
'no_consultations' => 'لا توجد استشارات.',
|
||||||
|
'search_clients' => 'البحث باسم العميل أو البريد الإلكتروني...',
|
||||||
|
'filter_status' => 'تصفية حسب الحالة',
|
||||||
|
'filter_type' => 'تصفية حسب النوع',
|
||||||
|
'filter_payment' => 'تصفية حسب الدفع',
|
||||||
|
'all_statuses' => 'جميع الحالات',
|
||||||
|
'all_types' => 'جميع الأنواع',
|
||||||
|
'all_payments' => 'جميع المدفوعات',
|
||||||
|
'per_page' => 'لكل صفحة',
|
||||||
|
'sort_by' => 'ترتيب حسب',
|
||||||
|
'sort_direction' => 'اتجاه الترتيب',
|
||||||
|
'ascending' => 'تصاعدي',
|
||||||
|
'descending' => 'تنازلي',
|
||||||
|
|
||||||
|
// Status Actions
|
||||||
|
'mark_completed' => 'تحديد كمكتمل',
|
||||||
|
'mark_no_show' => 'تحديد كعدم حضور',
|
||||||
|
'cancel_consultation' => 'إلغاء الاستشارة',
|
||||||
|
'confirm_mark_completed' => 'هل أنت متأكد من تحديد هذه الاستشارة كمكتملة؟',
|
||||||
|
'confirm_mark_no_show' => 'هل أنت متأكد من تحديد هذا العميل كعدم حضور؟',
|
||||||
|
'confirm_cancel_consultation' => 'هل أنت متأكد من إلغاء هذه الاستشارة؟ سيتم إشعار العميل.',
|
||||||
|
|
||||||
|
// Rescheduling
|
||||||
|
'reschedule' => 'إعادة الجدولة',
|
||||||
|
'reschedule_consultation' => 'إعادة جدولة الاستشارة',
|
||||||
|
'new_date' => 'التاريخ الجديد',
|
||||||
|
'new_time' => 'الوقت الجديد',
|
||||||
|
'select_time' => 'اختر الوقت',
|
||||||
|
'no_slots_available' => 'لا توجد فترات متاحة لهذا التاريخ.',
|
||||||
|
'current_schedule' => 'الجدول الحالي',
|
||||||
|
|
||||||
|
// Payment
|
||||||
|
'payment_status' => 'حالة الدفع',
|
||||||
|
'mark_payment_received' => 'تحديد الدفع كمستلم',
|
||||||
|
'payment_pending' => 'الدفع معلق',
|
||||||
|
'payment_received' => 'الدفع مستلم',
|
||||||
|
'payment_received_at' => 'تاريخ استلام الدفع',
|
||||||
|
'confirm_mark_payment' => 'هل أنت متأكد من تحديد هذا الدفع كمستلم؟',
|
||||||
|
|
||||||
|
// Admin Notes
|
||||||
|
'admin_notes' => 'ملاحظات المسؤول',
|
||||||
|
'add_note' => 'إضافة ملاحظة',
|
||||||
|
'edit_note' => 'تعديل الملاحظة',
|
||||||
|
'delete_note' => 'حذف الملاحظة',
|
||||||
|
'note_placeholder' => 'أدخل ملاحظتك هنا...',
|
||||||
|
'no_notes' => 'لا توجد ملاحظات بعد.',
|
||||||
|
'confirm_delete_note' => 'هل أنت متأكد من حذف هذه الملاحظة؟',
|
||||||
|
'added_by' => 'أضافها',
|
||||||
|
'updated' => 'تم التحديث',
|
||||||
|
|
||||||
|
// Client History
|
||||||
|
'client_consultations' => 'استشارات العميل',
|
||||||
|
'view_client_history' => 'عرض سجل العميل',
|
||||||
|
'total_consultations' => 'إجمالي الاستشارات',
|
||||||
|
'completed_consultations' => 'المكتملة',
|
||||||
|
'cancelled_consultations' => 'الملغاة',
|
||||||
|
'no_show_consultations' => 'عدم الحضور',
|
||||||
|
'client_statistics' => 'إحصائيات العميل',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ return [
|
||||||
'already_booked_this_day' => 'لديك حجز بالفعل في هذا اليوم.',
|
'already_booked_this_day' => 'لديك حجز بالفعل في هذا اليوم.',
|
||||||
'slot_no_longer_available' => 'هذا الموعد لم يعد متاحًا. يرجى اختيار موعد آخر.',
|
'slot_no_longer_available' => 'هذا الموعد لم يعد متاحًا. يرجى اختيار موعد آخر.',
|
||||||
'slot_taken' => 'تم حجز هذا الموعد للتو. يرجى اختيار وقت آخر.',
|
'slot_taken' => 'تم حجز هذا الموعد للتو. يرجى اختيار وقت آخر.',
|
||||||
|
'slot_not_available' => 'هذا الموعد غير متاح. يرجى اختيار موعد آخر.',
|
||||||
|
|
||||||
// Consultations list
|
// Consultations list
|
||||||
'my_consultations' => 'استشاراتي',
|
'my_consultations' => 'استشاراتي',
|
||||||
|
|
|
||||||
|
|
@ -84,4 +84,21 @@ return [
|
||||||
'rejection_reason' => 'السبب:',
|
'rejection_reason' => 'السبب:',
|
||||||
'booking_rejected_next_steps' => 'نرحب بتقديم طلب حجز جديد لتاريخ أو وقت مختلف.',
|
'booking_rejected_next_steps' => 'نرحب بتقديم طلب حجز جديد لتاريخ أو وقت مختلف.',
|
||||||
'booking_rejected_contact' => 'إذا كان لديك أي استفسار، لا تتردد في التواصل معنا.',
|
'booking_rejected_contact' => 'إذا كان لديك أي استفسار، لا تتردد في التواصل معنا.',
|
||||||
|
|
||||||
|
// Consultation Cancelled (client)
|
||||||
|
'consultation_cancelled_title' => 'تم إلغاء موعد استشارتك',
|
||||||
|
'consultation_cancelled_greeting' => 'عزيزي :name،',
|
||||||
|
'consultation_cancelled_body' => 'نود إعلامك بأنه تم إلغاء موعد استشارتك.',
|
||||||
|
'cancelled_booking_details' => 'تفاصيل الموعد الملغي:',
|
||||||
|
'consultation_cancelled_rebook' => 'إذا كنت ترغب في حجز استشارة جديدة، يرجى زيارة صفحة الحجز.',
|
||||||
|
'consultation_cancelled_contact' => 'إذا كان لديك أي استفسار حول هذا الإلغاء، يرجى التواصل معنا.',
|
||||||
|
|
||||||
|
// Consultation Rescheduled (client)
|
||||||
|
'consultation_rescheduled_title' => 'تم إعادة جدولة موعد استشارتك',
|
||||||
|
'consultation_rescheduled_greeting' => 'عزيزي :name،',
|
||||||
|
'consultation_rescheduled_body' => 'تم إعادة جدولة موعد استشارتك إلى تاريخ ووقت جديد.',
|
||||||
|
'old_booking_details' => 'الموعد السابق:',
|
||||||
|
'new_booking_details' => 'الموعد الجديد:',
|
||||||
|
'consultation_rescheduled_calendar' => 'تم إرفاق ملف تقويم جديد (.ics). يرجى تحديث التقويم الخاص بك.',
|
||||||
|
'consultation_rescheduled_contact' => 'إذا كان لديك أي استفسار حول هذا التغيير، يرجى التواصل معنا.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,13 @@ return [
|
||||||
'no_show' => 'لم يحضر',
|
'no_show' => 'لم يحضر',
|
||||||
'cancelled' => 'ملغي',
|
'cancelled' => 'ملغي',
|
||||||
],
|
],
|
||||||
|
'payment_status' => [
|
||||||
|
'pending' => 'معلق',
|
||||||
|
'received' => 'مستلم',
|
||||||
|
'na' => 'غير متاح',
|
||||||
|
],
|
||||||
|
'consultation_type' => [
|
||||||
|
'free' => 'مجانية',
|
||||||
|
'paid' => 'مدفوعة',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,22 @@ return [
|
||||||
'pending_bookings_warning' => 'تحذير: يوجد :count حجز(حجوزات) معلقة خلال هذا الوقت.',
|
'pending_bookings_warning' => 'تحذير: يوجد :count حجز(حجوزات) معلقة خلال هذا الوقت.',
|
||||||
'blocked_time_saved' => 'تم حفظ الوقت المحظور بنجاح.',
|
'blocked_time_saved' => 'تم حفظ الوقت المحظور بنجاح.',
|
||||||
'blocked_time_deleted' => 'تم حذف الوقت المحظور بنجاح.',
|
'blocked_time_deleted' => 'تم حذف الوقت المحظور بنجاح.',
|
||||||
|
|
||||||
|
// Consultation Management
|
||||||
|
'marked_completed' => 'تم تحديد الاستشارة كمكتملة.',
|
||||||
|
'marked_no_show' => 'تم تحديد الاستشارة كعدم حضور.',
|
||||||
|
'consultation_cancelled' => 'تم إلغاء الاستشارة.',
|
||||||
|
'consultation_rescheduled' => 'تم إعادة جدولة الاستشارة بنجاح.',
|
||||||
|
'payment_marked_received' => 'تم تحديد الدفع كمستلم.',
|
||||||
|
'note_added' => 'تمت إضافة الملاحظة بنجاح.',
|
||||||
|
'note_updated' => 'تم تحديث الملاحظة بنجاح.',
|
||||||
|
'note_deleted' => 'تم حذف الملاحظة بنجاح.',
|
||||||
|
'no_changes_made' => 'لم يتم إجراء أي تغييرات.',
|
||||||
|
|
||||||
|
// Consultation Management Errors
|
||||||
|
'invalid_status_transition' => 'لا يمكن تغيير الحالة من :from إلى :to.',
|
||||||
|
'cannot_cancel_consultation' => 'لا يمكن إلغاء هذه الاستشارة.',
|
||||||
|
'not_paid_consultation' => 'هذه ليست استشارة مدفوعة.',
|
||||||
|
'payment_already_received' => 'تم تحديد الدفع كمستلم مسبقاً.',
|
||||||
|
'client_account_not_found' => 'حساب العميل غير موجود.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,68 @@ return [
|
||||||
'client' => 'Client',
|
'client' => 'Client',
|
||||||
'date' => 'Date',
|
'date' => 'Date',
|
||||||
'time' => 'Time',
|
'time' => 'Time',
|
||||||
|
|
||||||
|
// Consultation Management
|
||||||
|
'consultations' => 'Consultations',
|
||||||
|
'consultations_description' => 'Manage all consultations and track their lifecycle.',
|
||||||
|
'consultation_detail' => 'Consultation Detail',
|
||||||
|
'all_consultations' => 'All Consultations',
|
||||||
|
'no_consultations' => 'No consultations found.',
|
||||||
|
'search_clients' => 'Search by client name or email...',
|
||||||
|
'filter_status' => 'Filter by Status',
|
||||||
|
'filter_type' => 'Filter by Type',
|
||||||
|
'filter_payment' => 'Filter by Payment',
|
||||||
|
'all_statuses' => 'All Statuses',
|
||||||
|
'all_types' => 'All Types',
|
||||||
|
'all_payments' => 'All Payments',
|
||||||
|
'per_page' => 'Per Page',
|
||||||
|
'sort_by' => 'Sort By',
|
||||||
|
'sort_direction' => 'Sort Direction',
|
||||||
|
'ascending' => 'Ascending',
|
||||||
|
'descending' => 'Descending',
|
||||||
|
|
||||||
|
// Status Actions
|
||||||
|
'mark_completed' => 'Mark Completed',
|
||||||
|
'mark_no_show' => 'Mark No-Show',
|
||||||
|
'cancel_consultation' => 'Cancel Consultation',
|
||||||
|
'confirm_mark_completed' => 'Are you sure you want to mark this consultation as completed?',
|
||||||
|
'confirm_mark_no_show' => 'Are you sure you want to mark this client as no-show?',
|
||||||
|
'confirm_cancel_consultation' => 'Are you sure you want to cancel this consultation? The client will be notified.',
|
||||||
|
|
||||||
|
// Rescheduling
|
||||||
|
'reschedule' => 'Reschedule',
|
||||||
|
'reschedule_consultation' => 'Reschedule Consultation',
|
||||||
|
'new_date' => 'New Date',
|
||||||
|
'new_time' => 'New Time',
|
||||||
|
'select_time' => 'Select Time',
|
||||||
|
'no_slots_available' => 'No slots available for this date.',
|
||||||
|
'current_schedule' => 'Current Schedule',
|
||||||
|
|
||||||
|
// Payment
|
||||||
|
'payment_status' => 'Payment Status',
|
||||||
|
'mark_payment_received' => 'Mark Payment Received',
|
||||||
|
'payment_pending' => 'Payment Pending',
|
||||||
|
'payment_received' => 'Payment Received',
|
||||||
|
'payment_received_at' => 'Payment Received At',
|
||||||
|
'confirm_mark_payment' => 'Are you sure you want to mark this payment as received?',
|
||||||
|
|
||||||
|
// Admin Notes
|
||||||
|
'admin_notes' => 'Admin Notes',
|
||||||
|
'add_note' => 'Add Note',
|
||||||
|
'edit_note' => 'Edit Note',
|
||||||
|
'delete_note' => 'Delete Note',
|
||||||
|
'note_placeholder' => 'Enter your note here...',
|
||||||
|
'no_notes' => 'No notes yet.',
|
||||||
|
'confirm_delete_note' => 'Are you sure you want to delete this note?',
|
||||||
|
'added_by' => 'Added by',
|
||||||
|
'updated' => 'Updated',
|
||||||
|
|
||||||
|
// Client History
|
||||||
|
'client_consultations' => 'Client Consultations',
|
||||||
|
'view_client_history' => 'View Client History',
|
||||||
|
'total_consultations' => 'Total Consultations',
|
||||||
|
'completed_consultations' => 'Completed',
|
||||||
|
'cancelled_consultations' => 'Cancelled',
|
||||||
|
'no_show_consultations' => 'No-Shows',
|
||||||
|
'client_statistics' => 'Client Statistics',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,7 @@ return [
|
||||||
'already_booked_this_day' => 'You already have a booking on this day.',
|
'already_booked_this_day' => 'You already have a booking on this day.',
|
||||||
'slot_no_longer_available' => 'This time slot is no longer available. Please select another.',
|
'slot_no_longer_available' => 'This time slot is no longer available. Please select another.',
|
||||||
'slot_taken' => 'This slot was just booked. Please select another time.',
|
'slot_taken' => 'This slot was just booked. Please select another time.',
|
||||||
|
'slot_not_available' => 'This time slot is not available. Please select another.',
|
||||||
|
|
||||||
// Consultations list
|
// Consultations list
|
||||||
'my_consultations' => 'My Consultations',
|
'my_consultations' => 'My Consultations',
|
||||||
|
|
|
||||||
|
|
@ -84,4 +84,21 @@ return [
|
||||||
'rejection_reason' => 'Reason:',
|
'rejection_reason' => 'Reason:',
|
||||||
'booking_rejected_next_steps' => 'You are welcome to submit a new booking request for a different date or time.',
|
'booking_rejected_next_steps' => 'You are welcome to submit a new booking request for a different date or time.',
|
||||||
'booking_rejected_contact' => 'If you have any questions, please do not hesitate to contact us.',
|
'booking_rejected_contact' => 'If you have any questions, please do not hesitate to contact us.',
|
||||||
|
|
||||||
|
// Consultation Cancelled (client)
|
||||||
|
'consultation_cancelled_title' => 'Your Consultation Has Been Cancelled',
|
||||||
|
'consultation_cancelled_greeting' => 'Dear :name,',
|
||||||
|
'consultation_cancelled_body' => 'We would like to inform you that your consultation appointment has been cancelled.',
|
||||||
|
'cancelled_booking_details' => 'Cancelled Appointment Details:',
|
||||||
|
'consultation_cancelled_rebook' => 'If you would like to book a new consultation, please visit our booking page.',
|
||||||
|
'consultation_cancelled_contact' => 'If you have any questions about this cancellation, please contact us.',
|
||||||
|
|
||||||
|
// Consultation Rescheduled (client)
|
||||||
|
'consultation_rescheduled_title' => 'Your Consultation Has Been Rescheduled',
|
||||||
|
'consultation_rescheduled_greeting' => 'Dear :name,',
|
||||||
|
'consultation_rescheduled_body' => 'Your consultation appointment has been rescheduled to a new date and time.',
|
||||||
|
'old_booking_details' => 'Previous Appointment:',
|
||||||
|
'new_booking_details' => 'New Appointment:',
|
||||||
|
'consultation_rescheduled_calendar' => 'A new calendar file (.ics) is attached. Please update your calendar.',
|
||||||
|
'consultation_rescheduled_contact' => 'If you have any questions about this change, please contact us.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -9,4 +9,13 @@ return [
|
||||||
'no_show' => 'No Show',
|
'no_show' => 'No Show',
|
||||||
'cancelled' => 'Cancelled',
|
'cancelled' => 'Cancelled',
|
||||||
],
|
],
|
||||||
|
'payment_status' => [
|
||||||
|
'pending' => 'Pending',
|
||||||
|
'received' => 'Received',
|
||||||
|
'na' => 'N/A',
|
||||||
|
],
|
||||||
|
'consultation_type' => [
|
||||||
|
'free' => 'Free',
|
||||||
|
'paid' => 'Paid',
|
||||||
|
],
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,22 @@ return [
|
||||||
'pending_bookings_warning' => 'Warning: :count pending booking(s) exist during this time.',
|
'pending_bookings_warning' => 'Warning: :count pending booking(s) exist during this time.',
|
||||||
'blocked_time_saved' => 'Blocked time saved successfully.',
|
'blocked_time_saved' => 'Blocked time saved successfully.',
|
||||||
'blocked_time_deleted' => 'Blocked time deleted successfully.',
|
'blocked_time_deleted' => 'Blocked time deleted successfully.',
|
||||||
|
|
||||||
|
// Consultation Management
|
||||||
|
'marked_completed' => 'Consultation marked as completed.',
|
||||||
|
'marked_no_show' => 'Consultation marked as no-show.',
|
||||||
|
'consultation_cancelled' => 'Consultation has been cancelled.',
|
||||||
|
'consultation_rescheduled' => 'Consultation has been rescheduled successfully.',
|
||||||
|
'payment_marked_received' => 'Payment marked as received.',
|
||||||
|
'note_added' => 'Note added successfully.',
|
||||||
|
'note_updated' => 'Note updated successfully.',
|
||||||
|
'note_deleted' => 'Note deleted successfully.',
|
||||||
|
'no_changes_made' => 'No changes were made.',
|
||||||
|
|
||||||
|
// Consultation Management Errors
|
||||||
|
'invalid_status_transition' => 'Cannot change status from :from to :to.',
|
||||||
|
'cannot_cancel_consultation' => 'This consultation cannot be cancelled.',
|
||||||
|
'not_paid_consultation' => 'This is not a paid consultation.',
|
||||||
|
'payment_already_received' => 'Payment has already been marked as received.',
|
||||||
|
'client_account_not_found' => 'Client account not found.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
@php
|
||||||
|
$locale = $user->preferred_language ?? 'ar';
|
||||||
|
@endphp
|
||||||
|
@component('mail::message')
|
||||||
|
@if($locale === 'ar')
|
||||||
|
<div dir="rtl" style="text-align: right;">
|
||||||
|
# {{ __('emails.consultation_cancelled_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.cancelled_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_rebook', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
# {{ __('emails.consultation_cancelled_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.cancelled_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_rebook', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_cancelled_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
@endif
|
||||||
|
@endcomponent
|
||||||
|
|
@ -0,0 +1,56 @@
|
||||||
|
@php
|
||||||
|
$locale = $user->preferred_language ?? 'ar';
|
||||||
|
@endphp
|
||||||
|
@component('mail::message')
|
||||||
|
@if($locale === 'ar')
|
||||||
|
<div dir="rtl" style="text-align: right;">
|
||||||
|
# {{ __('emails.consultation_rescheduled_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.old_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ $oldDate->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($oldTime)->format('g:i A') }}
|
||||||
|
|
||||||
|
**{{ __('emails.new_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
- **{{ __('emails.booking_duration', [], $locale) }}** 45 {{ __('common.minutes', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_calendar', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
# {{ __('emails.consultation_rescheduled_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.old_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ $oldDate->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($oldTime)->format('g:i A') }}
|
||||||
|
|
||||||
|
**{{ __('emails.new_booking_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.booking_date', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
- **{{ __('emails.booking_time', [], $locale) }}** {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
- **{{ __('emails.booking_duration', [], $locale) }}** 45 {{ __('common.minutes', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_calendar', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.consultation_rescheduled_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
@endif
|
||||||
|
@endcomponent
|
||||||
|
|
@ -0,0 +1,157 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Models\User;
|
||||||
|
use Livewire\Volt\Component;
|
||||||
|
use Livewire\WithPagination;
|
||||||
|
|
||||||
|
new class extends Component
|
||||||
|
{
|
||||||
|
use WithPagination;
|
||||||
|
|
||||||
|
public User $user;
|
||||||
|
|
||||||
|
public function mount(User $user): void
|
||||||
|
{
|
||||||
|
$this->user = $user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function with(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'consultations' => Consultation::query()
|
||||||
|
->where('user_id', $this->user->id)
|
||||||
|
->orderBy('booking_date', 'desc')
|
||||||
|
->orderBy('booking_time', 'desc')
|
||||||
|
->paginate(15),
|
||||||
|
'statistics' => [
|
||||||
|
'total' => Consultation::where('user_id', $this->user->id)->count(),
|
||||||
|
'completed' => Consultation::where('user_id', $this->user->id)
|
||||||
|
->where('status', ConsultationStatus::Completed)->count(),
|
||||||
|
'cancelled' => Consultation::where('user_id', $this->user->id)
|
||||||
|
->where('status', ConsultationStatus::Cancelled)->count(),
|
||||||
|
'no_show' => Consultation::where('user_id', $this->user->id)
|
||||||
|
->where('status', ConsultationStatus::NoShow)->count(),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}; ?>
|
||||||
|
|
||||||
|
<div class="max-w-5xl mx-auto">
|
||||||
|
<div class="mb-6">
|
||||||
|
@if($user->user_type->value === 'individual')
|
||||||
|
<flux:button href="{{ route('admin.clients.individual.show', $user) }}" variant="ghost" icon="arrow-left" wire:navigate>
|
||||||
|
{{ __('common.back') }}
|
||||||
|
</flux:button>
|
||||||
|
@else
|
||||||
|
<flux:button href="{{ route('admin.clients.company.show', $user) }}" variant="ghost" icon="arrow-left" wire:navigate>
|
||||||
|
{{ __('common.back') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6">
|
||||||
|
<div>
|
||||||
|
<flux:heading size="xl">{{ __('admin.client_consultations') }}</flux:heading>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400 mt-1">{{ $user->full_name }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Statistics -->
|
||||||
|
<div class="grid grid-cols-2 sm:grid-cols-4 gap-4 mb-6">
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700 text-center">
|
||||||
|
<p class="text-2xl font-bold text-zinc-900 dark:text-zinc-100">{{ $statistics['total'] }}</p>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.total_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700 text-center">
|
||||||
|
<p class="text-2xl font-bold text-green-600 dark:text-green-400">{{ $statistics['completed'] }}</p>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.completed_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700 text-center">
|
||||||
|
<p class="text-2xl font-bold text-red-600 dark:text-red-400">{{ $statistics['cancelled'] }}</p>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.cancelled_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700 text-center">
|
||||||
|
<p class="text-2xl font-bold text-amber-600 dark:text-amber-400">{{ $statistics['no_show'] }}</p>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.no_show_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Consultations List -->
|
||||||
|
<div class="space-y-4">
|
||||||
|
@forelse($consultations as $consultation)
|
||||||
|
<div wire:key="consultation-{{ $consultation->id }}" class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<div class="flex flex-col sm:flex-row sm:items-center justify-between gap-4">
|
||||||
|
<div class="flex-1">
|
||||||
|
<div class="flex items-center gap-3 mb-2">
|
||||||
|
<span class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->booking_date->translatedFormat('l, d M Y') }}
|
||||||
|
</span>
|
||||||
|
<span class="text-zinc-500 dark:text-zinc-400">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-wrap items-center gap-2">
|
||||||
|
@php
|
||||||
|
$statusVariant = match($consultation->status) {
|
||||||
|
\App\Enums\ConsultationStatus::Pending => 'warning',
|
||||||
|
\App\Enums\ConsultationStatus::Approved => 'primary',
|
||||||
|
\App\Enums\ConsultationStatus::Completed => 'success',
|
||||||
|
\App\Enums\ConsultationStatus::Cancelled => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::NoShow => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::Rejected => 'danger',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $statusVariant }}" size="sm">
|
||||||
|
{{ $consultation->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
|
||||||
|
<flux:badge variant="{{ $consultation->consultation_type === \App\Enums\ConsultationType::Paid ? 'primary' : 'outline' }}" size="sm">
|
||||||
|
{{ $consultation->consultation_type->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
|
||||||
|
@if($consultation->consultation_type === \App\Enums\ConsultationType::Paid)
|
||||||
|
@php
|
||||||
|
$paymentVariant = match($consultation->payment_status) {
|
||||||
|
\App\Enums\PaymentStatus::Pending => 'warning',
|
||||||
|
\App\Enums\PaymentStatus::Received => 'success',
|
||||||
|
default => 'outline',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $paymentVariant }}" size="sm">
|
||||||
|
{{ $consultation->payment_status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if($consultation->problem_summary)
|
||||||
|
<p class="mt-2 text-sm text-zinc-600 dark:text-zinc-400 line-clamp-2">
|
||||||
|
{{ Str::limit($consultation->problem_summary, 150) }}
|
||||||
|
</p>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
href="{{ route('admin.consultations.show', $consultation) }}"
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
wire:navigate
|
||||||
|
>
|
||||||
|
{{ __('common.edit') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@empty
|
||||||
|
<div class="text-center py-12 text-zinc-500 dark:text-zinc-400 bg-white dark:bg-zinc-800 rounded-lg border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:icon name="inbox" class="w-12 h-12 mx-auto mb-4" />
|
||||||
|
<p>{{ __('admin.no_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
@endforelse
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6">
|
||||||
|
{{ $consultations->links() }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,457 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Enums\ConsultationType;
|
||||||
|
use App\Enums\PaymentStatus;
|
||||||
|
use App\Models\AdminLog;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Notifications\ConsultationCancelled;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Livewire\Volt\Component;
|
||||||
|
use Livewire\WithPagination;
|
||||||
|
|
||||||
|
new class extends Component
|
||||||
|
{
|
||||||
|
use WithPagination;
|
||||||
|
|
||||||
|
public string $search = '';
|
||||||
|
public string $statusFilter = '';
|
||||||
|
public string $typeFilter = '';
|
||||||
|
public string $paymentFilter = '';
|
||||||
|
public string $dateFrom = '';
|
||||||
|
public string $dateTo = '';
|
||||||
|
public string $sortBy = 'booking_date';
|
||||||
|
public string $sortDir = 'desc';
|
||||||
|
public int $perPage = 15;
|
||||||
|
|
||||||
|
public function updatedSearch(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedStatusFilter(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedTypeFilter(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedPaymentFilter(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedDateFrom(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedDateTo(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedPerPage(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function sort(string $column): void
|
||||||
|
{
|
||||||
|
if ($this->sortBy === $column) {
|
||||||
|
$this->sortDir = $this->sortDir === 'asc' ? 'desc' : 'asc';
|
||||||
|
} else {
|
||||||
|
$this->sortBy = $column;
|
||||||
|
$this->sortDir = 'asc';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function clearFilters(): void
|
||||||
|
{
|
||||||
|
$this->search = '';
|
||||||
|
$this->statusFilter = '';
|
||||||
|
$this->typeFilter = '';
|
||||||
|
$this->paymentFilter = '';
|
||||||
|
$this->dateFrom = '';
|
||||||
|
$this->dateTo = '';
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function markCompleted(int $id): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($id) {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markAsCompleted();
|
||||||
|
|
||||||
|
$this->logStatusChange($consultation, $oldStatus, 'completed');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.marked_completed'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function markNoShow(int $id): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($id) {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markAsNoShow();
|
||||||
|
|
||||||
|
$this->logStatusChange($consultation, $oldStatus, 'no_show');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.marked_no_show'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(int $id): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($id) {
|
||||||
|
$consultation = Consultation::lockForUpdate()->with('user')->findOrFail($id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->cancel();
|
||||||
|
|
||||||
|
// Notify client
|
||||||
|
if ($consultation->user) {
|
||||||
|
$consultation->user->notify(new ConsultationCancelled($consultation));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logStatusChange($consultation, $oldStatus, 'cancelled');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.consultation_cancelled'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function markPaymentReceived(int $id): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () use ($id) {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($id);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markPaymentReceived();
|
||||||
|
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'payment_received',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $consultation->id,
|
||||||
|
'old_values' => ['payment_status' => 'pending'],
|
||||||
|
'new_values' => ['payment_status' => 'received'],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.payment_marked_received'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function logStatusChange(Consultation $consultation, string $oldStatus, string $newStatus): void
|
||||||
|
{
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'status_change',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => ['status' => $newStatus],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function with(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'consultations' => Consultation::query()
|
||||||
|
->with('user:id,full_name,email,phone,user_type')
|
||||||
|
->when($this->search, fn ($q) => $q->whereHas('user', fn ($uq) =>
|
||||||
|
$uq->where('full_name', 'like', "%{$this->search}%")
|
||||||
|
->orWhere('email', 'like', "%{$this->search}%")
|
||||||
|
))
|
||||||
|
->when($this->statusFilter, fn ($q) => $q->where('status', $this->statusFilter))
|
||||||
|
->when($this->typeFilter, fn ($q) => $q->where('consultation_type', $this->typeFilter))
|
||||||
|
->when($this->paymentFilter, fn ($q) => $q->where('payment_status', $this->paymentFilter))
|
||||||
|
->when($this->dateFrom, fn ($q) => $q->where('booking_date', '>=', $this->dateFrom))
|
||||||
|
->when($this->dateTo, fn ($q) => $q->where('booking_date', '<=', $this->dateTo))
|
||||||
|
->orderBy($this->sortBy, $this->sortDir)
|
||||||
|
->paginate($this->perPage),
|
||||||
|
'statuses' => ConsultationStatus::cases(),
|
||||||
|
'types' => ConsultationType::cases(),
|
||||||
|
'paymentStatuses' => PaymentStatus::cases(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}; ?>
|
||||||
|
|
||||||
|
<div class="max-w-7xl mx-auto">
|
||||||
|
<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6">
|
||||||
|
<div>
|
||||||
|
<flux:heading size="xl">{{ __('admin.consultations') }}</flux:heading>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400 mt-1">{{ __('admin.consultations_description') }}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if(session('success'))
|
||||||
|
<flux:callout variant="success" class="mb-6">
|
||||||
|
{{ session('success') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if(session('error'))
|
||||||
|
<flux:callout variant="danger" class="mb-6">
|
||||||
|
{{ session('error') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Filters -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-4 border border-zinc-200 dark:border-zinc-700 mb-6">
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4 mb-4">
|
||||||
|
<flux:field>
|
||||||
|
<flux:input
|
||||||
|
wire:model.live.debounce.300ms="search"
|
||||||
|
placeholder="{{ __('admin.search_clients') }}"
|
||||||
|
icon="magnifying-glass"
|
||||||
|
/>
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:select wire:model.live="statusFilter">
|
||||||
|
<option value="">{{ __('admin.all_statuses') }}</option>
|
||||||
|
@foreach($statuses as $status)
|
||||||
|
<option value="{{ $status->value }}">{{ $status->label() }}</option>
|
||||||
|
@endforeach
|
||||||
|
</flux:select>
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:select wire:model.live="typeFilter">
|
||||||
|
<option value="">{{ __('admin.all_types') }}</option>
|
||||||
|
@foreach($types as $type)
|
||||||
|
<option value="{{ $type->value }}">{{ $type->label() }}</option>
|
||||||
|
@endforeach
|
||||||
|
</flux:select>
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:select wire:model.live="paymentFilter">
|
||||||
|
<option value="">{{ __('admin.all_payments') }}</option>
|
||||||
|
@foreach($paymentStatuses as $ps)
|
||||||
|
<option value="{{ $ps->value }}">{{ $ps->label() }}</option>
|
||||||
|
@endforeach
|
||||||
|
</flux:select>
|
||||||
|
</flux:field>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col sm:flex-row gap-4 items-end">
|
||||||
|
<flux:field class="flex-1">
|
||||||
|
<flux:label>{{ __('admin.date_from') }}</flux:label>
|
||||||
|
<flux:input type="date" wire:model.live="dateFrom" />
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field class="flex-1">
|
||||||
|
<flux:label>{{ __('admin.date_to') }}</flux:label>
|
||||||
|
<flux:input type="date" wire:model.live="dateTo" />
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.per_page') }}</flux:label>
|
||||||
|
<flux:select wire:model.live="perPage">
|
||||||
|
<option value="15">15</option>
|
||||||
|
<option value="25">25</option>
|
||||||
|
<option value="50">50</option>
|
||||||
|
</flux:select>
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
@if($search || $statusFilter || $typeFilter || $paymentFilter || $dateFrom || $dateTo)
|
||||||
|
<flux:button wire:click="clearFilters" variant="ghost">
|
||||||
|
{{ __('common.clear') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Sort Headers -->
|
||||||
|
<div class="hidden lg:flex bg-zinc-100 dark:bg-zinc-700 rounded-t-lg px-4 py-2 text-sm font-medium text-zinc-600 dark:text-zinc-300 gap-4 mb-0">
|
||||||
|
<button wire:click="sort('booking_date')" class="flex items-center gap-1 w-32 hover:text-zinc-900 dark:hover:text-white">
|
||||||
|
{{ __('admin.date') }}
|
||||||
|
@if($sortBy === 'booking_date')
|
||||||
|
<flux:icon name="{{ $sortDir === 'asc' ? 'chevron-up' : 'chevron-down' }}" class="w-4 h-4" />
|
||||||
|
@endif
|
||||||
|
</button>
|
||||||
|
<span class="flex-1">{{ __('admin.client') }}</span>
|
||||||
|
<button wire:click="sort('status')" class="flex items-center gap-1 w-24 hover:text-zinc-900 dark:hover:text-white">
|
||||||
|
{{ __('admin.current_status') }}
|
||||||
|
@if($sortBy === 'status')
|
||||||
|
<flux:icon name="{{ $sortDir === 'asc' ? 'chevron-up' : 'chevron-down' }}" class="w-4 h-4" />
|
||||||
|
@endif
|
||||||
|
</button>
|
||||||
|
<span class="w-24">{{ __('admin.payment_status') }}</span>
|
||||||
|
<span class="w-48">{{ __('common.actions') }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Consultations List -->
|
||||||
|
<div class="space-y-0">
|
||||||
|
@forelse($consultations as $consultation)
|
||||||
|
<div wire:key="consultation-{{ $consultation->id }}" class="bg-white dark:bg-zinc-800 p-4 border border-zinc-200 dark:border-zinc-700 {{ $loop->first ? 'rounded-t-lg lg:rounded-t-none' : '' }} {{ $loop->last ? 'rounded-b-lg' : '' }} {{ !$loop->first ? 'border-t-0' : '' }}">
|
||||||
|
<div class="flex flex-col lg:flex-row lg:items-center gap-4">
|
||||||
|
<!-- Date/Time -->
|
||||||
|
<div class="lg:w-32">
|
||||||
|
<div class="text-sm font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('d M Y') }}
|
||||||
|
</div>
|
||||||
|
<div class="text-xs text-zinc-500 dark:text-zinc-400">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Client Info -->
|
||||||
|
<div class="flex-1">
|
||||||
|
<div class="flex items-center gap-2 mb-1">
|
||||||
|
<a href="{{ route('admin.consultations.show', $consultation) }}" class="font-semibold text-zinc-900 dark:text-zinc-100 hover:text-blue-600 dark:hover:text-blue-400" wire:navigate>
|
||||||
|
{{ $consultation->user?->full_name ?? __('common.unknown') }}
|
||||||
|
</a>
|
||||||
|
<flux:badge size="sm" variant="{{ $consultation->consultation_type === \App\Enums\ConsultationType::Paid ? 'primary' : 'outline' }}">
|
||||||
|
{{ $consultation->consultation_type->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</div>
|
||||||
|
<div class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||||
|
{{ $consultation->user?->email ?? '-' }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Status Badge -->
|
||||||
|
<div class="lg:w-24">
|
||||||
|
@php
|
||||||
|
$statusVariant = match($consultation->status) {
|
||||||
|
\App\Enums\ConsultationStatus::Pending => 'warning',
|
||||||
|
\App\Enums\ConsultationStatus::Approved => 'primary',
|
||||||
|
\App\Enums\ConsultationStatus::Completed => 'success',
|
||||||
|
\App\Enums\ConsultationStatus::Cancelled => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::NoShow => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::Rejected => 'danger',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $statusVariant }}" size="sm">
|
||||||
|
{{ $consultation->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Payment Status -->
|
||||||
|
<div class="lg:w-24">
|
||||||
|
@if($consultation->consultation_type === \App\Enums\ConsultationType::Paid)
|
||||||
|
@php
|
||||||
|
$paymentVariant = match($consultation->payment_status) {
|
||||||
|
\App\Enums\PaymentStatus::Pending => 'warning',
|
||||||
|
\App\Enums\PaymentStatus::Received => 'success',
|
||||||
|
default => 'outline',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $paymentVariant }}" size="sm">
|
||||||
|
{{ $consultation->payment_status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
@else
|
||||||
|
<span class="text-xs text-zinc-400">-</span>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions -->
|
||||||
|
<div class="lg:w-48 flex flex-wrap gap-2">
|
||||||
|
<flux:button
|
||||||
|
href="{{ route('admin.consultations.show', $consultation) }}"
|
||||||
|
variant="filled"
|
||||||
|
size="sm"
|
||||||
|
wire:navigate
|
||||||
|
>
|
||||||
|
{{ __('common.edit') }}
|
||||||
|
</flux:button>
|
||||||
|
|
||||||
|
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
|
||||||
|
<flux:dropdown>
|
||||||
|
<flux:button variant="ghost" size="sm" icon="ellipsis-vertical" />
|
||||||
|
|
||||||
|
<flux:menu>
|
||||||
|
<flux:menu.item
|
||||||
|
wire:click="markCompleted({{ $consultation->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_completed') }}"
|
||||||
|
icon="check-circle"
|
||||||
|
>
|
||||||
|
{{ __('admin.mark_completed') }}
|
||||||
|
</flux:menu.item>
|
||||||
|
|
||||||
|
<flux:menu.item
|
||||||
|
wire:click="markNoShow({{ $consultation->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
|
||||||
|
icon="x-circle"
|
||||||
|
>
|
||||||
|
{{ __('admin.mark_no_show') }}
|
||||||
|
</flux:menu.item>
|
||||||
|
|
||||||
|
<flux:menu.separator />
|
||||||
|
|
||||||
|
<flux:menu.item
|
||||||
|
wire:click="cancel({{ $consultation->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
|
||||||
|
icon="trash"
|
||||||
|
variant="danger"
|
||||||
|
>
|
||||||
|
{{ __('admin.cancel_consultation') }}
|
||||||
|
</flux:menu.item>
|
||||||
|
</flux:menu>
|
||||||
|
</flux:dropdown>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($consultation->status === \App\Enums\ConsultationStatus::Pending)
|
||||||
|
<flux:button
|
||||||
|
wire:click="cancel({{ $consultation->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
|
||||||
|
variant="danger"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('common.cancel') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($consultation->consultation_type === \App\Enums\ConsultationType::Paid && $consultation->payment_status === \App\Enums\PaymentStatus::Pending)
|
||||||
|
<flux:button
|
||||||
|
wire:click="markPaymentReceived({{ $consultation->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_payment') }}"
|
||||||
|
variant="primary"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('admin.payment_received') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@empty
|
||||||
|
<div class="text-center py-12 text-zinc-500 dark:text-zinc-400 bg-white dark:bg-zinc-800 rounded-lg border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:icon name="inbox" class="w-12 h-12 mx-auto mb-4" />
|
||||||
|
<p>{{ __('admin.no_consultations') }}</p>
|
||||||
|
</div>
|
||||||
|
@endforelse
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6">
|
||||||
|
{{ $consultations->links() }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,684 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Enums\ConsultationType;
|
||||||
|
use App\Enums\PaymentStatus;
|
||||||
|
use App\Models\AdminLog;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Notifications\ConsultationCancelled;
|
||||||
|
use App\Notifications\ConsultationRescheduled;
|
||||||
|
use App\Services\AvailabilityService;
|
||||||
|
use App\Services\CalendarService;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Livewire\Volt\Component;
|
||||||
|
|
||||||
|
new class extends Component
|
||||||
|
{
|
||||||
|
public Consultation $consultation;
|
||||||
|
|
||||||
|
// Reschedule
|
||||||
|
public bool $showRescheduleModal = false;
|
||||||
|
public string $newDate = '';
|
||||||
|
public string $newTime = '';
|
||||||
|
public array $availableSlots = [];
|
||||||
|
|
||||||
|
// Notes
|
||||||
|
public string $newNote = '';
|
||||||
|
public ?int $editingNoteIndex = null;
|
||||||
|
public string $editingNoteText = '';
|
||||||
|
|
||||||
|
public function mount(Consultation $consultation): void
|
||||||
|
{
|
||||||
|
$this->consultation = $consultation->load('user');
|
||||||
|
$this->newDate = $consultation->booking_date->format('Y-m-d');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Status Actions
|
||||||
|
public function markCompleted(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($this->consultation->id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markAsCompleted();
|
||||||
|
$this->consultation = $consultation->fresh();
|
||||||
|
|
||||||
|
$this->logStatusChange($oldStatus, 'completed');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.marked_completed'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function markNoShow(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($this->consultation->id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markAsNoShow();
|
||||||
|
$this->consultation = $consultation->fresh();
|
||||||
|
|
||||||
|
$this->logStatusChange($oldStatus, 'no_show');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.marked_no_show'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancel(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () {
|
||||||
|
$consultation = Consultation::lockForUpdate()->with('user')->findOrFail($this->consultation->id);
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->cancel();
|
||||||
|
$this->consultation = $consultation->fresh()->load('user');
|
||||||
|
|
||||||
|
if ($consultation->user) {
|
||||||
|
$consultation->user->notify(new ConsultationCancelled($consultation));
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->logStatusChange($oldStatus, 'cancelled');
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.consultation_cancelled'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function markPaymentReceived(): void
|
||||||
|
{
|
||||||
|
DB::transaction(function () {
|
||||||
|
$consultation = Consultation::lockForUpdate()->findOrFail($this->consultation->id);
|
||||||
|
|
||||||
|
try {
|
||||||
|
$consultation->markPaymentReceived();
|
||||||
|
$this->consultation = $consultation->fresh();
|
||||||
|
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'payment_received',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $consultation->id,
|
||||||
|
'old_values' => ['payment_status' => 'pending'],
|
||||||
|
'new_values' => ['payment_status' => 'received'],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.payment_marked_received'));
|
||||||
|
} catch (\InvalidArgumentException $e) {
|
||||||
|
session()->flash('error', $e->getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reschedule
|
||||||
|
public function openRescheduleModal(): void
|
||||||
|
{
|
||||||
|
$this->showRescheduleModal = true;
|
||||||
|
$this->newDate = $this->consultation->booking_date->format('Y-m-d');
|
||||||
|
$this->newTime = '';
|
||||||
|
$this->loadAvailableSlots();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function closeRescheduleModal(): void
|
||||||
|
{
|
||||||
|
$this->showRescheduleModal = false;
|
||||||
|
$this->newDate = '';
|
||||||
|
$this->newTime = '';
|
||||||
|
$this->availableSlots = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedNewDate(): void
|
||||||
|
{
|
||||||
|
$this->loadAvailableSlots();
|
||||||
|
$this->newTime = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
private function loadAvailableSlots(): void
|
||||||
|
{
|
||||||
|
if ($this->newDate) {
|
||||||
|
$service = app(AvailabilityService::class);
|
||||||
|
$this->availableSlots = $service->getAvailableSlots(Carbon::parse($this->newDate));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reschedule(): void
|
||||||
|
{
|
||||||
|
$this->validate([
|
||||||
|
'newDate' => ['required', 'date', 'after_or_equal:today'],
|
||||||
|
'newTime' => ['required'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$oldDate = $this->consultation->booking_date;
|
||||||
|
$oldTime = $this->consultation->booking_time;
|
||||||
|
|
||||||
|
// Check if same date/time
|
||||||
|
if ($oldDate->format('Y-m-d') === $this->newDate && $oldTime === $this->newTime) {
|
||||||
|
session()->flash('info', __('messages.no_changes_made'));
|
||||||
|
$this->closeRescheduleModal();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify slot available
|
||||||
|
$service = app(AvailabilityService::class);
|
||||||
|
$slots = $service->getAvailableSlots(Carbon::parse($this->newDate));
|
||||||
|
|
||||||
|
if (!in_array($this->newTime, $slots)) {
|
||||||
|
$this->addError('newTime', __('booking.slot_not_available'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Guard against missing user
|
||||||
|
if (!$this->consultation->user) {
|
||||||
|
session()->flash('error', __('messages.client_account_not_found'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::transaction(function () use ($oldDate, $oldTime) {
|
||||||
|
$this->consultation->reschedule($this->newDate, $this->newTime);
|
||||||
|
$this->consultation = $this->consultation->fresh()->load('user');
|
||||||
|
|
||||||
|
// Generate new .ics
|
||||||
|
$icsContent = '';
|
||||||
|
try {
|
||||||
|
$calendarService = app(CalendarService::class);
|
||||||
|
$icsContent = $calendarService->generateIcs($this->consultation);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Log::error('Failed to generate ICS on reschedule', [
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notify client
|
||||||
|
try {
|
||||||
|
$this->consultation->user->notify(
|
||||||
|
new ConsultationRescheduled($this->consultation, $oldDate, $oldTime, $icsContent)
|
||||||
|
);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Log::error('Failed to send reschedule notification', [
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'reschedule',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $this->consultation->id,
|
||||||
|
'old_values' => ['date' => $oldDate->format('Y-m-d'), 'time' => $oldTime],
|
||||||
|
'new_values' => ['date' => $this->newDate, 'time' => $this->newTime],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.consultation_rescheduled'));
|
||||||
|
$this->closeRescheduleModal();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Notes
|
||||||
|
public function addNote(): void
|
||||||
|
{
|
||||||
|
$this->validate([
|
||||||
|
'newNote' => ['required', 'string', 'max:1000'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->consultation->addNote($this->newNote, auth()->id());
|
||||||
|
$this->consultation = $this->consultation->fresh();
|
||||||
|
$this->newNote = '';
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.note_added'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function startEditNote(int $index): void
|
||||||
|
{
|
||||||
|
$notes = $this->consultation->admin_notes ?? [];
|
||||||
|
if (isset($notes[$index])) {
|
||||||
|
$this->editingNoteIndex = $index;
|
||||||
|
$this->editingNoteText = $notes[$index]['text'];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function cancelEditNote(): void
|
||||||
|
{
|
||||||
|
$this->editingNoteIndex = null;
|
||||||
|
$this->editingNoteText = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updateNote(): void
|
||||||
|
{
|
||||||
|
$this->validate([
|
||||||
|
'editingNoteText' => ['required', 'string', 'max:1000'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
if ($this->editingNoteIndex !== null) {
|
||||||
|
$this->consultation->updateNote($this->editingNoteIndex, $this->editingNoteText);
|
||||||
|
$this->consultation = $this->consultation->fresh();
|
||||||
|
$this->cancelEditNote();
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.note_updated'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public function deleteNote(int $index): void
|
||||||
|
{
|
||||||
|
$this->consultation->deleteNote($index);
|
||||||
|
$this->consultation = $this->consultation->fresh();
|
||||||
|
|
||||||
|
session()->flash('success', __('messages.note_deleted'));
|
||||||
|
}
|
||||||
|
|
||||||
|
private function logStatusChange(string $oldStatus, string $newStatus): void
|
||||||
|
{
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'status_change',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $this->consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => ['status' => $newStatus],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function with(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'adminUsers' => User::query()
|
||||||
|
->where('user_type', 'admin')
|
||||||
|
->pluck('full_name', 'id'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}; ?>
|
||||||
|
|
||||||
|
<div class="max-w-5xl mx-auto">
|
||||||
|
<div class="mb-6">
|
||||||
|
<flux:button href="{{ route('admin.consultations.index') }}" variant="ghost" icon="arrow-left" wire:navigate>
|
||||||
|
{{ __('common.back') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6">
|
||||||
|
<flux:heading size="xl">{{ __('admin.consultation_detail') }}</flux:heading>
|
||||||
|
|
||||||
|
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
|
||||||
|
<div class="flex gap-2">
|
||||||
|
<flux:button wire:click="openRescheduleModal" variant="filled" icon="calendar">
|
||||||
|
{{ __('admin.reschedule') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if(session('success'))
|
||||||
|
<flux:callout variant="success" class="mb-6">
|
||||||
|
{{ session('success') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if(session('error'))
|
||||||
|
<flux:callout variant="danger" class="mb-6">
|
||||||
|
{{ session('error') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if(session('info'))
|
||||||
|
<flux:callout variant="warning" class="mb-6">
|
||||||
|
{{ session('info') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
|
||||||
|
<!-- Main Details -->
|
||||||
|
<div class="lg:col-span-2 space-y-6">
|
||||||
|
<!-- Booking Info -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.booking_details') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.requested_date') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100 font-medium">
|
||||||
|
{{ $consultation->booking_date->translatedFormat('l, d M Y') }}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.requested_time') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100 font-medium">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.current_status') }}</dt>
|
||||||
|
<dd>
|
||||||
|
@php
|
||||||
|
$statusVariant = match($consultation->status) {
|
||||||
|
\App\Enums\ConsultationStatus::Pending => 'warning',
|
||||||
|
\App\Enums\ConsultationStatus::Approved => 'primary',
|
||||||
|
\App\Enums\ConsultationStatus::Completed => 'success',
|
||||||
|
\App\Enums\ConsultationStatus::Cancelled => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::NoShow => 'danger',
|
||||||
|
\App\Enums\ConsultationStatus::Rejected => 'danger',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $statusVariant }}">
|
||||||
|
{{ $consultation->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.consultation_type') }}</dt>
|
||||||
|
<dd>
|
||||||
|
<flux:badge variant="{{ $consultation->consultation_type === \App\Enums\ConsultationType::Paid ? 'primary' : 'outline' }}">
|
||||||
|
{{ $consultation->consultation_type->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if($consultation->problem_summary)
|
||||||
|
<div class="mt-4 pt-4 border-t border-zinc-200 dark:border-zinc-700">
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400 mb-2">{{ __('admin.problem_summary') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100">{{ $consultation->problem_summary }}</dd>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Payment Info (for paid consultations) -->
|
||||||
|
@if($consultation->consultation_type === \App\Enums\ConsultationType::Paid)
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<div class="flex justify-between items-center mb-4">
|
||||||
|
<flux:heading size="lg">{{ __('admin.payment_details') }}</flux:heading>
|
||||||
|
@if($consultation->payment_status === \App\Enums\PaymentStatus::Pending)
|
||||||
|
<flux:button
|
||||||
|
wire:click="markPaymentReceived"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_payment') }}"
|
||||||
|
variant="primary"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('admin.mark_payment_received') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.payment_amount') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100 font-medium">
|
||||||
|
{{ number_format($consultation->payment_amount, 2) }} {{ __('common.currency') }}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.payment_status') }}</dt>
|
||||||
|
<dd>
|
||||||
|
@php
|
||||||
|
$paymentVariant = match($consultation->payment_status) {
|
||||||
|
\App\Enums\PaymentStatus::Pending => 'warning',
|
||||||
|
\App\Enums\PaymentStatus::Received => 'success',
|
||||||
|
default => 'outline',
|
||||||
|
};
|
||||||
|
@endphp
|
||||||
|
<flux:badge variant="{{ $paymentVariant }}">
|
||||||
|
{{ $consultation->payment_status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
@if($consultation->payment_received_at)
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.payment_received_at') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->payment_received_at->translatedFormat('d M Y, g:i A') }}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Admin Notes -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.admin_notes') }}</flux:heading>
|
||||||
|
|
||||||
|
<!-- Add Note Form -->
|
||||||
|
<div class="mb-6">
|
||||||
|
<flux:field>
|
||||||
|
<flux:textarea
|
||||||
|
wire:model="newNote"
|
||||||
|
rows="3"
|
||||||
|
placeholder="{{ __('admin.note_placeholder') }}"
|
||||||
|
/>
|
||||||
|
@error('newNote')
|
||||||
|
<flux:error>{{ $message }}</flux:error>
|
||||||
|
@enderror
|
||||||
|
</flux:field>
|
||||||
|
<div class="mt-2 flex justify-end">
|
||||||
|
<flux:button wire:click="addNote" variant="primary" size="sm">
|
||||||
|
{{ __('admin.add_note') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Notes List -->
|
||||||
|
<div class="space-y-4">
|
||||||
|
@forelse($consultation->admin_notes ?? [] as $index => $note)
|
||||||
|
<div wire:key="note-{{ $index }}" class="p-4 bg-zinc-50 dark:bg-zinc-700/50 rounded-lg">
|
||||||
|
@if($editingNoteIndex === $index)
|
||||||
|
<flux:field>
|
||||||
|
<flux:textarea
|
||||||
|
wire:model="editingNoteText"
|
||||||
|
rows="3"
|
||||||
|
/>
|
||||||
|
@error('editingNoteText')
|
||||||
|
<flux:error>{{ $message }}</flux:error>
|
||||||
|
@enderror
|
||||||
|
</flux:field>
|
||||||
|
<div class="mt-2 flex gap-2 justify-end">
|
||||||
|
<flux:button wire:click="cancelEditNote" variant="ghost" size="sm">
|
||||||
|
{{ __('common.cancel') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button wire:click="updateNote" variant="primary" size="sm">
|
||||||
|
{{ __('common.save') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
<p class="text-zinc-900 dark:text-zinc-100 mb-2">{{ $note['text'] }}</p>
|
||||||
|
<div class="flex justify-between items-center text-xs text-zinc-500 dark:text-zinc-400">
|
||||||
|
<span>
|
||||||
|
{{ __('admin.added_by') }}: {{ $adminUsers[$note['admin_id']] ?? __('common.unknown') }}
|
||||||
|
@if(isset($note['updated_at']))
|
||||||
|
({{ __('admin.updated') }})
|
||||||
|
@endif
|
||||||
|
</span>
|
||||||
|
<span>{{ \Carbon\Carbon::parse($note['created_at'])->translatedFormat('d M Y, g:i A') }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="mt-2 flex gap-2 justify-end">
|
||||||
|
<flux:button wire:click="startEditNote({{ $index }})" variant="ghost" size="sm">
|
||||||
|
{{ __('common.edit') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button
|
||||||
|
wire:click="deleteNote({{ $index }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_delete_note') }}"
|
||||||
|
variant="danger"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('common.delete') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
@empty
|
||||||
|
<p class="text-zinc-500 dark:text-zinc-400 text-center py-4">{{ __('admin.no_notes') }}</p>
|
||||||
|
@endforelse
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Sidebar -->
|
||||||
|
<div class="space-y-6">
|
||||||
|
<!-- Client Info -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.client_information') }}</flux:heading>
|
||||||
|
|
||||||
|
@if($consultation->user)
|
||||||
|
<div class="space-y-3">
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_name') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100 font-medium">
|
||||||
|
{{ $consultation->user->full_name }}
|
||||||
|
</dd>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_email') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100">{{ $consultation->user->email }}</dd>
|
||||||
|
</div>
|
||||||
|
@if($consultation->user->phone)
|
||||||
|
<div>
|
||||||
|
<dt class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_phone') }}</dt>
|
||||||
|
<dd class="text-zinc-900 dark:text-zinc-100">{{ $consultation->user->phone }}</dd>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-4 pt-4 border-t border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:button
|
||||||
|
href="{{ route('admin.clients.consultation-history', $consultation->user) }}"
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
class="w-full"
|
||||||
|
wire:navigate
|
||||||
|
>
|
||||||
|
{{ __('admin.view_client_history') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
<p class="text-zinc-500 dark:text-zinc-400">{{ __('messages.client_account_not_found') }}</p>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Status Actions -->
|
||||||
|
@if($consultation->status === \App\Enums\ConsultationStatus::Approved)
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('common.actions') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="space-y-2">
|
||||||
|
<flux:button
|
||||||
|
wire:click="markCompleted"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_completed') }}"
|
||||||
|
variant="filled"
|
||||||
|
class="w-full"
|
||||||
|
icon="check-circle"
|
||||||
|
>
|
||||||
|
{{ __('admin.mark_completed') }}
|
||||||
|
</flux:button>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
wire:click="markNoShow"
|
||||||
|
wire:confirm="{{ __('admin.confirm_mark_no_show') }}"
|
||||||
|
variant="ghost"
|
||||||
|
class="w-full"
|
||||||
|
icon="x-circle"
|
||||||
|
>
|
||||||
|
{{ __('admin.mark_no_show') }}
|
||||||
|
</flux:button>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
wire:click="cancel"
|
||||||
|
wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
|
||||||
|
variant="danger"
|
||||||
|
class="w-full"
|
||||||
|
icon="trash"
|
||||||
|
>
|
||||||
|
{{ __('admin.cancel_consultation') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($consultation->status === \App\Enums\ConsultationStatus::Pending)
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('common.actions') }}</flux:heading>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
wire:click="cancel"
|
||||||
|
wire:confirm="{{ __('admin.confirm_cancel_consultation') }}"
|
||||||
|
variant="danger"
|
||||||
|
class="w-full"
|
||||||
|
icon="trash"
|
||||||
|
>
|
||||||
|
{{ __('admin.cancel_consultation') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Reschedule Modal -->
|
||||||
|
<flux:modal wire:model="showRescheduleModal" name="reschedule-modal" class="max-w-lg">
|
||||||
|
<div class="p-6">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.reschedule_consultation') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="mb-4 p-4 bg-zinc-50 dark:bg-zinc-700/50 rounded-lg">
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400 mb-1">{{ __('admin.current_schedule') }}</p>
|
||||||
|
<p class="text-zinc-900 dark:text-zinc-100 font-medium">
|
||||||
|
{{ $consultation->booking_date->translatedFormat('l, d M Y') }}
|
||||||
|
{{ __('admin.to') }}
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="space-y-4">
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.new_date') }}</flux:label>
|
||||||
|
<flux:input type="date" wire:model.live="newDate" min="{{ now()->format('Y-m-d') }}" />
|
||||||
|
@error('newDate')
|
||||||
|
<flux:error>{{ $message }}</flux:error>
|
||||||
|
@enderror
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.new_time') }}</flux:label>
|
||||||
|
@if(count($availableSlots) > 0)
|
||||||
|
<flux:select wire:model="newTime">
|
||||||
|
<option value="">{{ __('admin.select_time') }}</option>
|
||||||
|
@foreach($availableSlots as $slot)
|
||||||
|
<option value="{{ $slot }}">{{ \Carbon\Carbon::parse($slot)->format('g:i A') }}</option>
|
||||||
|
@endforeach
|
||||||
|
</flux:select>
|
||||||
|
@else
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.no_slots_available') }}</p>
|
||||||
|
@endif
|
||||||
|
@error('newTime')
|
||||||
|
<flux:error>{{ $message }}</flux:error>
|
||||||
|
@enderror
|
||||||
|
</flux:field>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6 flex gap-2 justify-end">
|
||||||
|
<flux:button wire:click="closeRescheduleModal" variant="ghost">
|
||||||
|
{{ __('common.cancel') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button wire:click="reschedule" variant="primary" :disabled="!$newDate || !$newTime">
|
||||||
|
{{ __('admin.reschedule') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</flux:modal>
|
||||||
|
</div>
|
||||||
|
|
@ -69,6 +69,16 @@ Route::middleware(['auth', 'active'])->group(function () {
|
||||||
Volt::route('/{consultation}', 'admin.bookings.review')->name('review');
|
Volt::route('/{consultation}', 'admin.bookings.review')->name('review');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Consultations Management
|
||||||
|
Route::prefix('consultations')->name('admin.consultations.')->group(function () {
|
||||||
|
Volt::route('/', 'admin.consultations.index')->name('index');
|
||||||
|
Volt::route('/{consultation}', 'admin.consultations.show')->name('show');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Client Consultation History
|
||||||
|
Volt::route('/clients/{user}/consultations', 'admin.clients.consultation-history')
|
||||||
|
->name('admin.clients.consultation-history');
|
||||||
|
|
||||||
// Admin Settings
|
// Admin Settings
|
||||||
Route::prefix('settings')->name('admin.settings.')->group(function () {
|
Route::prefix('settings')->name('admin.settings.')->group(function () {
|
||||||
Volt::route('/working-hours', 'admin.settings.working-hours')->name('working-hours');
|
Volt::route('/working-hours', 'admin.settings.working-hours')->name('working-hours');
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,596 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Enums\ConsultationType;
|
||||||
|
use App\Enums\PaymentStatus;
|
||||||
|
use App\Models\AdminLog;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Models\WorkingHour;
|
||||||
|
use App\Notifications\ConsultationCancelled;
|
||||||
|
use App\Notifications\ConsultationRescheduled;
|
||||||
|
use App\Services\AvailabilityService;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Livewire\Volt\Volt;
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// ACCESS CONTROL TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('guest cannot access consultations management page', function () {
|
||||||
|
$this->get(route('admin.consultations.index'))
|
||||||
|
->assertRedirect(route('login'));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client cannot access consultations management page', function () {
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
$this->actingAs($client)
|
||||||
|
->get(route('admin.consultations.index'))
|
||||||
|
->assertForbidden();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can access consultations management page', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin)
|
||||||
|
->get(route('admin.consultations.index'))
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// CONSULTATIONS LIST VIEW TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('consultations list displays all consultations', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create(['full_name' => 'Test Client']);
|
||||||
|
Consultation::factory()->approved()->create(['user_id' => $client->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->assertSee('Test Client');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('consultations list filters by status', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$approvedClient = User::factory()->individual()->create(['full_name' => 'Approved Client']);
|
||||||
|
$completedClient = User::factory()->individual()->create(['full_name' => 'Completed Client']);
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create(['user_id' => $approvedClient->id]);
|
||||||
|
Consultation::factory()->completed()->create(['user_id' => $completedClient->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->set('statusFilter', 'approved')
|
||||||
|
->assertSee('Approved Client')
|
||||||
|
->assertDontSee('Completed Client');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('consultations list filters by consultation type', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$freeClient = User::factory()->individual()->create(['full_name' => 'Free Client']);
|
||||||
|
$paidClient = User::factory()->individual()->create(['full_name' => 'Paid Client']);
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->free()->create(['user_id' => $freeClient->id]);
|
||||||
|
Consultation::factory()->approved()->paid()->create(['user_id' => $paidClient->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->set('typeFilter', 'free')
|
||||||
|
->assertSee('Free Client')
|
||||||
|
->assertDontSee('Paid Client');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('consultations list filters by payment status', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$pendingClient = User::factory()->individual()->create(['full_name' => 'Pending Payment']);
|
||||||
|
$receivedClient = User::factory()->individual()->create(['full_name' => 'Received Payment']);
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $pendingClient->id,
|
||||||
|
'consultation_type' => ConsultationType::Paid,
|
||||||
|
'payment_status' => PaymentStatus::Pending,
|
||||||
|
]);
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $receivedClient->id,
|
||||||
|
'consultation_type' => ConsultationType::Paid,
|
||||||
|
'payment_status' => PaymentStatus::Received,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->set('paymentFilter', 'pending')
|
||||||
|
->assertSee('Pending Payment')
|
||||||
|
->assertDontSee('Received Payment');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('consultations list searches by client name', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$targetUser = User::factory()->individual()->create(['full_name' => 'John Doe']);
|
||||||
|
$otherUser = User::factory()->individual()->create(['full_name' => 'Jane Smith']);
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create(['user_id' => $targetUser->id]);
|
||||||
|
Consultation::factory()->approved()->create(['user_id' => $otherUser->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->set('search', 'John')
|
||||||
|
->assertSee('John Doe')
|
||||||
|
->assertDontSee('Jane Smith');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('consultations list filters by date range', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$oldClient = User::factory()->individual()->create(['full_name' => 'Old Client']);
|
||||||
|
$newClient = User::factory()->individual()->create(['full_name' => 'New Client']);
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $oldClient->id,
|
||||||
|
'booking_date' => now()->subDays(10),
|
||||||
|
]);
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $newClient->id,
|
||||||
|
'booking_date' => now()->addDays(5),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->set('dateFrom', now()->format('Y-m-d'))
|
||||||
|
->assertSee('New Client')
|
||||||
|
->assertDontSee('Old Client');
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// STATUS MANAGEMENT TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('admin can mark consultation as completed', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markCompleted', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Completed);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot mark pending consultation as completed', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->pending()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markCompleted', $consultation->id);
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Pending);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can mark consultation as no-show', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markNoShow', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::NoShow);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot mark completed consultation as 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);
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Completed);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can cancel approved consultation', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create(['user_id' => $client->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('cancel', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Cancelled);
|
||||||
|
Notification::assertSentTo($client, ConsultationCancelled::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can cancel pending consultation', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
$consultation = Consultation::factory()->pending()->create(['user_id' => $client->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('cancel', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Cancelled);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot cancel already cancelled consultation', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->cancelled()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('cancel', $consultation->id);
|
||||||
|
|
||||||
|
Notification::assertNothingSent();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// PAYMENT TRACKING TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('admin can mark payment as received for paid consultation', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'consultation_type' => ConsultationType::Paid,
|
||||||
|
'payment_amount' => 150.00,
|
||||||
|
'payment_status' => PaymentStatus::Pending,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markPaymentReceived', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())
|
||||||
|
->payment_status->toBe(PaymentStatus::Received)
|
||||||
|
->payment_received_at->not->toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot mark payment received for free consultation', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->free()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markPaymentReceived', $consultation->id);
|
||||||
|
|
||||||
|
expect($consultation->fresh()->payment_status)->toBe(PaymentStatus::NotApplicable);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot mark payment received twice', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'consultation_type' => ConsultationType::Paid,
|
||||||
|
'payment_status' => PaymentStatus::Received,
|
||||||
|
'payment_received_at' => now()->subDay(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$originalReceivedAt = $consultation->payment_received_at;
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markPaymentReceived', $consultation->id);
|
||||||
|
|
||||||
|
expect($consultation->fresh()->payment_received_at->timestamp)
|
||||||
|
->toBe($originalReceivedAt->timestamp);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// RESCHEDULE TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('admin can access consultation detail page', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin)
|
||||||
|
->get(route('admin.consultations.show', $consultation))
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can reschedule consultation to available slot', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
'booking_date' => now()->addDays(3),
|
||||||
|
'booking_time' => '10:00:00',
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Create working hours for the new date
|
||||||
|
WorkingHour::factory()->create([
|
||||||
|
'day_of_week' => now()->addDays(5)->dayOfWeek,
|
||||||
|
'is_active' => true,
|
||||||
|
'start_time' => '09:00',
|
||||||
|
'end_time' => '17:00',
|
||||||
|
]);
|
||||||
|
|
||||||
|
$newDate = now()->addDays(5)->format('Y-m-d');
|
||||||
|
$newTime = '14:00';
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
// Mock the availability service
|
||||||
|
$this->mock(AvailabilityService::class)
|
||||||
|
->shouldReceive('getAvailableSlots')
|
||||||
|
->andReturn(['14:00', '15:00', '16:00']);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->set('showRescheduleModal', true)
|
||||||
|
->set('newDate', $newDate)
|
||||||
|
->set('newTime', $newTime)
|
||||||
|
->call('reschedule')
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())
|
||||||
|
->booking_date->format('Y-m-d')->toBe($newDate)
|
||||||
|
->booking_time->toBe($newTime);
|
||||||
|
|
||||||
|
Notification::assertSentTo($client, ConsultationRescheduled::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot reschedule to unavailable slot', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$newDate = now()->addDays(5)->format('Y-m-d');
|
||||||
|
$newTime = '14:00';
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
// Mock availability service - slot not available
|
||||||
|
$this->mock(AvailabilityService::class)
|
||||||
|
->shouldReceive('getAvailableSlots')
|
||||||
|
->andReturn(['10:00', '11:00']); // 14:00 not in list
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->set('showRescheduleModal', true)
|
||||||
|
->set('newDate', $newDate)
|
||||||
|
->set('newTime', $newTime)
|
||||||
|
->call('reschedule')
|
||||||
|
->assertHasErrors(['newTime']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot reschedule to past date', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->set('showRescheduleModal', true)
|
||||||
|
->set('newDate', now()->subDay()->format('Y-m-d'))
|
||||||
|
->set('newTime', '10:00')
|
||||||
|
->call('reschedule')
|
||||||
|
->assertHasErrors(['newDate']);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// ADMIN NOTES TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('admin can add note to consultation', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->set('newNote', 'Client requested Arabic documents')
|
||||||
|
->call('addNote')
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
$notes = $consultation->fresh()->admin_notes;
|
||||||
|
expect($notes)->toHaveCount(1)
|
||||||
|
->and($notes[0]['text'])->toBe('Client requested Arabic documents')
|
||||||
|
->and($notes[0]['admin_id'])->toBe($admin->id);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can update note', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'admin_notes' => [
|
||||||
|
['text' => 'Original note', 'admin_id' => $admin->id, 'created_at' => now()->toISOString()],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->call('startEditNote', 0)
|
||||||
|
->set('editingNoteText', 'Updated note')
|
||||||
|
->call('updateNote')
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
$notes = $consultation->fresh()->admin_notes;
|
||||||
|
expect($notes[0]['text'])->toBe('Updated note')
|
||||||
|
->and($notes[0])->toHaveKey('updated_at');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can delete note', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'admin_notes' => [
|
||||||
|
['text' => 'Note 1', 'admin_id' => $admin->id, 'created_at' => now()->toISOString()],
|
||||||
|
['text' => 'Note 2', 'admin_id' => $admin->id, 'created_at' => now()->toISOString()],
|
||||||
|
],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->call('deleteNote', 0)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
$notes = $consultation->fresh()->admin_notes;
|
||||||
|
expect($notes)->toHaveCount(1)
|
||||||
|
->and($notes[0]['text'])->toBe('Note 2');
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// AUDIT LOG TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('audit log entry created on status change to completed', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markCompleted', $consultation->id);
|
||||||
|
|
||||||
|
expect(AdminLog::query()
|
||||||
|
->where('admin_id', $admin->id)
|
||||||
|
->where('action', 'status_change')
|
||||||
|
->where('target_type', 'consultation')
|
||||||
|
->where('target_id', $consultation->id)
|
||||||
|
->exists()
|
||||||
|
)->toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('audit log entry created on payment received', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'consultation_type' => ConsultationType::Paid,
|
||||||
|
'payment_status' => PaymentStatus::Pending,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('markPaymentReceived', $consultation->id);
|
||||||
|
|
||||||
|
expect(AdminLog::query()
|
||||||
|
->where('admin_id', $admin->id)
|
||||||
|
->where('action', 'payment_received')
|
||||||
|
->where('target_type', 'consultation')
|
||||||
|
->where('target_id', $consultation->id)
|
||||||
|
->exists()
|
||||||
|
)->toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('audit log entry created on reschedule', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$newDate = now()->addDays(5)->format('Y-m-d');
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
$this->mock(AvailabilityService::class)
|
||||||
|
->shouldReceive('getAvailableSlots')
|
||||||
|
->andReturn(['14:00']);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.show', ['consultation' => $consultation])
|
||||||
|
->set('showRescheduleModal', true)
|
||||||
|
->set('newDate', $newDate)
|
||||||
|
->set('newTime', '14:00')
|
||||||
|
->call('reschedule');
|
||||||
|
|
||||||
|
expect(AdminLog::query()
|
||||||
|
->where('admin_id', $admin->id)
|
||||||
|
->where('action', 'reschedule')
|
||||||
|
->where('target_type', 'consultation')
|
||||||
|
->where('target_id', $consultation->id)
|
||||||
|
->exists()
|
||||||
|
)->toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// CLIENT HISTORY TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('admin can access client consultation history', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin)
|
||||||
|
->get(route('admin.clients.consultation-history', $client))
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client consultation history displays consultations', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
'booking_date' => now()->addDays(5),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.clients.consultation-history', ['user' => $client])
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client consultation history shows statistics', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
Consultation::factory()->completed()->count(2)->create(['user_id' => $client->id]);
|
||||||
|
Consultation::factory()->cancelled()->create(['user_id' => $client->id]);
|
||||||
|
Consultation::factory()->noShow()->create(['user_id' => $client->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.clients.consultation-history', ['user' => $client])
|
||||||
|
->assertSee('4') // total
|
||||||
|
->assertSee('2'); // completed
|
||||||
|
});
|
||||||
|
|
||||||
|
// ==========================================
|
||||||
|
// BILINGUAL TESTS
|
||||||
|
// ==========================================
|
||||||
|
|
||||||
|
test('cancellation notification sent in client preferred language', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$arabicUser = User::factory()->individual()->create(['preferred_language' => 'ar']);
|
||||||
|
$consultation = Consultation::factory()->approved()->create(['user_id' => $arabicUser->id]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.consultations.index')
|
||||||
|
->call('cancel', $consultation->id);
|
||||||
|
|
||||||
|
Notification::assertSentTo($arabicUser, ConsultationCancelled::class, function ($notification) {
|
||||||
|
return $notification->consultation->user->preferred_language === 'ar';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -8,4 +8,4 @@ test('confirm password screen can be rendered', function () {
|
||||||
$response = $this->actingAs($user)->get(route('password.confirm'));
|
$response = $this->actingAs($user)->get(route('password.confirm'));
|
||||||
|
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -57,4 +57,4 @@ test('password can be reset with valid token', function () {
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,4 @@ test('returns a successful response', function () {
|
||||||
$response = $this->get(route('home'));
|
$response = $this->get(route('home'));
|
||||||
|
|
||||||
$response->assertStatus(200);
|
$response->assertStatus(200);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -36,4 +36,4 @@ test('correct password must be provided to update password', function () {
|
||||||
->call('updatePassword');
|
->call('updatePassword');
|
||||||
|
|
||||||
$response->assertHasErrors(['current_password']);
|
$response->assertHasErrors(['current_password']);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -67,4 +67,4 @@ test('two factor authentication disabled when confirmation abandoned between req
|
||||||
'two_factor_secret' => null,
|
'two_factor_secret' => null,
|
||||||
'two_factor_recovery_codes' => null,
|
'two_factor_recovery_codes' => null,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,4 @@
|
||||||
|
|
||||||
test('that true is true', function () {
|
test('that true is true', function () {
|
||||||
expect(true)->toBeTrue();
|
expect(true)->toBeTrue();
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue