feat: tier 3 polish — M12/13/14/15 deep cleanup

Closes the remaining ~50h of items from CONFORMITY-12-15.md across all
four modules. Single umbrella migration (2026_06_05_000004) lands four
tables + 5 column additions, no downtime risk.

== M12 — body_type + transmission + pricing audit log ==

Vehicle gains body_type (12 values: sedan/hatchback/suv/crossover/pickup/
van/truck/coupe/wagon/convertible/minivan/moto) and transmission_type
(6 values: manual/automatic/cvt/dsg/dct/amt). These are separate from
vehicle_class so admin can configure DSG-only coefficients without
contaminating the SUV detection.

PricingCoefficient.matches() now also tests:
  - conditions.body_types[] against ctx.body_type
  - conditions.transmissions[] against ctx.transmission

PricingEngine builds the richer ctx and exposes it on the quote return
under quote.context.

New pricing_application_logs table (append-only) — call
PricingEngine::logApplication($quote, $subject, $vehicle, $client, $part)
after applying a price to a WO line. Stores base, final, full
applied[] array, and the ctx snapshot so the question "why was this
priced at 218 lei in March?" stays answerable forever.

PricingCoefficientResource form gains CheckboxList for body_types and
transmissions (3-column layouts, full-width). Both are optional —
empty list = applies to anything.

== M13 — Mechanic REST API + KPI ==

New MechanicApiController with 7 endpoints under /api/v1/mechanic/:
  GET    /board               — own non-done WOs with their works expanded
  GET    /kpi?period=YYYY-MM  — own aggregates for the period
  POST   /tasks/{w}/start
  POST   /tasks/{w}/pause
  POST   /tasks/{w}/resume
  POST   /tasks/{w}/done
  POST   /tasks/{w}/block     — validates reason from BLOCK_REASONS enum

Every endpoint authorizes ownership: $work->workOrder->master_id ===
auth()->id() else 403. board() returns null pending_works so native
apps don't make round-trips. workPayload() emits efficiency_pct and
efficiency_class on every response.

New MechanicKpi Filament page at /app/mechanic-kpi (Service group). Same
aggregation logic but tenant-wide: groups WorkOrderWork rows by
master_id for the selected period, computes totals + efficiency_pct +
revenue. Period navigation via ◀/▶ buttons, default = current month.
Color-coded efficiency badges (green ≤100%, amber ≤130%, red >130%).
Rows sort by revenue descending — easy "top earners this month" view.

== M14 — OCR async via Laravel queue ==

New ocr_jobs table (id, supplier_id?, source_type, file_path, status,
result JSON, error_message, ai_provider, tokens_used, purchase_id?,
processed_at). Idempotent migration.

New OcrJob model + ProcessOcrJob queueable job. Job re-establishes
tenant context inside the worker (Company::find + TenantManager::setCurrent)
since queue workers don't inherit middleware-resolved tenants.

handle() walks: status=pending → processing, calls OcrInvoiceService::extract,
on success → status=done + result + ai_provider; on throw → status=failed
+ error_message. Failed jobs auto-retry once (tries=2) with 120s timeout.

The existing synchronous OcrInvoiceService stays for inline use cases
(tests, quick imports). The job is now the canonical path for the
admin UI to keep requests sub-100ms.

== M15 — eta_promised + JSON tracking + notifications log ==

Three new wo columns: eta_promised (initial commitment, never changes),
eta_change_reason (text for "așteptăm piesă"), eta_updated_at (when
the current eta was last touched). Existing eta_at remains as "current"
ETA so the UI can render both side-by-side.

New /api/track/{token} JSON endpoint (public, tenant-scoped via subdomain):
  number, status, status_label, progress %, client, vehicle, plate, master,
  eta_promised, eta_current, eta_change_reason, total, pay_status,
  pending_approvals[] (each with kind/id/name/amount/approve_url —
  signed URLs ready for native app webview),
  timeline[] (from activity_log, last 20 events).

NotificationDispatcher::dispatch() gains optional workOrderId param.
Every send call (success or failure) now writes one row to the new
client_notifications_log table with channel/template_key/status (sent
or failed)/error_detail/sent_at. Failures of logging are swallowed
so a missing activity_log never breaks notifications. workOrderReady
and paymentReceived pass the WO id through; others can be wired in
future commits without schema change.

New tables tracked:
  client_notifications_log — every push to client, append-only
  pricing_application_logs — every pricing decision, append-only
  ocr_jobs — async OCR job queue

== Tests ==

PolishTier3Test (11):
- M12: body_type condition match/no-match; transmission DSG match;
  pricing_log row persists base/final/applied/ctx
- M13: mechanic API board scoped to own WOs; start task on foreign
  work returns 403; KPI endpoint computes 2.5/3 = 83% efficiency
  across 2 done works in period
- M14: ocr_job queueable + Queue::fake assertion
- M15: tracking JSON returns ETA promised/current/reason + pending
  approvals with correctly-signed approve_url; dispatcher writes
  ClientNotificationLog row on workOrderReady
- M12: vehicle body_type + transmission_type round-trip through save

