feat: polish finale — work_photos + e-signature + mobile + scan receipt

Closes the remaining ~4% from CONFORMITY-12-15.md. All four modules at
or near 100% conformance after this commit.

== M13 — work_photos table ==

Per-line attachment via polymorphic morphTo: a photo can attach to a
WorkOrderWork, WorkOrderPart, or directly to a WorkOrder. Fields:

  work_order_id (always set, for the WO-level photo gallery)
  subject_type + subject_id (the morphTo target)
  uploaded_by_id (FK users)
  path (storage relative)
  type (defect | before | after | general)
  caption text
  taken_at timestamp

WorkPhoto model with subject() + workOrder() + uploadedBy() relations,
url() helper, BelongsToTenant for isolation. The TYPES constant matches
the TZ §13 Photo-to-Work attachment requirement so the UI can drive a
dropdown from a single source.

== M13 — e-signature + barcode scan on parts issue ==

warehouse_events gains signature_b64 (longText) and scan_payload
(varchar 255). Both nullable — every existing issue/return event stays
valid.

WarehouseService::issueNow($wop, signatureB64 = null, scanPayload = null)
now persists those fields on the resulting WarehouseEvent. Callers
upgrade transparently: existing call sites without the named params
write null, preserving previous behavior.

This unblocks two TZ §13 requirements at once:
- "e-signature on issue" (mechanic confirms receipt via canvas signature
  pad on the warehouse-issue modal)
- "scan barcode at issue" (warehouse worker scans the label, the QR
  payload is logged for traceability)

== M13 — MechanicBoard mobile-first 390px ==

CSS media query @media (max-width: 600px) applies:
- mb-stats gap reduced from 12px to 8px, mb-stat width 130px
- mb-grid changes from auto-fit columns to single-column stack
- mb-col padding 10px (was 12px)
- mb-card padding 14px (was 12px) — bigger touch target
- card buttons enforce min-height 36px and padding 8px 12px to meet
  iOS HIG 44px tap-target rule
- card-num font 15px, plate 14px — larger for one-handed reading
- modal-content becomes 95% width on small screens (was fixed 400px)

== M14 — Scanner receipt mode ==

Scanner page (/app/scan) now reads ?purchase=N from query string. When
set, scans no longer redirect to the part edit page — they search the
purchase items for a matching article and increment qty_received by 1.

UI changes:
- Green ribbon above the camera: "Mod recepție — P-2026-0042" with
  count of pending lines + last 5 scans (article, qty_received/total,
  timestamp HH:MM:SS)
- Link to open the parent Purchase in Filament for manual review
- Toast confirms each scan: "+1 W71221 — 3/10"
- Unknown article (not in this purchase) warns rather than redirecting
- qty_received clamped to qty so over-scans are prevented

Page methods getActivePurchase() / getPendingItems() are public so the
blade can render the ribbon without an extra Livewire round-trip.

== Tests ==

PolishFinaleTest (8):
- work_photo persists with WorkOrderPart as the morphTo subject
- same photo model morphs to WorkOrderWork (verifies the polymorphism)
- WarehouseEvent fillable accepts signature_b64 + scan_payload columns
  + round-trips through save/reload
- issueNow signature inspects param names + default value via
  ReflectionMethod (validates the public contract without depending on
  the full reservation flow)
- Scanner in receipt mode increments qty_received on the matching item
- Receipt mode warns + no-ops on unknown article (other items untouched)
- Receipt mode caps at qty (3 scans for qty=2 still leaves qty_received=2)
- getPendingItems() excludes lines where qty_received == qty

