Stage 9 — Subcontractor System: outsourced work with cost+markup

Schema: - subcontractors (specialty, rating, contact) - subcontract_jobs (work_order link, cost, markup_pct, client_price, status workflow, sent_at/eta/returned_at, paid_to_sub) Models: - SubcontractJob: auto number (SC-YY-NNNN), client_price = cost×(1+markup/100) when markup>0 (else manual), margin() helper, recalcs parent WO on save/delete - WorkOrder.recalcTotal now includes non-cancelled subcontract job client_price Filament (new "Subcontractare" nav group): - SubcontractorResource (specialty/rating CRUD) - SubcontractJobResource board with cost/client/margin columns + status filters, nav badge = open jobs - SubcontractJobsRelationManager on WorkOrder Tests (7 new): - client_price from markup; manual price without markup; auto number; WO total includes jobs; cancelled excluded; delete recalcs; tenant isolation Closes roadmap to 16/18 stages (only Stage 10 Bodyshop remains). Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-28 06:43:15 +00:00
parent 94938f24d7
commit e8078f157a
15 changed files with 680 additions and 1 deletions
@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Filament\Tenant\Resources;
+
+use App\Filament\Tenant\Resources\SubcontractJobResource\Pages;
+use App\Models\Tenant\Subcontractor;
+use App\Models\Tenant\SubcontractJob;
+use App\Models\Tenant\WorkOrder;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Resources\Resource;
+use Filament\Schemas;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class SubcontractJobResource extends Resource
+{
+    protected static ?string $model = SubcontractJob::class;
+
+    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-arrow-top-right-on-square';
+
+    protected static ?string $navigationLabel = 'Lucrări terți';
+
+    protected static string|\UnitEnum|null $navigationGroup = 'Subcontractare';
+
+    protected static ?string $modelLabel = 'lucrare terți';
+
+    protected static ?string $pluralModelLabel = 'lucrări terți';
+
+    protected static ?int $navigationSort = 71;
+
+    public static function getNavigationBadge(): ?string
+    {
+        $open = static::getModel()::query()->whereNotIn('status', ['done', 'returned', 'cancelled'])->count();
+        return $open > 0 ? (string) $open : null;
+    }
+
+    public static function form(Schema $schema): Schema
+    {
+        return $schema->components([
+            Schemas\Components\Section::make('Lucrare')
+                ->columns(2)
+                ->schema([
+                    Forms\Components\TextInput::make('number')->label('Nr.')->disabled()->dehydrated(false)->placeholder('Generat automat'),
+                    Forms\Components\Select::make('status')->options(SubcontractJob::STATUSES)->default('sent')->required(),
+                    Forms\Components\Select::make('subcontractor_id')
+                        ->label('Subcontractor')
+                        ->options(fn () => Subcontractor::where('is_active', true)->pluck('name', 'id'))
+                        ->searchable(),
+                    Forms\Components\Select::make('work_order_id')
+                        ->label('Fișă asociată')
+                        ->options(fn () => WorkOrder::whereNotIn('status', ['done', 'cancelled'])
+                            ->get()->mapWithKeys(fn ($w) => [$w->id => "#{$w->number} · " . ($w->vehicle?->plate ?? '')])->toArray())
+                        ->searchable(),
+                    Forms\Components\Select::make('category')
+                        ->label('Categorie')
+                        ->options(array_combine(Subcontractor::SPECIALTIES, Subcontractor::SPECIALTIES))
+                        ->searchable(),
+                    Forms\Components\Textarea::make('description')->label('Descriere')->rows(2)->columnSpanFull(),
+                ]),
+            Schemas\Components\Section::make('Cost & marjă')
+                ->columns(3)
+                ->schema([
+                    Forms\Components\TextInput::make('cost')->label('Cost (de la terț)')->numeric()->default(0)->required(),
+                    Forms\Components\TextInput::make('markup_pct')->label('Markup %')->numeric()->default(0)
+                        ->helperText('> 0 calculează automat prețul client.'),
+                    Forms\Components\TextInput::make('client_price')->label('Preț client')->numeric()->default(0)
+                        ->helperText('Setat manual dacă markup = 0.'),
+                    Forms\Components\Toggle::make('paid_to_sub')->label('Plătit către terț'),
+                ]),
+            Schemas\Components\Section::make('Termene')
+                ->columns(3)
+                ->schema([
+                    Forms\Components\DatePicker::make('sent_at')->label('Trimis')->default(today()),
+                    Forms\Components\DatePicker::make('eta')->label('ETA'),
+                    Forms\Components\DatePicker::make('returned_at')->label('Returnat'),
+                    Forms\Components\Textarea::make('notes')->label('Observații')->columnSpanFull()->rows(2),
+                ]),
+        ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('number')->label('Nr.')->searchable()->sortable(),
+                Tables\Columns\TextColumn::make('subcontractor.name')->label('Terț')->placeholder('—'),
+                Tables\Columns\TextColumn::make('category')->badge()->placeholder('—'),
+                Tables\Columns\TextColumn::make('workOrder.number')->label('Fișă')->placeholder('—'),
+                Tables\Columns\TextColumn::make('cost')->label('Cost')->money('MDL')->alignRight(),
+                Tables\Columns\TextColumn::make('client_price')->label('Preț client')->money('MDL')->alignRight(),
+                Tables\Columns\TextColumn::make('margin')
+                    ->label('Marjă')
+                    ->state(fn (SubcontractJob $r) => $r->margin())
+                    ->money('MDL')
+                    ->alignRight()
+                    ->color(fn ($state) => (float) $state > 0 ? 'success' : ((float) $state < 0 ? 'danger' : 'gray')),
+                Tables\Columns\TextColumn::make('status')
+                    ->formatStateUsing(fn ($s) => SubcontractJob::STATUSES[$s] ?? $s)
+                    ->badge()
+                    ->colors([
+                        'warning' => ['sent', 'in_progress'],
+                        'success' => ['done', 'returned'],
+                        'danger' => ['cancelled'],
+                    ]),
+                Tables\Columns\IconColumn::make('paid_to_sub')->label('Plătit terț')->boolean()->toggleable(),
+            ])
+            ->filters([
+                Tables\Filters\SelectFilter::make('status')->options(SubcontractJob::STATUSES),
+                Tables\Filters\SelectFilter::make('subcontractor_id')
+                    ->label('Subcontractor')
+                    ->options(fn () => Subcontractor::pluck('name', 'id')),
+            ])
+            ->actions([
+                Actions\EditAction::make(),
+                Actions\DeleteAction::make(),
+            ])
+            ->emptyStateHeading('Nicio lucrare la terți')
+            ->emptyStateDescription('Înregistrează lucrările trimise la ateliere externe (turbo, cutii, vopsitorie). Costul terțului + markup intră automat în totalul fișei asociate.')
+            ->emptyStateIcon('heroicon-o-arrow-top-right-on-square')
+            ->defaultSort('created_at', 'desc');
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListSubcontractJobs::route('/'),
+            'create' => Pages\CreateSubcontractJob::route('/create'),
+            'edit' => Pages\EditSubcontractJob::route('/{record}/edit'),
+        ];
+    }
+}
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractJobResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractJobResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateSubcontractJob extends CreateRecord
+{
+    protected static string $resource = SubcontractJobResource::class;
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractJobResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractJobResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditSubcontractJob extends EditRecord
+{
+    protected static string $resource = SubcontractJobResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [Actions\DeleteAction::make()];
+    }
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractJobResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractJobResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListSubcontractJobs extends ListRecords
+{
+    protected static string $resource = SubcontractJobResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [Actions\CreateAction::make()];
+    }
+}
@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Filament\Tenant\Resources;
+
+use App\Filament\Tenant\Resources\SubcontractorResource\Pages;
+use App\Models\Tenant\Subcontractor;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Resources\Resource;
+use Filament\Schemas;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class SubcontractorResource extends Resource
+{
+    protected static ?string $model = Subcontractor::class;
+
+    protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-user-group';
+
+    protected static ?string $navigationLabel = 'Subcontractori';
+
+    protected static string|\UnitEnum|null $navigationGroup = 'Subcontractare';
+
+    protected static ?string $modelLabel = 'subcontractor';
+
+    protected static ?string $pluralModelLabel = 'subcontractori';
+
+    protected static ?int $navigationSort = 70;
+
+    public static function form(Schema $schema): Schema
+    {
+        return $schema->components([
+            Schemas\Components\Section::make()->columns(2)->schema([
+                Forms\Components\TextInput::make('name')->label('Nume')->required()->maxLength(160),
+                Forms\Components\Select::make('specialty')
+                    ->label('Specialitate')
+                    ->options(array_combine(Subcontractor::SPECIALTIES, Subcontractor::SPECIALTIES))
+                    ->searchable(),
+                Forms\Components\TextInput::make('phone')->label('Telefon')->tel()->maxLength(40),
+                Forms\Components\TextInput::make('email')->email()->maxLength(120),
+                Forms\Components\Select::make('rating')
+                    ->label('Rating')
+                    ->options([1 => '★', 2 => '★★', 3 => '★★★', 4 => '★★★★', 5 => '★★★★★'])
+                    ->default(3),
+                Forms\Components\Toggle::make('is_active')->label('Activ')->default(true),
+                Forms\Components\Textarea::make('notes')->label('Observații')->columnSpanFull()->rows(2),
+            ]),
+        ]);
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')->searchable()->sortable(),
+                Tables\Columns\TextColumn::make('specialty')->badge()->placeholder('—'),
+                Tables\Columns\TextColumn::make('phone')->copyable()->placeholder('—'),
+                Tables\Columns\TextColumn::make('rating')->formatStateUsing(fn ($s) => str_repeat('★', (int) $s)),
+                Tables\Columns\TextColumn::make('jobs_count')->counts('jobs')->label('Lucrări')->alignRight(),
+                Tables\Columns\IconColumn::make('is_active')->boolean(),
+            ])
+            ->filters([
+                Tables\Filters\TernaryFilter::make('is_active')->label('Activi'),
+            ])
+            ->actions([
+                Actions\EditAction::make(),
+                Actions\DeleteAction::make(),
+            ])
+            ->emptyStateHeading('Niciun subcontractor')
+            ->emptyStateDescription('Adaugă atelierele terțe la care trimiți lucrări (turbo, cutii, vopsitorie, PDR) și urmărește costul + marja.')
+            ->emptyStateIcon('heroicon-o-user-group')
+            ->defaultSort('name');
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListSubcontractors::route('/'),
+            'create' => Pages\CreateSubcontractor::route('/create'),
+            'edit' => Pages\EditSubcontractor::route('/{record}/edit'),
+        ];
+    }
+}
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractorResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractorResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateSubcontractor extends CreateRecord
+{
+    protected static string $resource = SubcontractorResource::class;
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractorResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractorResource;
+use Filament\Actions;
+use Filament\Resources\Pages\EditRecord;
+
+class EditSubcontractor extends EditRecord
+{
+    protected static string $resource = SubcontractorResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [Actions\DeleteAction::make()];
+    }
+}
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\SubcontractorResource\Pages;
+
+use App\Filament\Tenant\Resources\SubcontractorResource;
+use Filament\Actions;
+use Filament\Resources\Pages\ListRecords;
+
+class ListSubcontractors extends ListRecords
+{
+    protected static string $resource = SubcontractorResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [Actions\CreateAction::make()];
+    }
+}
@@ -214,6 +214,7 @@ class WorkOrderResource extends Resource
        return [
            RelationManagers\WorksRelationManager::class,
            RelationManagers\PartsRelationManager::class,
+            RelationManagers\SubcontractJobsRelationManager::class,
            RelationManagers\PaymentsRelationManager::class,
        ];
    }
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Filament\Tenant\Resources\WorkOrderResource\RelationManagers;
+
+use App\Models\Tenant\Subcontractor;
+use App\Models\Tenant\SubcontractJob;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Schemas\Schema;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class SubcontractJobsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'subcontractJobs';
+
+    protected static ?string $title = 'Lucrări la terți';
+
+    public function form(Schema $schema): Schema
+    {
+        return $schema->components([
+            Forms\Components\Select::make('subcontractor_id')
+                ->label('Subcontractor')
+                ->options(fn () => Subcontractor::where('is_active', true)->pluck('name', 'id'))
+                ->searchable()
+                ->columnSpanFull(),
+            Forms\Components\Select::make('category')
+                ->label('Categorie')
+                ->options(array_combine(Subcontractor::SPECIALTIES, Subcontractor::SPECIALTIES))
+                ->searchable(),
+            Forms\Components\Select::make('status')->options(SubcontractJob::STATUSES)->default('sent')->required(),
+            Forms\Components\Textarea::make('description')->label('Descriere')->rows(2)->columnSpanFull(),
+            Forms\Components\TextInput::make('cost')->label('Cost (terț)')->numeric()->default(0)->required(),
+            Forms\Components\TextInput::make('markup_pct')->label('Markup %')->numeric()->default(0),
+            Forms\Components\TextInput::make('client_price')->label('Preț client')->numeric()->default(0)
+                ->helperText('Folosit dacă markup = 0.'),
+            Forms\Components\DatePicker::make('eta')->label('ETA'),
+        ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('number')
+            ->columns([
+                Tables\Columns\TextColumn::make('number')->label('Nr.'),
+                Tables\Columns\TextColumn::make('subcontractor.name')->label('Terț')->placeholder('—'),
+                Tables\Columns\TextColumn::make('category')->badge()->placeholder('—'),
+                Tables\Columns\TextColumn::make('cost')->money('MDL')->alignRight(),
+                Tables\Columns\TextColumn::make('client_price')->label('Preț client')->money('MDL')->alignRight(),
+                Tables\Columns\TextColumn::make('margin')
+                    ->label('Marjă')
+                    ->state(fn (SubcontractJob $r) => $r->margin())
+                    ->money('MDL')->alignRight()
+                    ->color(fn ($s) => (float) $s > 0 ? 'success' : ((float) $s < 0 ? 'danger' : 'gray')),
+                Tables\Columns\TextColumn::make('status')
+                    ->formatStateUsing(fn ($s) => SubcontractJob::STATUSES[$s] ?? $s)
+                    ->badge()
+                    ->colors(['warning' => ['sent', 'in_progress'], 'success' => ['done', 'returned'], 'danger' => ['cancelled']]),
+            ])
+            ->headerActions([Actions\CreateAction::make()])
+            ->actions([Actions\EditAction::make(), Actions\DeleteAction::make()]);
+    }
+}
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Models\Tenant;
+
+use App\Models\Concerns\BelongsToTenant;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class SubcontractJob extends Model
+{
+    use BelongsToTenant, SoftDeletes;
+
+    public const STATUSES = [
+        'sent' => 'Trimis',
+        'in_progress' => 'În lucru',
+        'done' => 'Gata',
+        'returned' => 'Returnat',
+        'cancelled' => 'Anulat',
+    ];
+
+    protected $fillable = [
+        'company_id', 'work_order_id', 'subcontractor_id',
+        'number', 'category', 'description',
+        'cost', 'markup_pct', 'client_price',
+        'status', 'sent_at', 'eta', 'returned_at', 'paid_to_sub', 'notes',
+    ];
+
+    protected $casts = [
+        'cost' => 'decimal:2',
+        'markup_pct' => 'decimal:2',
+        'client_price' => 'decimal:2',
+        'sent_at' => 'date',
+        'eta' => 'date',
+        'returned_at' => 'date',
+        'paid_to_sub' => 'boolean',
+    ];
+
+    public function workOrder(): BelongsTo
+    {
+        return $this->belongsTo(WorkOrder::class);
+    }
+
+    public function subcontractor(): BelongsTo
+    {
+        return $this->belongsTo(Subcontractor::class);
+    }
+
+    /** Our margin = what we bill the client − what the sub charges us. */
+    public function margin(): float
+    {
+        return round((float) $this->client_price - (float) $this->cost, 2);
+    }
+
+    public static function generateNumber(int $companyId): string
+    {
+        $year = date('y');
+        $count = static::withoutGlobalScopes()
+            ->where('company_id', $companyId)
+            ->whereYear('created_at', date('Y'))
+            ->count();
+        return sprintf('SC-%s-%04d', $year, $count + 1);
+    }
+
+    protected static function booted(): void
+    {
+        static::creating(function (self $job) {
+            if (empty($job->number)) {
+                $job->number = static::generateNumber(
+                    $job->company_id ?: app(\App\Tenancy\TenantManager::class)->currentId()
+                );
+            }
+        });
+
+        static::saving(function (self $job) {
+            // markup drives client_price unless markup is zero (then keep manual price).
+            if ((float) $job->markup_pct > 0) {
+                $job->client_price = round((float) $job->cost * (1 + (float) $job->markup_pct / 100), 2);
+            }
+        });
+
+        static::saved(fn (self $job) => $job->workOrder?->recalcTotal());
+        static::deleted(fn (self $job) => $job->workOrder?->recalcTotal());
+    }
+}
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Models\Tenant;
+
+use App\Models\Concerns\BelongsToTenant;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Subcontractor extends Model
+{
+    use BelongsToTenant, SoftDeletes;
+
+    public const SPECIALTIES = [
+        'Turbo', 'Cutie viteze', 'Variator', 'Casetă direcție',
+        'PDR', 'Vopsitorie', 'Electronică', 'Injectoare', 'Altele',
+    ];
+
+    protected $fillable = [
+        'company_id', 'name', 'specialty', 'phone', 'email',
+        'rating', 'is_active', 'notes',
+    ];
+
+    protected $casts = [
+        'is_active' => 'boolean',
+    ];
+
+    public function jobs(): HasMany
+    {
+        return $this->hasMany(SubcontractJob::class);
+    }
+}
@@ -93,6 +93,11 @@ class WorkOrder extends Model implements HasMedia
        return $this->hasMany(Payment::class);
    }

+    public function subcontractJobs(): HasMany
+    {
+        return $this->hasMany(SubcontractJob::class);
+    }
+
    public function paidAmount(): float
    {
        return (float) $this->payments()->sum('amount');
@@ -107,7 +112,10 @@ class WorkOrder extends Model implements HasMedia
    {
        $worksTotal = $this->works()->sum('total');
        $partsTotal = $this->parts()->sum('total');
-        $sub = (float) $worksTotal + (float) $partsTotal;
+        $subcontractTotal = $this->subcontractJobs()
+            ->where('status', '!=', 'cancelled')
+            ->sum('client_price');
+        $sub = (float) $worksTotal + (float) $partsTotal + (float) $subcontractTotal;
        $disc = (float) $this->discount_pct;
        $this->total = round($sub * (1 - $disc / 100), 2);
        $this->save();