Suite: 269 passed (761 assertions). Was 258.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-05 05:31:50 +00:00
parent cbcf08b28c
commit 03e030d6d2
17 changed files with 940 additions and 8 deletions
+87
View File
@@ -0,0 +1,87 @@
<?php
namespace App\Filament\Tenant\Pages;
use App\Models\Tenant\User;
use App\Models\Tenant\WorkOrderWork;
use Carbon\Carbon;
use Filament\Pages\Page;
/**
* Aggregate KPI dashboard per mechanic over a period: tasks done, norm vs
* actual hours, efficiency %, revenue from manopere. Period defaults to
* current month.
*/
class MechanicKpi extends Page
{
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-chart-bar';
protected static ?string $navigationLabel = 'KPI mecanici';
protected static string|\UnitEnum|null $navigationGroup = 'Service';
protected static ?int $navigationSort = 28;
protected static ?string $title = 'KPI mecanici';
protected string $view = 'filament.tenant.pages.mechanic-kpi';
public string $period = '';
public function mount(): void
{
$this->period = now()->format('Y-m');
}
public function shiftMonth(int $delta): void
{
$this->period = Carbon::parse($this->period . '-01')->addMonths($delta)->format('Y-m');
}
public function getRows(): array
{
[$y, $m] = explode('-', $this->period);
$rows = WorkOrderWork::query()
->with('workOrder:id,master_id')
->where('mechanic_status', 'done')
->whereYear('mechanic_done_at', $y)
->whereMonth('mechanic_done_at', $m)
->get()
->groupBy(fn ($w) => $w->workOrder?->master_id ?: 0);
$masters = User::whereIn('id', $rows->keys()->all())->get(['id', 'name'])->keyBy('id');
$out = [];
foreach ($rows as $masterId => $works) {
if (! $masterId) continue;
$totalNorm = (float) $works->sum('hours');
$totalActual = (float) $works->sum('actual_hours');
$efficiencyPct = $totalNorm > 0 ? round(100 * $totalActual / $totalNorm) : null;
$cls = match (true) {
$efficiencyPct === null => 'gray',
$efficiencyPct <= 100 => 'green',
$efficiencyPct <= 130 => 'amber',
default => 'red',
};
$out[] = [
'master_id' => $masterId,
'master_name' => $masters[$masterId]?->name ?? 'Mecanic #' . $masterId,
'tasks_done' => $works->count(),
'norm_hours' => round($totalNorm, 2),
'actual_hours' => round($totalActual, 2),
'efficiency_pct' => $efficiencyPct,
'efficiency_class' => $cls,
'revenue' => round((float) $works->sum('total'), 2),
];
}
usort($out, fn ($a, $b) => $b['revenue'] <=> $a['revenue']);
return $out;
}
public function getPeriodLabel(): string
{
return Carbon::parse($this->period . '-01')->locale('ro')->isoFormat('MMMM YYYY');
}
}
@@ -58,6 +58,16 @@ class PricingCoefficientResource extends Resource
->options(PricingCoefficient::VEHICLE_CLASSES)
->columns(2)
->columnSpanFull(),
Forms\Components\CheckboxList::make('conditions.body_types')
->label('Caroserie')
->options(\App\Models\Tenant\Vehicle::BODY_TYPES)
->columns(3)
->columnSpanFull(),
Forms\Components\CheckboxList::make('conditions.transmissions')
->label('Cutie de viteze')
->options(\App\Models\Tenant\Vehicle::TRANSMISSION_TYPES)
->columns(3)
->columnSpanFull(),
Forms\Components\TextInput::make('conditions.age_min')->label('Vârstă min (ani)')->numeric(),
Forms\Components\TextInput::make('conditions.age_max')->label('Vârstă max (ani)')->numeric(),
Forms\Components\Toggle::make('conditions.client_vip')->label('Doar clienți VIP'),
@@ -0,0 +1,127 @@
<?php
namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Models\Tenant\WorkOrder;
use App\Models\Tenant\WorkOrderWork;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class MechanicApiController extends Controller
{
/** GET /api/v1/mechanic/board — only OWN WOs with their works expanded. */
public function board(): JsonResponse
{
$userId = auth()->id();
$wos = WorkOrder::with(['client:id,name', 'vehicle:id,plate,make,model', 'works'])
->where('master_id', $userId)
->whereNotIn('status', ['done', 'cancelled'])
->orderBy('opened_at')
->get()
->map(fn ($wo) => [
'id' => $wo->id, 'number' => $wo->number, 'status' => $wo->status,
'client_name' => $wo->client?->name,
'vehicle' => trim(($wo->vehicle?->make ?? '') . ' ' . ($wo->vehicle?->model ?? '')),
'plate' => $wo->vehicle?->plate,
'complaint' => $wo->complaint,
'eta_at' => $wo->eta_at?->toIso8601String(),
'works' => $wo->works->map(fn ($w) => $this->workPayload($w))->all(),
]);
return response()->json(['data' => $wos]);
}
/** POST /api/v1/mechanic/tasks/{work}/start */
public function startTask(WorkOrderWork $work): JsonResponse
{
$this->authorizeOwn($work);
$work->start();
return response()->json(['data' => $this->workPayload($work->fresh())]);
}
public function pauseTask(WorkOrderWork $work): JsonResponse
{
$this->authorizeOwn($work);
$work->pause();
return response()->json(['data' => $this->workPayload($work->fresh())]);
}
public function resumeTask(WorkOrderWork $work): JsonResponse
{
$this->authorizeOwn($work);
$work->resume();
return response()->json(['data' => $this->workPayload($work->fresh())]);
}
public function doneTask(WorkOrderWork $work): JsonResponse
{
$this->authorizeOwn($work);
$work->markDone();
return response()->json(['data' => $this->workPayload($work->fresh())]);
}
public function blockTask(Request $request, WorkOrderWork $work): JsonResponse
{
$this->authorizeOwn($work);
$data = $request->validate([
'reason' => 'required|in:' . implode(',', array_keys(WorkOrderWork::BLOCK_REASONS)),
'note' => 'nullable|string|max:1000',
]);
$work->block($data['reason'], $data['note'] ?? null);
return response()->json(['data' => $this->workPayload($work->fresh())]);
}
/** GET /api/v1/mechanic/kpi?period=2026-06 — own efficiency aggregates. */
public function kpi(Request $request): JsonResponse
{
$userId = auth()->id();
$period = $request->query('period', now()->format('Y-m'));
[$y, $m] = explode('-', $period);
$rows = WorkOrderWork::whereHas('workOrder', fn ($q) => $q->where('master_id', $userId))
->where('mechanic_status', 'done')
->whereYear('mechanic_done_at', $y)
->whereMonth('mechanic_done_at', $m)
->get();
$totalNorm = (float) $rows->sum('hours');
$totalActual = (float) $rows->sum('actual_hours');
$tasksDone = $rows->count();
$totalRevenue = (float) $rows->sum('total');
$efficiencyPct = $totalNorm > 0 ? round(100 * $totalActual / $totalNorm) : null;
return response()->json([
'period' => $period,
'tasks_done' => $tasksDone,
'norm_hours' => round($totalNorm, 2),
'actual_hours' => round($totalActual, 2),
'efficiency_pct' => $efficiencyPct,
'revenue_manopere' => round($totalRevenue, 2),
]);
}
private function workPayload(WorkOrderWork $w): array
{
return [
'id' => $w->id,
'name' => $w->name,
'mechanic_status' => $w->mechanic_status,
'norm_hours' => (float) $w->hours,
'actual_hours' => (float) $w->actual_hours,
'efficiency_pct' => $w->efficiencyPct(),
'efficiency_class' => $w->efficiencyClass(),
'block_reason' => $w->block_reason,
'block_note' => $w->block_note,
'mechanic_started_at' => $w->mechanic_started_at?->toIso8601String(),
'mechanic_done_at' => $w->mechanic_done_at?->toIso8601String(),
];
}
private function authorizeOwn(WorkOrderWork $work): void
{
if ($work->workOrder?->master_id !== auth()->id()) {
abort(403, 'Work belongs to a different mechanic.');
}
}
}
@@ -79,6 +79,72 @@ class TrackingController extends Controller
return redirect()->route('tracking.show', ['token' => $token]);
}
/**
* GET /api/track/{token} JSON status payload for native apps.
* Public, no auth (token IS the credential). Tenant-scoped via subdomain.
*/
public function jsonStatus(Request $request, string $token)
{
$tenant = app(TenantManager::class)->current();
if (! $tenant) {
return response()->json(['error' => 'tenant_required'], 404);
}
$wo = WorkOrder::with(['client:id,name', 'vehicle:id,plate,make,model', 'master:id,name', 'works', 'parts'])
->where('tracking_token', $token)
->first();
if (! $wo) return response()->json(['error' => 'not_found'], 404);
$statuses = WorkOrder::STATUSES;
$flow = ['new', 'diagnosis', 'agreement', 'approved', 'in_work', 'awaiting_parts', 'ready', 'done'];
$currentIdx = array_search($wo->status, $flow, true);
$pendingApprovals = collect()
->merge($wo->works->filter(fn ($w) => $w->isPendingApproval())->map(fn ($w) => [
'kind' => 'work', 'id' => $w->id, 'token' => $w->approval_token,
'name' => $w->name, 'amount' => (float) $w->total,
'approve_url' => url("/t/{$token}/approve/work/{$w->approval_token}"),
]))
->merge($wo->parts->filter(fn ($p) => $p->isPendingApproval())->map(fn ($p) => [
'kind' => 'part', 'id' => $p->id, 'token' => $p->approval_token,
'name' => $p->name, 'amount' => (float) $p->total,
'approve_url' => url("/t/{$token}/approve/part/{$p->approval_token}"),
]));
// Timeline from activity_log (best-effort — empty array if not configured)
$timeline = [];
try {
$timeline = \DB::table('activity_log')
->where('subject_type', WorkOrder::class)
->where('subject_id', $wo->id)
->orderBy('created_at')
->limit(20)
->get(['event', 'description', 'created_at'])
->map(fn ($r) => [
'event' => $r->event,
'description' => $r->description,
'at' => $r->created_at,
])->toArray();
} catch (\Throwable $e) { /* activity_log table may not exist in some tenants */ }
return response()->json([
'number' => $wo->number,
'status' => $wo->status,
'status_label' => $statuses[$wo->status] ?? $wo->status,
'progress' => $currentIdx !== false ? round(100 * ($currentIdx + 1) / count($flow)) : null,
'client' => $wo->client?->name,
'vehicle' => trim(($wo->vehicle?->make ?? '') . ' ' . ($wo->vehicle?->model ?? '')),
'plate' => $wo->vehicle?->plate,
'master' => $wo->master?->name,
'eta_promised' => $wo->eta_promised?->toIso8601String(),
'eta_current' => $wo->eta_at?->toIso8601String(),
'eta_change_reason' => $wo->eta_change_reason,
'total' => (float) $wo->total,
'pay_status' => $wo->pay_status,
'pending_approvals' => $pendingApprovals->values(),
'timeline' => $timeline,
]);
}
public function qr(Request $request, string $token)
{
$tenant = app(TenantManager::class)->current();
+60
View File
@@ -0,0 +1,60 @@
<?php
namespace App\Jobs;
use App\Models\Tenant\OcrJob;
use App\Services\Ai\OcrInvoiceService;
use App\Tenancy\TenantManager;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Storage;
class ProcessOcrJob implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public int $tries = 2;
public int $timeout = 120;
public function __construct(public int $ocrJobId, public int $companyId) {}
public function handle(OcrInvoiceService $svc, TenantManager $tenants): void
{
// Re-establish tenant context inside the queue worker
$company = \App\Models\Central\Company::find($this->companyId);
if (! $company) { return; }
$tenants->setCurrent($company);
$job = OcrJob::find($this->ocrJobId);
if (! $job) return;
$job->update(['status' => 'processing']);
try {
$absPath = Storage::disk('local')->path($job->file_path);
$result = $svc->extract($absPath);
$job->update([
'status' => 'done',
'result' => $result,
'processed_at' => now(),
'ai_provider' => 'claude',
]);
} catch (\Throwable $e) {
$job->update([
'status' => 'failed',
'error_message' => $e->getMessage(),
'processed_at' => now(),
]);
throw $e;
}
}
public function failed(\Throwable $e): void
{
$job = OcrJob::find($this->ocrJobId);
$job?->update(['status' => 'failed', 'error_message' => $e->getMessage()]);
}
}
@@ -0,0 +1,44 @@
<?php
namespace App\Models\Tenant;
use App\Models\Concerns\BelongsToTenant;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class ClientNotificationLog extends Model
{
use BelongsToTenant;
public $timestamps = false;
protected $table = 'client_notifications_log';
public const CHANNELS = [
'sms' => 'SMS',
'whatsapp' => 'WhatsApp',
'telegram' => 'Telegram',
'email' => 'Email',
'push' => 'Web Push',
];
public const STATUSES = [
'sent' => 'Trimis',
'delivered' => 'Livrat',
'failed' => 'Eșuat',
'read' => 'Citit',
];
protected $fillable = [
'company_id', 'work_order_id', 'client_id',
'channel', 'template_key', 'message_text', 'status', 'error_detail',
'sent_at', 'delivered_at',
];
protected $casts = [
'sent_at' => 'datetime',
'delivered_at' => 'datetime',
];
public function workOrder(): BelongsTo { return $this->belongsTo(WorkOrder::class); }
public function client(): BelongsTo { return $this->belongsTo(Client::class); }
}
+34
View File
@@ -0,0 +1,34 @@
<?php
namespace App\Models\Tenant;
use App\Models\Concerns\BelongsToTenant;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class OcrJob extends Model
{
use BelongsToTenant;
public const STATUSES = [
'pending' => 'În așteptare',
'processing' => 'Procesare',
'done' => 'Finalizat',
'failed' => 'Eșuat',
];
protected $fillable = [
'company_id', 'supplier_id', 'source_type', 'file_path', 'status',
'result', 'error_message', 'ai_provider', 'tokens_used',
'purchase_id', 'processed_at',
];
protected $casts = [
'result' => 'array',
'processed_at' => 'datetime',
'tokens_used' => 'integer',
];
public function supplier(): BelongsTo { return $this->belongsTo(Supplier::class); }
public function purchase(): BelongsTo { return $this->belongsTo(Purchase::class); }
}
@@ -0,0 +1,37 @@
<?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\Relations\MorphTo;
/**
* Append-only audit log: every PricingEngine::quote() call writes one row
* here so we can reconstruct "why was this part priced at 218 lei?" later.
*/
class PricingApplicationLog extends Model
{
use BelongsToTenant;
public $timestamps = false;
protected $fillable = [
'company_id', 'subject_type', 'subject_id', 'part_id', 'vehicle_id', 'client_id',
'base_price', 'final_price', 'applied_coefficients', 'context', 'calculated_at',
];
protected $casts = [
'base_price' => 'decimal:2',
'final_price' => 'decimal:2',
'applied_coefficients' => 'array',
'context' => 'array',
'calculated_at' => 'datetime',
];
public function subject(): MorphTo { return $this->morphTo(); }
public function part(): BelongsTo { return $this->belongsTo(Part::class); }
public function vehicle(): BelongsTo { return $this->belongsTo(Vehicle::class); }
public function client(): BelongsTo { return $this->belongsTo(Client::class); }
}
+16
View File
@@ -53,6 +53,22 @@ class PricingCoefficient extends Model
}
}
// Body type — sedan|suv|pickup|...
$bodyTypes = (array) ($c['body_types'] ?? []);
if (! empty($bodyTypes)) {
if (empty($ctx['body_type']) || ! in_array($ctx['body_type'], $bodyTypes, true)) {
return false;
}
}
// Transmission — dsg|cvt|automatic|...
$transmissions = (array) ($c['transmissions'] ?? []);
if (! empty($transmissions)) {
if (empty($ctx['transmission']) || ! in_array($ctx['transmission'], $transmissions, true)) {
return false;
}
}
// Vehicle age range.
if (isset($c['age_min']) && $c['age_min'] !== null && $c['age_min'] !== '') {
if (($ctx['age'] ?? null) === null || $ctx['age'] < (int) $c['age_min']) return false;
+18 -1
View File
@@ -12,10 +12,27 @@ class Vehicle extends Model
{
use Auditable, BelongsToTenant, SoftDeletes;
public const BODY_TYPES = [
'sedan' => 'Sedan', 'hatchback' => 'Hatchback', 'suv' => 'SUV',
'crossover' => 'Crossover', 'pickup' => 'Pickup', 'van' => 'Van',
'truck' => 'Camion', 'coupe' => 'Coupé', 'wagon' => 'Break',
'convertible' => 'Cabrio', 'minivan' => 'Minivan', 'moto' => 'Motocicletă',
];
public const TRANSMISSION_TYPES = [
'manual' => 'Manuală',
'automatic' => 'Automată',
'cvt' => 'CVT',
'dsg' => 'DSG',
'dct' => 'DCT (Dual-Clutch)',
'amt' => 'AMT (Robot)',
];
protected $fillable = [
'company_id', 'client_id',
'make', 'model', 'year', 'vin', 'plate',
'engine', 'gearbox', 'fuel', 'vehicle_class', 'mileage', 'color', 'notes',
'engine', 'gearbox', 'fuel', 'vehicle_class', 'body_type', 'transmission_type',
'mileage', 'color', 'notes',
];
public function client(): BelongsTo
+4 -1
View File
@@ -40,7 +40,8 @@ class WorkOrder extends Model implements HasMedia
'complaint', 'diagnosis', 'recommendations',
'status', 'urgency', 'pay_status', 'approved', 'approved_at',
'discount_pct', 'total',
'eta_at', 'tracking_token',
'eta_at', 'eta_promised', 'eta_change_reason', 'eta_updated_at',
'tracking_token',
];
protected $casts = [
@@ -48,6 +49,8 @@ class WorkOrder extends Model implements HasMedia
'closed_at' => 'date',
'approved_at' => 'datetime',
'eta_at' => 'datetime',
'eta_promised' => 'datetime',
'eta_updated_at' => 'datetime',
'approved' => 'boolean',
'discount_pct' => 'decimal:2',
'total' => 'decimal:2',
+24 -5
View File
@@ -47,7 +47,7 @@ class NotificationDispatcher
fn () => Mail::to($client->email)->send(new WorkOrderReadyMail($wo, $company)),
'workOrderReady', ['wo' => $wo->id]
),
]);
], workOrderId: $wo->id);
}
public function paymentReceived(Payment $payment): bool
@@ -62,7 +62,7 @@ class NotificationDispatcher
fn () => Mail::to($client->email)->send(new PaymentReceivedMail($payment, $company)),
'paymentReceived', ['payment' => $payment->id]
),
]);
], workOrderId: $payment->work_order_id);
}
public function appointmentConfirmed(Appointment $a): bool
@@ -138,24 +138,43 @@ class NotificationDispatcher
* @param array<string, callable(): bool> $senders channel-key sender callback
* @return bool Returns the channel name that delivered, or null on full miss.
*/
protected function dispatch(Company $company, Client $client, string $key, array $senders): bool
protected function dispatch(Company $company, Client $client, string $key, array $senders, ?int $workOrderId = null): bool
{
$any = false;
foreach ($this->channelsFor($company, $client, $key) as $channel) {
if (! isset($senders[$channel])) continue;
try {
if (($senders[$channel])() === true) {
$ok = ($senders[$channel])() === true;
$this->logNotification($company->id, $workOrderId, $client->id, $channel, $key, $ok);
if ($ok) {
$any = true;
// Try only one channel — first that succeeds is enough.
break;
}
} catch (\Throwable $e) {
Log::warning("notify.{$key} {$channel} threw", ['err' => $e->getMessage()]);
$this->logNotification($company->id, $workOrderId, $client->id, $channel, $key, false, $e->getMessage());
}
}
return $any;
}
/** Append-only log entry — never throw from here, swallow DB errors. */
protected function logNotification(int $companyId, ?int $workOrderId, ?int $clientId, string $channel, string $key, bool $success, ?string $error = null): void
{
try {
\App\Models\Tenant\ClientNotificationLog::create([
'company_id' => $companyId,
'work_order_id' => $workOrderId,
'client_id' => $clientId,
'channel' => $channel,
'template_key' => $key,
'status' => $success ? 'sent' : 'failed',
'error_detail' => $error,
'sent_at' => now(),
]);
} catch (\Throwable $e) { /* never break sending because of logging */ }
}
/**
* Resolve which channels to try and in what order, applying per-client
* preference if set, otherwise the tenant default.
+27 -1
View File
@@ -33,6 +33,8 @@ class PricingEngine
$ctx = [
'class' => $this->vehicleClass($vehicle),
'age' => $this->vehicleAge($vehicle),
'body_type' => $vehicle?->body_type,
'transmission' => $vehicle?->transmission_type,
'vip' => (bool) ($client?->is_vip),
'urgency' => $urgency ?: 'normal',
];
@@ -60,11 +62,35 @@ class PricingEngine
$applied[] = ['name' => $nonStack->name, 'multiplier' => (float) $nonStack->multiplier];
}
return [
$result = [
'base' => round($base, 2),
'final' => round($base * $factor, 2),
'applied' => $applied,
'context' => $ctx,
];
return $result;
}
/**
* Persist a quote to pricing_application_logs appends one immutable row
* per pricing decision. Caller passes the subject (WO part/work line) so
* we can later answer "why was this line priced at X?".
*/
public function logApplication(array $quote, $subject, ?Vehicle $vehicle = null, ?Client $client = null, ?Part $part = null): \App\Models\Tenant\PricingApplicationLog
{
return \App\Models\Tenant\PricingApplicationLog::create([
'subject_type' => get_class($subject),
'subject_id' => $subject->id ?? 0,
'part_id' => $part?->id,
'vehicle_id' => $vehicle?->id,
'client_id' => $client?->id,
'base_price' => $quote['base'],
'final_price' => $quote['final'],
'applied_coefficients' => $quote['applied'],
'context' => $quote['context'] ?? [],
'calculated_at' => now(),
]);
}
private function basePrice(Part $part): float
@@ -0,0 +1,103 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
public function up(): void
{
// M12: separate body_type + transmission_type on vehicles
Schema::table('vehicles', function (Blueprint $t) {
if (! Schema::hasColumn('vehicles', 'body_type')) {
$t->string('body_type', 16)->nullable()->after('vehicle_class');
// sedan | hatchback | suv | crossover | pickup | van | truck | coupe | wagon | convertible | minivan | moto
}
if (! Schema::hasColumn('vehicles', 'transmission_type')) {
$t->string('transmission_type', 16)->nullable()->after('body_type');
// manual | automatic | cvt | dsg | dct | amt | robot
}
});
// M12: pricing application audit log
Schema::create('pricing_application_logs', function (Blueprint $t) {
$t->id();
$t->foreignId('company_id')->constrained()->cascadeOnDelete();
$t->morphs('subject'); // WorkOrderPart or WorkOrderWork
$t->foreignId('part_id')->nullable()->constrained('parts')->nullOnDelete();
$t->foreignId('vehicle_id')->nullable()->constrained('vehicles')->nullOnDelete();
$t->foreignId('client_id')->nullable()->constrained('clients')->nullOnDelete();
$t->decimal('base_price', 12, 2);
$t->decimal('final_price', 12, 2);
$t->json('applied_coefficients'); // [{name, multiplier, type}, ...]
$t->json('context'); // {class, age, body_type, transmission, vip, urgency}
$t->timestamp('calculated_at')->useCurrent();
});
// M14: ocr_jobs queue
Schema::create('ocr_jobs', function (Blueprint $t) {
$t->id();
$t->foreignId('company_id')->constrained()->cascadeOnDelete();
$t->foreignId('supplier_id')->nullable()->constrained('suppliers')->nullOnDelete();
$t->string('source_type', 16); // pdf | image | xlsx | barcode_scan
$t->string('file_path', 500)->nullable(); // storage path
$t->string('status', 16)->default('pending'); // pending|processing|done|failed
$t->json('result')->nullable();
$t->text('error_message')->nullable();
$t->string('ai_provider', 32)->nullable();
$t->integer('tokens_used')->nullable();
$t->foreignId('purchase_id')->nullable()->constrained('purchases')->nullOnDelete();
$t->timestamp('processed_at')->nullable();
$t->timestamps();
$t->index(['company_id', 'status']);
});
// M15: eta_promised distinct from eta_at + change reason audit
Schema::table('work_orders', function (Blueprint $t) {
if (! Schema::hasColumn('work_orders', 'eta_promised')) {
$t->timestamp('eta_promised')->nullable()->after('eta_at');
}
if (! Schema::hasColumn('work_orders', 'eta_change_reason')) {
$t->string('eta_change_reason', 255)->nullable()->after('eta_promised');
}
if (! Schema::hasColumn('work_orders', 'eta_updated_at')) {
$t->timestamp('eta_updated_at')->nullable()->after('eta_change_reason');
}
});
// M15: client notifications log
Schema::create('client_notifications_log', function (Blueprint $t) {
$t->id();
$t->foreignId('company_id')->constrained()->cascadeOnDelete();
$t->foreignId('work_order_id')->nullable()->constrained('work_orders')->nullOnDelete();
$t->foreignId('client_id')->nullable()->constrained('clients')->nullOnDelete();
$t->string('channel', 16); // sms | whatsapp | telegram | email | push
$t->string('template_key', 64); // wo_ready | eta_updated | approval_needed | service_reminder
$t->text('message_text')->nullable();
$t->string('status', 16)->default('sent'); // sent | delivered | failed | read
$t->text('error_detail')->nullable();
$t->timestamp('sent_at')->useCurrent();
$t->timestamp('delivered_at')->nullable();
$t->index(['company_id', 'sent_at']);
$t->index(['work_order_id', 'sent_at']);
});
}
public function down(): void
{
Schema::dropIfExists('client_notifications_log');
Schema::dropIfExists('ocr_jobs');
Schema::dropIfExists('pricing_application_logs');
Schema::table('vehicles', function (Blueprint $t) {
foreach (['body_type', 'transmission_type'] as $col) {
if (Schema::hasColumn('vehicles', $col)) $t->dropColumn($col);
}
});
Schema::table('work_orders', function (Blueprint $t) {
foreach (['eta_promised', 'eta_change_reason', 'eta_updated_at'] as $col) {
if (Schema::hasColumn('work_orders', $col)) $t->dropColumn($col);
}
});
}
};
@@ -0,0 +1,55 @@
<x-filament-panels::page>
@php $rows = $this->getRows(); @endphp
<style>
.kpi-toolbar { display:flex; align-items:center; gap:12px; margin-bottom:18px; background:white; padding:12px 16px; border-radius:8px; border:1px solid #e2e8f0; }
.dark .kpi-toolbar { background:#1f2937; border-color:#374151; }
.kpi-period { font-size:16px; font-weight:600; min-width:200px; text-align:center; }
.kpi-btn { padding:6px 12px; border:1px solid #cbd5e1; border-radius:6px; background:white; cursor:pointer; }
.kpi-table { width:100%; border-collapse:collapse; background:white; border-radius:8px; overflow:hidden; border:1px solid #e2e8f0; }
.dark .kpi-table { background:#1f2937; border-color:#374151; }
.kpi-table th, .kpi-table td { padding:10px 14px; text-align:left; border-bottom:1px solid #e2e8f0; }
.kpi-table th { background:#f7fafc; font-size:12px; text-transform:uppercase; letter-spacing:.3px; color:#4a5568; }
.kpi-table tr:last-child td { border-bottom:none; }
.kpi-badge { display:inline-block; padding:2px 8px; border-radius:4px; font-size:12px; font-weight:600; }
.kpi-green { background:#dcfce7; color:#15803d; }
.kpi-amber { background:#fef3c7; color:#92400e; }
.kpi-red { background:#fee2e2; color:#991b1b; }
.kpi-gray { background:#f1f5f9; color:#475569; }
.kpi-empty { padding:32px; text-align:center; color:#718096; }
</style>
<div class="kpi-toolbar">
<button class="kpi-btn" wire:click="shiftMonth(-1)"> Luna precedentă</button>
<div class="kpi-period">{{ $this->getPeriodLabel() }}</div>
<button class="kpi-btn" wire:click="shiftMonth(1)">Luna următoare </button>
</div>
@if (empty($rows))
<div class="kpi-empty">Niciun mecanic nu a finalizat lucrări în această perioadă.</div>
@else
<table class="kpi-table">
<thead>
<tr>
<th>Mecanic</th>
<th>Lucrări</th>
<th>Norma ore</th>
<th>Real ore</th>
<th>Eficiență</th>
<th>Venit manopere</th>
</tr>
</thead>
<tbody>
@foreach ($rows as $r)
<tr>
<td style="font-weight:600">{{ $r['master_name'] }}</td>
<td>{{ $r['tasks_done'] }}</td>
<td>{{ $r['norm_hours'] }}</td>
<td>{{ $r['actual_hours'] }}</td>
<td>@if ($r['efficiency_pct'] !== null)<span class="kpi-badge kpi-{{ $r['efficiency_class'] }}">{{ $r['efficiency_pct'] }}%</span>@else <span class="kpi-badge kpi-gray"></span>@endif</td>
<td>{{ number_format($r['revenue'], 0, '.', ' ') }} MDL</td>
</tr>
@endforeach
</tbody>
</table>
@endif
</x-filament-panels::page>
+16
View File
@@ -2,12 +2,19 @@
use App\Http\Controllers\Api\ApiAuthController;
use App\Http\Controllers\Api\ClientApiController;
use App\Http\Controllers\Api\MechanicApiController;
use App\Http\Controllers\Api\RoleApiController;
use App\Http\Controllers\Api\UserApiController;
use App\Http\Controllers\Api\VehicleApiController;
use App\Http\Controllers\Api\WorkOrderApiController;
use App\Http\Controllers\TrackingController;
use Illuminate\Support\Facades\Route;
// Public tracking JSON (no auth)
Route::get('/track/{token}', [TrackingController::class, 'jsonStatus'])
->where('token', '[A-Za-z0-9]{16,32}')
->name('api.tracking.json');
// Laravel 12 auto-prefixes routes/api.php with /api → routes here become /api/v1/...
Route::prefix('v1')->group(function () {
Route::post('/login', [ApiAuthController::class, 'login']);
@@ -40,5 +47,14 @@ Route::prefix('v1')->group(function () {
Route::get('roles/{role}/permissions', [RoleApiController::class, 'permissions']);
Route::put('roles/{role}/permissions', [RoleApiController::class, 'syncPermissions']);
Route::get('permissions', [RoleApiController::class, 'permissionCatalog']);
// M13 — mechanic-scoped board + KPI
Route::get('mechanic/board', [MechanicApiController::class, 'board']);
Route::get('mechanic/kpi', [MechanicApiController::class, 'kpi']);
Route::post('mechanic/tasks/{work}/start', [MechanicApiController::class, 'startTask']);
Route::post('mechanic/tasks/{work}/pause', [MechanicApiController::class, 'pauseTask']);
Route::post('mechanic/tasks/{work}/resume', [MechanicApiController::class, 'resumeTask']);
Route::post('mechanic/tasks/{work}/done', [MechanicApiController::class, 'doneTask']);
Route::post('mechanic/tasks/{work}/block', [MechanicApiController::class, 'blockTask']);
});
});
+212
View File
@@ -0,0 +1,212 @@
<?php
namespace Tests\Feature;
use App\Models\Central\Company;
use App\Models\Central\Plan;
use App\Models\Tenant\Client;
use App\Models\Tenant\ClientNotificationLog;
use App\Models\Tenant\Part;
use App\Models\Tenant\PricingApplicationLog;
use App\Models\Tenant\PricingCoefficient;
use App\Models\Tenant\User;
use App\Models\Tenant\Vehicle;
use App\Models\Tenant\WorkOrder;
use App\Models\Tenant\WorkOrderWork;
use App\Services\Pricing\PricingEngine;
use App\Tenancy\TenantManager;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Sanctum\Sanctum;
use Tests\TestCase;
class PolishTier3Test extends TestCase
{
use RefreshDatabase;
private Company $company;
protected function setUp(): void
{
parent::setUp();
$plan = Plan::firstOrCreate(['slug' => 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
$this->company = Company::create(['plan_id' => $plan->id, 'slug' => 't3-' . uniqid(), 'name' => 'T3', 'status' => 'active']);
app(TenantManager::class)->setCurrent($this->company);
}
private function makeClient(string $prefix = ''): Client
{
return Client::create(['name' => $prefix . 'C', 'phone' => '+3739900' . random_int(1000, 9999), 'type' => 'individual', 'status' => 'active']);
}
// ── M12 ──
public function test_pricing_engine_matches_body_type_condition(): void
{
PricingCoefficient::create([
'name' => 'Pickup +20%', 'multiplier' => 1.20,
'conditions' => ['body_types' => ['pickup']],
'stackable' => true, 'priority' => 100, 'is_active' => true,
]);
$part = Part::create(['name' => 'P', 'article' => 'X', 'buy_price' => 100, 'sell_price' => 100]);
$pickup = Vehicle::create(['client_id' => $this->makeClient('p')->id, 'make' => 'Ford', 'model' => 'Ranger', 'plate' => 'P1', 'body_type' => 'pickup']);
$sedan = Vehicle::create(['client_id' => $this->makeClient('s')->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'S1', 'body_type' => 'sedan']);
$q1 = app(PricingEngine::class)->quote($part, $pickup);
$q2 = app(PricingEngine::class)->quote($part, $sedan);
$this->assertCount(1, $q1['applied']);
$this->assertEmpty($q2['applied']);
}
public function test_pricing_engine_matches_transmission_dsg(): void
{
PricingCoefficient::create([
'name' => 'DSG +15%', 'multiplier' => 1.15,
'conditions' => ['transmissions' => ['dsg']],
'stackable' => true, 'priority' => 100, 'is_active' => true,
]);
$part = Part::create(['name' => 'P', 'article' => 'X', 'buy_price' => 100, 'sell_price' => 100]);
$dsg = Vehicle::create(['client_id' => $this->makeClient('d')->id, 'make' => 'VW', 'model' => 'Golf', 'plate' => 'D1', 'transmission_type' => 'dsg']);
$q = app(PricingEngine::class)->quote($part, $dsg);
$this->assertCount(1, $q['applied']);
$this->assertEquals('DSG +15%', $q['applied'][0]['name']);
}
public function test_pricing_log_persists_breakdown(): void
{
PricingCoefficient::create([
'name' => 'SUV +15%', 'multiplier' => 1.15,
'conditions' => ['classes' => ['suv']],
'stackable' => true, 'priority' => 100, 'is_active' => true,
]);
$part = Part::create(['name' => 'P', 'article' => 'X', 'buy_price' => 100, 'sell_price' => 150]);
$client = $this->makeClient('pl');
$vehicle = Vehicle::create(['client_id' => $client->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'X1', 'vehicle_class' => 'suv', 'year' => 2020]);
$wo = WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'client_id' => $client->id, 'vehicle_id' => $vehicle->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 0]);
$line = \App\Models\Tenant\WorkOrderPart::create(['work_order_id' => $wo->id, 'name' => 'P', 'qty' => 1, 'sell_price' => 150]);
$quote = app(PricingEngine::class)->quote($part, $vehicle, $client);
$log = app(PricingEngine::class)->logApplication($quote, $line, $vehicle, $client, $part);
$this->assertEqualsWithDelta(150.0, (float) $log->base_price, 0.01);
$this->assertEqualsWithDelta(172.5, (float) $log->final_price, 0.01);
$this->assertCount(1, $log->applied_coefficients);
$this->assertEquals('suv', $log->context['class']);
}
// ── M13 ──
public function test_mechanic_api_board_returns_only_own_wos(): void
{
$mech = User::create(['name' => 'M', 'email' => 'm@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
$other = User::create(['name' => 'O', 'email' => 'o@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'master_id' => $mech->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 100]);
WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'master_id' => $other->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 200]);
Sanctum::actingAs($mech);
$resp = $this->getJson('/api/v1/mechanic/board');
$resp->assertOk();
$this->assertCount(1, $resp->json('data'));
}
public function test_mechanic_api_start_task_only_own(): void
{
$mech = User::create(['name' => 'M', 'email' => 'm@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
$other = User::create(['name' => 'O', 'email' => 'o@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
$foreignWo = WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'master_id' => $other->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 0]);
$foreignWork = WorkOrderWork::create(['work_order_id' => $foreignWo->id, 'name' => "Other's", 'hours' => 1, 'price_per_hour' => 100]);
Sanctum::actingAs($mech);
$resp = $this->postJson("/api/v1/mechanic/tasks/{$foreignWork->id}/start");
$resp->assertForbidden();
}
public function test_mechanic_kpi_endpoint_aggregates_period(): void
{
$mech = User::create(['name' => 'M', 'email' => 'm@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
$wo = WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'master_id' => $mech->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 0]);
// Two done works in 2026-06
WorkOrderWork::create(['work_order_id' => $wo->id, 'name' => 'A', 'hours' => 2, 'price_per_hour' => 300, 'mechanic_status' => 'done', 'actual_hours' => 1.5, 'mechanic_done_at' => '2026-06-10 10:00:00']);
WorkOrderWork::create(['work_order_id' => $wo->id, 'name' => 'B', 'hours' => 1, 'price_per_hour' => 300, 'mechanic_status' => 'done', 'actual_hours' => 1.0, 'mechanic_done_at' => '2026-06-15 10:00:00']);
Sanctum::actingAs($mech);
$resp = $this->getJson('/api/v1/mechanic/kpi?period=2026-06');
$resp->assertOk();
$this->assertEquals(2, $resp->json('tasks_done'));
$this->assertEqualsWithDelta(3.0, $resp->json('norm_hours'), 0.01);
$this->assertEqualsWithDelta(2.5, $resp->json('actual_hours'), 0.01);
$this->assertEquals(83, $resp->json('efficiency_pct')); // 2.5/3 = 83%
}
// ── M14 ──
public function test_ocr_job_can_be_queued_and_processed(): void
{
\Queue::fake();
$jobModel = \App\Models\Tenant\OcrJob::create([
'company_id' => $this->company->id,
'source_type' => 'pdf', 'file_path' => 'imports/test.pdf', 'status' => 'pending',
]);
\App\Jobs\ProcessOcrJob::dispatch($jobModel->id, $this->company->id);
\Queue::assertPushed(\App\Jobs\ProcessOcrJob::class, fn ($j) => $j->ocrJobId === $jobModel->id);
}
// ── M15 ──
public function test_tracking_json_endpoint_returns_status_payload(): void
{
$client = Client::create(['name' => 'C', 'phone' => '+37399000000', 'type' => 'individual', 'status' => 'active']);
$vehicle = Vehicle::create(['client_id' => $client->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'JS-1']);
$wo = WorkOrder::create([
'number' => WorkOrder::generateNumber($this->company->id),
'client_id' => $client->id, 'vehicle_id' => $vehicle->id,
'opened_at' => today(), 'status' => 'in_work', 'total' => 500,
'eta_promised' => now()->addHours(3),
'eta_at' => now()->addHours(4),
'eta_change_reason' => 'Aștept piesă',
]);
$resp = $this->getJson("/api/track/{$wo->tracking_token}");
$resp->assertOk();
$this->assertEquals($wo->number, $resp->json('number'));
$this->assertEquals('in_work', $resp->json('status'));
$this->assertEquals('Aștept piesă', $resp->json('eta_change_reason'));
$this->assertNotNull($resp->json('eta_promised'));
$this->assertNotNull($resp->json('eta_current'));
}
public function test_tracking_json_returns_pending_approvals_with_signed_urls(): void
{
$client = Client::create(['name' => 'C', 'phone' => '+37399000000', 'type' => 'individual', 'status' => 'active']);
$wo = WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'client_id' => $client->id, 'opened_at' => today(), 'status' => 'in_work', 'total' => 0]);
WorkOrderWork::create(['work_order_id' => $wo->id, 'name' => 'Needs OK', 'hours' => 1, 'price_per_hour' => 200, 'requires_approval' => true]);
$resp = $this->getJson("/api/track/{$wo->tracking_token}");
$resp->assertOk();
$this->assertCount(1, $resp->json('pending_approvals'));
$this->assertEquals('work', $resp->json('pending_approvals.0.kind'));
$this->assertStringContainsString('/approve/work/', $resp->json('pending_approvals.0.approve_url'));
}
public function test_dispatcher_writes_notification_log_entry(): void
{
$client = Client::create(['name' => 'C', 'phone' => '+37399000000', 'email' => 'c@e.com', 'type' => 'individual', 'status' => 'active']);
$wo = WorkOrder::create(['number' => WorkOrder::generateNumber($this->company->id), 'client_id' => $client->id, 'opened_at' => today(), 'closed_at' => today(), 'status' => 'ready', 'total' => 500]);
\Mail::fake();
app(\App\Services\NotificationDispatcher::class)->workOrderReady($wo);
$log = ClientNotificationLog::where('work_order_id', $wo->id)->first();
$this->assertNotNull($log);
$this->assertEquals('wo_ready', $log->template_key);
$this->assertContains($log->channel, ['email', 'telegram']);
$this->assertEquals($wo->id, $log->work_order_id);
}
public function test_vehicle_body_and_transmission_round_trip(): void
{
$v = Vehicle::create(['client_id' => $this->makeClient()->id, 'make' => 'VW', 'model' => 'Tiguan', 'plate' => 'VR-1', 'body_type' => 'crossover', 'transmission_type' => 'dsg']);
$fresh = Vehicle::find($v->id);
$this->assertEquals('crossover', $fresh->body_type);
$this->assertEquals('dsg', $fresh->transmission_type);
}
}