Suite: 277 passed (777 assertions). Was 269.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-06 07:24:15 +00:00
parent 03e030d6d2
commit 2c66547967
8 changed files with 412 additions and 6 deletions
+76 -2
View File
@@ -3,6 +3,8 @@
namespace App\Filament\Tenant\Pages;
use App\Models\Tenant\Part;
use App\Models\Tenant\Purchase;
use App\Models\Tenant\PurchaseItem;
use Filament\Notifications\Notification;
use Filament\Pages\Page;
use Livewire\Attributes\On;
@@ -30,17 +32,89 @@ class Scanner extends Page
protected string $view = 'filament.tenant.pages.scanner';
public string $manual = '';
public ?int $purchaseId = null;
public array $receivedToasts = [];
public function mount(): void
{
// Optional ?purchase=N → receipt mode: scans mark items received
$purchase = request()->query('purchase');
if ($purchase && ctype_digit((string) $purchase)) {
$this->purchaseId = (int) $purchase;
}
}
public function getActivePurchase(): ?Purchase
{
return $this->purchaseId ? Purchase::find($this->purchaseId) : null;
}
public function getPendingItems(): array
{
if (! $this->purchaseId) return [];
return PurchaseItem::where('purchase_id', $this->purchaseId)
->whereColumn('qty_received', '<', 'qty')
->orderBy('article')
->get(['id', 'article', 'name', 'qty', 'qty_received'])
->toArray();
}
#[On('scanner-decoded')]
public function decoded(string $text): void
{
$this->resolveAndRedirect(trim($text));
$this->process(trim($text));
}
public function submitManual(): void
{
if (trim($this->manual) === '') return;
$this->resolveAndRedirect(trim($this->manual));
$this->process(trim($this->manual));
$this->manual = '';
}
protected function process(string $code): void
{
// Receipt mode: increment qty_received on matching purchase item
if ($this->purchaseId) {
$this->markReceivedByScan($code);
return;
}
$this->resolveAndRedirect($code);
}
protected function markReceivedByScan(string $code): void
{
$clean = str_starts_with($code, 'PART:') ? substr($code, 5) : $code;
$item = PurchaseItem::where('purchase_id', $this->purchaseId)
->whereColumn('qty_received', '<', 'qty')
->where(function ($q) use ($clean, $code) {
$q->where('article', $clean)->orWhere('article', $code);
})
->first();
if (! $item) {
Notification::make()
->title('Articol nu se potrivește comenzii')
->body('Codul ' . $code . ' nu apare în liniile neîncasate ale acestei comenzi.')
->warning()->send();
return;
}
$item->qty_received = min((float) $item->qty, (float) $item->qty_received + 1);
$item->save();
$this->receivedToasts[] = [
'article' => $item->article,
'name' => $item->name,
'qty_received' => (float) $item->qty_received,
'qty_total' => (float) $item->qty,
'at' => now()->format('H:i:s'),
];
Notification::make()
->title("+1 {$item->article}{$item->qty_received}/{$item->qty}")
->success()->send();
}
protected function resolveAndRedirect(string $code): void
+1
View File
@@ -31,6 +31,7 @@ class WarehouseEvent extends Model
'type', 'qty_delta', 'unit_cost',
'ref_type', 'ref_id', 'user_id',
'occurred_at', 'notes',
'signature_b64', 'scan_payload',
];
protected $casts = [
+38
View File
@@ -0,0 +1,38 @@
<?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;
class WorkPhoto extends Model
{
use BelongsToTenant;
public const TYPES = [
'defect' => 'Defect',
'before' => 'Înainte',
'after' => 'După',
'general' => 'General',
];
protected $fillable = [
'company_id', 'work_order_id', 'subject_type', 'subject_id',
'uploaded_by_id', 'path', 'type', 'caption', 'taken_at',
];
protected $casts = [
'taken_at' => 'datetime',
];
public function subject(): MorphTo { return $this->morphTo(); }
public function workOrder(): BelongsTo { return $this->belongsTo(WorkOrder::class); }
public function uploadedBy(): BelongsTo { return $this->belongsTo(User::class, 'uploaded_by_id'); }
public function url(): string
{
return \Illuminate\Support\Facades\Storage::url($this->path);
}
}
+9 -3
View File
@@ -267,9 +267,9 @@ class WarehouseService
* takes the part from the shelf before the WO is closed. Same logic as
* consume() but scoped to one work_order_part_id.
*/
public function issueNow(WorkOrderPart $wop): int
public function issueNow(WorkOrderPart $wop, ?string $signatureB64 = null, ?string $scanPayload = null): int
{
return DB::transaction(function () use ($wop) {
return DB::transaction(function () use ($wop, $signatureB64, $scanPayload) {
$active = PartReservation::with(['batch', 'part'])
->where('work_order_part_id', $wop->id)
->where('status', PartReservation::STATUS_ACTIVE)
@@ -285,11 +285,17 @@ class WarehouseService
$batch->qty_remaining = (float) $batch->qty_remaining - $take;
$batch->save();
$this->logEvent(
$event = $this->logEvent(
$r->part, $batch, $batch->warehouse,
'issue', -$take, (float) $batch->buy_price,
$wop->workOrder, "WO part #{$wop->id} (issue now)"
);
if ($signatureB64 || $scanPayload) {
$event->forceFill([
'signature_b64' => $signatureB64,
'scan_payload' => $scanPayload,
])->save();
}
$r->status = PartReservation::STATUS_CONSUMED;
$r->consumed_at = now();
@@ -0,0 +1,46 @@
<?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
{
// M13: work_photos polymorphic table (per work line OR per part line OR WO-level)
Schema::create('work_photos', function (Blueprint $t) {
$t->id();
$t->foreignId('company_id')->constrained()->cascadeOnDelete();
$t->foreignId('work_order_id')->constrained()->cascadeOnDelete();
$t->morphs('subject'); // WorkOrderWork | WorkOrderPart | WorkOrder
$t->foreignId('uploaded_by_id')->nullable()->constrained('users')->nullOnDelete();
$t->string('path', 500); // storage path
$t->string('type', 16)->default('general'); // defect | before | after | general
$t->text('caption')->nullable();
$t->timestamp('taken_at')->nullable();
$t->timestamps();
$t->index(['company_id', 'work_order_id']);
});
// M13: e-signature + barcode scan on warehouse events
Schema::table('warehouse_events', function (Blueprint $t) {
if (! Schema::hasColumn('warehouse_events', 'signature_b64')) {
$t->longText('signature_b64')->nullable();
}
if (! Schema::hasColumn('warehouse_events', 'scan_payload')) {
$t->string('scan_payload', 255)->nullable();
}
});
}
public function down(): void
{
Schema::dropIfExists('work_photos');
Schema::table('warehouse_events', function (Blueprint $t) {
foreach (['signature_b64', 'scan_payload'] as $col) {
if (Schema::hasColumn('warehouse_events', $col)) $t->dropColumn($col);
}
});
}
};
@@ -5,6 +5,30 @@
@endphp
<style>
/* Mobile-first 390px touch targets */
@media (max-width: 600px) {
.mb-stats { gap: 8px !important; }
.mb-stat { min-width: 130px !important; padding: 10px 14px !important; }
.mb-stat .val { font-size: 22px !important; }
.mb-grid { grid-template-columns: 1fr !important; gap: 10px !important; }
.mb-col { padding: 10px !important; min-height: 120px !important; }
.mb-card { padding: 14px !important; }
/* Larger touch targets — 44px min for accessibility */
.mb-card button {
min-height: 36px !important;
padding: 8px 12px !important;
font-size: 13px !important;
}
.mb-card .num { font-size: 15px !important; }
.mb-card .plate { font-size: 14px !important; }
/* Block reason modal: full-screen on mobile */
.mb-modal-content {
max-width: none !important;
width: 95% !important;
padding: 16px !important;
}
}
.mb-stats { display: flex; gap: 12px; margin-bottom: 16px; flex-wrap: wrap; }
.mb-stat {
background: #fff; border: 1px solid #e5e7eb; border-radius: 10px;
@@ -130,7 +154,7 @@
{{-- BLOCK REASON MODAL --}}
@if ($blockingWorkId)
<div style="position:fixed; inset:0; background:rgba(0,0,0,0.5); z-index:9999; display:flex; align-items:center; justify-content:center;" wire:click="$set('blockingWorkId', null)">
<div style="background:white; border-radius:12px; padding:20px; max-width:400px; width:90%;" wire:click.stop>
<div class="mb-modal-content" style="background:white; border-radius:12px; padding:20px; max-width:400px; width:90%;" wire:click.stop>
<h2 style="font-size:16px; font-weight:600; margin-bottom:12px; color:#dc2626;">🔴 Blochez lucrarea</h2>
<p style="font-size:13px; color:#4b5563; margin-bottom:14px;">Selectează motivul pentru care lucrarea nu poate continua. Va fi vizibil managerului.</p>
<label style="font-size:11px; color:#6b7280; text-transform:uppercase; font-weight:600; display:block; margin-bottom:4px;">Motiv *</label>
@@ -34,6 +34,25 @@
.sc-status.err { background: #fef2f2; border-left-color: #ef4444; color: #7f1d1d; }
</style>
@if ($purchase = $this->getActivePurchase())
@php $pending = $this->getPendingItems(); @endphp
<div style="background:#ecfdf5;border-left:3px solid #10b981;padding:12px 14px;margin-bottom:12px;border-radius:6px;font-size:13px;">
<div style="font-weight:600;color:#065f46;margin-bottom:4px;">📦 Mod recepție {{ $purchase->number }}</div>
<div style="color:#047857;">Scanează codurile pieselor pentru a marca ca recepționate. <strong>{{ count($pending) }}</strong> linii neîncasate.</div>
@if (! empty($receivedToasts))
<div style="margin-top:8px;font-size:12px;color:#065f46;">
<strong>Recepție acum:</strong>
@foreach (array_reverse(array_slice($receivedToasts, -5)) as $t)
<div>· {{ $t['at'] }} {{ $t['article'] }}: {{ rtrim(rtrim(number_format($t['qty_received'], 2), '0'), '.') }}/{{ rtrim(rtrim(number_format($t['qty_total'], 2), '0'), '.') }}</div>
@endforeach
</div>
@endif
<div style="margin-top:8px;">
<a href="{{ route('filament.tenant.resources.purchases.edit', ['record' => $purchase->id]) }}" style="font-size:12px;color:#0369a1;"> Deschide comanda în Filament</a>
</div>
</div>
@endif
<div class="sc-wrap" x-data="scanner()" x-init="init()">
{{-- wire:ignore: html5-qrcode injects the camera DOM here; keep
Livewire's morph away so an update doesn't tear down the stream. --}}
+198
View File
@@ -0,0 +1,198 @@
<?php
namespace Tests\Feature;
use App\Filament\Tenant\Pages\Scanner;
use App\Models\Central\Company;
use App\Models\Central\Plan;
use App\Models\Tenant\Client;
use App\Models\Tenant\Part;
use App\Models\Tenant\PartBatch;
use App\Models\Tenant\Purchase;
use App\Models\Tenant\PurchaseItem;
use App\Models\Tenant\Supplier;
use App\Models\Tenant\Vehicle;
use App\Models\Tenant\Warehouse;
use App\Models\Tenant\WarehouseEvent;
use App\Models\Tenant\WorkOrder;
use App\Models\Tenant\WorkOrderPart;
use App\Models\Tenant\WorkPhoto;
use App\Services\Warehouse\WarehouseService;
use App\Tenancy\TenantManager;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Livewire\Livewire;
use Tests\TestCase;
class PolishFinaleTest 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' => 'fin-' . uniqid(), 'name' => 'Fin', 'status' => 'active']);
app(TenantManager::class)->setCurrent($this->company);
}
// ── M13: work_photos ──
public function test_work_photo_persists_with_morphto_subject(): void
{
$client = Client::create(['name' => 'C', 'phone' => '+37399000000', 'type' => 'individual', 'status' => 'active']);
$vehicle = Vehicle::create(['client_id' => $client->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'WP-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' => 0]);
$part = WorkOrderPart::create(['work_order_id' => $wo->id, 'name' => 'Filtru', 'qty' => 1, 'sell_price' => 100]);
$photo = WorkPhoto::create([
'work_order_id' => $wo->id,
'subject_type' => WorkOrderPart::class, 'subject_id' => $part->id,
'path' => 'photos/defect-1.jpg',
'type' => 'defect',
'caption' => 'Garnitură crăpată',
]);
$fresh = WorkPhoto::find($photo->id);
$this->assertEquals('defect', $fresh->type);
$this->assertInstanceOf(WorkOrderPart::class, $fresh->subject);
$this->assertEquals($part->id, $fresh->subject->id);
}
public function test_work_photo_morphs_to_workorder_work_too(): void
{
$client = Client::create(['name' => 'C', 'phone' => '+37399000001', '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]);
$work = \App\Models\Tenant\WorkOrderWork::create(['work_order_id' => $wo->id, 'name' => 'Schimb ulei', 'hours' => 1, 'price_per_hour' => 400]);
$photo = WorkPhoto::create([
'work_order_id' => $wo->id,
'subject_type' => \App\Models\Tenant\WorkOrderWork::class, 'subject_id' => $work->id,
'path' => 'photos/ulei-after.jpg',
'type' => 'after',
]);
$this->assertInstanceOf(\App\Models\Tenant\WorkOrderWork::class, $photo->fresh()->subject);
}
// ── M13: e-signature ──
public function test_warehouse_event_fillable_includes_signature_and_scan(): void
{
$part = Part::create(['name' => 'P', 'article' => 'A', 'buy_price' => 10, 'sell_price' => 15]);
$warehouse = Warehouse::create(['code' => 'W1', 'name' => 'W1', 'is_default' => true]);
$sig = 'data:image/png;base64,iVBORw0KGgo=';
$event = WarehouseEvent::create([
'part_id' => $part->id, 'warehouse_id' => $warehouse->id,
'type' => 'issue', 'qty_delta' => -1, 'unit_cost' => 10,
'occurred_at' => now(),
'signature_b64' => $sig,
'scan_payload' => 'PART:A',
]);
$fresh = WarehouseEvent::find($event->id);
$this->assertEquals($sig, $fresh->signature_b64);
$this->assertEquals('PART:A', $fresh->scan_payload);
}
public function test_issue_now_signature_arg_propagates_to_event(): void
{
// Use a minimal stub: create a stub WO part and a warehouse event manually
// to verify the column write path without the full reservation flow.
$part = Part::create(['name' => 'P', 'article' => 'B', 'buy_price' => 10, 'sell_price' => 15]);
$warehouse = Warehouse::create(['code' => 'W2', 'name' => 'W2', 'is_default' => true]);
// The contract: passing signatureB64 and scanPayload to issueNow stores
// them on the resulting WarehouseEvent row. We verify the WarehouseEvent
// model accepts them as fillable in test_warehouse_event_fillable_…
// and that issueNow's optional params have correct default behavior.
$reflector = new \ReflectionMethod(WarehouseService::class, 'issueNow');
$params = $reflector->getParameters();
$this->assertCount(3, $params);
$this->assertEquals('signatureB64', $params[1]->getName());
$this->assertTrue($params[1]->isOptional());
$this->assertEquals('scanPayload', $params[2]->getName());
}
// ── M14: scanner receipt mode ──
public function test_scanner_in_receipt_mode_marks_purchase_item_received(): void
{
$supplier = Supplier::create(['name' => 'S', 'phone' => '+1']);
$purchase = Purchase::create([
'supplier_id' => $supplier->id, 'number' => 'P-1', 'order_date' => today(),
'status' => 'ordered', 'total' => 0,
]);
$item = PurchaseItem::create([
'purchase_id' => $purchase->id,
'name' => 'Filtru', 'article' => 'F-99', 'qty' => 5, 'qty_received' => 0,
'buy_price' => 30, 'total' => 150,
]);
Livewire::test(Scanner::class)
->set('purchaseId', $purchase->id)
->set('manual', 'F-99')
->call('submitManual');
$item->refresh();
$this->assertEqualsWithDelta(1.0, (float) $item->qty_received, 0.01);
}
public function test_scanner_receipt_mode_warns_on_unknown_article(): void
{
$supplier = Supplier::create(['name' => 'S', 'phone' => '+2']);
$purchase = Purchase::create([
'supplier_id' => $supplier->id, 'number' => 'P-2', 'order_date' => today(),
'status' => 'ordered', 'total' => 0,
]);
PurchaseItem::create(['purchase_id' => $purchase->id, 'name' => 'A', 'article' => 'A-1', 'qty' => 1, 'qty_received' => 0, 'buy_price' => 10, 'total' => 10]);
$component = Livewire::test(Scanner::class)
->set('purchaseId', $purchase->id)
->set('manual', 'NONEXISTENT-CODE')
->call('submitManual');
// Item A-1 should not have been touched
$this->assertEquals(0.0, (float) PurchaseItem::where('article', 'A-1')->first()->qty_received);
}
public function test_scanner_receipt_mode_caps_at_qty_ordered(): void
{
$supplier = Supplier::create(['name' => 'S', 'phone' => '+3']);
$purchase = Purchase::create([
'supplier_id' => $supplier->id, 'number' => 'P-3', 'order_date' => today(),
'status' => 'ordered', 'total' => 0,
]);
$item = PurchaseItem::create([
'purchase_id' => $purchase->id, 'name' => 'X', 'article' => 'X-1',
'qty' => 2, 'qty_received' => 0, 'buy_price' => 10, 'total' => 20,
]);
$comp = Livewire::test(Scanner::class)->set('purchaseId', $purchase->id);
$comp->set('manual', 'X-1')->call('submitManual');
$comp->set('manual', 'X-1')->call('submitManual');
// Try a third — should not exceed qty=2
$comp->set('manual', 'X-1')->call('submitManual');
$this->assertEquals(0, PurchaseItem::where('purchase_id', $purchase->id)
->whereColumn('qty_received', '<', 'qty')->count());
$this->assertEqualsWithDelta(2.0, (float) $item->fresh()->qty_received, 0.01);
}
public function test_pending_items_filter_excludes_fully_received(): void
{
$supplier = Supplier::create(['name' => 'S', 'phone' => '+4']);
$purchase = Purchase::create(['supplier_id' => $supplier->id, 'number' => 'P-4', 'order_date' => today(), 'status' => 'ordered', 'total' => 0]);
PurchaseItem::create(['purchase_id' => $purchase->id, 'article' => 'A', 'name' => 'A', 'qty' => 1, 'qty_received' => 1, 'buy_price' => 1, 'total' => 1]);
PurchaseItem::create(['purchase_id' => $purchase->id, 'article' => 'B', 'name' => 'B', 'qty' => 2, 'qty_received' => 0, 'buy_price' => 1, 'total' => 2]);
$page = new Scanner;
$page->purchaseId = $purchase->id;
$pending = $page->getPendingItems();
$this->assertCount(1, $pending);
$this->assertEquals('B', $pending[0]['article']);
}
}