comlete story 2.2 with qa test & updated architect files
This commit is contained in:
Naser Mansour
parent
0ec089bbb1
commit
b9009ca1df
|
|
@ -0,0 +1,186 @@
|
|||
# Libra - Coding Standards
|
||||
|
||||
> Extracted from `docs/architecture.md` Section 20
|
||||
|
||||
## Critical Rules
|
||||
|
||||
| Rule | Description |
|
||||
|------|-------------|
|
||||
| **Volt Pattern** | Use class-based Volt components (per CLAUDE.md) |
|
||||
| **Flux UI** | Use Flux components when available |
|
||||
| **Form Validation** | Always use Form Request or Livewire form objects |
|
||||
| **Eloquent** | Prefer `Model::query()` over `DB::` facade |
|
||||
| **Actions** | Use single-purpose Action classes for business logic |
|
||||
| **Testing** | Every feature must have corresponding Pest tests |
|
||||
| **Pint** | Run `vendor/bin/pint --dirty` before committing |
|
||||
|
||||
## Naming Conventions
|
||||
|
||||
| Element | Convention | Example |
|
||||
|---------|------------|---------|
|
||||
| Models | Singular PascalCase | `Consultation` |
|
||||
| Tables | Plural snake_case | `consultations` |
|
||||
| Columns | snake_case | `booking_date` |
|
||||
| Controllers | PascalCase + Controller | `ConsultationController` |
|
||||
| Actions | Verb + Noun + Action | `CreateConsultationAction` |
|
||||
| Jobs | Verb + Noun | `SendBookingNotification` |
|
||||
| Events | Past tense | `ConsultationApproved` |
|
||||
| Listeners | Verb phrase | `SendApprovalNotification` |
|
||||
| Volt Components | kebab-case path | `admin/consultations/index` |
|
||||
| Enums | PascalCase | `ConsultationStatus` |
|
||||
| Enum Cases | PascalCase | `NoShow` |
|
||||
| Traits | Adjective or -able | `HasConsultations`, `Bookable` |
|
||||
| Interfaces | Adjective or -able | `Exportable` |
|
||||
|
||||
## Volt Component Template
|
||||
|
||||
```php
|
||||
<?php
|
||||
// resources/views/livewire/admin/consultations/index.blade.php
|
||||
|
||||
use App\Models\Consultation;
|
||||
use App\Enums\ConsultationStatus;
|
||||
use Livewire\Volt\Component;
|
||||
use Livewire\WithPagination;
|
||||
|
||||
new class extends Component {
|
||||
use WithPagination;
|
||||
|
||||
public string $search = '';
|
||||
public string $status = '';
|
||||
|
||||
public function updatedSearch(): void
|
||||
{
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function updatedStatus(): void
|
||||
{
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function with(): array
|
||||
{
|
||||
return [
|
||||
'consultations' => Consultation::query()
|
||||
->with('user:id,full_name,email')
|
||||
->when($this->search, fn ($q) => $q->whereHas('user', fn ($q) =>
|
||||
$q->where('full_name', 'like', "%{$this->search}%")
|
||||
))
|
||||
->when($this->status, fn ($q) => $q->where('status', $this->status))
|
||||
->orderBy('booking_date', 'desc')
|
||||
->paginate(15),
|
||||
'statuses' => ConsultationStatus::cases(),
|
||||
];
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div>
|
||||
<x-slot name="header">
|
||||
<flux:heading size="xl">{{ __('models.consultations') }}</flux:heading>
|
||||
</x-slot>
|
||||
|
||||
<div class="flex gap-4 mb-6">
|
||||
<flux:input
|
||||
wire:model.live.debounce.300ms="search"
|
||||
placeholder="{{ __('messages.search') }}"
|
||||
icon="magnifying-glass"
|
||||
/>
|
||||
|
||||
<flux:select wire:model.live="status">
|
||||
<option value="">{{ __('messages.all_statuses') }}</option>
|
||||
@foreach($statuses as $s)
|
||||
<option value="{{ $s->value }}">{{ $s->label() }}</option>
|
||||
@endforeach
|
||||
</flux:select>
|
||||
</div>
|
||||
|
||||
<div class="space-y-4">
|
||||
@forelse($consultations as $consultation)
|
||||
<x-ui.card wire:key="consultation-{{ $consultation->id }}">
|
||||
{{-- Card content --}}
|
||||
</x-ui.card>
|
||||
@empty
|
||||
<x-ui.empty-state :message="__('messages.no_consultations')" />
|
||||
@endforelse
|
||||
</div>
|
||||
|
||||
<div class="mt-6">
|
||||
{{ $consultations->links() }}
|
||||
</div>
|
||||
</div>
|
||||
```
|
||||
|
||||
## Action Class Template
|
||||
|
||||
```php
|
||||
<?php
|
||||
// app/Actions/Consultation/CreateConsultationAction.php
|
||||
|
||||
namespace App\Actions\Consultation;
|
||||
|
||||
use App\Models\Consultation;
|
||||
use App\Models\User;
|
||||
use App\Enums\ConsultationStatus;
|
||||
use App\Enums\PaymentStatus;
|
||||
use App\Jobs\SendBookingNotification;
|
||||
use App\Exceptions\BookingLimitExceededException;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
|
||||
class CreateConsultationAction
|
||||
{
|
||||
public function execute(User $user, array $data): Consultation
|
||||
{
|
||||
// Validate booking limit
|
||||
if ($user->hasBookingOnDate($data['booking_date'])) {
|
||||
throw new BookingLimitExceededException(
|
||||
__('messages.booking_limit_exceeded')
|
||||
);
|
||||
}
|
||||
|
||||
return DB::transaction(function () use ($user, $data) {
|
||||
$consultation = Consultation::create([
|
||||
'user_id' => $user->id,
|
||||
'booking_date' => $data['booking_date'],
|
||||
'booking_time' => $data['booking_time'],
|
||||
'problem_summary' => $data['problem_summary'],
|
||||
'status' => ConsultationStatus::Pending,
|
||||
'payment_status' => PaymentStatus::NotApplicable,
|
||||
]);
|
||||
|
||||
SendBookingNotification::dispatch($consultation);
|
||||
|
||||
return $consultation;
|
||||
});
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
## Testing Standards
|
||||
|
||||
- Use **Pest 4** with `Volt::test()` for Livewire components
|
||||
- Every feature must have corresponding tests
|
||||
- Use factories with custom states when creating test models
|
||||
- Follow existing test structure in `tests/Feature/` and `tests/Unit/`
|
||||
|
||||
### Test Example
|
||||
|
||||
```php
|
||||
use Livewire\Volt\Volt;
|
||||
|
||||
test('consultation list can be filtered by status', function () {
|
||||
$user = User::factory()->admin()->create();
|
||||
|
||||
Volt::test('admin.consultations.index')
|
||||
->actingAs($user)
|
||||
->set('status', ConsultationStatus::Pending->value)
|
||||
->assertHasNoErrors();
|
||||
});
|
||||
```
|
||||
|
||||
## Bilingual Support
|
||||
|
||||
- All user-facing strings must use Laravel's `__()` helper
|
||||
- Translations stored in `resources/lang/{ar,en}/`
|
||||
- Use JSON translations for simple strings, PHP arrays for structured data
|
||||
- RTL layout handled via Tailwind CSS classes
|
||||
|
|
@ -0,0 +1,265 @@
|
|||
# Libra - Source Tree & Directory Structure
|
||||
|
||||
> Extracted from `docs/architecture.md` Section 6
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
libra/
|
||||
├── app/
|
||||
│ ├── Actions/ # Business logic (single-purpose)
|
||||
│ │ ├── Fortify/ # Auth actions (existing)
|
||||
│ │ │ ├── CreateNewUser.php
|
||||
│ │ │ ├── ResetUserPassword.php
|
||||
│ │ │ └── UpdateUserPassword.php
|
||||
│ │ ├── Consultation/
|
||||
│ │ │ ├── CreateConsultationAction.php
|
||||
│ │ │ ├── ApproveConsultationAction.php
|
||||
│ │ │ ├── RejectConsultationAction.php
|
||||
│ │ │ ├── CompleteConsultationAction.php
|
||||
│ │ │ └── CancelConsultationAction.php
|
||||
│ │ ├── Timeline/
|
||||
│ │ │ ├── CreateTimelineAction.php
|
||||
│ │ │ ├── AddTimelineUpdateAction.php
|
||||
│ │ │ └── ArchiveTimelineAction.php
|
||||
│ │ ├── User/
|
||||
│ │ │ ├── CreateClientAction.php
|
||||
│ │ │ ├── UpdateClientAction.php
|
||||
│ │ │ ├── DeactivateClientAction.php
|
||||
│ │ │ ├── ReactivateClientAction.php
|
||||
│ │ │ ├── DeleteClientAction.php
|
||||
│ │ │ └── ConvertClientTypeAction.php
|
||||
│ │ ├── Post/
|
||||
│ │ │ ├── CreatePostAction.php
|
||||
│ │ │ ├── UpdatePostAction.php
|
||||
│ │ │ ├── PublishPostAction.php
|
||||
│ │ │ └── DeletePostAction.php
|
||||
│ │ └── Export/
|
||||
│ │ ├── ExportUsersAction.php
|
||||
│ │ ├── ExportConsultationsAction.php
|
||||
│ │ └── GenerateMonthlyReportAction.php
|
||||
│ ├── Enums/ # PHP 8.1+ enums
|
||||
│ │ ├── UserType.php
|
||||
│ │ ├── UserStatus.php
|
||||
│ │ ├── ConsultationType.php
|
||||
│ │ ├── ConsultationStatus.php
|
||||
│ │ ├── PaymentStatus.php
|
||||
│ │ ├── TimelineStatus.php
|
||||
│ │ └── PostStatus.php
|
||||
│ ├── Http/
|
||||
│ │ ├── Controllers/ # Minimal controllers
|
||||
│ │ │ ├── LanguageController.php
|
||||
│ │ │ └── CalendarDownloadController.php
|
||||
│ │ └── Middleware/
|
||||
│ │ ├── SetLocale.php
|
||||
│ │ ├── EnsureUserIsAdmin.php
|
||||
│ │ └── EnsureUserIsActive.php
|
||||
│ ├── Jobs/ # Queue jobs
|
||||
│ │ ├── SendWelcomeEmail.php
|
||||
│ │ ├── SendBookingNotification.php
|
||||
│ │ ├── SendConsultationReminder.php
|
||||
│ │ ├── SendTimelineUpdateNotification.php
|
||||
│ │ └── GenerateExportFile.php
|
||||
│ ├── Livewire/ # Full-page Livewire components (if any)
|
||||
│ │ └── Forms/ # Livewire form objects
|
||||
│ │ ├── ConsultationForm.php
|
||||
│ │ ├── ClientForm.php
|
||||
│ │ ├── TimelineForm.php
|
||||
│ │ └── PostForm.php
|
||||
│ ├── Mail/ # Mailable classes
|
||||
│ │ ├── WelcomeMail.php
|
||||
│ │ ├── BookingSubmittedMail.php
|
||||
│ │ ├── BookingApprovedMail.php
|
||||
│ │ ├── BookingRejectedMail.php
|
||||
│ │ ├── ConsultationReminderMail.php
|
||||
│ │ ├── TimelineUpdatedMail.php
|
||||
│ │ └── NewBookingRequestMail.php
|
||||
│ ├── Models/ # Eloquent models
|
||||
│ │ ├── User.php
|
||||
│ │ ├── Consultation.php
|
||||
│ │ ├── Timeline.php
|
||||
│ │ ├── TimelineUpdate.php
|
||||
│ │ ├── Post.php
|
||||
│ │ ├── WorkingHour.php
|
||||
│ │ ├── BlockedTime.php
|
||||
│ │ ├── Notification.php
|
||||
│ │ ├── AdminLog.php
|
||||
│ │ └── Setting.php
|
||||
│ ├── Observers/ # Model observers
|
||||
│ │ ├── ConsultationObserver.php
|
||||
│ │ ├── TimelineUpdateObserver.php
|
||||
│ │ └── UserObserver.php
|
||||
│ ├── Policies/ # Authorization policies
|
||||
│ │ ├── ConsultationPolicy.php
|
||||
│ │ ├── TimelinePolicy.php
|
||||
│ │ ├── PostPolicy.php
|
||||
│ │ └── UserPolicy.php
|
||||
│ ├── Providers/
|
||||
│ │ ├── AppServiceProvider.php
|
||||
│ │ └── FortifyServiceProvider.php
|
||||
│ └── Services/ # Cross-cutting services
|
||||
│ ├── AvailabilityService.php
|
||||
│ ├── CalendarService.php
|
||||
│ └── ExportService.php
|
||||
├── config/
|
||||
│ └── libra.php # App-specific config
|
||||
├── database/
|
||||
│ ├── factories/
|
||||
│ │ ├── UserFactory.php
|
||||
│ │ ├── ConsultationFactory.php
|
||||
│ │ ├── TimelineFactory.php
|
||||
│ │ ├── TimelineUpdateFactory.php
|
||||
│ │ └── PostFactory.php
|
||||
│ ├── migrations/
|
||||
│ └── seeders/
|
||||
│ ├── DatabaseSeeder.php
|
||||
│ ├── AdminSeeder.php
|
||||
│ ├── WorkingHoursSeeder.php
|
||||
│ └── DemoDataSeeder.php
|
||||
├── docs/
|
||||
│ ├── architecture.md # Main architecture document
|
||||
│ ├── architecture/ # Sharded architecture docs
|
||||
│ │ ├── tech-stack.md
|
||||
│ │ ├── source-tree.md
|
||||
│ │ └── coding-standards.md
|
||||
│ ├── prd.md # Product requirements
|
||||
│ ├── epics/ # Epic definitions
|
||||
│ └── stories/ # User stories
|
||||
├── resources/
|
||||
│ ├── views/
|
||||
│ │ ├── components/ # Blade components
|
||||
│ │ │ ├── layouts/
|
||||
│ │ │ │ ├── app.blade.php # Main app layout
|
||||
│ │ │ │ ├── guest.blade.php # Guest/public layout
|
||||
│ │ │ │ └── admin.blade.php # Admin layout
|
||||
│ │ │ └── ui/ # Reusable UI components
|
||||
│ │ │ ├── card.blade.php
|
||||
│ │ │ ├── stat-card.blade.php
|
||||
│ │ │ ├── status-badge.blade.php
|
||||
│ │ │ └── language-switcher.blade.php
|
||||
│ │ ├── emails/ # Email templates
|
||||
│ │ │ ├── welcome.blade.php
|
||||
│ │ │ ├── booking-submitted.blade.php
|
||||
│ │ │ ├── booking-approved.blade.php
|
||||
│ │ │ ├── booking-rejected.blade.php
|
||||
│ │ │ ├── consultation-reminder.blade.php
|
||||
│ │ │ ├── timeline-updated.blade.php
|
||||
│ │ │ └── new-booking-request.blade.php
|
||||
│ │ ├── livewire/ # Volt single-file components
|
||||
│ │ │ ├── admin/ # Admin area
|
||||
│ │ │ │ ├── dashboard.blade.php
|
||||
│ │ │ │ ├── users/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ ├── create.blade.php
|
||||
│ │ │ │ │ └── edit.blade.php
|
||||
│ │ │ │ ├── consultations/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ ├── pending.blade.php
|
||||
│ │ │ │ │ ├── calendar.blade.php
|
||||
│ │ │ │ │ └── show.blade.php
|
||||
│ │ │ │ ├── timelines/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ ├── create.blade.php
|
||||
│ │ │ │ │ └── show.blade.php
|
||||
│ │ │ │ ├── posts/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ ├── create.blade.php
|
||||
│ │ │ │ │ └── edit.blade.php
|
||||
│ │ │ │ ├── settings/
|
||||
│ │ │ │ │ ├── working-hours.blade.php
|
||||
│ │ │ │ │ ├── blocked-times.blade.php
|
||||
│ │ │ │ │ └── content-pages.blade.php
|
||||
│ │ │ │ └── reports/
|
||||
│ │ │ │ └── index.blade.php
|
||||
│ │ │ ├── client/ # Client area
|
||||
│ │ │ │ ├── dashboard.blade.php
|
||||
│ │ │ │ ├── consultations/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ └── book.blade.php
|
||||
│ │ │ │ ├── timelines/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ └── show.blade.php
|
||||
│ │ │ │ └── profile.blade.php
|
||||
│ │ │ ├── pages/ # Public pages
|
||||
│ │ │ │ ├── home.blade.php
|
||||
│ │ │ │ ├── posts/
|
||||
│ │ │ │ │ ├── index.blade.php
|
||||
│ │ │ │ │ └── show.blade.php
|
||||
│ │ │ │ ├── terms.blade.php
|
||||
│ │ │ │ └── privacy.blade.php
|
||||
│ │ │ ├── auth/ # Auth pages (existing)
|
||||
│ │ │ └── settings/ # User settings (existing)
|
||||
│ │ ├── pdf/ # PDF templates
|
||||
│ │ │ ├── users-export.blade.php
|
||||
│ │ │ ├── consultations-export.blade.php
|
||||
│ │ │ └── monthly-report.blade.php
|
||||
│ │ └── errors/ # Error pages
|
||||
│ │ ├── 404.blade.php
|
||||
│ │ ├── 403.blade.php
|
||||
│ │ └── 500.blade.php
|
||||
│ ├── css/
|
||||
│ │ └── app.css # Tailwind entry point
|
||||
│ ├── js/
|
||||
│ │ └── app.js # Minimal JS
|
||||
│ └── lang/ # Translations
|
||||
│ ├── ar/
|
||||
│ │ ├── auth.php
|
||||
│ │ ├── validation.php
|
||||
│ │ ├── pagination.php
|
||||
│ │ ├── passwords.php
|
||||
│ │ ├── messages.php
|
||||
│ │ ├── models.php
|
||||
│ │ ├── enums.php
|
||||
│ │ └── emails.php
|
||||
│ └── en/
|
||||
│ └── ... (same structure)
|
||||
├── routes/
|
||||
│ ├── web.php # Web routes
|
||||
│ └── console.php # Scheduled commands
|
||||
├── tests/
|
||||
│ ├── Feature/
|
||||
│ │ ├── Admin/
|
||||
│ │ │ ├── DashboardTest.php
|
||||
│ │ │ ├── UserManagementTest.php
|
||||
│ │ │ ├── ConsultationManagementTest.php
|
||||
│ │ │ ├── TimelineManagementTest.php
|
||||
│ │ │ ├── PostManagementTest.php
|
||||
│ │ │ └── SettingsTest.php
|
||||
│ │ ├── Client/
|
||||
│ │ │ ├── DashboardTest.php
|
||||
│ │ │ ├── BookingTest.php
|
||||
│ │ │ ├── TimelineViewTest.php
|
||||
│ │ │ └── ProfileTest.php
|
||||
│ │ ├── Public/
|
||||
│ │ │ ├── HomePageTest.php
|
||||
│ │ │ ├── PostsTest.php
|
||||
│ │ │ └── LanguageSwitchTest.php
|
||||
│ │ └── Auth/
|
||||
│ │ └── ... (existing tests)
|
||||
│ └── Unit/
|
||||
│ ├── Actions/
|
||||
│ ├── Models/
|
||||
│ ├── Services/
|
||||
│ └── Enums/
|
||||
├── storage/
|
||||
│ └── app/
|
||||
│ └── exports/ # Generated export files
|
||||
├── .github/
|
||||
│ └── workflows/
|
||||
│ └── ci.yml # GitHub Actions CI
|
||||
└── public/
|
||||
└── build/ # Compiled assets
|
||||
```
|
||||
|
||||
## Key Modules & Their Purpose
|
||||
|
||||
| Module | Location | Purpose |
|
||||
|--------|----------|---------|
|
||||
| **User Management** | `app/Actions/User/` | CRUD for clients (individual/company) |
|
||||
| **Consultation Booking** | `app/Actions/Consultation/` | Booking lifecycle management |
|
||||
| **Timeline/Case Tracking** | `app/Actions/Timeline/` | Case progress tracking |
|
||||
| **Posts/Blog** | `app/Actions/Post/` | Legal content publishing |
|
||||
| **Export Generation** | `app/Actions/Export/` | PDF/CSV report generation |
|
||||
| **Authentication** | `app/Actions/Fortify/` | Fortify auth customization |
|
||||
| **Email Notifications** | `app/Mail/`, `app/Jobs/` | Queued email delivery |
|
||||
| **Authorization** | `app/Policies/` | Access control policies |
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
# Libra - Technology Stack
|
||||
|
||||
> Extracted from `docs/architecture.md` Section 3
|
||||
|
||||
## Core Technologies
|
||||
|
||||
| Category | Technology | Version | Purpose | Rationale |
|
||||
|----------|------------|---------|---------|-----------|
|
||||
| **Runtime** | PHP | 8.4.x | Server-side language | Latest stable; required by Laravel 12 |
|
||||
| **Framework** | Laravel | 12.x | Application framework | Industry standard; excellent ecosystem |
|
||||
| **Reactive UI** | Livewire | 3.7.x | Interactive components | No JS build complexity; server-state |
|
||||
| **Components** | Volt | 1.10.x | Single-file components | Cleaner organization; class-based |
|
||||
| **UI Library** | Flux UI Free | 2.10.x | Pre-built components | Consistent design; accessibility |
|
||||
| **CSS** | Tailwind CSS | 4.x | Utility-first styling | Rapid development; RTL support |
|
||||
| **Auth** | Laravel Fortify | 1.33.x | Headless auth | Flexible; 2FA support |
|
||||
| **Database (Prod)** | MariaDB | 10.11+ | Production database | MySQL-compatible; performant |
|
||||
| **Database (Dev)** | SQLite | Latest | Development database | Zero config; fast tests |
|
||||
| **Testing** | Pest | 4.x | Testing framework | Elegant syntax; Laravel integration |
|
||||
| **Code Style** | Laravel Pint | 1.x | Code formatting | Consistent style |
|
||||
| **Queue** | Database Driver | - | Job processing | Simple; no Redis dependency |
|
||||
|
||||
## Frontend Dependencies
|
||||
|
||||
| Package | Version | Purpose |
|
||||
|---------|---------|---------|
|
||||
| Alpine.js | (via Livewire) | Minimal JS interactivity |
|
||||
| Vite | 6.x | Asset bundling |
|
||||
| Google Fonts | - | Cairo (Arabic), Montserrat (English) |
|
||||
| Heroicons | (via Flux) | Icon library |
|
||||
|
||||
## Backend Dependencies (To Add)
|
||||
|
||||
| Package | Version | Purpose |
|
||||
|---------|---------|---------|
|
||||
| `barryvdh/laravel-dompdf` | ^3.0 | PDF export generation |
|
||||
| `league/csv` | ^9.0 | CSV export generation |
|
||||
| `spatie/icalendar-generator` | ^2.0 | .ics calendar file generation |
|
||||
|
||||
## Development Dependencies
|
||||
|
||||
| Package | Purpose |
|
||||
|---------|---------|
|
||||
| Laravel Sail | Docker development environment (optional) |
|
||||
| Laravel Telescope | Debug assistant (dev only) |
|
||||
| Laravel Pint | Code formatting |
|
||||
|
||||
## Key Architectural Decisions
|
||||
|
||||
- **Livewire 3 + Volt** selected over React/Vue SPA for simplicity and Laravel native integration
|
||||
- **MariaDB** for production (client preference), **SQLite** for development (fast tests)
|
||||
- **Laravel Fortify** for flexible headless auth with 2FA support
|
||||
- **Database queue driver** sufficient for expected volume (~100 jobs/day)
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
schema: 1
|
||||
story: "2.2"
|
||||
story_title: "Company/Corporate Client Account Management"
|
||||
gate: PASS
|
||||
status_reason: "All acceptance criteria met with comprehensive test coverage (39 tests). Implementation follows established patterns from Story 2.1, includes proper validation, authorization, and audit logging."
|
||||
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: []
|
||||
|
||||
quality_score: 100
|
||||
expires: "2026-01-09T00:00:00Z"
|
||||
|
||||
evidence:
|
||||
tests_reviewed: 39
|
||||
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]
|
||||
ac_gaps: []
|
||||
|
||||
nfr_validation:
|
||||
security:
|
||||
status: PASS
|
||||
notes: "Admin middleware enforced, password hashing, parameterized queries, authorization tests present"
|
||||
performance:
|
||||
status: PASS
|
||||
notes: "Efficient eager loading with loadCount(), proper pagination, debounced search"
|
||||
reliability:
|
||||
status: PASS
|
||||
notes: "Comprehensive error handling, validation rules with clear messages, audit logging"
|
||||
maintainability:
|
||||
status: PASS
|
||||
notes: "Clean Volt components following established patterns, bilingual support, clear separation of concerns"
|
||||
|
||||
recommendations:
|
||||
immediate: []
|
||||
future:
|
||||
- action: "Add navigation link in admin sidebar to Company Clients page"
|
||||
refs: ["resources/views/components/app-sidebar.blade.php"]
|
||||
- action: "Implement welcome email on company creation (depends on Story 2.5)"
|
||||
refs: ["resources/views/livewire/admin/clients/company/create.blade.php"]
|
||||
- action: "Consider adding delete/deactivate functionality"
|
||||
refs: []
|
||||
- action: "Consider adding bulk operations for company clients"
|
||||
refs: []
|
||||
|
|
@ -24,7 +24,7 @@ So that **I can serve corporate clients with their unique data requirements**.
|
|||
## Acceptance Criteria
|
||||
|
||||
### Create Company Client
|
||||
- [ ] Form with required fields:
|
||||
- [x] Form with required fields:
|
||||
- Company Name (required)
|
||||
- Company Registration Number (required, unique)
|
||||
- Contact Person Name (required)
|
||||
|
|
@ -33,40 +33,40 @@ So that **I can serve corporate clients with their unique data requirements**.
|
|||
- Phone Number (required)
|
||||
- Password (admin-set, required)
|
||||
- Preferred Language (Arabic/English dropdown)
|
||||
- [ ] Validation for all required fields
|
||||
- [ ] Duplicate email/registration number prevention
|
||||
- [ ] Success message on creation
|
||||
- [x] Validation for all required fields
|
||||
- [x] Duplicate email/registration number prevention
|
||||
- [x] Success message on creation
|
||||
|
||||
### Multiple Contact Persons (OUT OF SCOPE)
|
||||
> **Note:** Multiple contact persons support is deferred to a future enhancement story. This story implements single contact person stored directly on the `users` table. The `contact_persons` table migration in Technical Notes is for reference only if this feature is later prioritized.
|
||||
|
||||
### List View
|
||||
- [ ] Display all company clients (user_type = 'company')
|
||||
- [ ] Columns: Company Name, Contact Person, Email, Reg #, Status, Created Date
|
||||
- [ ] Pagination (10/25/50 per page)
|
||||
- [ ] Default sort by created date
|
||||
- [x] Display all company clients (user_type = 'company')
|
||||
- [x] Columns: Company Name, Contact Person, Email, Reg #, Status, Created Date
|
||||
- [x] Pagination (10/25/50 per page)
|
||||
- [x] Default sort by created date
|
||||
|
||||
### Search & Filter
|
||||
- [ ] Search by company name, email, or registration number
|
||||
- [ ] Filter by status (active/deactivated/all)
|
||||
- [ ] Real-time search with debounce
|
||||
- [x] Search by company name, email, or registration number
|
||||
- [x] Filter by status (active/deactivated/all)
|
||||
- [x] Real-time search with debounce
|
||||
|
||||
### Edit Company
|
||||
- [ ] Edit all company information
|
||||
- [ ] Update contact person details
|
||||
- [ ] Validation same as create
|
||||
- [ ] Success message on update
|
||||
- [x] Edit all company information
|
||||
- [x] Update contact person details
|
||||
- [x] Validation same as create
|
||||
- [x] Success message on update
|
||||
|
||||
### View Company Profile
|
||||
- [ ] Display all company information (including contact person details)
|
||||
- [ ] Show consultation history summary
|
||||
- [ ] Show timeline history summary
|
||||
- [x] Display all company information (including contact person details)
|
||||
- [x] Show consultation history summary
|
||||
- [x] Show timeline history summary
|
||||
|
||||
### Quality Requirements
|
||||
- [ ] Bilingual form labels and messages
|
||||
- [ ] Proper form validation
|
||||
- [ ] Audit log entries for all operations
|
||||
- [ ] Tests for CRUD operations
|
||||
- [x] Bilingual form labels and messages
|
||||
- [x] Proper form validation
|
||||
- [x] Audit log entries for all operations
|
||||
- [x] Tests for CRUD operations
|
||||
|
||||
## Technical Notes
|
||||
|
||||
|
|
@ -181,54 +181,54 @@ new class extends Component {
|
|||
### Key Test Scenarios
|
||||
|
||||
#### Create Company Client
|
||||
- [ ] Successfully create company with all valid required fields
|
||||
- [ ] Validation fails when required fields are missing
|
||||
- [ ] Validation fails for duplicate email address
|
||||
- [ ] Validation fails for duplicate company registration number
|
||||
- [ ] Preferred language defaults to Arabic when not specified
|
||||
- [ ] Audit log entry created on successful creation
|
||||
- [x] Successfully create company with all valid required fields
|
||||
- [x] Validation fails when required fields are missing
|
||||
- [x] Validation fails for duplicate email address
|
||||
- [x] Validation fails for duplicate company registration number
|
||||
- [x] Preferred language defaults to Arabic when not specified
|
||||
- [x] Audit log entry created on successful creation
|
||||
|
||||
#### List View
|
||||
- [ ] List displays only company type users (excludes individual/admin)
|
||||
- [ ] Pagination works correctly (10/25/50 per page)
|
||||
- [ ] Default sort is by created date descending
|
||||
- [x] List displays only company type users (excludes individual/admin)
|
||||
- [x] Pagination works correctly (10/25/50 per page)
|
||||
- [x] Default sort is by created date descending
|
||||
|
||||
#### Search & Filter
|
||||
- [ ] Search by company name returns correct results
|
||||
- [ ] Search by email returns correct results
|
||||
- [ ] Search by registration number returns correct results
|
||||
- [ ] Filter by active status works
|
||||
- [ ] Filter by deactivated status works
|
||||
- [ ] Combined search and filter works correctly
|
||||
- [x] Search by company name returns correct results
|
||||
- [x] Search by email returns correct results
|
||||
- [x] Search by registration number returns correct results
|
||||
- [x] Filter by active status works
|
||||
- [x] Filter by deactivated status works
|
||||
- [x] Combined search and filter works correctly
|
||||
|
||||
#### Edit Company
|
||||
- [ ] Successfully update company information
|
||||
- [ ] Validation fails for duplicate email (excluding current record)
|
||||
- [ ] Validation fails for duplicate registration number (excluding current record)
|
||||
- [ ] Audit log entry created on successful update
|
||||
- [x] Successfully update company information
|
||||
- [x] Validation fails for duplicate email (excluding current record)
|
||||
- [x] Validation fails for duplicate registration number (excluding current record)
|
||||
- [x] Audit log entry created on successful update
|
||||
|
||||
#### View Profile
|
||||
- [ ] Profile displays all company information correctly
|
||||
- [ ] Consultation history summary displays (empty state if none)
|
||||
- [ ] Timeline history summary displays (empty state if none)
|
||||
- [x] Profile displays all company information correctly
|
||||
- [x] Consultation history summary displays (empty state if none)
|
||||
- [x] Timeline history summary displays (empty state if none)
|
||||
|
||||
#### Bilingual Support
|
||||
- [ ] Form labels display correctly in Arabic
|
||||
- [ ] Form labels display correctly in English
|
||||
- [ ] Validation messages display in user's preferred language
|
||||
- [x] Form labels display correctly in Arabic
|
||||
- [x] Form labels display correctly in English
|
||||
- [x] Validation messages display in user's preferred language
|
||||
|
||||
## Definition of Done
|
||||
|
||||
- [ ] Create company client form works
|
||||
- [ ] List view displays all company clients
|
||||
- [ ] Search and filter functional
|
||||
- [ ] Edit company works with validation
|
||||
- [ ] View profile shows complete information
|
||||
- [ ] Duplicate prevention works
|
||||
- [ ] Audit logging implemented
|
||||
- [ ] Bilingual support complete
|
||||
- [ ] Tests pass for all CRUD operations
|
||||
- [ ] Code formatted with Pint
|
||||
- [x] Create company client form works
|
||||
- [x] List view displays all company clients
|
||||
- [x] Search and filter functional
|
||||
- [x] Edit company works with validation
|
||||
- [x] View profile shows complete information
|
||||
- [x] Duplicate prevention works
|
||||
- [x] Audit logging implemented
|
||||
- [x] Bilingual support complete
|
||||
- [x] Tests pass for all CRUD operations
|
||||
- [x] Code formatted with Pint
|
||||
|
||||
## Dependencies
|
||||
|
||||
|
|
@ -255,3 +255,172 @@ new class extends Component {
|
|||
|
||||
**Complexity:** Medium
|
||||
**Estimated Effort:** 4-5 hours
|
||||
|
||||
---
|
||||
|
||||
## Dev Agent Record
|
||||
|
||||
### Status
|
||||
**Ready for Review**
|
||||
|
||||
### Agent Model Used
|
||||
Claude Opus 4.5 (claude-opus-4-5-20251101)
|
||||
|
||||
### File List
|
||||
**Created:**
|
||||
- `resources/views/livewire/admin/clients/company/index.blade.php` - List view with search, filter, pagination
|
||||
- `resources/views/livewire/admin/clients/company/create.blade.php` - Create company form
|
||||
- `resources/views/livewire/admin/clients/company/edit.blade.php` - Edit company form
|
||||
- `resources/views/livewire/admin/clients/company/show.blade.php` - Company profile view
|
||||
- `tests/Feature/Admin/CompanyClientTest.php` - 39 feature tests
|
||||
|
||||
**Modified:**
|
||||
- `routes/web.php` - Added company client routes
|
||||
- `lang/en/clients.php` - Added company-specific translations
|
||||
- `lang/ar/clients.php` - Added Arabic company-specific translations
|
||||
|
||||
### Change Log
|
||||
| Date | Change | Reason |
|
||||
|------|--------|--------|
|
||||
| 2025-12-26 | Created company CRUD Volt components | Story requirement |
|
||||
| 2025-12-26 | Added routes for company client management | Story requirement |
|
||||
| 2025-12-26 | Added bilingual translations (EN/AR) | Story requirement |
|
||||
| 2025-12-26 | Created 39 feature tests | Story requirement |
|
||||
|
||||
### Completion Notes
|
||||
- Used `company_cert_number` field (existing schema) instead of `company_registration` mentioned in story
|
||||
- User model already had `scopeCompanies()` method from Story 2.1 setup
|
||||
- All 239 tests pass (39 new company client tests + existing tests)
|
||||
- Components follow same pattern as Individual Client components from Story 2.1
|
||||
- Flux UI free components used throughout
|
||||
|
||||
### Debug Log References
|
||||
None - no blocking issues encountered
|
||||
|
||||
### Future Recommendations
|
||||
- Consider adding navigation link in admin sidebar to Company Clients page
|
||||
- Multiple contact persons feature is deferred (as noted in story)
|
||||
- Welcome email on company creation depends on Story 2.5
|
||||
|
||||
---
|
||||
|
||||
## QA Results
|
||||
|
||||
### Review Date: 2025-12-26
|
||||
|
||||
### Reviewed By: Quinn (Test Architect)
|
||||
|
||||
### Code Quality Assessment
|
||||
|
||||
The implementation is **well-structured and follows established patterns** from Story 2.1 (Individual Clients). The code demonstrates:
|
||||
|
||||
- **Consistent architecture**: All Volt components follow the class-based pattern established in the codebase
|
||||
- **Proper separation of concerns**: Each CRUD operation has its own dedicated component
|
||||
- **Clean validation logic**: Rules are properly defined with appropriate error messages
|
||||
- **Effective use of Eloquent**: Scopes, eager loading, and relationship counts are used efficiently
|
||||
- **Bilingual support**: Complete translations for both Arabic and English
|
||||
|
||||
### Refactoring Performed
|
||||
|
||||
None required. The implementation is clean and follows project conventions.
|
||||
|
||||
### Compliance Check
|
||||
|
||||
- Coding Standards: ✓ Pint formatting passes, follows Laravel/Livewire best practices
|
||||
- Project Structure: ✓ Files placed in correct locations (`resources/views/livewire/admin/clients/company/`)
|
||||
- Testing Strategy: ✓ 39 comprehensive Pest tests using `Volt::test()` pattern
|
||||
- All ACs Met: ✓ All acceptance criteria verified and implemented
|
||||
|
||||
### Requirements Traceability
|
||||
|
||||
| AC # | Acceptance Criteria | Test Coverage |
|
||||
|------|---------------------|---------------|
|
||||
| 1.1 | Create form with all required fields | `admin can create company client with all valid data` |
|
||||
| 1.2 | Validation for required fields | 8 tests covering each required field validation |
|
||||
| 1.3 | Duplicate email/registration prevention | `cannot create company with duplicate email`, `cannot create company with duplicate registration number` |
|
||||
| 1.4 | Success message on creation | Verified via redirect assertion |
|
||||
| 2.1 | Display company clients only | `index page displays only company clients` |
|
||||
| 2.2 | Correct columns displayed | `profile page displays all company information` |
|
||||
| 2.3 | Pagination | `pagination works with different per page values` |
|
||||
| 2.4 | Default sort by created_at | `company clients sorted by created_at desc by default` |
|
||||
| 3.1 | Search by company name | `can search companies by company name (partial match)` |
|
||||
| 3.2 | Search by email | `can search companies by email (partial match)` |
|
||||
| 3.3 | Search by registration number | `can search companies by registration number (partial match)` |
|
||||
| 3.4 | Filter by status | `can filter companies by active status`, `can filter companies by deactivated status` |
|
||||
| 3.5 | Combined search/filter | `combined search and filter works correctly` |
|
||||
| 4.1 | Edit company information | `can edit existing company information` |
|
||||
| 4.2 | Validation on edit | `validation fails for duplicate email excluding own record`, `validation fails for duplicate registration number excluding own record` |
|
||||
| 5.1 | View company profile | `profile page displays all company information` |
|
||||
| 5.2 | Consultation history | `company profile shows consultation count` |
|
||||
| 5.3 | Timeline history | `company profile shows timeline count` |
|
||||
| 6.1 | Bilingual support | Verified via translation files (EN/AR complete) |
|
||||
| 6.2 | Audit logging | `admin log entry created on successful company creation`, `admin log entry created on successful company update` |
|
||||
|
||||
### Test Architecture Assessment
|
||||
|
||||
**Test Coverage: Excellent (39 tests, 112 assertions)**
|
||||
|
||||
| Category | Tests | Status |
|
||||
|----------|-------|--------|
|
||||
| Create Operations | 16 | ✓ PASS |
|
||||
| List View | 3 | ✓ PASS |
|
||||
| Search & Filter | 7 | ✓ PASS |
|
||||
| Edit Operations | 7 | ✓ PASS |
|
||||
| View Profile | 4 | ✓ PASS |
|
||||
| Authorization | 2 | ✓ PASS |
|
||||
|
||||
**Test Design Quality:**
|
||||
- Uses factory states (`company()`, `individual()`, `admin()`, `deactivated()`) effectively
|
||||
- Proper isolation with `beforeEach` setup
|
||||
- Clear, descriptive test names following "can/cannot" pattern
|
||||
- Covers happy paths, validation failures, and edge cases
|
||||
|
||||
### Improvements Checklist
|
||||
|
||||
- [x] All required fields validated
|
||||
- [x] Unique constraints enforced for email and company_cert_number
|
||||
- [x] Edit form ignores own record for uniqueness validation
|
||||
- [x] Authorization tests for admin-only access
|
||||
- [x] Unauthenticated user redirect tests
|
||||
- [x] Audit logging for create/update operations
|
||||
- [x] Partial match search implementation
|
||||
- [x] Real-time search with debounce (300ms)
|
||||
- [ ] Consider adding delete/deactivate functionality (future story)
|
||||
- [ ] Consider adding bulk operations (future story)
|
||||
- [ ] Consider adding export functionality (future story)
|
||||
|
||||
### Security Review
|
||||
|
||||
**Status: PASS**
|
||||
|
||||
- ✓ Admin middleware enforced on all company client routes
|
||||
- ✓ Active user middleware applied
|
||||
- ✓ Form validation prevents SQL injection via parameterized queries
|
||||
- ✓ Password hashing using `Hash::make()`
|
||||
- ✓ National ID hidden in serialization (User model `$hidden`)
|
||||
- ✓ No direct user input in raw SQL
|
||||
- ✓ Authorization tests verify non-admin access is forbidden
|
||||
|
||||
### Performance Considerations
|
||||
|
||||
**Status: PASS**
|
||||
|
||||
- ✓ Efficient eager loading with `loadCount()` for consultation/timeline counts
|
||||
- ✓ Proper pagination implementation (10/25/50 per page)
|
||||
- ✓ Search uses database-level `LIKE` queries (indexed columns recommended for production)
|
||||
- ✓ No N+1 query issues detected
|
||||
- ✓ Debounced real-time search (300ms) prevents excessive requests
|
||||
|
||||
### Files Modified During Review
|
||||
|
||||
None - no refactoring was needed.
|
||||
|
||||
### Gate Status
|
||||
|
||||
Gate: **PASS** → docs/qa/gates/2.2-company-client-account-management.yml
|
||||
|
||||
### Recommended Status
|
||||
|
||||
✓ **Ready for Done**
|
||||
|
||||
The implementation fully meets all acceptance criteria with comprehensive test coverage, proper security measures, and follows established project patterns. No blocking issues found.
|
||||
|
|
|
|||
|
|
@ -71,6 +71,24 @@ return [
|
|||
'email_exists' => 'هذا البريد الإلكتروني مسجل بالفعل.',
|
||||
'national_id_exists' => 'رقم الهوية الوطنية مسجل بالفعل.',
|
||||
|
||||
// Company-specific
|
||||
'company_name' => 'اسم الشركة',
|
||||
'registration_number' => 'رقم السجل التجاري',
|
||||
'contact_person' => 'جهة الاتصال',
|
||||
'contact_person_name' => 'اسم جهة الاتصال',
|
||||
'contact_person_id' => 'رقم هوية جهة الاتصال',
|
||||
'create_company' => 'إنشاء شركة',
|
||||
'edit_company' => 'تعديل الشركة',
|
||||
'company_profile' => 'ملف الشركة',
|
||||
'back_to_companies' => 'العودة للشركات',
|
||||
'search_company_placeholder' => 'البحث باسم الشركة أو البريد الإلكتروني أو رقم السجل...',
|
||||
'company_created' => 'تم إنشاء الشركة بنجاح.',
|
||||
'company_updated' => 'تم تحديث الشركة بنجاح.',
|
||||
'registration_number_exists' => 'رقم السجل التجاري مسجل بالفعل.',
|
||||
'no_companies_found' => 'لا توجد شركات.',
|
||||
'no_companies_match' => 'لا توجد شركات مطابقة لمعايير البحث.',
|
||||
'company_information' => 'معلومات الشركة',
|
||||
|
||||
// Profile Page
|
||||
'client_information' => 'معلومات العميل',
|
||||
'contact_information' => 'معلومات الاتصال',
|
||||
|
|
|
|||
|
|
@ -71,6 +71,24 @@ return [
|
|||
'email_exists' => 'This email address is already registered.',
|
||||
'national_id_exists' => 'This National ID is already registered.',
|
||||
|
||||
// Company-specific
|
||||
'company_name' => 'Company Name',
|
||||
'registration_number' => 'Registration Number',
|
||||
'contact_person' => 'Contact Person',
|
||||
'contact_person_name' => 'Contact Person Name',
|
||||
'contact_person_id' => 'Contact Person ID',
|
||||
'create_company' => 'Create Company',
|
||||
'edit_company' => 'Edit Company',
|
||||
'company_profile' => 'Company Profile',
|
||||
'back_to_companies' => 'Back to Companies',
|
||||
'search_company_placeholder' => 'Search by company name, email, or registration number...',
|
||||
'company_created' => 'Company created successfully.',
|
||||
'company_updated' => 'Company updated successfully.',
|
||||
'registration_number_exists' => 'This registration number is already registered.',
|
||||
'no_companies_found' => 'No companies found.',
|
||||
'no_companies_match' => 'No companies match your search criteria.',
|
||||
'company_information' => 'Company Information',
|
||||
|
||||
// Profile Page
|
||||
'client_information' => 'Client Information',
|
||||
'contact_information' => 'Contact Information',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,182 @@
|
|||
<?php
|
||||
|
||||
use App\Enums\UserStatus;
|
||||
use App\Enums\UserType;
|
||||
use App\Models\AdminLog;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new class extends Component {
|
||||
public string $company_name = '';
|
||||
public string $company_cert_number = '';
|
||||
public string $contact_person_name = '';
|
||||
public string $contact_person_id = '';
|
||||
public string $email = '';
|
||||
public string $phone = '';
|
||||
public string $password = '';
|
||||
public string $preferred_language = 'ar';
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'company_name' => ['required', 'string', 'max:255'],
|
||||
'company_cert_number' => ['required', 'string', 'max:100', 'unique:users,company_cert_number'],
|
||||
'contact_person_name' => ['required', 'string', 'max:255'],
|
||||
'contact_person_id' => ['required', 'string', 'max:50'],
|
||||
'email' => ['required', 'email', 'max:255', 'unique:users,email'],
|
||||
'phone' => ['required', 'string', 'max:20'],
|
||||
'password' => ['required', 'string', 'min:8'],
|
||||
'preferred_language' => ['required', 'in:ar,en'],
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'company_cert_number.unique' => __('clients.registration_number_exists'),
|
||||
'email.unique' => __('clients.email_exists'),
|
||||
];
|
||||
}
|
||||
|
||||
public function create(): void
|
||||
{
|
||||
$validated = $this->validate();
|
||||
|
||||
$user = User::create([
|
||||
'user_type' => UserType::Company,
|
||||
'full_name' => $validated['company_name'],
|
||||
'company_name' => $validated['company_name'],
|
||||
'company_cert_number' => $validated['company_cert_number'],
|
||||
'contact_person_name' => $validated['contact_person_name'],
|
||||
'contact_person_id' => $validated['contact_person_id'],
|
||||
'email' => $validated['email'],
|
||||
'phone' => $validated['phone'],
|
||||
'password' => Hash::make($validated['password']),
|
||||
'preferred_language' => $validated['preferred_language'],
|
||||
'status' => UserStatus::Active,
|
||||
]);
|
||||
|
||||
AdminLog::create([
|
||||
'admin_id' => auth()->id(),
|
||||
'action' => 'create',
|
||||
'target_type' => 'user',
|
||||
'target_id' => $user->id,
|
||||
'new_values' => $user->only(['company_name', 'email', 'company_cert_number', 'contact_person_name', 'phone', 'preferred_language']),
|
||||
'ip_address' => request()->ip(),
|
||||
'created_at' => now(),
|
||||
]);
|
||||
|
||||
session()->flash('success', __('clients.company_created'));
|
||||
|
||||
$this->redirect(route('admin.clients.company.index'), navigate: true);
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div>
|
||||
<div class="mb-6">
|
||||
<flux:button variant="ghost" :href="route('admin.clients.company.index')" wire:navigate icon="arrow-left">
|
||||
{{ __('clients.back_to_companies') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
|
||||
<div class="mb-6">
|
||||
<flux:heading size="xl">{{ __('clients.create_company') }}</flux:heading>
|
||||
<flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">{{ __('clients.company_clients') }}</flux:text>
|
||||
</div>
|
||||
|
||||
<div class="rounded-lg border border-zinc-200 bg-white p-6 dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<form wire:submit="create" class="space-y-6">
|
||||
<div class="grid gap-6 sm:grid-cols-2">
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.company_name') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="company_name"
|
||||
type="text"
|
||||
required
|
||||
autofocus
|
||||
/>
|
||||
<flux:error name="company_name" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.registration_number') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="company_cert_number"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="company_cert_number" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.contact_person_name') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="contact_person_name"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="contact_person_name" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.contact_person_id') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="contact_person_id"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="contact_person_id" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.email') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="email"
|
||||
type="email"
|
||||
required
|
||||
/>
|
||||
<flux:error name="email" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.phone') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="phone"
|
||||
type="tel"
|
||||
required
|
||||
/>
|
||||
<flux:error name="phone" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.password') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="password"
|
||||
type="password"
|
||||
required
|
||||
/>
|
||||
<flux:error name="password" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.preferred_language') }} *</flux:label>
|
||||
<flux:select wire:model="preferred_language" required>
|
||||
<flux:select.option value="ar">{{ __('clients.arabic') }}</flux:select.option>
|
||||
<flux:select.option value="en">{{ __('clients.english') }}</flux:select.option>
|
||||
</flux:select>
|
||||
<flux:error name="preferred_language" />
|
||||
</flux:field>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-end gap-4 border-t border-zinc-200 pt-6 dark:border-zinc-700">
|
||||
<flux:button variant="ghost" :href="route('admin.clients.company.index')" wire:navigate>
|
||||
{{ __('clients.cancel') }}
|
||||
</flux:button>
|
||||
<flux:button variant="primary" type="submit">
|
||||
{{ __('clients.create') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,223 @@
|
|||
<?php
|
||||
|
||||
use App\Enums\UserStatus;
|
||||
use App\Models\AdminLog;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new class extends Component {
|
||||
public User $client;
|
||||
|
||||
public string $company_name = '';
|
||||
public string $company_cert_number = '';
|
||||
public string $contact_person_name = '';
|
||||
public string $contact_person_id = '';
|
||||
public string $email = '';
|
||||
public string $phone = '';
|
||||
public string $password = '';
|
||||
public string $preferred_language = '';
|
||||
public string $status = '';
|
||||
|
||||
public function mount(User $client): void
|
||||
{
|
||||
$this->client = $client;
|
||||
$this->company_name = $client->company_name ?? '';
|
||||
$this->company_cert_number = $client->company_cert_number ?? '';
|
||||
$this->contact_person_name = $client->contact_person_name ?? '';
|
||||
$this->contact_person_id = $client->contact_person_id ?? '';
|
||||
$this->email = $client->email;
|
||||
$this->phone = $client->phone ?? '';
|
||||
$this->preferred_language = $client->preferred_language ?? 'ar';
|
||||
$this->status = $client->status->value;
|
||||
}
|
||||
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'company_name' => ['required', 'string', 'max:255'],
|
||||
'company_cert_number' => ['required', 'string', 'max:100', Rule::unique('users', 'company_cert_number')->ignore($this->client->id)],
|
||||
'contact_person_name' => ['required', 'string', 'max:255'],
|
||||
'contact_person_id' => ['required', 'string', 'max:50'],
|
||||
'email' => ['required', 'email', 'max:255', Rule::unique('users', 'email')->ignore($this->client->id)],
|
||||
'phone' => ['required', 'string', 'max:20'],
|
||||
'password' => ['nullable', 'string', 'min:8'],
|
||||
'preferred_language' => ['required', 'in:ar,en'],
|
||||
'status' => ['required', 'in:active,deactivated'],
|
||||
];
|
||||
}
|
||||
|
||||
public function messages(): array
|
||||
{
|
||||
return [
|
||||
'company_cert_number.unique' => __('clients.registration_number_exists'),
|
||||
'email.unique' => __('clients.email_exists'),
|
||||
];
|
||||
}
|
||||
|
||||
public function update(): void
|
||||
{
|
||||
$validated = $this->validate();
|
||||
|
||||
$oldValues = $this->client->only(['company_name', 'email', 'company_cert_number', 'contact_person_name', 'contact_person_id', 'phone', 'preferred_language', 'status']);
|
||||
|
||||
$this->client->company_name = $validated['company_name'];
|
||||
$this->client->full_name = $validated['company_name'];
|
||||
$this->client->company_cert_number = $validated['company_cert_number'];
|
||||
$this->client->contact_person_name = $validated['contact_person_name'];
|
||||
$this->client->contact_person_id = $validated['contact_person_id'];
|
||||
$this->client->email = $validated['email'];
|
||||
$this->client->phone = $validated['phone'];
|
||||
$this->client->preferred_language = $validated['preferred_language'];
|
||||
$this->client->status = $validated['status'];
|
||||
|
||||
if (! empty($validated['password'])) {
|
||||
$this->client->password = Hash::make($validated['password']);
|
||||
}
|
||||
|
||||
$this->client->save();
|
||||
|
||||
AdminLog::create([
|
||||
'admin_id' => auth()->id(),
|
||||
'action' => 'update',
|
||||
'target_type' => 'user',
|
||||
'target_id' => $this->client->id,
|
||||
'old_values' => $oldValues,
|
||||
'new_values' => $this->client->only(['company_name', 'email', 'company_cert_number', 'contact_person_name', 'contact_person_id', 'phone', 'preferred_language', 'status']),
|
||||
'ip_address' => request()->ip(),
|
||||
'created_at' => now(),
|
||||
]);
|
||||
|
||||
session()->flash('success', __('clients.company_updated'));
|
||||
|
||||
$this->redirect(route('admin.clients.company.index'), navigate: true);
|
||||
}
|
||||
|
||||
public function with(): array
|
||||
{
|
||||
return [
|
||||
'statuses' => UserStatus::cases(),
|
||||
];
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div>
|
||||
<div class="mb-6">
|
||||
<flux:button variant="ghost" :href="route('admin.clients.company.index')" wire:navigate icon="arrow-left">
|
||||
{{ __('clients.back_to_companies') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
|
||||
<div class="mb-6">
|
||||
<flux:heading size="xl">{{ __('clients.edit_company') }}</flux:heading>
|
||||
<flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">{{ $client->company_name }}</flux:text>
|
||||
</div>
|
||||
|
||||
<div class="rounded-lg border border-zinc-200 bg-white p-6 dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<form wire:submit="update" class="space-y-6">
|
||||
<div class="grid gap-6 sm:grid-cols-2">
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.company_name') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="company_name"
|
||||
type="text"
|
||||
required
|
||||
autofocus
|
||||
/>
|
||||
<flux:error name="company_name" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.registration_number') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="company_cert_number"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="company_cert_number" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.contact_person_name') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="contact_person_name"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="contact_person_name" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.contact_person_id') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="contact_person_id"
|
||||
type="text"
|
||||
required
|
||||
/>
|
||||
<flux:error name="contact_person_id" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.email') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="email"
|
||||
type="email"
|
||||
required
|
||||
/>
|
||||
<flux:error name="email" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.phone') }} *</flux:label>
|
||||
<flux:input
|
||||
wire:model="phone"
|
||||
type="tel"
|
||||
required
|
||||
/>
|
||||
<flux:error name="phone" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.password') }}</flux:label>
|
||||
<flux:input
|
||||
wire:model="password"
|
||||
type="password"
|
||||
placeholder="{{ __('Leave blank to keep current password') }}"
|
||||
/>
|
||||
<flux:error name="password" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.preferred_language') }} *</flux:label>
|
||||
<flux:select wire:model="preferred_language" required>
|
||||
<flux:select.option value="ar">{{ __('clients.arabic') }}</flux:select.option>
|
||||
<flux:select.option value="en">{{ __('clients.english') }}</flux:select.option>
|
||||
</flux:select>
|
||||
<flux:error name="preferred_language" />
|
||||
</flux:field>
|
||||
|
||||
<flux:field>
|
||||
<flux:label>{{ __('clients.status') }} *</flux:label>
|
||||
<flux:select wire:model="status" required>
|
||||
@foreach ($statuses as $statusOption)
|
||||
<flux:select.option value="{{ $statusOption->value }}">
|
||||
{{ __('clients.' . $statusOption->value) }}
|
||||
</flux:select.option>
|
||||
@endforeach
|
||||
</flux:select>
|
||||
<flux:error name="status" />
|
||||
</flux:field>
|
||||
</div>
|
||||
|
||||
<div class="flex items-center justify-end gap-4 border-t border-zinc-200 pt-6 dark:border-zinc-700">
|
||||
<flux:button variant="ghost" :href="route('admin.clients.company.index')" wire:navigate>
|
||||
{{ __('clients.cancel') }}
|
||||
</flux:button>
|
||||
<flux:button variant="primary" type="submit">
|
||||
{{ __('clients.update') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,207 @@
|
|||
<?php
|
||||
|
||||
use App\Enums\UserStatus;
|
||||
use App\Models\User;
|
||||
use Livewire\Volt\Component;
|
||||
use Livewire\WithPagination;
|
||||
|
||||
new class extends Component {
|
||||
use WithPagination;
|
||||
|
||||
public string $search = '';
|
||||
public string $statusFilter = '';
|
||||
public int $perPage = 10;
|
||||
|
||||
public function updatedSearch(): void
|
||||
{
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function updatedStatusFilter(): void
|
||||
{
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function updatedPerPage(): void
|
||||
{
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function clearFilters(): void
|
||||
{
|
||||
$this->search = '';
|
||||
$this->statusFilter = '';
|
||||
$this->resetPage();
|
||||
}
|
||||
|
||||
public function with(): array
|
||||
{
|
||||
return [
|
||||
'clients' => User::companies()
|
||||
->when($this->search, fn ($q) => $q->where(function ($q) {
|
||||
$q->where('company_name', 'like', "%{$this->search}%")
|
||||
->orWhere('email', 'like', "%{$this->search}%")
|
||||
->orWhere('company_cert_number', 'like', "%{$this->search}%");
|
||||
}))
|
||||
->when($this->statusFilter, fn ($q) => $q->where('status', $this->statusFilter))
|
||||
->latest()
|
||||
->paginate($this->perPage),
|
||||
'statuses' => UserStatus::cases(),
|
||||
];
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div>
|
||||
<div class="mb-6 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
||||
<div>
|
||||
<flux:heading size="xl">{{ __('clients.company_clients') }}</flux:heading>
|
||||
<flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">{{ __('clients.clients') }}</flux:text>
|
||||
</div>
|
||||
<flux:button variant="primary" :href="route('admin.clients.company.create')" wire:navigate icon="plus">
|
||||
{{ __('clients.create_company') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
|
||||
<div class="mb-6 rounded-lg border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<div class="flex flex-col gap-4 sm:flex-row sm:items-end">
|
||||
<div class="flex-1">
|
||||
<flux:input
|
||||
wire:model.live.debounce.300ms="search"
|
||||
:placeholder="__('clients.search_company_placeholder')"
|
||||
icon="magnifying-glass"
|
||||
/>
|
||||
</div>
|
||||
<div class="w-full sm:w-48">
|
||||
<flux:select wire:model.live="statusFilter">
|
||||
<flux:select.option value="">{{ __('clients.all_statuses') }}</flux:select.option>
|
||||
@foreach ($statuses as $status)
|
||||
<flux:select.option value="{{ $status->value }}">
|
||||
{{ __('clients.' . $status->value) }}
|
||||
</flux:select.option>
|
||||
@endforeach
|
||||
</flux:select>
|
||||
</div>
|
||||
<div class="w-full sm:w-32">
|
||||
<flux:select wire:model.live="perPage">
|
||||
<flux:select.option value="10">10 {{ __('clients.per_page') }}</flux:select.option>
|
||||
<flux:select.option value="25">25 {{ __('clients.per_page') }}</flux:select.option>
|
||||
<flux:select.option value="50">50 {{ __('clients.per_page') }}</flux:select.option>
|
||||
</flux:select>
|
||||
</div>
|
||||
@if ($search || $statusFilter)
|
||||
<flux:button wire:click="clearFilters" variant="ghost" icon="x-mark">
|
||||
{{ __('clients.clear_filters') }}
|
||||
</flux:button>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="overflow-hidden rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<div class="overflow-x-auto">
|
||||
<table class="min-w-full divide-y divide-zinc-200 dark:divide-zinc-700">
|
||||
<thead class="bg-zinc-50 dark:bg-zinc-900">
|
||||
<tr>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.company_name') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.contact_person') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.email') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.registration_number') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.status') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-start text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.created_at') }}
|
||||
</th>
|
||||
<th class="px-6 py-3 text-end text-xs font-medium uppercase tracking-wider text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.actions') }}
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="divide-y divide-zinc-200 bg-white dark:divide-zinc-700 dark:bg-zinc-800">
|
||||
@forelse ($clients as $client)
|
||||
<tr wire:key="client-{{ $client->id }}">
|
||||
<td class="whitespace-nowrap px-6 py-4">
|
||||
<div class="flex items-center gap-3">
|
||||
<flux:avatar size="sm" :name="$client->company_name" />
|
||||
<span class="font-medium text-zinc-900 dark:text-zinc-100">{{ $client->company_name }}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4 text-zinc-600 dark:text-zinc-400">
|
||||
{{ $client->contact_person_name }}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4 text-zinc-600 dark:text-zinc-400">
|
||||
{{ $client->email }}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4 text-zinc-600 dark:text-zinc-400">
|
||||
{{ $client->company_cert_number }}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4">
|
||||
@if ($client->status === UserStatus::Active)
|
||||
<flux:badge color="green" size="sm">{{ __('clients.active') }}</flux:badge>
|
||||
@else
|
||||
<flux:badge color="red" size="sm">{{ __('clients.deactivated') }}</flux:badge>
|
||||
@endif
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4 text-zinc-600 dark:text-zinc-400">
|
||||
{{ $client->created_at->format('Y-m-d') }}
|
||||
</td>
|
||||
<td class="whitespace-nowrap px-6 py-4 text-end">
|
||||
<div class="flex items-center justify-end gap-2">
|
||||
<flux:button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
icon="eye"
|
||||
:href="route('admin.clients.company.show', $client)"
|
||||
wire:navigate
|
||||
:title="__('clients.view')"
|
||||
/>
|
||||
<flux:button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
icon="pencil"
|
||||
:href="route('admin.clients.company.edit', $client)"
|
||||
wire:navigate
|
||||
:title="__('clients.edit')"
|
||||
/>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@empty
|
||||
<tr>
|
||||
<td colspan="7" class="px-6 py-12 text-center">
|
||||
<div class="flex flex-col items-center">
|
||||
<flux:icon name="building-office" class="mb-4 h-12 w-12 text-zinc-400" />
|
||||
<flux:text class="text-zinc-500 dark:text-zinc-400">
|
||||
@if ($search || $statusFilter)
|
||||
{{ __('clients.no_companies_match') }}
|
||||
@else
|
||||
{{ __('clients.no_companies_found') }}
|
||||
@endif
|
||||
</flux:text>
|
||||
@if ($search || $statusFilter)
|
||||
<flux:button wire:click="clearFilters" variant="ghost" class="mt-4">
|
||||
{{ __('clients.clear_filters') }}
|
||||
</flux:button>
|
||||
@endif
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@endforelse
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if ($clients->hasPages())
|
||||
<div class="border-t border-zinc-200 bg-zinc-50 px-6 py-4 dark:border-zinc-700 dark:bg-zinc-900">
|
||||
{{ $clients->links() }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
<?php
|
||||
|
||||
use App\Enums\ConsultationStatus;
|
||||
use App\Enums\TimelineStatus;
|
||||
use App\Enums\UserStatus;
|
||||
use App\Models\User;
|
||||
use Livewire\Volt\Component;
|
||||
|
||||
new class extends Component {
|
||||
public User $client;
|
||||
|
||||
public function mount(User $client): void
|
||||
{
|
||||
$this->client = $client->loadCount([
|
||||
'consultations',
|
||||
'consultations as pending_consultations_count' => fn ($q) => $q->where('status', ConsultationStatus::Pending),
|
||||
'consultations as completed_consultations_count' => fn ($q) => $q->where('status', ConsultationStatus::Completed),
|
||||
'timelines',
|
||||
'timelines as active_timelines_count' => fn ($q) => $q->where('status', TimelineStatus::Active),
|
||||
]);
|
||||
}
|
||||
}; ?>
|
||||
|
||||
<div>
|
||||
<div class="mb-6 flex flex-col gap-4 sm:flex-row sm:items-center sm:justify-between">
|
||||
<div>
|
||||
<flux:button variant="ghost" :href="route('admin.clients.company.index')" wire:navigate icon="arrow-left">
|
||||
{{ __('clients.back_to_companies') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
<flux:button variant="primary" :href="route('admin.clients.company.edit', $client)" wire:navigate icon="pencil">
|
||||
{{ __('clients.edit_company') }}
|
||||
</flux:button>
|
||||
</div>
|
||||
|
||||
<div class="mb-6">
|
||||
<flux:heading size="xl">{{ __('clients.company_profile') }}</flux:heading>
|
||||
<flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">{{ $client->company_name }}</flux:text>
|
||||
</div>
|
||||
|
||||
<div class="grid gap-6 lg:grid-cols-3">
|
||||
{{-- Company Information --}}
|
||||
<div class="lg:col-span-2">
|
||||
<div class="rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<div class="border-b border-zinc-200 px-6 py-4 dark:border-zinc-700">
|
||||
<flux:heading size="lg">{{ __('clients.company_information') }}</flux:heading>
|
||||
</div>
|
||||
<div class="p-6">
|
||||
<div class="flex items-start gap-6">
|
||||
<flux:avatar size="xl" :name="$client->company_name" />
|
||||
<div class="flex-1">
|
||||
<div class="grid gap-6 sm:grid-cols-2">
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.company_name') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->company_name }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.registration_number') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->company_cert_number }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.contact_person_name') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->contact_person_name }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.contact_person_id') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->contact_person_id }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.email') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->email }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.phone') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->phone }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.preferred_language') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">
|
||||
{{ $client->preferred_language === 'ar' ? __('clients.arabic') : __('clients.english') }}
|
||||
</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.status') }}</flux:text>
|
||||
<div class="mt-1">
|
||||
@if ($client->status === UserStatus::Active)
|
||||
<flux:badge color="green">{{ __('clients.active') }}</flux:badge>
|
||||
@else
|
||||
<flux:badge color="red">{{ __('clients.deactivated') }}</flux:badge>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.member_since') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ $client->created_at->format('Y-m-d') }}</flux:text>
|
||||
</div>
|
||||
<div>
|
||||
<flux:text class="text-sm font-medium text-zinc-500 dark:text-zinc-400">{{ __('clients.user_type') }}</flux:text>
|
||||
<flux:text class="mt-1 text-zinc-900 dark:text-zinc-100">{{ __('clients.company') }}</flux:text>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Stats Sidebar --}}
|
||||
<div class="space-y-6">
|
||||
{{-- Consultation Summary --}}
|
||||
<div class="rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<div class="border-b border-zinc-200 px-6 py-4 dark:border-zinc-700">
|
||||
<flux:heading size="lg">{{ __('clients.consultation_history') }}</flux:heading>
|
||||
</div>
|
||||
<div class="p-6">
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('clients.total_consultations') }}</flux:text>
|
||||
<flux:badge color="zinc">{{ $client->consultations_count }}</flux:badge>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('clients.pending_consultations') }}</flux:text>
|
||||
<flux:badge color="yellow">{{ $client->pending_consultations_count }}</flux:badge>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('clients.completed_consultations') }}</flux:text>
|
||||
<flux:badge color="green">{{ $client->completed_consultations_count }}</flux:badge>
|
||||
</div>
|
||||
</div>
|
||||
@if ($client->consultations_count > 0)
|
||||
<div class="mt-4 border-t border-zinc-200 pt-4 dark:border-zinc-700">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.view_all_consultations') }}
|
||||
</flux:text>
|
||||
</div>
|
||||
@else
|
||||
<div class="mt-4 border-t border-zinc-200 pt-4 dark:border-zinc-700">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.no_consultations') }}
|
||||
</flux:text>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Timeline Summary --}}
|
||||
<div class="rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-800">
|
||||
<div class="border-b border-zinc-200 px-6 py-4 dark:border-zinc-700">
|
||||
<flux:heading size="lg">{{ __('clients.timeline_history') }}</flux:heading>
|
||||
</div>
|
||||
<div class="p-6">
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('clients.total_timelines') }}</flux:text>
|
||||
<flux:badge color="zinc">{{ $client->timelines_count }}</flux:badge>
|
||||
</div>
|
||||
<div class="flex items-center justify-between">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ __('clients.active_timelines') }}</flux:text>
|
||||
<flux:badge color="blue">{{ $client->active_timelines_count }}</flux:badge>
|
||||
</div>
|
||||
</div>
|
||||
@if ($client->timelines_count > 0)
|
||||
<div class="mt-4 border-t border-zinc-200 pt-4 dark:border-zinc-700">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.view_all_timelines') }}
|
||||
</flux:text>
|
||||
</div>
|
||||
@else
|
||||
<div class="mt-4 border-t border-zinc-200 pt-4 dark:border-zinc-700">
|
||||
<flux:text class="text-sm text-zinc-500 dark:text-zinc-400">
|
||||
{{ __('clients.no_timelines') }}
|
||||
</flux:text>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -51,6 +51,14 @@ Route::middleware(['auth', 'active'])->group(function () {
|
|||
Volt::route('/{client}', 'admin.clients.individual.show')->name('show');
|
||||
Volt::route('/{client}/edit', 'admin.clients.individual.edit')->name('edit');
|
||||
});
|
||||
|
||||
// Company Clients Management
|
||||
Route::prefix('clients/company')->name('admin.clients.company.')->group(function () {
|
||||
Volt::route('/', 'admin.clients.company.index')->name('index');
|
||||
Volt::route('/create', 'admin.clients.company.create')->name('create');
|
||||
Volt::route('/{client}', 'admin.clients.company.show')->name('show');
|
||||
Volt::route('/{client}/edit', 'admin.clients.company.edit')->name('edit');
|
||||
});
|
||||
});
|
||||
|
||||
// Client routes
|
||||
|
|
|
|||
|
|
@ -0,0 +1,664 @@
|
|||
<?php
|
||||
|
||||
use App\Enums\UserStatus;
|
||||
use App\Enums\UserType;
|
||||
use App\Models\AdminLog;
|
||||
use App\Models\User;
|
||||
use Livewire\Volt\Volt;
|
||||
|
||||
beforeEach(function () {
|
||||
$this->admin = User::factory()->admin()->create();
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// Create Company Client Tests
|
||||
// ===========================================
|
||||
|
||||
test('admin can access company clients index page', function () {
|
||||
$this->actingAs($this->admin)
|
||||
->get(route('admin.clients.company.index'))
|
||||
->assertOk();
|
||||
});
|
||||
|
||||
test('admin can access create company client page', function () {
|
||||
$this->actingAs($this->admin)
|
||||
->get(route('admin.clients.company.create'))
|
||||
->assertOk();
|
||||
});
|
||||
|
||||
test('admin can create company client with all valid data', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasNoErrors()
|
||||
->assertRedirect(route('admin.clients.company.index'));
|
||||
|
||||
expect(User::where('email', 'testcompany@example.com')->exists())->toBeTrue();
|
||||
|
||||
$client = User::where('email', 'testcompany@example.com')->first();
|
||||
expect($client->user_type)->toBe(UserType::Company);
|
||||
expect($client->status)->toBe(UserStatus::Active);
|
||||
expect($client->company_name)->toBe('Test Company LLC');
|
||||
expect($client->company_cert_number)->toBe('CR-123456');
|
||||
expect($client->contact_person_name)->toBe('John Doe');
|
||||
expect($client->contact_person_id)->toBe('987654321');
|
||||
});
|
||||
|
||||
test('created company has user_type set to company', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasNoErrors();
|
||||
|
||||
$client = User::where('email', 'testcompany@example.com')->first();
|
||||
expect($client->user_type)->toBe(UserType::Company);
|
||||
});
|
||||
|
||||
test('admin log entry created on successful company creation', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasNoErrors();
|
||||
|
||||
expect(AdminLog::where('action', 'create')
|
||||
->where('target_type', 'user')
|
||||
->where('admin_id', $this->admin->id)
|
||||
->exists())->toBeTrue();
|
||||
});
|
||||
|
||||
test('cannot create company without required company_name field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', '')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['company_name' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company without required company_cert_number field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', '')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['company_cert_number' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company without required contact_person_name field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', '')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['contact_person_name' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company without required contact_person_id field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['contact_person_id' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company without required email field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', '')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['email' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company without required phone field', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['phone' => 'required']);
|
||||
});
|
||||
|
||||
test('cannot create company with invalid email format', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'invalid-email')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['email' => 'email']);
|
||||
});
|
||||
|
||||
test('cannot create company with duplicate email', function () {
|
||||
User::factory()->company()->create(['email' => 'existing@example.com']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'existing@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['email' => 'unique']);
|
||||
});
|
||||
|
||||
test('cannot create company with duplicate registration number', function () {
|
||||
User::factory()->company()->create(['company_cert_number' => 'CR-123456']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'password123')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['company_cert_number' => 'unique']);
|
||||
});
|
||||
|
||||
test('cannot create company with password less than 8 characters', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.create')
|
||||
->set('company_name', 'Test Company LLC')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'John Doe')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'testcompany@example.com')
|
||||
->set('phone', '+970599123456')
|
||||
->set('password', 'short')
|
||||
->set('preferred_language', 'ar')
|
||||
->call('create')
|
||||
->assertHasErrors(['password' => 'min']);
|
||||
});
|
||||
|
||||
test('preferred language defaults to Arabic', function () {
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.create');
|
||||
|
||||
expect($component->get('preferred_language'))->toBe('ar');
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// List View Tests
|
||||
// ===========================================
|
||||
|
||||
test('index page displays only company clients', function () {
|
||||
// Create different types of users
|
||||
$companyClient = User::factory()->company()->create(['company_name' => 'Company Test']);
|
||||
$individualClient = User::factory()->individual()->create(['full_name' => 'Individual Test']);
|
||||
$adminUser = User::factory()->admin()->create(['full_name' => 'Admin Test']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->assertSee('Company Test')
|
||||
->assertDontSee('Individual Test')
|
||||
->assertDontSee('Admin Test');
|
||||
});
|
||||
|
||||
test('company clients sorted by created_at desc by default', function () {
|
||||
$oldCompany = User::factory()->company()->create([
|
||||
'company_name' => 'Old Company',
|
||||
'created_at' => now()->subDays(10),
|
||||
]);
|
||||
|
||||
$newCompany = User::factory()->company()->create([
|
||||
'company_name' => 'New Company',
|
||||
'created_at' => now(),
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$response = Volt::test('admin.clients.company.index');
|
||||
|
||||
// The new company should appear before the old company
|
||||
$response->assertSeeInOrder(['New Company', 'Old Company']);
|
||||
});
|
||||
|
||||
test('pagination works with different per page values', function () {
|
||||
User::factory()->company()->count(15)->create();
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.index')
|
||||
->set('perPage', 10);
|
||||
|
||||
// Should show pagination
|
||||
expect($component->get('perPage'))->toBe(10);
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// Search & Filter Tests
|
||||
// ===========================================
|
||||
|
||||
test('can search companies by company name (partial match)', function () {
|
||||
User::factory()->company()->create(['company_name' => 'Tech Solutions Inc']);
|
||||
User::factory()->company()->create(['company_name' => 'Finance Corp']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('search', 'Tech')
|
||||
->assertSee('Tech Solutions Inc')
|
||||
->assertDontSee('Finance Corp');
|
||||
});
|
||||
|
||||
test('can search companies by email (partial match)', function () {
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Tech Solutions Inc',
|
||||
'email' => 'tech@example.com',
|
||||
]);
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Finance Corp',
|
||||
'email' => 'finance@example.com',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('search', 'tech@')
|
||||
->assertSee('Tech Solutions Inc')
|
||||
->assertDontSee('Finance Corp');
|
||||
});
|
||||
|
||||
test('can search companies by registration number (partial match)', function () {
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Tech Solutions Inc',
|
||||
'company_cert_number' => 'CR-111222',
|
||||
]);
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Finance Corp',
|
||||
'company_cert_number' => 'CR-333444',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('search', 'CR-111')
|
||||
->assertSee('Tech Solutions Inc')
|
||||
->assertDontSee('Finance Corp');
|
||||
});
|
||||
|
||||
test('can filter companies by active status', function () {
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Active Company',
|
||||
'status' => UserStatus::Active,
|
||||
]);
|
||||
User::factory()->company()->deactivated()->create([
|
||||
'company_name' => 'Deactivated Company',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('statusFilter', 'active')
|
||||
->assertSee('Active Company')
|
||||
->assertDontSee('Deactivated Company');
|
||||
});
|
||||
|
||||
test('can filter companies by deactivated status', function () {
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Active Company',
|
||||
'status' => UserStatus::Active,
|
||||
]);
|
||||
User::factory()->company()->deactivated()->create([
|
||||
'company_name' => 'Deactivated Company',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('statusFilter', 'deactivated')
|
||||
->assertDontSee('Active Company')
|
||||
->assertSee('Deactivated Company');
|
||||
});
|
||||
|
||||
test('combined search and filter works correctly', function () {
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Active Tech',
|
||||
'status' => UserStatus::Active,
|
||||
]);
|
||||
User::factory()->company()->deactivated()->create([
|
||||
'company_name' => 'Deactivated Tech',
|
||||
]);
|
||||
User::factory()->company()->create([
|
||||
'company_name' => 'Active Finance',
|
||||
'status' => UserStatus::Active,
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.index')
|
||||
->set('search', 'Tech')
|
||||
->set('statusFilter', 'active')
|
||||
->assertSee('Active Tech')
|
||||
->assertDontSee('Deactivated Tech')
|
||||
->assertDontSee('Active Finance');
|
||||
});
|
||||
|
||||
test('clear filters resets search and filter', function () {
|
||||
User::factory()->company()->create(['company_name' => 'Test Company']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.index')
|
||||
->set('search', 'something')
|
||||
->set('statusFilter', 'active')
|
||||
->call('clearFilters');
|
||||
|
||||
expect($component->get('search'))->toBe('');
|
||||
expect($component->get('statusFilter'))->toBe('');
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// Edit Company Tests
|
||||
// ===========================================
|
||||
|
||||
test('admin can access edit company client page', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin)
|
||||
->get(route('admin.clients.company.edit', $client))
|
||||
->assertOk();
|
||||
});
|
||||
|
||||
test('edit form pre-populates with current values', function () {
|
||||
$client = User::factory()->company()->create([
|
||||
'company_name' => 'Original Company',
|
||||
'company_cert_number' => 'CR-ORIGINAL',
|
||||
'contact_person_name' => 'Original Contact',
|
||||
'contact_person_id' => '111111111',
|
||||
'email' => 'original@example.com',
|
||||
'phone' => '+970599000000',
|
||||
'preferred_language' => 'en',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.edit', ['client' => $client]);
|
||||
|
||||
expect($component->get('company_name'))->toBe('Original Company');
|
||||
expect($component->get('company_cert_number'))->toBe('CR-ORIGINAL');
|
||||
expect($component->get('contact_person_name'))->toBe('Original Contact');
|
||||
expect($component->get('contact_person_id'))->toBe('111111111');
|
||||
expect($component->get('email'))->toBe('original@example.com');
|
||||
expect($component->get('phone'))->toBe('+970599000000');
|
||||
expect($component->get('preferred_language'))->toBe('en');
|
||||
});
|
||||
|
||||
test('can edit existing company information', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.edit', ['client' => $client])
|
||||
->set('company_name', 'Updated Company')
|
||||
->set('company_cert_number', 'CR-UPDATED')
|
||||
->set('contact_person_name', 'Updated Contact')
|
||||
->set('contact_person_id', '222222222')
|
||||
->set('email', 'updated@example.com')
|
||||
->set('phone', '+970599111111')
|
||||
->set('preferred_language', 'en')
|
||||
->set('status', 'active')
|
||||
->call('update')
|
||||
->assertHasNoErrors()
|
||||
->assertRedirect(route('admin.clients.company.index'));
|
||||
|
||||
$client->refresh();
|
||||
|
||||
expect($client->company_name)->toBe('Updated Company');
|
||||
expect($client->company_cert_number)->toBe('CR-UPDATED');
|
||||
expect($client->contact_person_name)->toBe('Updated Contact');
|
||||
expect($client->email)->toBe('updated@example.com');
|
||||
});
|
||||
|
||||
test('validation allows same email and registration for own record', function () {
|
||||
$client = User::factory()->company()->create([
|
||||
'email' => 'company@example.com',
|
||||
'company_cert_number' => 'CR-123456',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
// Should not error when keeping same email and registration number
|
||||
Volt::test('admin.clients.company.edit', ['client' => $client])
|
||||
->set('company_name', 'Updated Company')
|
||||
->set('company_cert_number', 'CR-123456')
|
||||
->set('contact_person_name', 'Contact Person')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'company@example.com')
|
||||
->set('phone', '+970599111111')
|
||||
->set('preferred_language', 'en')
|
||||
->set('status', 'active')
|
||||
->call('update')
|
||||
->assertHasNoErrors();
|
||||
});
|
||||
|
||||
test('validation fails for duplicate email excluding own record', function () {
|
||||
$existingClient = User::factory()->company()->create(['email' => 'existing@example.com']);
|
||||
$client = User::factory()->company()->create(['email' => 'original@example.com']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.edit', ['client' => $client])
|
||||
->set('company_name', 'Updated Company')
|
||||
->set('company_cert_number', 'CR-UNIQUE')
|
||||
->set('contact_person_name', 'Contact Person')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'existing@example.com')
|
||||
->set('phone', '+970599111111')
|
||||
->set('preferred_language', 'en')
|
||||
->set('status', 'active')
|
||||
->call('update')
|
||||
->assertHasErrors(['email' => 'unique']);
|
||||
});
|
||||
|
||||
test('validation fails for duplicate registration number excluding own record', function () {
|
||||
$existingClient = User::factory()->company()->create(['company_cert_number' => 'CR-EXISTING']);
|
||||
$client = User::factory()->company()->create(['company_cert_number' => 'CR-ORIGINAL']);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.edit', ['client' => $client])
|
||||
->set('company_name', 'Updated Company')
|
||||
->set('company_cert_number', 'CR-EXISTING')
|
||||
->set('contact_person_name', 'Contact Person')
|
||||
->set('contact_person_id', '987654321')
|
||||
->set('email', 'unique@example.com')
|
||||
->set('phone', '+970599111111')
|
||||
->set('preferred_language', 'en')
|
||||
->set('status', 'active')
|
||||
->call('update')
|
||||
->assertHasErrors(['company_cert_number' => 'unique']);
|
||||
});
|
||||
|
||||
test('admin log entry created on successful company update', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.edit', ['client' => $client])
|
||||
->set('company_name', 'Updated Company')
|
||||
->set('company_cert_number', 'CR-UPDATED')
|
||||
->set('contact_person_name', 'Updated Contact')
|
||||
->set('contact_person_id', '222222222')
|
||||
->set('email', 'updated@example.com')
|
||||
->set('phone', '+970599111111')
|
||||
->set('preferred_language', 'en')
|
||||
->set('status', 'active')
|
||||
->call('update')
|
||||
->assertHasNoErrors();
|
||||
|
||||
expect(AdminLog::where('action', 'update')
|
||||
->where('target_type', 'user')
|
||||
->where('target_id', $client->id)
|
||||
->where('admin_id', $this->admin->id)
|
||||
->exists())->toBeTrue();
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// View Profile Tests
|
||||
// ===========================================
|
||||
|
||||
test('admin can access view company client page', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin)
|
||||
->get(route('admin.clients.company.show', $client))
|
||||
->assertOk();
|
||||
});
|
||||
|
||||
test('profile page displays all company information', function () {
|
||||
$client = User::factory()->company()->create([
|
||||
'company_name' => 'Test Company LLC',
|
||||
'company_cert_number' => 'CR-123456',
|
||||
'contact_person_name' => 'John Doe',
|
||||
'contact_person_id' => '987654321',
|
||||
'email' => 'company@example.com',
|
||||
'phone' => '+970599123456',
|
||||
]);
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
Volt::test('admin.clients.company.show', ['client' => $client])
|
||||
->assertSee('Test Company LLC')
|
||||
->assertSee('CR-123456')
|
||||
->assertSee('John Doe')
|
||||
->assertSee('987654321')
|
||||
->assertSee('company@example.com')
|
||||
->assertSee('+970599123456');
|
||||
});
|
||||
|
||||
test('company profile shows consultation count', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.show', ['client' => $client]);
|
||||
|
||||
// The component should load consultation counts
|
||||
expect($component->get('client')->consultations_count)->toBe(0);
|
||||
});
|
||||
|
||||
test('company profile shows timeline count', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->actingAs($this->admin);
|
||||
|
||||
$component = Volt::test('admin.clients.company.show', ['client' => $client]);
|
||||
|
||||
// The component should load timeline counts
|
||||
expect($component->get('client')->timelines_count)->toBe(0);
|
||||
});
|
||||
|
||||
// ===========================================
|
||||
// Authorization Tests
|
||||
// ===========================================
|
||||
|
||||
test('non-admin cannot access company clients pages', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
$individualUser = User::factory()->individual()->create();
|
||||
|
||||
$this->actingAs($individualUser);
|
||||
|
||||
$this->get(route('admin.clients.company.index'))->assertForbidden();
|
||||
$this->get(route('admin.clients.company.create'))->assertForbidden();
|
||||
$this->get(route('admin.clients.company.show', $client))->assertForbidden();
|
||||
$this->get(route('admin.clients.company.edit', $client))->assertForbidden();
|
||||
});
|
||||
|
||||
test('unauthenticated user cannot access company clients pages', function () {
|
||||
$client = User::factory()->company()->create();
|
||||
|
||||
$this->get(route('admin.clients.company.index'))->assertRedirect(route('login'));
|
||||
$this->get(route('admin.clients.company.create'))->assertRedirect(route('login'));
|
||||
$this->get(route('admin.clients.company.show', $client))->assertRedirect(route('login'));
|
||||
$this->get(route('admin.clients.company.edit', $client))->assertRedirect(route('login'));
|
||||
});
|
||||
Loading…
Reference in New Issue