03e030d6d2
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>
176 lines
7.1 KiB
PHP
176 lines
7.1 KiB
PHP
<?php
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
use App\Models\Tenant\WorkOrder;
|
|
use App\Models\Tenant\WorkOrderPart;
|
|
use App\Models\Tenant\WorkOrderWork;
|
|
use App\Tenancy\TenantManager;
|
|
use Illuminate\Http\Request;
|
|
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
|
|
|
|
class TrackingController extends Controller
|
|
{
|
|
/**
|
|
* Public WO tracking page — accessed via QR code or SMS link.
|
|
*/
|
|
public function show(Request $request, string $token)
|
|
{
|
|
$tenant = app(TenantManager::class)->current();
|
|
if (! $tenant) {
|
|
throw new NotFoundHttpException('Tracking only available on tenant subdomain.');
|
|
}
|
|
|
|
$wo = WorkOrder::with(['client', 'vehicle', 'master', 'media', 'works', 'parts'])
|
|
->where('tracking_token', $token)
|
|
->first();
|
|
|
|
if (! $wo) {
|
|
throw new NotFoundHttpException('Fișa nu a fost găsită.');
|
|
}
|
|
|
|
$pendingWorks = $wo->works->filter(fn ($w) => $w->isPendingApproval());
|
|
$pendingParts = $wo->parts->filter(fn ($p) => $p->isPendingApproval());
|
|
|
|
return view('tracking.show', [
|
|
'wo' => $wo,
|
|
'tenant' => $tenant,
|
|
'photos' => $wo->getMedia('photos'),
|
|
'pendingWorks' => $pendingWorks,
|
|
'pendingParts' => $pendingParts,
|
|
'approvalStatus' => $request->session()->pull('approval_status'),
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* Client approves or declines a pending work/part line via the unique
|
|
* approval_token. The line's approval_token IS the credential — anyone
|
|
* with the URL can act (clients won't share it).
|
|
*/
|
|
public function approve(Request $request, string $token, string $kind, string $lineToken)
|
|
{
|
|
$tenant = app(TenantManager::class)->current();
|
|
if (! $tenant) throw new NotFoundHttpException();
|
|
|
|
$wo = WorkOrder::where('tracking_token', $token)->first();
|
|
if (! $wo) throw new NotFoundHttpException();
|
|
|
|
$decision = $request->input('decision', 'approve');
|
|
|
|
$line = match ($kind) {
|
|
'work' => WorkOrderWork::where('work_order_id', $wo->id)->where('approval_token', $lineToken)->first(),
|
|
'part' => WorkOrderPart::where('work_order_id', $wo->id)->where('approval_token', $lineToken)->first(),
|
|
default => null,
|
|
};
|
|
if (! $line || ! $line->isPendingApproval()) {
|
|
$request->session()->flash('approval_status', ['kind' => 'error', 'message' => 'Linia nu mai necesită aprobare.']);
|
|
return redirect()->route('tracking.show', ['token' => $token]);
|
|
}
|
|
|
|
if ($decision === 'approve') {
|
|
$line->forceFill(['approved_at' => now()])->save();
|
|
$msg = '✅ Lucrarea „' . $line->name . '" a fost aprobată. Mulțumim!';
|
|
} else {
|
|
$line->forceFill(['declined_at' => now()])->save();
|
|
$msg = '❌ Lucrarea „' . $line->name . '" a fost respinsă. Vă vom contacta.';
|
|
}
|
|
|
|
$request->session()->flash('approval_status', ['kind' => 'success', 'message' => $msg]);
|
|
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();
|
|
if (! $tenant) {
|
|
throw new NotFoundHttpException();
|
|
}
|
|
$wo = WorkOrder::where('tracking_token', $token)->first();
|
|
if (! $wo) {
|
|
throw new NotFoundHttpException();
|
|
}
|
|
|
|
$options = new \chillerlan\QRCode\QROptions([
|
|
'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_MARKUP_SVG,
|
|
'eccLevel' => \chillerlan\QRCode\QRCode::ECC_M,
|
|
'scale' => 6,
|
|
'imageBase64' => false,
|
|
'svgViewBoxSize' => 200,
|
|
'addQuietzone' => true,
|
|
]);
|
|
|
|
$svg = (new \chillerlan\QRCode\QRCode($options))->render($wo->trackingUrl());
|
|
|
|
return response($svg, 200, [
|
|
'Content-Type' => 'image/svg+xml',
|
|
'Cache-Control' => 'public, max-age=3600',
|
|
]);
|
|
}
|
|
}
|