feat: M14 Excel import wizard + M15 client approval via tracking link
Top-ROI items from CONFORMITY-12-15.md. Together: ~40h of TZ work
delivered in one pass.
== M14 — Excel/CSV invoice import wizard ==
phpoffice/phpspreadsheet ^5.7 added as composer dep — parses both XLSX
and CSV cleanly.
ExcelInvoiceImportService (app/Services/ExcelInvoiceImportService.php):
- headersPreview($path) → first 5 rows + detected column letters
- preview($path, $mapping) → all rows classified as found/new/no_article
- import($supplier, $rows, $createNew=true) → creates Purchase + items,
auto-creates Parts for "new" rows
- rememberMapping / rememberedMappingFor($supplier) — round-trips JSON
config (article_col / name_col / qty_col / price_col / brand_col? /
header_row / sheet_name?) per supplier so the second import is
instant
Decimal parser tolerates European formats: "1 234,56", "1,234.56",
non-breaking spaces (U+00A0 NBSP common in copy-pastes from PDF).
Article matching uses single batch query (Part::whereIn) — O(1) for
the whole sheet, not O(rows).
ExcelImportWizard Filament page (/app/excel-import-wizard) — 4-step
Livewire wizard:
1. Upload + supplier select (saved mapping auto-loads if exists)
2. Column mapping with first-3-rows preview table + per-column
dropdowns
3. Preview with status badges per row (✅ Found / ⚠️ New / ❓ Missing)
+ summary counts
4. Confirmation → "Open Purchase" CTA
Stored in nav group "Stoc & Finanțe", sort 65. Width Full.
Migration: supplier_invoice_mappings (id, company_id, supplier_id UNIQUE,
mapping_config JSON, sample_file_name, last_used_at, timestamps).
Per-tenant scope via BelongsToTenant.
== M15 — Client approval via tracking link (the P0 from TZ §15) ==
Migration: adds 4 columns to wo_works AND wo_parts:
- requires_approval boolean default false
- approved_at timestamp nullable
- approval_token varchar(32) nullable (indexed for fast lookup)
- declined_at timestamp nullable
Both model booted hooks: when a row is saved with requires_approval=true
and no token yet, auto-generate Str::random(24). Models gain
isPendingApproval() helper returning true only while not yet approved
nor declined.
Public route: POST /t/{token}/approve/{kind}/{lineToken}
kind = 'work' | 'part'
body: decision = 'approve' | 'decline'
The line's approval_token IS the credential — anyone with the URL can
act. No CSRF token required since this is the unauthed public tracking
flow (the tracking_token + line approval_token combo functions as
shared-secret). Form-encoded POST with csrf_field() on the public form
keeps Laravel happy.
TrackingController::show() now eager-loads works + parts, computes
pendingWorks and pendingParts collections, passes them to the view.
TrackingController::approve() validates kind, locates the line by
(work_order_id, approval_token), idempotently marks approved_at or
declined_at, redirects back to /t/{token} with a flash status.
UI banner (tracking/show.blade.php) at the top of the page:
- Amber warning "⚠ Necesită aprobarea ta"
- Per-line card: title + amount (ore/qty + total MDL) + two buttons
(green Aprob / outline-red Nu aprob)
- Disappears as soon as approved/declined
- Success/error flash above the banner after each action
== Tests ==
ExcelInvoiceImportTest (5):
- headers_preview returns first 5 rows + column letters
- preview classifies rows as found/new/no_article based on Part DB
- import creates Purchase with items + auto-creates parts for "new"
- remember_mapping upserts, no duplicate per supplier
- decimal parser tolerates "1 234,56" European format with NBSP
TrackingApprovalTest (7):
- creating a work with requires_approval auto-generates 24-char token
- POST /t/{token}/approve/work/{lineToken} marks approved_at
- POST with decision=decline marks declined_at instead
- wrong line token redirects with error flash (no leak)
- already-approved line cannot be approved again (idempotent)
- tracking page renders "Necesită aprobarea ta" banner when pending
- approved line vanishes from banner on next page load
Suite: 246 passed (700 assertions). Was 234.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,143 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Pages;
|
||||
|
||||
use App\Models\Tenant\Supplier;
|
||||
use App\Services\ExcelInvoiceImportService;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Pages\Page;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Livewire\WithFileUploads;
|
||||
|
||||
class ExcelImportWizard extends Page
|
||||
{
|
||||
use WithFileUploads;
|
||||
|
||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-arrow-up-tray';
|
||||
|
||||
protected static ?string $navigationLabel = 'Import factură Excel';
|
||||
|
||||
protected static string|\UnitEnum|null $navigationGroup = 'Stoc & Finanțe';
|
||||
|
||||
protected static ?int $navigationSort = 65;
|
||||
|
||||
protected static ?string $title = 'Import factură Excel/CSV';
|
||||
|
||||
protected string $view = 'filament.tenant.pages.excel-import-wizard';
|
||||
|
||||
public int $step = 1;
|
||||
public ?int $supplierId = null;
|
||||
public $upload = null;
|
||||
public ?string $storedPath = null;
|
||||
public array $headersPreview = ['columns' => [], 'rows' => []];
|
||||
public array $mapping = [
|
||||
'article_col' => 'B',
|
||||
'name_col' => 'C',
|
||||
'qty_col' => 'E',
|
||||
'price_col' => 'F',
|
||||
'brand_col' => null,
|
||||
'header_row' => 1,
|
||||
];
|
||||
public bool $rememberMapping = true;
|
||||
public array $previewRows = [];
|
||||
public array $previewSummary = ['total' => 0, 'found' => 0, 'new' => 0, 'no_article' => 0];
|
||||
public bool $createNew = true;
|
||||
|
||||
public function getMaxContentWidth(): \Filament\Support\Enums\Width
|
||||
{
|
||||
return \Filament\Support\Enums\Width::Full;
|
||||
}
|
||||
|
||||
public function getSupplierOptions(): array
|
||||
{
|
||||
return Supplier::orderBy('name')->pluck('name', 'id')->toArray();
|
||||
}
|
||||
|
||||
public function goToStep2(): void
|
||||
{
|
||||
if (! $this->supplierId) {
|
||||
Notification::make()->title('Selectează furnizorul')->danger()->send();
|
||||
return;
|
||||
}
|
||||
if (! $this->upload) {
|
||||
Notification::make()->title('Încarcă fișierul Excel sau CSV')->danger()->send();
|
||||
return;
|
||||
}
|
||||
|
||||
// Persist the uploaded file so Livewire reuses can resolve it
|
||||
$this->storedPath = $this->upload->store('imports', 'local');
|
||||
|
||||
// Try to load remembered mapping for this supplier
|
||||
$svc = app(ExcelInvoiceImportService::class);
|
||||
$supplier = Supplier::find($this->supplierId);
|
||||
$remembered = $svc->rememberedMappingFor($supplier);
|
||||
if ($remembered) {
|
||||
$this->mapping = array_merge($this->mapping, $remembered);
|
||||
}
|
||||
|
||||
$absPath = Storage::disk('local')->path($this->storedPath);
|
||||
$this->headersPreview = $svc->headersPreview($absPath);
|
||||
|
||||
$this->step = 2;
|
||||
}
|
||||
|
||||
public function goToStep3(): void
|
||||
{
|
||||
$absPath = Storage::disk('local')->path($this->storedPath);
|
||||
$svc = app(ExcelInvoiceImportService::class);
|
||||
$result = $svc->preview($absPath, $this->mapping);
|
||||
$this->previewRows = $result['rows'];
|
||||
$this->previewSummary = $result['summary'];
|
||||
|
||||
if (empty($this->previewRows)) {
|
||||
Notification::make()->title('Nu am găsit linii valide — verifică maparea coloanelor')->warning()->send();
|
||||
return;
|
||||
}
|
||||
|
||||
$this->step = 3;
|
||||
}
|
||||
|
||||
public function confirmImport(): void
|
||||
{
|
||||
$svc = app(ExcelInvoiceImportService::class);
|
||||
$supplier = Supplier::find($this->supplierId);
|
||||
|
||||
if ($this->rememberMapping) {
|
||||
$svc->rememberMapping($supplier, $this->mapping, basename($this->storedPath ?? ''));
|
||||
}
|
||||
|
||||
$purchase = $svc->import($supplier, $this->previewRows, $this->createNew);
|
||||
|
||||
Notification::make()
|
||||
->title("Import reușit — Purchase {$purchase->number}")
|
||||
->body("{$this->previewSummary['total']} linii importate")
|
||||
->success()
|
||||
->send();
|
||||
|
||||
// Cleanup uploaded file
|
||||
if ($this->storedPath) {
|
||||
Storage::disk('local')->delete($this->storedPath);
|
||||
}
|
||||
|
||||
$this->step = 4;
|
||||
$this->dispatch('purchase-created', purchaseId: $purchase->id);
|
||||
|
||||
// Set the redirect URL on the page so the blade can show a CTA
|
||||
session()->flash('purchase_id', $purchase->id);
|
||||
}
|
||||
|
||||
public function reset_(): void
|
||||
{
|
||||
$this->step = 1;
|
||||
$this->supplierId = null;
|
||||
$this->upload = null;
|
||||
$this->storedPath = null;
|
||||
$this->headersPreview = ['columns' => [], 'rows' => []];
|
||||
$this->mapping = [
|
||||
'article_col' => 'B', 'name_col' => 'C', 'qty_col' => 'E',
|
||||
'price_col' => 'F', 'brand_col' => null, 'header_row' => 1,
|
||||
];
|
||||
$this->previewRows = [];
|
||||
$this->previewSummary = ['total' => 0, 'found' => 0, 'new' => 0, 'no_article' => 0];
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user