+ @if (isset($approvalStatus) && $approvalStatus)
+
{{ $approvalStatus['message'] }}
+ @endif
+
+ @if ($pendingWorks->isNotEmpty() || $pendingParts->isNotEmpty())
+
+
⚠ Necesită aprobarea ta
+
Am descoperit lucrări suplimentare. Te rugăm să decizi mai jos.
+ @foreach ($pendingWorks as $w)
+
+
{{ $w->name }}
+
{{ rtrim(rtrim(number_format($w->hours, 2), '0'), '.') }} ore · {{ number_format($w->total, 0, '.', ' ') }} MDL
+
+
+
+
+ @endforeach
+ @foreach ($pendingParts as $p)
+
+
{{ $p->name }} @if ($p->article) · {{ $p->article }}@endif
+
{{ rtrim(rtrim(number_format($p->qty, 2), '0'), '.') }} {{ $p->unit ?? 'buc' }} · {{ number_format($p->total, 0, '.', ' ') }} MDL
+
+
+
+
+ @endforeach
+
+ @endif
+
{{ $statuses[$wo->status] ?? $wo->status }}
@if ($wo->eta_at && in_array($wo->status, ['in_work', 'awaiting_parts', 'approved', 'diagnosis'], true))
diff --git a/routes/web.php b/routes/web.php
index f33aed8..215ea4c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -123,6 +123,11 @@ Route::get('/t/{token}', [\App\Http\Controllers\TrackingController::class, 'show
Route::get('/t/{token}/qr.svg', [\App\Http\Controllers\TrackingController::class, 'qr'])
->where('token', '[A-Za-z0-9]{16,32}')
->name('tracking.qr');
+Route::post('/t/{token}/approve/{kind}/{lineToken}', [\App\Http\Controllers\TrackingController::class, 'approve'])
+ ->where('token', '[A-Za-z0-9]{16,32}')
+ ->where('kind', 'work|part')
+ ->where('lineToken', '[A-Za-z0-9]{16,32}')
+ ->name('tracking.approve');
// Locale switch — POST /locale/{lang} sets session and persists to user.
Route::post('/locale/{lang}', function (Request $request, string $lang) {
diff --git a/tests/Feature/ExcelInvoiceImportTest.php b/tests/Feature/ExcelInvoiceImportTest.php
new file mode 100644
index 0000000..d36b73d
--- /dev/null
+++ b/tests/Feature/ExcelInvoiceImportTest.php
@@ -0,0 +1,158 @@
+ 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
+ $this->company = Company::create(['plan_id' => $plan->id, 'slug' => 'exc-' . uniqid(), 'name' => 'Exc Co', 'status' => 'active']);
+ app(TenantManager::class)->setCurrent($this->company);
+ $this->supplier = Supplier::create(['name' => 'Rossko MD', 'phone' => '+37322000000']);
+ }
+
+ private function makeXlsx(array $rows, string $headerName = 'Articol'): string
+ {
+ $spreadsheet = new Spreadsheet;
+ $sheet = $spreadsheet->getActiveSheet();
+ $sheet->setCellValue('A1', '');
+ $sheet->setCellValue('B1', $headerName);
+ $sheet->setCellValue('C1', 'Denumire');
+ $sheet->setCellValue('D1', 'Brand');
+ $sheet->setCellValue('E1', 'Cant');
+ $sheet->setCellValue('F1', 'Preț');
+ $r = 2;
+ foreach ($rows as $row) {
+ $sheet->setCellValue("B$r", $row[0]);
+ $sheet->setCellValue("C$r", $row[1]);
+ $sheet->setCellValue("D$r", $row[2]);
+ $sheet->setCellValue("E$r", $row[3]);
+ $sheet->setCellValue("F$r", $row[4]);
+ $r++;
+ }
+ $tmp = tempnam(sys_get_temp_dir(), 'inv') . '.xlsx';
+ (new Xlsx($spreadsheet))->save($tmp);
+ return $tmp;
+ }
+
+ public function test_headers_preview_returns_first_5_rows_and_column_letters(): void
+ {
+ $path = $this->makeXlsx([
+ ['W71221', 'Filtru ulei Mann', 'Mann', 10, 61.00],
+ ['GDB1550', 'Plăcuțe TRW', 'TRW', 4, 280.00],
+ ]);
+
+ $svc = app(ExcelInvoiceImportService::class);
+ $preview = $svc->headersPreview($path);
+
+ $this->assertContains('B', $preview['columns']);
+ $this->assertContains('F', $preview['columns']);
+ $this->assertEquals('Articol', $preview['rows'][0]['B']);
+ $this->assertEquals('Filtru ulei Mann', $preview['rows'][1]['C']);
+ unlink($path);
+ }
+
+ public function test_preview_classifies_rows_as_found_or_new(): void
+ {
+ // Existing part in DB
+ Part::create(['name' => 'Filtru ulei Mann W712/83', 'article' => 'W71221', 'buy_price' => 60, 'sell_price' => 85]);
+
+ $path = $this->makeXlsx([
+ ['W71221', 'Filtru ulei', 'Mann', 10, 61.00],
+ ['NEW-001', 'Articol nou', 'Generic', 5, 30.00],
+ ['', 'Fără cod', '', 1, 100.00],
+ ]);
+
+ $result = app(ExcelInvoiceImportService::class)->preview($path, [
+ 'article_col' => 'B', 'name_col' => 'C', 'brand_col' => 'D',
+ 'qty_col' => 'E', 'price_col' => 'F', 'header_row' => 1,
+ ]);
+
+ $this->assertEquals(3, $result['summary']['total']);
+ $this->assertEquals(1, $result['summary']['found']);
+ $this->assertEquals(1, $result['summary']['new']);
+ $this->assertEquals(1, $result['summary']['no_article']);
+
+ $this->assertEquals('found', $result['rows'][0]['status']);
+ $this->assertEquals('new', $result['rows'][1]['status']);
+ $this->assertEquals('no_article', $result['rows'][2]['status']);
+ unlink($path);
+ }
+
+ public function test_import_creates_purchase_with_items_and_auto_creates_new_parts(): void
+ {
+ Part::create(['name' => 'Existing', 'article' => 'EX-1', 'buy_price' => 50]);
+ $svc = app(ExcelInvoiceImportService::class);
+
+ $path = $this->makeXlsx([
+ ['EX-1', 'Existing', 'B1', 2, 50],
+ ['NEW-A', 'New thing', 'B2', 3, 120],
+ ]);
+
+ $preview = $svc->preview($path, [
+ 'article_col' => 'B', 'name_col' => 'C', 'brand_col' => 'D',
+ 'qty_col' => 'E', 'price_col' => 'F', 'header_row' => 1,
+ ]);
+ $purchase = $svc->import($this->supplier, $preview['rows'], createNew: true);
+
+ $this->assertNotNull($purchase);
+ $this->assertEquals(2, PurchaseItem::where('purchase_id', $purchase->id)->count());
+ // 2*50 + 3*120 = 460
+ $this->assertEqualsWithDelta(460.0, (float) $purchase->total, 0.01);
+
+ // NEW-A should have been auto-created as a Part
+ $this->assertNotNull(Part::where('article', 'NEW-A')->first());
+ unlink($path);
+ }
+
+ public function test_remember_mapping_persists_and_round_trips(): void
+ {
+ $mapping = ['article_col' => 'B', 'name_col' => 'C', 'qty_col' => 'E', 'price_col' => 'F', 'header_row' => 2];
+ $svc = app(ExcelInvoiceImportService::class);
+
+ $svc->rememberMapping($this->supplier, $mapping, 'rossko-march.xlsx');
+
+ $loaded = $svc->rememberedMappingFor($this->supplier);
+ $this->assertEquals('B', $loaded['article_col']);
+ $this->assertEquals(2, $loaded['header_row']);
+
+ // Update — should upsert, not duplicate
+ $mapping['header_row'] = 3;
+ $svc->rememberMapping($this->supplier, $mapping);
+ $this->assertEquals(1, SupplierInvoiceMapping::where('supplier_id', $this->supplier->id)->count());
+ $this->assertEquals(3, $svc->rememberedMappingFor($this->supplier)['header_row']);
+ }
+
+ public function test_decimal_parser_tolerates_european_format(): void
+ {
+ $path = $this->makeXlsx([
+ ['EU-1', 'European', 'Brand', '2', '1 234,56'],
+ ]);
+ $preview = app(ExcelInvoiceImportService::class)->preview($path, [
+ 'article_col' => 'B', 'name_col' => 'C', 'qty_col' => 'E', 'price_col' => 'F', 'header_row' => 1,
+ ]);
+ $this->assertEqualsWithDelta(1234.56, $preview['rows'][0]['price'], 0.01);
+ unlink($path);
+ }
+}
diff --git a/tests/Feature/TrackingApprovalTest.php b/tests/Feature/TrackingApprovalTest.php
new file mode 100644
index 0000000..d917191
--- /dev/null
+++ b/tests/Feature/TrackingApprovalTest.php
@@ -0,0 +1,153 @@
+ 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
+ $this->company = Company::create(['plan_id' => $plan->id, 'slug' => 'trk-' . uniqid(), 'name' => 'Trk Co', 'status' => 'active']);
+ app(TenantManager::class)->setCurrent($this->company);
+ $client = Client::create(['name' => 'Cli', 'phone' => '+37399123456', 'type' => 'individual', 'status' => 'active']);
+ $vehicle = Vehicle::create(['client_id' => $client->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'TRK-1']);
+ $this->wo = WorkOrder::create([
+ 'number' => WorkOrder::generateNumber($this->company->id),
+ 'client_id' => $client->id, 'vehicle_id' => $vehicle->id,
+ 'opened_at' => today(), 'status' => 'in_work', 'total' => 5000,
+ ]);
+ }
+
+ public function test_creating_work_with_requires_approval_generates_token(): void
+ {
+ $work = WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Înlocuire amortizor față stâng',
+ 'hours' => 1.5, 'price_per_hour' => 420, 'status' => 'todo',
+ 'requires_approval' => true,
+ ]);
+
+ $this->assertNotEmpty($work->approval_token);
+ $this->assertEquals(24, strlen($work->approval_token));
+ $this->assertTrue($work->isPendingApproval());
+ }
+
+ public function test_approve_endpoint_marks_line_approved(): void
+ {
+ $work = WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Extra labor', 'hours' => 1, 'price_per_hour' => 400,
+ 'status' => 'todo', 'requires_approval' => true,
+ ]);
+ $token = $this->wo->tracking_token;
+ $lineToken = $work->approval_token;
+
+ $resp = $this->post("/t/{$token}/approve/work/{$lineToken}", ['decision' => 'approve']);
+ $resp->assertRedirect(route('tracking.show', ['token' => $token]));
+
+ $work->refresh();
+ $this->assertNotNull($work->approved_at);
+ $this->assertFalse($work->isPendingApproval());
+ }
+
+ public function test_decline_endpoint_marks_line_declined(): void
+ {
+ $part = WorkOrderPart::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Filtru extra', 'article' => 'EX-1',
+ 'qty' => 1, 'sell_price' => 200, 'status' => 'needed',
+ 'requires_approval' => true,
+ ]);
+ $token = $this->wo->tracking_token;
+
+ $resp = $this->post("/t/{$token}/approve/part/{$part->approval_token}", ['decision' => 'decline']);
+ $resp->assertRedirect();
+
+ $part->refresh();
+ $this->assertNull($part->approved_at);
+ $this->assertNotNull($part->declined_at);
+ $this->assertFalse($part->isPendingApproval());
+ }
+
+ public function test_wrong_line_token_returns_redirect_with_error(): void
+ {
+ WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'X', 'hours' => 1, 'price_per_hour' => 200,
+ 'status' => 'todo', 'requires_approval' => true,
+ ]);
+ $token = $this->wo->tracking_token;
+
+ $resp = $this->post("/t/{$token}/approve/work/wrongtoken12345678901234");
+ $resp->assertRedirect();
+ // Session flashed with error
+ $resp->assertSessionHas('approval_status');
+ $status = session('approval_status');
+ $this->assertEquals('error', $status['kind']);
+ }
+
+ public function test_already_approved_line_cannot_be_approved_again(): void
+ {
+ $work = WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Already approved', 'hours' => 1, 'price_per_hour' => 200,
+ 'status' => 'todo', 'requires_approval' => true,
+ ]);
+ $work->update(['approved_at' => now()->subHour()]);
+ $originalApproval = $work->approved_at;
+ $token = $this->wo->tracking_token;
+
+ // Second attempt should be a no-op (line no longer pending)
+ $this->post("/t/{$token}/approve/work/{$work->approval_token}", ['decision' => 'approve']);
+
+ $work->refresh();
+ $this->assertEquals($originalApproval->toIso8601String(), $work->approved_at->toIso8601String());
+ }
+
+ public function test_tracking_show_includes_pending_approval_banner(): void
+ {
+ WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Înlocuire amortizor', 'hours' => 1.5, 'price_per_hour' => 420,
+ 'status' => 'todo', 'requires_approval' => true,
+ ]);
+
+ $token = $this->wo->tracking_token;
+ $resp = $this->get("/t/{$token}");
+ $resp->assertOk();
+ $resp->assertSee('Necesită aprobarea ta');
+ $resp->assertSee('Înlocuire amortizor');
+ $resp->assertSee('Aprob');
+ }
+
+ public function test_approved_line_does_not_appear_in_banner(): void
+ {
+ $work = WorkOrderWork::create([
+ 'work_order_id' => $this->wo->id,
+ 'name' => 'Should not show', 'hours' => 1, 'price_per_hour' => 200,
+ 'status' => 'todo', 'requires_approval' => true,
+ ]);
+ $work->update(['approved_at' => now()]);
+
+ $resp = $this->get("/t/{$this->wo->tracking_token}");
+ $resp->assertOk();
+ $resp->assertDontSee('Should not show');
+ }
+}