complete story 3.5 with qa test
This commit is contained in:
Naser Mansour
parent
875741d906
commit
f752337943
|
|
@ -0,0 +1,84 @@
|
||||||
|
<?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 BookingApproved extends Notification implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new notification instance.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public Consultation $consultation,
|
||||||
|
public string $icsContent,
|
||||||
|
public ?string $paymentInstructions = null
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.booking-approved', [
|
||||||
|
'consultation' => $this->consultation,
|
||||||
|
'paymentInstructions' => $this->paymentInstructions,
|
||||||
|
'locale' => $locale,
|
||||||
|
'user' => $notifiable,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Attach .ics file if available
|
||||||
|
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 Booking Approved';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the array representation of the notification.
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function toArray(object $notifiable): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'type' => 'booking_approved',
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
<?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 BookingRejected extends Notification implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new notification instance.
|
||||||
|
*/
|
||||||
|
public function __construct(
|
||||||
|
public Consultation $consultation,
|
||||||
|
public ?string $rejectionReason = null
|
||||||
|
) {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 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.booking-rejected', [
|
||||||
|
'consultation' => $this->consultation,
|
||||||
|
'rejectionReason' => $this->rejectionReason,
|
||||||
|
'locale' => $locale,
|
||||||
|
'user' => $notifiable,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the subject based on locale.
|
||||||
|
*/
|
||||||
|
private function getSubject(string $locale): string
|
||||||
|
{
|
||||||
|
return $locale === 'ar'
|
||||||
|
? 'بخصوص طلب الاستشارة الخاص بك'
|
||||||
|
: 'Regarding Your Consultation Request';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the array representation of the notification.
|
||||||
|
*
|
||||||
|
* @return array<string, mixed>
|
||||||
|
*/
|
||||||
|
public function toArray(object $notifiable): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'type' => 'booking_rejected',
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,87 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Services;
|
||||||
|
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Spatie\IcalendarGenerator\Components\Calendar;
|
||||||
|
use Spatie\IcalendarGenerator\Components\Event;
|
||||||
|
use Spatie\IcalendarGenerator\Enums\ParticipationStatus;
|
||||||
|
|
||||||
|
class CalendarService
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Generate an ICS calendar file for a consultation.
|
||||||
|
*/
|
||||||
|
public function generateIcs(Consultation $consultation): string
|
||||||
|
{
|
||||||
|
$consultation->load('user');
|
||||||
|
|
||||||
|
$startDateTime = Carbon::parse($consultation->booking_date)
|
||||||
|
->setTimeFromTimeString($consultation->booking_time);
|
||||||
|
$endDateTime = $startDateTime->copy()->addHour();
|
||||||
|
|
||||||
|
$locale = $consultation->user?->preferred_language ?? 'ar';
|
||||||
|
|
||||||
|
$eventName = $locale === 'ar'
|
||||||
|
? 'استشارة قانونية - مكتب ليبرا للمحاماة'
|
||||||
|
: 'Legal Consultation - Libra Law Firm';
|
||||||
|
|
||||||
|
$description = $this->buildDescription($consultation, $locale);
|
||||||
|
|
||||||
|
$event = Event::create()
|
||||||
|
->name($eventName)
|
||||||
|
->description($description)
|
||||||
|
->uniqueIdentifier("consultation-{$consultation->id}@libra.ps")
|
||||||
|
->createdAt(now())
|
||||||
|
->startsAt($startDateTime)
|
||||||
|
->endsAt($endDateTime)
|
||||||
|
->organizer('info@libra.ps', 'Libra Law Firm');
|
||||||
|
|
||||||
|
if ($consultation->user?->email) {
|
||||||
|
$event->attendee(
|
||||||
|
$consultation->user->email,
|
||||||
|
$consultation->user->full_name,
|
||||||
|
ParticipationStatus::Accepted
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$calendar = Calendar::create('Libra Law Firm')
|
||||||
|
->productIdentifier('-//Libra Law Firm//Consultation Booking//EN')
|
||||||
|
->event($event);
|
||||||
|
|
||||||
|
return $calendar->get();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Build the event description based on locale.
|
||||||
|
*/
|
||||||
|
private function buildDescription(Consultation $consultation, string $locale): string
|
||||||
|
{
|
||||||
|
if ($locale === 'ar') {
|
||||||
|
$description = "استشارة قانونية مع مكتب ليبرا للمحاماة\n\n";
|
||||||
|
$description .= "العميل: {$consultation->user?->full_name}\n";
|
||||||
|
$description .= 'التاريخ: '.Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y')."\n";
|
||||||
|
$description .= 'الوقت: '.Carbon::parse($consultation->booking_time)->format('g:i A')."\n";
|
||||||
|
|
||||||
|
if ($consultation->consultation_type?->value === 'paid' && $consultation->payment_amount) {
|
||||||
|
$description .= "المبلغ: {$consultation->payment_amount} شيكل\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$description .= "\nللتواصل: info@libra.ps";
|
||||||
|
} else {
|
||||||
|
$description = "Legal Consultation with Libra Law Firm\n\n";
|
||||||
|
$description .= "Client: {$consultation->user?->full_name}\n";
|
||||||
|
$description .= 'Date: '.Carbon::parse($consultation->booking_date)->format('l, d M Y')."\n";
|
||||||
|
$description .= 'Time: '.Carbon::parse($consultation->booking_time)->format('g:i A')."\n";
|
||||||
|
|
||||||
|
if ($consultation->consultation_type?->value === 'paid' && $consultation->payment_amount) {
|
||||||
|
$description .= "Amount: {$consultation->payment_amount} ILS\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
$description .= "\nContact: info@libra.ps";
|
||||||
|
}
|
||||||
|
|
||||||
|
return $description;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -14,7 +14,8 @@
|
||||||
"laravel/framework": "^12.0",
|
"laravel/framework": "^12.0",
|
||||||
"laravel/tinker": "^2.10.1",
|
"laravel/tinker": "^2.10.1",
|
||||||
"livewire/flux": "^2.9.0",
|
"livewire/flux": "^2.9.0",
|
||||||
"livewire/volt": "^1.7.0"
|
"livewire/volt": "^1.7.0",
|
||||||
|
"spatie/icalendar-generator": "^3.2"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fakerphp/faker": "^1.23",
|
"fakerphp/faker": "^1.23",
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "7430bc88c7280cb14cac742ccc2c15b3",
|
"content-hash": "2a39aadfa854d0ed495f60962c32e48e",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "bacon/bacon-qr-code",
|
"name": "bacon/bacon-qr-code",
|
||||||
|
|
@ -3792,6 +3792,65 @@
|
||||||
},
|
},
|
||||||
"time": "2025-12-14T04:43:48+00:00"
|
"time": "2025-12-14T04:43:48+00:00"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "spatie/icalendar-generator",
|
||||||
|
"version": "3.2.0",
|
||||||
|
"source": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://github.com/spatie/icalendar-generator.git",
|
||||||
|
"reference": "410885abfd26d8653234cead2ae1da78e7558cdb"
|
||||||
|
},
|
||||||
|
"dist": {
|
||||||
|
"type": "zip",
|
||||||
|
"url": "https://api.github.com/repos/spatie/icalendar-generator/zipball/410885abfd26d8653234cead2ae1da78e7558cdb",
|
||||||
|
"reference": "410885abfd26d8653234cead2ae1da78e7558cdb",
|
||||||
|
"shasum": ""
|
||||||
|
},
|
||||||
|
"require": {
|
||||||
|
"ext-mbstring": "*",
|
||||||
|
"php": "^8.1"
|
||||||
|
},
|
||||||
|
"require-dev": {
|
||||||
|
"ext-json": "*",
|
||||||
|
"larapack/dd": "^1.1",
|
||||||
|
"nesbot/carbon": "^3.5",
|
||||||
|
"pestphp/pest": "^2.34 || ^3.0 || ^4.0",
|
||||||
|
"phpstan/phpstan": "^2.0",
|
||||||
|
"spatie/pest-plugin-snapshots": "^2.1"
|
||||||
|
},
|
||||||
|
"type": "library",
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"Spatie\\IcalendarGenerator\\": "src"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"notification-url": "https://packagist.org/downloads/",
|
||||||
|
"license": [
|
||||||
|
"MIT"
|
||||||
|
],
|
||||||
|
"authors": [
|
||||||
|
{
|
||||||
|
"name": "Ruben Van Assche",
|
||||||
|
"email": "ruben@spatie.be",
|
||||||
|
"homepage": "https://spatie.be",
|
||||||
|
"role": "Developer"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"description": "Build calendars in the iCalendar format",
|
||||||
|
"homepage": "https://github.com/spatie/icalendar-generator",
|
||||||
|
"keywords": [
|
||||||
|
"calendar",
|
||||||
|
"iCalendar",
|
||||||
|
"ical",
|
||||||
|
"ics",
|
||||||
|
"spatie"
|
||||||
|
],
|
||||||
|
"support": {
|
||||||
|
"issues": "https://github.com/spatie/icalendar-generator/issues",
|
||||||
|
"source": "https://github.com/spatie/icalendar-generator/tree/3.2.0"
|
||||||
|
},
|
||||||
|
"time": "2025-12-03T11:07:27+00:00"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/clock",
|
"name": "symfony/clock",
|
||||||
"version": "v8.0.0",
|
"version": "v8.0.0",
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,46 @@
|
||||||
|
# Quality Gate: Story 3.5
|
||||||
|
|
||||||
|
schema: 1
|
||||||
|
story: "3.5"
|
||||||
|
story_title: "Admin Booking Review & Approval"
|
||||||
|
gate: PASS
|
||||||
|
status_reason: "All acceptance criteria implemented with comprehensive test coverage (21 tests, 47 assertions). Code quality is excellent with proper error handling, security measures, and bilingual support."
|
||||||
|
reviewer: "Quinn (Test Architect)"
|
||||||
|
updated: "2025-12-26T12:00:00Z"
|
||||||
|
|
||||||
|
waiver: { active: false }
|
||||||
|
|
||||||
|
top_issues: []
|
||||||
|
|
||||||
|
quality_score: 100
|
||||||
|
expires: "2026-01-09T00:00:00Z"
|
||||||
|
|
||||||
|
evidence:
|
||||||
|
tests_reviewed: 21
|
||||||
|
assertions: 47
|
||||||
|
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: "Routes protected by admin middleware, proper authorization tests, audit logging implemented"
|
||||||
|
performance:
|
||||||
|
status: PASS
|
||||||
|
notes: "Eager loading prevents N+1, pagination used, notifications are queued"
|
||||||
|
reliability:
|
||||||
|
status: PASS
|
||||||
|
notes: "Error handling for calendar generation, status guards prevent double-processing"
|
||||||
|
maintainability:
|
||||||
|
status: PASS
|
||||||
|
notes: "Clean separation of concerns, follows Volt patterns, comprehensive test coverage"
|
||||||
|
|
||||||
|
recommendations:
|
||||||
|
immediate: []
|
||||||
|
future:
|
||||||
|
- action: "Consider adding database transaction with locking for concurrent approval protection"
|
||||||
|
refs: ["resources/views/livewire/admin/bookings/review.blade.php:59-64"]
|
||||||
|
- action: "Implement bulk actions for processing multiple bookings (marked optional)"
|
||||||
|
refs: ["resources/views/livewire/admin/bookings/pending.blade.php"]
|
||||||
|
|
@ -19,48 +19,48 @@ So that **I can manage my consultation schedule and set appropriate consultation
|
||||||
## Acceptance Criteria
|
## Acceptance Criteria
|
||||||
|
|
||||||
### Pending Bookings List
|
### Pending Bookings List
|
||||||
- [ ] View all pending booking requests
|
- [x] View all pending booking requests
|
||||||
- [ ] Display: client name, requested date/time, submission date
|
- [x] Display: client name, requested date/time, submission date
|
||||||
- [ ] Show problem summary preview
|
- [x] Show problem summary preview
|
||||||
- [ ] Click to view full details
|
- [x] Click to view full details
|
||||||
- [ ] Sort by date (oldest first default)
|
- [x] Sort by date (oldest first default)
|
||||||
- [ ] Filter by date range
|
- [x] Filter by date range
|
||||||
|
|
||||||
### Booking Details View
|
### Booking Details View
|
||||||
- [ ] Full client information
|
- [x] Full client information
|
||||||
- [ ] Complete problem summary
|
- [x] Complete problem summary
|
||||||
- [ ] Client consultation history
|
- [x] Client consultation history
|
||||||
- [ ] Requested date and time
|
- [x] Requested date and time
|
||||||
|
|
||||||
### Approval Workflow
|
### Approval Workflow
|
||||||
- [ ] Set consultation type:
|
- [x] Set consultation type:
|
||||||
- Free consultation
|
- Free consultation
|
||||||
- Paid consultation
|
- Paid consultation
|
||||||
- [ ] If paid: set payment amount
|
- [x] If paid: set payment amount
|
||||||
- [ ] If paid: add payment instructions (optional)
|
- [x] If paid: add payment instructions (optional)
|
||||||
- [ ] Approve button with confirmation
|
- [x] Approve button with confirmation
|
||||||
- [ ] On approval:
|
- [x] On approval:
|
||||||
- Status changes to 'approved'
|
- Status changes to 'approved'
|
||||||
- Client notified via email
|
- Client notified via email
|
||||||
- .ics calendar file attached to email
|
- .ics calendar file attached to email
|
||||||
- Payment instructions included if paid
|
- Payment instructions included if paid
|
||||||
|
|
||||||
### Rejection Workflow
|
### Rejection Workflow
|
||||||
- [ ] Optional rejection reason field
|
- [x] Optional rejection reason field
|
||||||
- [ ] Reject button with confirmation
|
- [x] Reject button with confirmation
|
||||||
- [ ] On rejection:
|
- [x] On rejection:
|
||||||
- Status changes to 'rejected'
|
- Status changes to 'rejected'
|
||||||
- Client notified via email with reason
|
- Client notified via email with reason
|
||||||
|
|
||||||
### Quick Actions
|
### Quick Actions
|
||||||
- [ ] Quick approve (free) button on list
|
- [x] Quick approve (free) button on list
|
||||||
- [ ] Quick reject button on list
|
- [x] Quick reject button on list
|
||||||
- [ ] Bulk actions (optional)
|
- [ ] Bulk actions (optional)
|
||||||
|
|
||||||
### Quality Requirements
|
### Quality Requirements
|
||||||
- [ ] Audit log for all decisions
|
- [x] Audit log for all decisions
|
||||||
- [ ] Bilingual notifications
|
- [x] Bilingual notifications
|
||||||
- [ ] Tests for approval/rejection flow
|
- [x] Tests for approval/rejection flow
|
||||||
|
|
||||||
## Technical Notes
|
## Technical Notes
|
||||||
|
|
||||||
|
|
@ -647,18 +647,18 @@ it('sends approval notification in client preferred language', function () {
|
||||||
|
|
||||||
## Definition of Done
|
## Definition of Done
|
||||||
|
|
||||||
- [ ] Pending bookings list displays correctly
|
- [x] Pending bookings list displays correctly
|
||||||
- [ ] Can view booking details
|
- [x] Can view booking details
|
||||||
- [ ] Can approve as free consultation
|
- [x] Can approve as free consultation
|
||||||
- [ ] Can approve as paid with amount
|
- [x] Can approve as paid with amount
|
||||||
- [ ] Can reject with optional reason
|
- [x] Can reject with optional reason
|
||||||
- [ ] Approval sends email with .ics file
|
- [x] Approval sends email with .ics file
|
||||||
- [ ] Rejection sends email with reason
|
- [x] Rejection sends email with reason
|
||||||
- [ ] Quick actions work from list
|
- [x] Quick actions work from list
|
||||||
- [ ] Audit log entries created
|
- [x] Audit log entries created
|
||||||
- [ ] Bilingual support complete
|
- [x] Bilingual support complete
|
||||||
- [ ] Tests for approval/rejection
|
- [x] Tests for approval/rejection
|
||||||
- [ ] Code formatted with Pint
|
- [x] Code formatted with Pint
|
||||||
|
|
||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
|
|
@ -677,3 +677,165 @@ it('sends approval notification in client preferred language', function () {
|
||||||
|
|
||||||
**Complexity:** Medium
|
**Complexity:** Medium
|
||||||
**Estimated Effort:** 4-5 hours
|
**Estimated Effort:** 4-5 hours
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Dev Agent Record
|
||||||
|
|
||||||
|
### Status
|
||||||
|
Ready for Review
|
||||||
|
|
||||||
|
### Agent Model Used
|
||||||
|
Claude Opus 4.5
|
||||||
|
|
||||||
|
### File List
|
||||||
|
|
||||||
|
**New Files:**
|
||||||
|
- `resources/views/livewire/admin/bookings/pending.blade.php` - Pending bookings list component
|
||||||
|
- `resources/views/livewire/admin/bookings/review.blade.php` - Booking review/approval component
|
||||||
|
- `app/Services/CalendarService.php` - .ics calendar file generation service
|
||||||
|
- `app/Notifications/BookingApproved.php` - Booking approval notification
|
||||||
|
- `app/Notifications/BookingRejected.php` - Booking rejection notification
|
||||||
|
- `resources/views/emails/booking-approved.blade.php` - Approval email template
|
||||||
|
- `resources/views/emails/booking-rejected.blade.php` - Rejection email template
|
||||||
|
- `tests/Feature/Admin/BookingReviewApprovalTest.php` - Test suite for approval/rejection
|
||||||
|
|
||||||
|
**Modified Files:**
|
||||||
|
- `routes/web.php` - Added admin booking routes
|
||||||
|
- `resources/views/components/layouts/app/sidebar.blade.php` - Added navigation link
|
||||||
|
- `lang/en/navigation.php` - Added booking navigation translations
|
||||||
|
- `lang/ar/navigation.php` - Added booking navigation translations (Arabic)
|
||||||
|
- `lang/en/admin.php` - Added booking management translations
|
||||||
|
- `lang/ar/admin.php` - Added booking management translations (Arabic)
|
||||||
|
- `lang/en/emails.php` - Added approval/rejection email translations
|
||||||
|
- `lang/ar/emails.php` - Added approval/rejection email translations (Arabic)
|
||||||
|
- `lang/en/common.php` - Added common translations (clear, unknown, currency)
|
||||||
|
- `lang/ar/common.php` - Added common translations (Arabic)
|
||||||
|
- `composer.json` - Added spatie/icalendar-generator dependency
|
||||||
|
|
||||||
|
### Change Log
|
||||||
|
- Installed `spatie/icalendar-generator` package for .ics file generation
|
||||||
|
- Created pending bookings list with filtering by date range
|
||||||
|
- Created booking review page with full client details and consultation history
|
||||||
|
- Implemented approval workflow with free/paid consultation types
|
||||||
|
- Implemented rejection workflow with optional reason
|
||||||
|
- Added quick approve/reject actions from list view
|
||||||
|
- Created CalendarService for generating .ics calendar files
|
||||||
|
- Created BookingApproved notification with .ics attachment
|
||||||
|
- Created BookingRejected notification
|
||||||
|
- Added bilingual email templates (Arabic/English)
|
||||||
|
- Added comprehensive admin and navigation translations
|
||||||
|
- Added audit logging for all approval/rejection actions
|
||||||
|
- Created 21 tests covering all workflows
|
||||||
|
|
||||||
|
### Completion Notes
|
||||||
|
- All acceptance criteria completed except "Bulk actions" which was marked as optional
|
||||||
|
- Full test coverage with 21 passing tests
|
||||||
|
- All 312 project tests pass (748 assertions)
|
||||||
|
- Code formatted with Pint
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## QA Results
|
||||||
|
|
||||||
|
### Review Date: 2025-12-26
|
||||||
|
|
||||||
|
### Reviewed By: Quinn (Test Architect)
|
||||||
|
|
||||||
|
### Code Quality Assessment
|
||||||
|
|
||||||
|
**Overall Assessment: HIGH QUALITY**
|
||||||
|
|
||||||
|
This implementation demonstrates excellent adherence to Laravel and project conventions. The code is well-structured, follows the Volt class-based component pattern, and implements all critical acceptance criteria. Key strengths include:
|
||||||
|
|
||||||
|
1. **Proper Status Guards**: Both components correctly check `status !== ConsultationStatus::Pending` before processing, preventing double-processing of bookings
|
||||||
|
2. **Error Handling**: Calendar generation failures are caught and logged but don't block the approval flow
|
||||||
|
3. **User Existence Checks**: Notifications only send if `$consultation->user` exists
|
||||||
|
4. **Comprehensive Audit Logging**: All actions are logged with old/new values and IP address
|
||||||
|
5. **Clean Separation of Concerns**: CalendarService handles ICS generation, Notifications handle email delivery
|
||||||
|
|
||||||
|
### Refactoring Performed
|
||||||
|
|
||||||
|
None required. The code quality is excellent and follows all project patterns.
|
||||||
|
|
||||||
|
### Compliance Check
|
||||||
|
|
||||||
|
- Coding Standards: ✓ Code formatted with Pint, follows Laravel 12 conventions
|
||||||
|
- Project Structure: ✓ Volt components in correct location, follows existing patterns
|
||||||
|
- Testing Strategy: ✓ 21 comprehensive tests covering all workflows
|
||||||
|
- All ACs Met: ✓ All acceptance criteria implemented (bulk actions marked optional in story)
|
||||||
|
|
||||||
|
### Requirements Traceability
|
||||||
|
|
||||||
|
| AC | Description | Test Coverage |
|
||||||
|
|----|-------------|---------------|
|
||||||
|
| 1 | View all pending booking requests | `pending bookings list displays pending consultations` |
|
||||||
|
| 2 | Display client name, date/time, submission date | `pending.blade.php` displays all fields |
|
||||||
|
| 3 | Show problem summary preview | `Str::limit($booking->problem_summary, 150)` |
|
||||||
|
| 4 | Click to view full details | `review` route and component |
|
||||||
|
| 5 | Sort by date (oldest first) | `orderBy('booking_date')->orderBy('booking_time')` |
|
||||||
|
| 6 | Filter by date range | `admin can filter bookings by date range` |
|
||||||
|
| 7 | Full client information | `review.blade.php` client information section |
|
||||||
|
| 8 | Complete problem summary | `whitespace-pre-wrap` display in review |
|
||||||
|
| 9 | Client consultation history | `booking details view shows client consultation history` |
|
||||||
|
| 10 | Set consultation type (free/paid) | `admin can approve booking as free/paid` |
|
||||||
|
| 11 | Payment amount for paid | `paid consultation requires payment amount` |
|
||||||
|
| 12 | Payment instructions | `paymentInstructions` field in modal |
|
||||||
|
| 13 | Approve with confirmation | `showApproveModal` with confirm |
|
||||||
|
| 14 | Status changes to approved | Tests verify `status->toBe(ConsultationStatus::Approved)` |
|
||||||
|
| 15 | Client notified via email | `Notification::assertSentTo` tests |
|
||||||
|
| 16 | .ics calendar attached | `CalendarService::generateIcs` + `attachData` |
|
||||||
|
| 17 | Payment instructions in email | Included in `BookingApproved` notification |
|
||||||
|
| 18 | Rejection reason field | `rejectionReason` input in modal |
|
||||||
|
| 19 | Reject with confirmation | `showRejectModal` with confirm |
|
||||||
|
| 20 | Rejection notification | `BookingRejected` notification sent |
|
||||||
|
| 21 | Quick approve button | `quickApprove` method tested |
|
||||||
|
| 22 | Quick reject button | `quickReject` method tested |
|
||||||
|
| 23 | Audit log for decisions | `audit log entry created on approval/rejection` tests |
|
||||||
|
| 24 | Bilingual notifications | `notification sent in client preferred language` tests |
|
||||||
|
|
||||||
|
### Improvements Checklist
|
||||||
|
|
||||||
|
- [x] Status guard prevents double-processing (already implemented)
|
||||||
|
- [x] Error handling for calendar generation (already implemented)
|
||||||
|
- [x] Null safety for user notifications (already implemented)
|
||||||
|
- [x] Audit logging with context (already implemented)
|
||||||
|
- [x] Bilingual support for emails (already implemented)
|
||||||
|
- [ ] Consider adding database transaction with locking for concurrent approval protection (future enhancement)
|
||||||
|
- [ ] Bulk actions (marked as optional in story - not implemented)
|
||||||
|
|
||||||
|
### Security Review
|
||||||
|
|
||||||
|
**Status: PASS**
|
||||||
|
|
||||||
|
1. **Authorization**: Routes are protected by `admin` middleware (verified in routes/web.php)
|
||||||
|
2. **Access Control Tests**: Tests verify guests and clients cannot access admin booking pages
|
||||||
|
3. **Input Validation**: Proper validation rules for consultation type and payment amount
|
||||||
|
4. **Audit Trail**: All admin actions logged with admin_id, action, target, and IP address
|
||||||
|
5. **Status Guards**: Cannot re-process already processed bookings
|
||||||
|
|
||||||
|
### Performance Considerations
|
||||||
|
|
||||||
|
**Status: PASS**
|
||||||
|
|
||||||
|
1. **Eager Loading**: `with('user')` used consistently to prevent N+1 queries
|
||||||
|
2. **Pagination**: List uses pagination (15 per page)
|
||||||
|
3. **Limited History**: Consultation history limited to 5 records
|
||||||
|
4. **Selective Fields**: User relation loads only needed fields: `id,full_name,email,phone,user_type`
|
||||||
|
5. **Queued Notifications**: Both `BookingApproved` and `BookingRejected` implement `ShouldQueue`
|
||||||
|
|
||||||
|
### Files Modified During Review
|
||||||
|
|
||||||
|
None - no modifications required.
|
||||||
|
|
||||||
|
### Gate Status
|
||||||
|
|
||||||
|
Gate: **PASS** → docs/qa/gates/3.5-admin-booking-review-approval.yml
|
||||||
|
|
||||||
|
### Recommended Status
|
||||||
|
|
||||||
|
✓ **Ready for Done**
|
||||||
|
|
||||||
|
The implementation is complete, well-tested, and follows all project conventions. All 21 tests pass with 47 assertions. The code demonstrates excellent quality with proper error handling, security measures, and bilingual support.
|
||||||
|
|
||||||
|
**Note to Story Owner**: Consider implementing bulk actions in a future story if the admin frequently needs to process multiple bookings at once.
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,48 @@ return [
|
||||||
'all' => 'الكل',
|
'all' => 'الكل',
|
||||||
'confirm_delete' => 'تأكيد الحذف',
|
'confirm_delete' => 'تأكيد الحذف',
|
||||||
'confirm_delete_blocked_time' => 'هل أنت متأكد من حذف هذا الوقت المحظور؟',
|
'confirm_delete_blocked_time' => 'هل أنت متأكد من حذف هذا الوقت المحظور؟',
|
||||||
|
|
||||||
|
// Booking Management
|
||||||
|
'pending_bookings' => 'الحجوزات المعلقة',
|
||||||
|
'review_booking' => 'مراجعة الحجز',
|
||||||
|
'approve_booking' => 'الموافقة على الحجز',
|
||||||
|
'reject_booking' => 'رفض الحجز',
|
||||||
|
'booking_details' => 'تفاصيل الحجز',
|
||||||
|
'client_information' => 'معلومات العميل',
|
||||||
|
'client_name' => 'اسم العميل',
|
||||||
|
'client_email' => 'البريد الإلكتروني',
|
||||||
|
'client_phone' => 'الهاتف',
|
||||||
|
'client_type' => 'نوع العميل',
|
||||||
|
'requested_date' => 'التاريخ المطلوب',
|
||||||
|
'requested_time' => 'الوقت المطلوب',
|
||||||
|
'submission_date' => 'تاريخ التقديم',
|
||||||
|
'current_status' => 'الحالة الحالية',
|
||||||
|
'problem_summary' => 'ملخص المشكلة',
|
||||||
|
'consultation_history' => 'سجل الاستشارات',
|
||||||
|
'consultation_type' => 'نوع الاستشارة',
|
||||||
|
'free_consultation' => 'استشارة مجانية',
|
||||||
|
'paid_consultation' => 'استشارة مدفوعة',
|
||||||
|
'payment_amount' => 'مبلغ الدفع',
|
||||||
|
'payment_instructions' => 'تعليمات الدفع',
|
||||||
|
'payment_instructions_placeholder' => 'أدخل تعليمات الدفع (تفاصيل التحويل البنكي، إلخ)',
|
||||||
|
'rejection_reason' => 'سبب الرفض',
|
||||||
|
'rejection_reason_placeholder' => 'أدخل سبب الرفض (اختياري)',
|
||||||
|
'approve' => 'موافقة',
|
||||||
|
'reject' => 'رفض',
|
||||||
|
'review' => 'مراجعة',
|
||||||
|
'quick_approve' => 'موافقة سريعة',
|
||||||
|
'quick_reject' => 'رفض سريع',
|
||||||
|
'confirm_quick_approve' => 'هل أنت متأكد من الموافقة على هذا الحجز كاستشارة مجانية؟',
|
||||||
|
'confirm_quick_reject' => 'هل أنت متأكد من رفض هذا الحجز؟',
|
||||||
|
'booking_approved' => 'تمت الموافقة على الحجز بنجاح.',
|
||||||
|
'booking_rejected' => 'تم رفض الحجز.',
|
||||||
|
'booking_already_processed' => 'تم معالجة هذا الحجز مسبقاً.',
|
||||||
|
'booking_already_processed_info' => 'تم معالجة هذا الحجز مسبقاً. الحالة: :status',
|
||||||
|
'no_pending_bookings' => 'لا توجد حجوزات معلقة.',
|
||||||
|
'date_from' => 'من تاريخ',
|
||||||
|
'date_to' => 'إلى تاريخ',
|
||||||
|
'submitted' => 'تم التقديم',
|
||||||
|
'client' => 'العميل',
|
||||||
|
'date' => 'التاريخ',
|
||||||
|
'time' => 'الوقت',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,7 @@ return [
|
||||||
'loading' => 'جاري التحميل...',
|
'loading' => 'جاري التحميل...',
|
||||||
'submitting' => 'جاري الإرسال...',
|
'submitting' => 'جاري الإرسال...',
|
||||||
'minutes' => 'دقيقة',
|
'minutes' => 'دقيقة',
|
||||||
|
'clear' => 'مسح',
|
||||||
|
'unknown' => 'غير معروف',
|
||||||
|
'currency' => 'شيكل',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -63,4 +63,25 @@ return [
|
||||||
'client_phone' => 'الهاتف:',
|
'client_phone' => 'الهاتف:',
|
||||||
'problem_summary' => 'ملخص المشكلة:',
|
'problem_summary' => 'ملخص المشكلة:',
|
||||||
'view_in_dashboard' => 'عرض في لوحة التحكم',
|
'view_in_dashboard' => 'عرض في لوحة التحكم',
|
||||||
|
|
||||||
|
// Booking Approved (client)
|
||||||
|
'booking_approved_title' => 'تمت الموافقة على حجزك',
|
||||||
|
'booking_approved_greeting' => 'عزيزي :name،',
|
||||||
|
'booking_approved_body' => 'يسعدنا إبلاغك بأنه تمت الموافقة على طلب حجز الاستشارة الخاص بك.',
|
||||||
|
'consultation_type' => 'النوع:',
|
||||||
|
'free_consultation' => 'استشارة مجانية',
|
||||||
|
'paid_consultation' => 'استشارة مدفوعة',
|
||||||
|
'payment_details' => 'تفاصيل الدفع:',
|
||||||
|
'payment_amount' => 'المبلغ:',
|
||||||
|
'payment_instructions' => 'تعليمات الدفع:',
|
||||||
|
'booking_approved_calendar' => 'تم إرفاق ملف تقويم (.ics) بهذا البريد الإلكتروني. يمكنك إضافته إلى تطبيق التقويم الخاص بك.',
|
||||||
|
'booking_approved_contact' => 'إذا كان لديك أي استفسار أو تحتاج إلى إعادة الجدولة، يرجى التواصل معنا.',
|
||||||
|
|
||||||
|
// Booking Rejected (client)
|
||||||
|
'booking_rejected_title' => 'بخصوص طلب الاستشارة الخاص بك',
|
||||||
|
'booking_rejected_greeting' => 'عزيزي :name،',
|
||||||
|
'booking_rejected_body' => 'نأسف لإبلاغك بأنه لم نتمكن من الموافقة على طلب حجز الاستشارة الخاص بك في الوقت الحالي.',
|
||||||
|
'rejection_reason' => 'السبب:',
|
||||||
|
'booking_rejected_next_steps' => 'نرحب بتقديم طلب حجز جديد لتاريخ أو وقت مختلف.',
|
||||||
|
'booking_rejected_contact' => 'إذا كان لديك أي استفسار، لا تتردد في التواصل معنا.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -27,4 +27,6 @@ return [
|
||||||
'clients' => 'العملاء',
|
'clients' => 'العملاء',
|
||||||
'individual_clients' => 'العملاء الأفراد',
|
'individual_clients' => 'العملاء الأفراد',
|
||||||
'company_clients' => 'الشركات العملاء',
|
'company_clients' => 'الشركات العملاء',
|
||||||
|
'bookings' => 'الحجوزات',
|
||||||
|
'pending_bookings' => 'الحجوزات المعلقة',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,48 @@ return [
|
||||||
'all' => 'All',
|
'all' => 'All',
|
||||||
'confirm_delete' => 'Confirm Delete',
|
'confirm_delete' => 'Confirm Delete',
|
||||||
'confirm_delete_blocked_time' => 'Are you sure you want to delete this blocked time?',
|
'confirm_delete_blocked_time' => 'Are you sure you want to delete this blocked time?',
|
||||||
|
|
||||||
|
// Booking Management
|
||||||
|
'pending_bookings' => 'Pending Bookings',
|
||||||
|
'review_booking' => 'Review Booking',
|
||||||
|
'approve_booking' => 'Approve Booking',
|
||||||
|
'reject_booking' => 'Reject Booking',
|
||||||
|
'booking_details' => 'Booking Details',
|
||||||
|
'client_information' => 'Client Information',
|
||||||
|
'client_name' => 'Client Name',
|
||||||
|
'client_email' => 'Email',
|
||||||
|
'client_phone' => 'Phone',
|
||||||
|
'client_type' => 'Client Type',
|
||||||
|
'requested_date' => 'Requested Date',
|
||||||
|
'requested_time' => 'Requested Time',
|
||||||
|
'submission_date' => 'Submission Date',
|
||||||
|
'current_status' => 'Current Status',
|
||||||
|
'problem_summary' => 'Problem Summary',
|
||||||
|
'consultation_history' => 'Consultation History',
|
||||||
|
'consultation_type' => 'Consultation Type',
|
||||||
|
'free_consultation' => 'Free Consultation',
|
||||||
|
'paid_consultation' => 'Paid Consultation',
|
||||||
|
'payment_amount' => 'Payment Amount',
|
||||||
|
'payment_instructions' => 'Payment Instructions',
|
||||||
|
'payment_instructions_placeholder' => 'Enter payment instructions (bank transfer details, etc.)',
|
||||||
|
'rejection_reason' => 'Rejection Reason',
|
||||||
|
'rejection_reason_placeholder' => 'Enter reason for rejection (optional)',
|
||||||
|
'approve' => 'Approve',
|
||||||
|
'reject' => 'Reject',
|
||||||
|
'review' => 'Review',
|
||||||
|
'quick_approve' => 'Quick Approve',
|
||||||
|
'quick_reject' => 'Quick Reject',
|
||||||
|
'confirm_quick_approve' => 'Are you sure you want to approve this booking as a free consultation?',
|
||||||
|
'confirm_quick_reject' => 'Are you sure you want to reject this booking?',
|
||||||
|
'booking_approved' => 'Booking has been approved successfully.',
|
||||||
|
'booking_rejected' => 'Booking has been rejected.',
|
||||||
|
'booking_already_processed' => 'This booking has already been processed.',
|
||||||
|
'booking_already_processed_info' => 'This booking has already been processed. Status: :status',
|
||||||
|
'no_pending_bookings' => 'No pending bookings found.',
|
||||||
|
'date_from' => 'Date From',
|
||||||
|
'date_to' => 'Date To',
|
||||||
|
'submitted' => 'Submitted',
|
||||||
|
'client' => 'Client',
|
||||||
|
'date' => 'Date',
|
||||||
|
'time' => 'Time',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,7 @@ return [
|
||||||
'loading' => 'Loading...',
|
'loading' => 'Loading...',
|
||||||
'submitting' => 'Submitting...',
|
'submitting' => 'Submitting...',
|
||||||
'minutes' => 'minutes',
|
'minutes' => 'minutes',
|
||||||
|
'clear' => 'Clear',
|
||||||
|
'unknown' => 'Unknown',
|
||||||
|
'currency' => 'ILS',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -63,4 +63,25 @@ return [
|
||||||
'client_phone' => 'Phone:',
|
'client_phone' => 'Phone:',
|
||||||
'problem_summary' => 'Problem Summary:',
|
'problem_summary' => 'Problem Summary:',
|
||||||
'view_in_dashboard' => 'View in Dashboard',
|
'view_in_dashboard' => 'View in Dashboard',
|
||||||
|
|
||||||
|
// Booking Approved (client)
|
||||||
|
'booking_approved_title' => 'Your Booking Has Been Approved',
|
||||||
|
'booking_approved_greeting' => 'Dear :name,',
|
||||||
|
'booking_approved_body' => 'We are pleased to inform you that your consultation booking request has been approved.',
|
||||||
|
'consultation_type' => 'Type:',
|
||||||
|
'free_consultation' => 'Free Consultation',
|
||||||
|
'paid_consultation' => 'Paid Consultation',
|
||||||
|
'payment_details' => 'Payment Details:',
|
||||||
|
'payment_amount' => 'Amount:',
|
||||||
|
'payment_instructions' => 'Payment Instructions:',
|
||||||
|
'booking_approved_calendar' => 'A calendar file (.ics) is attached to this email. You can add it to your calendar application.',
|
||||||
|
'booking_approved_contact' => 'If you have any questions or need to reschedule, please contact us.',
|
||||||
|
|
||||||
|
// Booking Rejected (client)
|
||||||
|
'booking_rejected_title' => 'Regarding Your Consultation Request',
|
||||||
|
'booking_rejected_greeting' => 'Dear :name,',
|
||||||
|
'booking_rejected_body' => 'We regret to inform you that your consultation booking request could not be approved at this time.',
|
||||||
|
'rejection_reason' => 'Reason:',
|
||||||
|
'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.',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -27,4 +27,6 @@ return [
|
||||||
'clients' => 'Clients',
|
'clients' => 'Clients',
|
||||||
'individual_clients' => 'Individual Clients',
|
'individual_clients' => 'Individual Clients',
|
||||||
'company_clients' => 'Company Clients',
|
'company_clients' => 'Company Clients',
|
||||||
|
'bookings' => 'Bookings',
|
||||||
|
'pending_bookings' => 'Pending Bookings',
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,17 @@
|
||||||
</flux:navlist.group>
|
</flux:navlist.group>
|
||||||
|
|
||||||
@if (auth()->user()->isAdmin())
|
@if (auth()->user()->isAdmin())
|
||||||
|
<flux:navlist.group :heading="__('navigation.bookings')" class="grid">
|
||||||
|
<flux:navlist.item
|
||||||
|
icon="calendar"
|
||||||
|
:href="route('admin.bookings.pending')"
|
||||||
|
:current="request()->routeIs('admin.bookings.*')"
|
||||||
|
wire:navigate
|
||||||
|
>
|
||||||
|
{{ __('navigation.pending_bookings') }}
|
||||||
|
</flux:navlist.item>
|
||||||
|
</flux:navlist.group>
|
||||||
|
|
||||||
<flux:navlist.group :heading="__('navigation.user_management')" class="grid">
|
<flux:navlist.group :heading="__('navigation.user_management')" class="grid">
|
||||||
<flux:navlist.item
|
<flux:navlist.item
|
||||||
icon="users"
|
icon="users"
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
@php
|
||||||
|
$locale = $user->preferred_language ?? 'ar';
|
||||||
|
@endphp
|
||||||
|
@component('mail::message')
|
||||||
|
@if($locale === 'ar')
|
||||||
|
<div dir="rtl" style="text-align: right;">
|
||||||
|
# {{ __('emails.booking_approved_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.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_type', [], $locale) }}** {{ $consultation->consultation_type->value === 'paid' ? __('emails.paid_consultation', [], $locale) : __('emails.free_consultation', [], $locale) }}
|
||||||
|
|
||||||
|
@if($consultation->consultation_type->value === 'paid' && $consultation->payment_amount)
|
||||||
|
**{{ __('emails.payment_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.payment_amount', [], $locale) }}** {{ $consultation->payment_amount }} {{ __('common.currency', [], $locale) }}
|
||||||
|
|
||||||
|
@if($paymentInstructions)
|
||||||
|
**{{ __('emails.payment_instructions', [], $locale) }}**
|
||||||
|
|
||||||
|
{{ $paymentInstructions }}
|
||||||
|
@endif
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_calendar', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
# {{ __('emails.booking_approved_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.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_type', [], $locale) }}** {{ $consultation->consultation_type->value === 'paid' ? __('emails.paid_consultation', [], $locale) : __('emails.free_consultation', [], $locale) }}
|
||||||
|
|
||||||
|
@if($consultation->consultation_type->value === 'paid' && $consultation->payment_amount)
|
||||||
|
**{{ __('emails.payment_details', [], $locale) }}**
|
||||||
|
|
||||||
|
- **{{ __('emails.payment_amount', [], $locale) }}** {{ $consultation->payment_amount }} {{ __('common.currency', [], $locale) }}
|
||||||
|
|
||||||
|
@if($paymentInstructions)
|
||||||
|
**{{ __('emails.payment_instructions', [], $locale) }}**
|
||||||
|
|
||||||
|
{{ $paymentInstructions }}
|
||||||
|
@endif
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_calendar', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_approved_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.booking_rejected_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.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') }}
|
||||||
|
|
||||||
|
@if($rejectionReason)
|
||||||
|
**{{ __('emails.rejection_reason', [], $locale) }}**
|
||||||
|
|
||||||
|
{{ $rejectionReason }}
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_next_steps', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
</div>
|
||||||
|
@else
|
||||||
|
# {{ __('emails.booking_rejected_title', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_greeting', ['name' => $user->company_name ?? $user->full_name], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_body', [], $locale) }}
|
||||||
|
|
||||||
|
**{{ __('emails.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') }}
|
||||||
|
|
||||||
|
@if($rejectionReason)
|
||||||
|
**{{ __('emails.rejection_reason', [], $locale) }}**
|
||||||
|
|
||||||
|
{{ $rejectionReason }}
|
||||||
|
@endif
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_next_steps', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.booking_rejected_contact', [], $locale) }}
|
||||||
|
|
||||||
|
{{ __('emails.regards', [], $locale) }}<br>
|
||||||
|
{{ config('app.name') }}
|
||||||
|
@endif
|
||||||
|
@endcomponent
|
||||||
|
|
@ -0,0 +1,268 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Enums\ConsultationType;
|
||||||
|
use App\Enums\PaymentStatus;
|
||||||
|
use App\Models\AdminLog;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Notifications\BookingApproved;
|
||||||
|
use App\Notifications\BookingRejected;
|
||||||
|
use App\Services\CalendarService;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Livewire\Volt\Component;
|
||||||
|
use Livewire\WithPagination;
|
||||||
|
|
||||||
|
new class extends Component
|
||||||
|
{
|
||||||
|
use WithPagination;
|
||||||
|
|
||||||
|
public string $dateFrom = '';
|
||||||
|
public string $dateTo = '';
|
||||||
|
|
||||||
|
public function updatedDateFrom(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function updatedDateTo(): void
|
||||||
|
{
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function clearFilters(): void
|
||||||
|
{
|
||||||
|
$this->dateFrom = '';
|
||||||
|
$this->dateTo = '';
|
||||||
|
$this->resetPage();
|
||||||
|
}
|
||||||
|
|
||||||
|
public function quickApprove(int $id): void
|
||||||
|
{
|
||||||
|
$consultation = Consultation::with('user')->findOrFail($id);
|
||||||
|
|
||||||
|
if ($consultation->status !== ConsultationStatus::Pending) {
|
||||||
|
session()->flash('error', __('admin.booking_already_processed'));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
$consultation->update([
|
||||||
|
'status' => ConsultationStatus::Approved,
|
||||||
|
'consultation_type' => ConsultationType::Free,
|
||||||
|
'payment_status' => PaymentStatus::NotApplicable,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Generate calendar file and send notification
|
||||||
|
try {
|
||||||
|
$calendarService = app(CalendarService::class);
|
||||||
|
$icsContent = $calendarService->generateIcs($consultation);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Log::error('Failed to generate calendar file', [
|
||||||
|
'consultation_id' => $consultation->id,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
$icsContent = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($consultation->user) {
|
||||||
|
$consultation->user->notify(
|
||||||
|
new BookingApproved($consultation, $icsContent ?? '', null)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log action
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'approve',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => [
|
||||||
|
'status' => ConsultationStatus::Approved->value,
|
||||||
|
'consultation_type' => ConsultationType::Free->value,
|
||||||
|
],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('admin.booking_approved'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function quickReject(int $id): void
|
||||||
|
{
|
||||||
|
$consultation = Consultation::with('user')->findOrFail($id);
|
||||||
|
|
||||||
|
if ($consultation->status !== ConsultationStatus::Pending) {
|
||||||
|
session()->flash('error', __('admin.booking_already_processed'));
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$oldStatus = $consultation->status->value;
|
||||||
|
|
||||||
|
$consultation->update([
|
||||||
|
'status' => ConsultationStatus::Rejected,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Send rejection notification
|
||||||
|
if ($consultation->user) {
|
||||||
|
$consultation->user->notify(
|
||||||
|
new BookingRejected($consultation, null)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log action
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'reject',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => [
|
||||||
|
'status' => ConsultationStatus::Rejected->value,
|
||||||
|
],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('admin.booking_rejected'));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function with(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'bookings' => Consultation::query()
|
||||||
|
->where('status', ConsultationStatus::Pending)
|
||||||
|
->when($this->dateFrom, fn ($q) => $q->where('booking_date', '>=', $this->dateFrom))
|
||||||
|
->when($this->dateTo, fn ($q) => $q->where('booking_date', '<=', $this->dateTo))
|
||||||
|
->with('user:id,full_name,email,phone,user_type')
|
||||||
|
->orderBy('booking_date')
|
||||||
|
->orderBy('booking_time')
|
||||||
|
->paginate(15),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}; ?>
|
||||||
|
|
||||||
|
<div class="max-w-6xl mx-auto">
|
||||||
|
<div class="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 mb-6">
|
||||||
|
<flux:heading size="xl">{{ __('admin.pending_bookings') }}</flux:heading>
|
||||||
|
</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="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>
|
||||||
|
|
||||||
|
@if($dateFrom || $dateTo)
|
||||||
|
<flux:button wire:click="clearFilters" variant="ghost">
|
||||||
|
{{ __('common.clear') }}
|
||||||
|
</flux:button>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Bookings List -->
|
||||||
|
<div class="space-y-4">
|
||||||
|
@forelse($bookings as $booking)
|
||||||
|
<div wire:key="booking-{{ $booking->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 lg:flex-row lg:items-start justify-between gap-4">
|
||||||
|
<!-- Booking Info -->
|
||||||
|
<div class="flex-1">
|
||||||
|
<div class="flex items-center gap-3 mb-2">
|
||||||
|
<span class="font-semibold text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $booking->user?->full_name ?? __('common.unknown') }}
|
||||||
|
</span>
|
||||||
|
<flux:badge variant="warning" size="sm">
|
||||||
|
{{ $booking->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 sm:grid-cols-2 gap-2 text-sm text-zinc-600 dark:text-zinc-400">
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<flux:icon name="calendar" class="w-4 h-4" />
|
||||||
|
{{ \Carbon\Carbon::parse($booking->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<flux:icon name="clock" class="w-4 h-4" />
|
||||||
|
{{ \Carbon\Carbon::parse($booking->booking_time)->format('g:i A') }}
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<flux:icon name="envelope" class="w-4 h-4" />
|
||||||
|
{{ $booking->user?->email ?? '-' }}
|
||||||
|
</div>
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<flux:icon name="document-text" class="w-4 h-4" />
|
||||||
|
{{ __('admin.submitted') }}: {{ $booking->created_at->translatedFormat('d M Y') }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p class="mt-3 text-sm text-zinc-600 dark:text-zinc-400 line-clamp-2">
|
||||||
|
{{ Str::limit($booking->problem_summary, 150) }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Actions -->
|
||||||
|
<div class="flex flex-wrap gap-2 lg:flex-col">
|
||||||
|
<flux:button
|
||||||
|
href="{{ route('admin.bookings.review', $booking) }}"
|
||||||
|
variant="primary"
|
||||||
|
size="sm"
|
||||||
|
wire:navigate
|
||||||
|
>
|
||||||
|
{{ __('admin.review') }}
|
||||||
|
</flux:button>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
wire:click="quickApprove({{ $booking->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_quick_approve') }}"
|
||||||
|
variant="filled"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('admin.quick_approve') }}
|
||||||
|
</flux:button>
|
||||||
|
|
||||||
|
<flux:button
|
||||||
|
wire:click="quickReject({{ $booking->id }})"
|
||||||
|
wire:confirm="{{ __('admin.confirm_quick_reject') }}"
|
||||||
|
variant="danger"
|
||||||
|
size="sm"
|
||||||
|
>
|
||||||
|
{{ __('admin.quick_reject') }}
|
||||||
|
</flux:button>
|
||||||
|
</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_pending_bookings') }}</p>
|
||||||
|
</div>
|
||||||
|
@endforelse
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mt-6">
|
||||||
|
{{ $bookings->links() }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
@ -0,0 +1,395 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
use App\Enums\ConsultationStatus;
|
||||||
|
use App\Enums\ConsultationType;
|
||||||
|
use App\Enums\PaymentStatus;
|
||||||
|
use App\Models\AdminLog;
|
||||||
|
use App\Models\Consultation;
|
||||||
|
use App\Notifications\BookingApproved;
|
||||||
|
use App\Notifications\BookingRejected;
|
||||||
|
use App\Services\CalendarService;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Livewire\Volt\Component;
|
||||||
|
|
||||||
|
new class extends Component
|
||||||
|
{
|
||||||
|
public Consultation $consultation;
|
||||||
|
|
||||||
|
public string $consultationType = 'free';
|
||||||
|
public ?string $paymentAmount = null;
|
||||||
|
public string $paymentInstructions = '';
|
||||||
|
public string $rejectionReason = '';
|
||||||
|
|
||||||
|
public bool $showApproveModal = false;
|
||||||
|
public bool $showRejectModal = false;
|
||||||
|
|
||||||
|
public function mount(Consultation $consultation): void
|
||||||
|
{
|
||||||
|
$this->consultation = $consultation->load(['user']);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function openApproveModal(): void
|
||||||
|
{
|
||||||
|
$this->showApproveModal = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function openRejectModal(): void
|
||||||
|
{
|
||||||
|
$this->showRejectModal = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function approve(): void
|
||||||
|
{
|
||||||
|
if ($this->consultation->status !== ConsultationStatus::Pending) {
|
||||||
|
session()->flash('error', __('admin.booking_already_processed'));
|
||||||
|
$this->showApproveModal = false;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->validate([
|
||||||
|
'consultationType' => ['required', 'in:free,paid'],
|
||||||
|
'paymentAmount' => ['required_if:consultationType,paid', 'nullable', 'numeric', 'min:0'],
|
||||||
|
'paymentInstructions' => ['nullable', 'string', 'max:1000'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$oldStatus = $this->consultation->status->value;
|
||||||
|
$type = $this->consultationType === 'paid' ? ConsultationType::Paid : ConsultationType::Free;
|
||||||
|
|
||||||
|
$this->consultation->update([
|
||||||
|
'status' => ConsultationStatus::Approved,
|
||||||
|
'consultation_type' => $type,
|
||||||
|
'payment_amount' => $type === ConsultationType::Paid ? $this->paymentAmount : null,
|
||||||
|
'payment_status' => $type === ConsultationType::Paid ? PaymentStatus::Pending : PaymentStatus::NotApplicable,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Generate calendar file
|
||||||
|
$icsContent = null;
|
||||||
|
try {
|
||||||
|
$calendarService = app(CalendarService::class);
|
||||||
|
$icsContent = $calendarService->generateIcs($this->consultation);
|
||||||
|
} catch (\Exception $e) {
|
||||||
|
Log::error('Failed to generate calendar file', [
|
||||||
|
'consultation_id' => $this->consultation->id,
|
||||||
|
'error' => $e->getMessage(),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send notification with .ics attachment
|
||||||
|
if ($this->consultation->user) {
|
||||||
|
$this->consultation->user->notify(
|
||||||
|
new BookingApproved(
|
||||||
|
$this->consultation,
|
||||||
|
$icsContent ?? '',
|
||||||
|
$this->paymentInstructions ?: null
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log action
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'approve',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $this->consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => [
|
||||||
|
'status' => ConsultationStatus::Approved->value,
|
||||||
|
'consultation_type' => $type->value,
|
||||||
|
'payment_amount' => $this->paymentAmount,
|
||||||
|
],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('admin.booking_approved'));
|
||||||
|
$this->redirect(route('admin.bookings.pending'), navigate: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function reject(): void
|
||||||
|
{
|
||||||
|
if ($this->consultation->status !== ConsultationStatus::Pending) {
|
||||||
|
session()->flash('error', __('admin.booking_already_processed'));
|
||||||
|
$this->showRejectModal = false;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->validate([
|
||||||
|
'rejectionReason' => ['nullable', 'string', 'max:1000'],
|
||||||
|
]);
|
||||||
|
|
||||||
|
$oldStatus = $this->consultation->status->value;
|
||||||
|
|
||||||
|
$this->consultation->update([
|
||||||
|
'status' => ConsultationStatus::Rejected,
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Send rejection notification
|
||||||
|
if ($this->consultation->user) {
|
||||||
|
$this->consultation->user->notify(
|
||||||
|
new BookingRejected($this->consultation, $this->rejectionReason ?: null)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Log action
|
||||||
|
AdminLog::create([
|
||||||
|
'admin_id' => auth()->id(),
|
||||||
|
'action' => 'reject',
|
||||||
|
'target_type' => 'consultation',
|
||||||
|
'target_id' => $this->consultation->id,
|
||||||
|
'old_values' => ['status' => $oldStatus],
|
||||||
|
'new_values' => [
|
||||||
|
'status' => ConsultationStatus::Rejected->value,
|
||||||
|
'reason' => $this->rejectionReason,
|
||||||
|
],
|
||||||
|
'ip_address' => request()->ip(),
|
||||||
|
'created_at' => now(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
session()->flash('success', __('admin.booking_rejected'));
|
||||||
|
$this->redirect(route('admin.bookings.pending'), navigate: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function with(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'consultationHistory' => Consultation::query()
|
||||||
|
->where('user_id', $this->consultation->user_id)
|
||||||
|
->where('id', '!=', $this->consultation->id)
|
||||||
|
->orderBy('booking_date', 'desc')
|
||||||
|
->limit(5)
|
||||||
|
->get(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}; ?>
|
||||||
|
|
||||||
|
<div class="max-w-4xl mx-auto">
|
||||||
|
<div class="flex items-center gap-4 mb-6">
|
||||||
|
<flux:button href="{{ route('admin.bookings.pending') }}" variant="ghost" wire:navigate>
|
||||||
|
<flux:icon name="arrow-left" class="w-4 h-4 rtl:rotate-180" />
|
||||||
|
{{ __('common.back') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:heading size="xl">{{ __('admin.review_booking') }}</flux:heading>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
@if(session('error'))
|
||||||
|
<flux:callout variant="danger" class="mb-6">
|
||||||
|
{{ session('error') }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($consultation->status !== ConsultationStatus::Pending)
|
||||||
|
<flux:callout variant="warning" class="mb-6">
|
||||||
|
{{ __('admin.booking_already_processed_info', ['status' => $consultation->status->label()]) }}
|
||||||
|
</flux:callout>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Client Information -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700 mb-6">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.client_information') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_name') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->user?->full_name ?? __('common.unknown') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_email') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->user?->email ?? '-' }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_phone') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->user?->phone ?? '-' }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.client_type') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->user?->user_type?->value ?? '-' }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Booking Details -->
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700 mb-6">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.booking_details') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-4">
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.requested_date') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.requested_time') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.submission_date') }}</p>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ $consultation->created_at->translatedFormat('d M Y, g:i A') }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('admin.current_status') }}</p>
|
||||||
|
<flux:badge :variant="match($consultation->status) {
|
||||||
|
ConsultationStatus::Pending => 'warning',
|
||||||
|
ConsultationStatus::Approved => 'success',
|
||||||
|
ConsultationStatus::Rejected => 'danger',
|
||||||
|
default => 'default',
|
||||||
|
}">
|
||||||
|
{{ $consultation->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400 mb-2">{{ __('admin.problem_summary') }}</p>
|
||||||
|
<p class="text-zinc-900 dark:text-zinc-100 whitespace-pre-wrap">
|
||||||
|
{{ $consultation->problem_summary }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Consultation History -->
|
||||||
|
@if($consultationHistory->count() > 0)
|
||||||
|
<div class="bg-white dark:bg-zinc-800 rounded-lg p-6 border border-zinc-200 dark:border-zinc-700 mb-6">
|
||||||
|
<flux:heading size="lg" class="mb-4">{{ __('admin.consultation_history') }}</flux:heading>
|
||||||
|
|
||||||
|
<div class="space-y-3">
|
||||||
|
@foreach($consultationHistory as $history)
|
||||||
|
<div class="flex items-center justify-between p-3 bg-zinc-50 dark:bg-zinc-700 rounded-lg">
|
||||||
|
<div>
|
||||||
|
<p class="font-medium text-zinc-900 dark:text-zinc-100">
|
||||||
|
{{ \Carbon\Carbon::parse($history->booking_date)->translatedFormat('d M Y') }}
|
||||||
|
</p>
|
||||||
|
<p class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||||
|
{{ $history->consultation_type?->value ?? '-' }}
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<flux:badge :variant="match($history->status) {
|
||||||
|
ConsultationStatus::Pending => 'warning',
|
||||||
|
ConsultationStatus::Approved => 'success',
|
||||||
|
ConsultationStatus::Completed => 'default',
|
||||||
|
ConsultationStatus::Rejected => 'danger',
|
||||||
|
ConsultationStatus::Cancelled => 'danger',
|
||||||
|
ConsultationStatus::NoShow => 'danger',
|
||||||
|
}" size="sm">
|
||||||
|
{{ $history->status->label() }}
|
||||||
|
</flux:badge>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Action Buttons -->
|
||||||
|
@if($consultation->status === ConsultationStatus::Pending)
|
||||||
|
<div class="flex gap-4">
|
||||||
|
<flux:button wire:click="openApproveModal" variant="primary">
|
||||||
|
{{ __('admin.approve') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button wire:click="openRejectModal" variant="danger">
|
||||||
|
{{ __('admin.reject') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<!-- Approve Modal -->
|
||||||
|
<flux:modal wire:model="showApproveModal">
|
||||||
|
<div class="space-y-6">
|
||||||
|
<flux:heading size="lg">{{ __('admin.approve_booking') }}</flux:heading>
|
||||||
|
|
||||||
|
<!-- Client Info Summary -->
|
||||||
|
<div class="bg-zinc-50 dark:bg-zinc-700 p-4 rounded-lg">
|
||||||
|
<p><strong>{{ __('admin.client') }}:</strong> {{ $consultation->user?->full_name }}</p>
|
||||||
|
<p><strong>{{ __('admin.date') }}:</strong> {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}</p>
|
||||||
|
<p><strong>{{ __('admin.time') }}:</strong> {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Consultation Type -->
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.consultation_type') }}</flux:label>
|
||||||
|
<flux:radio.group wire:model.live="consultationType">
|
||||||
|
<flux:radio value="free" label="{{ __('admin.free_consultation') }}" />
|
||||||
|
<flux:radio value="paid" label="{{ __('admin.paid_consultation') }}" />
|
||||||
|
</flux:radio.group>
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<!-- Payment Amount (if paid) -->
|
||||||
|
@if($consultationType === 'paid')
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.payment_amount') }} *</flux:label>
|
||||||
|
<flux:input
|
||||||
|
type="number"
|
||||||
|
wire:model="paymentAmount"
|
||||||
|
step="0.01"
|
||||||
|
min="0"
|
||||||
|
/>
|
||||||
|
<flux:error name="paymentAmount" />
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.payment_instructions') }}</flux:label>
|
||||||
|
<flux:textarea
|
||||||
|
wire:model="paymentInstructions"
|
||||||
|
rows="3"
|
||||||
|
placeholder="{{ __('admin.payment_instructions_placeholder') }}"
|
||||||
|
/>
|
||||||
|
</flux:field>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="flex gap-3 justify-end">
|
||||||
|
<flux:button wire:click="$set('showApproveModal', false)">
|
||||||
|
{{ __('common.cancel') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button variant="primary" wire:click="approve">
|
||||||
|
{{ __('admin.approve') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</flux:modal>
|
||||||
|
|
||||||
|
<!-- Reject Modal -->
|
||||||
|
<flux:modal wire:model="showRejectModal">
|
||||||
|
<div class="space-y-6">
|
||||||
|
<flux:heading size="lg">{{ __('admin.reject_booking') }}</flux:heading>
|
||||||
|
|
||||||
|
<!-- Client Info Summary -->
|
||||||
|
<div class="bg-zinc-50 dark:bg-zinc-700 p-4 rounded-lg">
|
||||||
|
<p><strong>{{ __('admin.client') }}:</strong> {{ $consultation->user?->full_name }}</p>
|
||||||
|
<p><strong>{{ __('admin.date') }}:</strong> {{ \Carbon\Carbon::parse($consultation->booking_date)->translatedFormat('l, d M Y') }}</p>
|
||||||
|
<p><strong>{{ __('admin.time') }}:</strong> {{ \Carbon\Carbon::parse($consultation->booking_time)->format('g:i A') }}</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<flux:field>
|
||||||
|
<flux:label>{{ __('admin.rejection_reason') }} ({{ __('common.optional') }})</flux:label>
|
||||||
|
<flux:textarea
|
||||||
|
wire:model="rejectionReason"
|
||||||
|
rows="3"
|
||||||
|
placeholder="{{ __('admin.rejection_reason_placeholder') }}"
|
||||||
|
/>
|
||||||
|
<flux:error name="rejectionReason" />
|
||||||
|
</flux:field>
|
||||||
|
|
||||||
|
<div class="flex gap-3 justify-end">
|
||||||
|
<flux:button wire:click="$set('showRejectModal', false)">
|
||||||
|
{{ __('common.cancel') }}
|
||||||
|
</flux:button>
|
||||||
|
<flux:button variant="danger" wire:click="reject">
|
||||||
|
{{ __('admin.reject') }}
|
||||||
|
</flux:button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</flux:modal>
|
||||||
|
</div>
|
||||||
|
|
@ -60,6 +60,12 @@ Route::middleware(['auth', 'active'])->group(function () {
|
||||||
Volt::route('/{client}/edit', 'admin.clients.company.edit')->name('edit');
|
Volt::route('/{client}/edit', 'admin.clients.company.edit')->name('edit');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Bookings Management
|
||||||
|
Route::prefix('bookings')->name('admin.bookings.')->group(function () {
|
||||||
|
Volt::route('/pending', 'admin.bookings.pending')->name('pending');
|
||||||
|
Volt::route('/{consultation}', 'admin.bookings.review')->name('review');
|
||||||
|
});
|
||||||
|
|
||||||
// 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,389 @@
|
||||||
|
<?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\BookingApproved;
|
||||||
|
use App\Notifications\BookingRejected;
|
||||||
|
use Illuminate\Support\Facades\Notification;
|
||||||
|
use Livewire\Volt\Volt;
|
||||||
|
|
||||||
|
test('guest cannot access pending bookings page', function () {
|
||||||
|
$this->get(route('admin.bookings.pending'))
|
||||||
|
->assertRedirect(route('login'));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('client cannot access pending bookings page', function () {
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
$this->actingAs($client)
|
||||||
|
->get(route('admin.bookings.pending'))
|
||||||
|
->assertForbidden();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can access pending bookings page', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin)
|
||||||
|
->get(route('admin.bookings.pending'))
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('pending bookings list displays pending consultations', function () {
|
||||||
|
$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.bookings.pending')
|
||||||
|
->assertSee($client->full_name);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('pending bookings list does not show non-pending consultations', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
Consultation::factory()->approved()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.pending')
|
||||||
|
->assertDontSee($client->full_name);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can filter bookings 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()->pending()->create([
|
||||||
|
'user_id' => $oldClient->id,
|
||||||
|
'booking_date' => now()->subDays(10),
|
||||||
|
]);
|
||||||
|
Consultation::factory()->pending()->create([
|
||||||
|
'user_id' => $newClient->id,
|
||||||
|
'booking_date' => now()->addDays(5),
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.pending')
|
||||||
|
->set('dateFrom', now()->format('Y-m-d'))
|
||||||
|
->assertSee('New Client')
|
||||||
|
->assertDontSee('Old Client');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can access booking review page', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->pending()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin)
|
||||||
|
->get(route('admin.bookings.review', $consultation))
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can approve booking as free 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'free')
|
||||||
|
->call('approve')
|
||||||
|
->assertHasNoErrors()
|
||||||
|
->assertRedirect(route('admin.bookings.pending'));
|
||||||
|
|
||||||
|
expect($consultation->fresh())
|
||||||
|
->status->toBe(ConsultationStatus::Approved)
|
||||||
|
->consultation_type->toBe(ConsultationType::Free)
|
||||||
|
->payment_status->toBe(PaymentStatus::NotApplicable);
|
||||||
|
|
||||||
|
Notification::assertSentTo($client, BookingApproved::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can approve booking as paid consultation with amount', 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'paid')
|
||||||
|
->set('paymentAmount', '150.00')
|
||||||
|
->set('paymentInstructions', 'Bank transfer to account XYZ')
|
||||||
|
->call('approve')
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())
|
||||||
|
->status->toBe(ConsultationStatus::Approved)
|
||||||
|
->consultation_type->toBe(ConsultationType::Paid)
|
||||||
|
->payment_amount->toBe('150.00')
|
||||||
|
->payment_status->toBe(PaymentStatus::Pending);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('paid consultation requires payment amount', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->pending()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'paid')
|
||||||
|
->set('paymentAmount', null)
|
||||||
|
->call('approve')
|
||||||
|
->assertHasErrors(['paymentAmount']);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can reject booking with reason', 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('rejectionReason', 'Schedule conflict')
|
||||||
|
->call('reject')
|
||||||
|
->assertHasNoErrors()
|
||||||
|
->assertRedirect(route('admin.bookings.pending'));
|
||||||
|
|
||||||
|
expect($consultation->fresh())->status->toBe(ConsultationStatus::Rejected);
|
||||||
|
|
||||||
|
Notification::assertSentTo($client, BookingRejected::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('admin can reject booking without reason', 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->call('reject')
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())->status->toBe(ConsultationStatus::Rejected);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('quick approve from list works', 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.bookings.pending')
|
||||||
|
->call('quickApprove', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())
|
||||||
|
->status->toBe(ConsultationStatus::Approved)
|
||||||
|
->consultation_type->toBe(ConsultationType::Free);
|
||||||
|
|
||||||
|
Notification::assertSentTo($client, BookingApproved::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('quick reject from list works', 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.bookings.pending')
|
||||||
|
->call('quickReject', $consultation->id)
|
||||||
|
->assertHasNoErrors();
|
||||||
|
|
||||||
|
expect($consultation->fresh())->status->toBe(ConsultationStatus::Rejected);
|
||||||
|
|
||||||
|
Notification::assertSentTo($client, BookingRejected::class);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('audit log entry created on approval', 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'free')
|
||||||
|
->call('approve');
|
||||||
|
|
||||||
|
expect(AdminLog::query()
|
||||||
|
->where('admin_id', $admin->id)
|
||||||
|
->where('action', 'approve')
|
||||||
|
->where('target_type', 'consultation')
|
||||||
|
->where('target_id', $consultation->id)
|
||||||
|
->exists()
|
||||||
|
)->toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('audit log entry created on rejection', 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.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('rejectionReason', 'Not available')
|
||||||
|
->call('reject');
|
||||||
|
|
||||||
|
expect(AdminLog::query()
|
||||||
|
->where('admin_id', $admin->id)
|
||||||
|
->where('action', 'reject')
|
||||||
|
->where('target_type', 'consultation')
|
||||||
|
->where('target_id', $consultation->id)
|
||||||
|
->exists()
|
||||||
|
)->toBeTrue();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot approve already approved booking', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->approved()->create();
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
// Ensure status doesn't change
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->call('approve');
|
||||||
|
|
||||||
|
// Verify consultation status is still approved (not changed)
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Approved);
|
||||||
|
|
||||||
|
// Verify no duplicate notification was sent
|
||||||
|
Notification::assertNothingSent();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('cannot reject already rejected booking', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$consultation = Consultation::factory()->create([
|
||||||
|
'status' => ConsultationStatus::Rejected,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
// Ensure status doesn't change
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->call('reject');
|
||||||
|
|
||||||
|
// Verify consultation status is still rejected (not changed)
|
||||||
|
expect($consultation->fresh()->status)->toBe(ConsultationStatus::Rejected);
|
||||||
|
|
||||||
|
// Verify no notification was sent
|
||||||
|
Notification::assertNothingSent();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('booking details view shows client consultation history', function () {
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$client = User::factory()->individual()->create();
|
||||||
|
|
||||||
|
// Create past consultations
|
||||||
|
Consultation::factory()->completed()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
'booking_date' => now()->subMonth(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Create current pending consultation
|
||||||
|
$consultation = Consultation::factory()->pending()->create([
|
||||||
|
'user_id' => $client->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->assertOk();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('notification sent in client preferred language arabic', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$arabicClient = User::factory()->individual()->create([
|
||||||
|
'preferred_language' => 'ar',
|
||||||
|
]);
|
||||||
|
$consultation = Consultation::factory()->pending()->create([
|
||||||
|
'user_id' => $arabicClient->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'free')
|
||||||
|
->call('approve');
|
||||||
|
|
||||||
|
Notification::assertSentTo($arabicClient, BookingApproved::class, function ($notification) {
|
||||||
|
return $notification->consultation->user->preferred_language === 'ar';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test('notification sent in client preferred language english', function () {
|
||||||
|
Notification::fake();
|
||||||
|
|
||||||
|
$admin = User::factory()->admin()->create();
|
||||||
|
$englishClient = User::factory()->individual()->create([
|
||||||
|
'preferred_language' => 'en',
|
||||||
|
]);
|
||||||
|
$consultation = Consultation::factory()->pending()->create([
|
||||||
|
'user_id' => $englishClient->id,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->actingAs($admin);
|
||||||
|
|
||||||
|
Volt::test('admin.bookings.review', ['consultation' => $consultation])
|
||||||
|
->set('consultationType', 'free')
|
||||||
|
->call('approve');
|
||||||
|
|
||||||
|
Notification::assertSentTo($englishClient, BookingApproved::class, function ($notification) {
|
||||||
|
return $notification->consultation->user->preferred_language === 'en';
|
||||||
|
});
|
||||||
|
});
|
||||||
Loading…
Reference in New Issue