Stage 7+14 — Mechanic Board + Scan Center
Mechanic Workflow (Stage 7): - /app/mechanic Filament page filtered to master_id = auth user - Kanban 4 columns (in_work / awaiting_parts / ready / recent), each card shows WO#, plate, client, complaint summary, photo presence - 2 KPI tiles (active now / closed today) - Mobile-responsive grid (auto-fit, minmax 260px) WarehouseService: - issueNow(WorkOrderPart) — consume reservations immediately scoped to one line, without closing the WO (mechanic physically takes part now) - returnPart(WorkOrderPart, qty?, notes?) — refund to stock as new batch at original buy_price, writes `return` event, capped at consumed total WO PartsRelationManager: - "Eliberează" action — visible when active reservation exists - "Restituire" action — visible when consumed reservation exists, with qty modal + notes Scan Center (Stage 14): - PartResource "QR" action — per-part SVG QR with payload PART:<article|id> - BulkAction "Tipărește etichete QR" → /parts/labels?ids=N,M (HTML A4 sheet, 3-col grid, print CSS hides toolbar) - /app/scan Filament page using html5-qrcode 2.3.8 (CDN), auto-picks back camera, decodes → Livewire dispatches scanner-decoded → resolveAndRedirect - Lookup matches PART:N prefix, parts.article, parts.barcode, or numeric id - Manual input fallback for browsers without camera Tests (6 new): - WarehouseIssueReturnTest (3): issueNow consumes immediately; returnPart creates positive batch + return event; over-return is capped - ScannerLookupTest (3): PART: prefix lookup, raw barcode lookup, unknown miss Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,85 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Pages;
|
||||
|
||||
use App\Models\Tenant\WorkOrder;
|
||||
use Filament\Pages\Page;
|
||||
|
||||
/**
|
||||
* Mobile-first dashboard for a single mechanic — shows ONLY work orders
|
||||
* assigned to the currently logged-in user (master_id = auth()->id()).
|
||||
* Kanban-style grouped by status.
|
||||
*/
|
||||
class MechanicBoard extends Page
|
||||
{
|
||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-wrench';
|
||||
|
||||
protected static ?string $navigationLabel = 'Atelierul meu';
|
||||
|
||||
protected static string|\UnitEnum|null $navigationGroup = 'Service';
|
||||
|
||||
protected static ?int $navigationSort = 25;
|
||||
|
||||
protected static ?string $title = 'Atelierul meu';
|
||||
|
||||
protected string $view = 'filament.tenant.pages.mechanic-board';
|
||||
|
||||
public function getColumns(): array
|
||||
{
|
||||
$userId = auth()->id();
|
||||
if (! $userId) return [];
|
||||
|
||||
$all = WorkOrder::with(['client', 'vehicle'])
|
||||
->where('master_id', $userId)
|
||||
->whereIn('status', ['in_work', 'awaiting_parts', 'ready', 'done', 'approved', 'diagnosis'])
|
||||
->orderBy('opened_at', 'desc')
|
||||
->get();
|
||||
|
||||
return [
|
||||
[
|
||||
'key' => 'in_work',
|
||||
'label' => 'În lucru',
|
||||
'color' => '#f59e0b',
|
||||
'items' => $all->where('status', 'in_work')->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'awaiting_parts',
|
||||
'label' => 'Așteaptă piese',
|
||||
'color' => '#8b5cf6',
|
||||
'items' => $all->whereIn('status', ['awaiting_parts'])->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'ready',
|
||||
'label' => 'Gata',
|
||||
'color' => '#10b981',
|
||||
'items' => $all->where('status', 'ready')->values(),
|
||||
],
|
||||
[
|
||||
'key' => 'recent',
|
||||
'label' => 'Recente / restul',
|
||||
'color' => '#64748b',
|
||||
'items' => $all->whereIn('status', ['done', 'approved', 'diagnosis'])
|
||||
->take(20)
|
||||
->values(),
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
public function getCounts(): array
|
||||
{
|
||||
$userId = auth()->id();
|
||||
return [
|
||||
'active' => $userId
|
||||
? WorkOrder::where('master_id', $userId)
|
||||
->whereIn('status', ['in_work', 'awaiting_parts', 'ready'])
|
||||
->count()
|
||||
: 0,
|
||||
'closed_today' => $userId
|
||||
? WorkOrder::where('master_id', $userId)
|
||||
->where('status', 'done')
|
||||
->whereDate('closed_at', today())
|
||||
->count()
|
||||
: 0,
|
||||
];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filament\Tenant\Pages;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Pages\Page;
|
||||
use Livewire\Attributes\On;
|
||||
|
||||
/**
|
||||
* Mobile scanner: opens camera in the browser, decodes QR/barcode, looks up
|
||||
* Part by:
|
||||
* - `PART:<article|id>` payload (our own QR labels)
|
||||
* - exact barcode match on parts.barcode
|
||||
* - exact article match on parts.article
|
||||
* On match → redirect to Part edit page.
|
||||
*/
|
||||
class Scanner extends Page
|
||||
{
|
||||
protected static string|\BackedEnum|null $navigationIcon = 'heroicon-o-qr-code';
|
||||
|
||||
protected static ?string $navigationLabel = 'Scaner';
|
||||
|
||||
protected static string|\UnitEnum|null $navigationGroup = 'Depozit';
|
||||
|
||||
protected static ?int $navigationSort = 39;
|
||||
|
||||
protected static ?string $title = 'Scaner cod QR / Bare';
|
||||
|
||||
protected string $view = 'filament.tenant.pages.scanner';
|
||||
|
||||
public string $manual = '';
|
||||
|
||||
#[On('scanner-decoded')]
|
||||
public function decoded(string $text): void
|
||||
{
|
||||
$this->resolveAndRedirect(trim($text));
|
||||
}
|
||||
|
||||
public function submitManual(): void
|
||||
{
|
||||
if (trim($this->manual) === '') return;
|
||||
$this->resolveAndRedirect(trim($this->manual));
|
||||
}
|
||||
|
||||
protected function resolveAndRedirect(string $code): void
|
||||
{
|
||||
$clean = $code;
|
||||
if (str_starts_with($clean, 'PART:')) {
|
||||
$clean = substr($clean, 5);
|
||||
}
|
||||
|
||||
$part = Part::where(function ($q) use ($clean, $code) {
|
||||
$q->where('article', $clean)
|
||||
->orWhere('barcode', $clean)
|
||||
->orWhere('barcode', $code);
|
||||
if (ctype_digit($clean)) $q->orWhere('id', (int) $clean);
|
||||
})
|
||||
->first();
|
||||
|
||||
if (! $part) {
|
||||
Notification::make()
|
||||
->title('Cod necunoscut')
|
||||
->body('Nu am găsit nicio piesă pentru: ' . $code)
|
||||
->warning()
|
||||
->send();
|
||||
return;
|
||||
}
|
||||
|
||||
Notification::make()
|
||||
->title('Piesă găsită: ' . $part->name)
|
||||
->success()
|
||||
->send();
|
||||
|
||||
$this->redirect(
|
||||
route('filament.tenant.resources.parts.edit', ['record' => $part->id])
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -135,6 +135,26 @@ class PartResource extends Resource
|
||||
->query(fn ($q) => $q->where('qty', '<=', 0)),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('qr')
|
||||
->label('QR')
|
||||
->icon('heroicon-m-qr-code')
|
||||
->color('gray')
|
||||
->modalHeading(fn (Part $r) => 'QR pentru ' . $r->name)
|
||||
->modalSubmitAction(false)
|
||||
->modalCancelActionLabel('Închide')
|
||||
->modalContent(function (Part $r) {
|
||||
$payload = 'PART:' . ($r->article ?: $r->id);
|
||||
$svg = (new \chillerlan\QRCode\QRCode(new \chillerlan\QRCode\QROptions([
|
||||
'outputType' => \chillerlan\QRCode\QRCode::OUTPUT_MARKUP_SVG,
|
||||
'eccLevel' => \chillerlan\QRCode\QRCode::ECC_M,
|
||||
'scale' => 8,
|
||||
'imageBase64' => false,
|
||||
'addQuietzone' => true,
|
||||
])))->render($payload);
|
||||
return view('filament.tenant.part-qr', [
|
||||
'part' => $r, 'svg' => $svg, 'payload' => $payload,
|
||||
]);
|
||||
}),
|
||||
Actions\Action::make('ai_price')
|
||||
->label('AI: preț recomandat')
|
||||
->icon('heroicon-m-sparkles')
|
||||
@@ -186,6 +206,17 @@ class PartResource extends Resource
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
])
|
||||
->bulkActions([
|
||||
Actions\BulkAction::make('print_labels')
|
||||
->label('Tipărește etichete QR')
|
||||
->icon('heroicon-m-printer')
|
||||
->color('gray')
|
||||
->action(function ($records) {
|
||||
$ids = collect($records)->pluck('id')->implode(',');
|
||||
return redirect()->away('/parts/labels?ids=' . $ids);
|
||||
})
|
||||
->deselectRecordsAfterCompletion(),
|
||||
])
|
||||
->emptyStateHeading('Depozit gol')
|
||||
->emptyStateDescription('Adaugă piese manual, sau folosește Achiziții ca să le adaugi prin recepție de la furnizor (cu prețuri și stoc auto). Procentaj poate seta automat prețul de vânzare.')
|
||||
->emptyStateIcon('heroicon-o-cube')
|
||||
|
||||
+45
@@ -3,9 +3,12 @@
|
||||
namespace App\Filament\Tenant\Resources\WorkOrderResource\RelationManagers;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use App\Models\Tenant\PartReservation;
|
||||
use App\Models\Tenant\WorkOrderPart;
|
||||
use App\Services\Warehouse\WarehouseService;
|
||||
use Filament\Actions;
|
||||
use Filament\Forms;
|
||||
use Filament\Notifications\Notification;
|
||||
use Filament\Resources\RelationManagers\RelationManager;
|
||||
use Filament\Schemas\Components\Utilities\Set;
|
||||
use Filament\Schemas\Schema;
|
||||
@@ -82,6 +85,48 @@ class PartsRelationManager extends RelationManager
|
||||
Actions\CreateAction::make(),
|
||||
])
|
||||
->actions([
|
||||
Actions\Action::make('issue_now')
|
||||
->label('Eliberează')
|
||||
->icon('heroicon-m-arrow-up-on-square')
|
||||
->color('warning')
|
||||
->visible(fn (WorkOrderPart $r) => $r->part_id
|
||||
&& PartReservation::where('work_order_part_id', $r->id)
|
||||
->where('status', PartReservation::STATUS_ACTIVE)
|
||||
->exists())
|
||||
->requiresConfirmation()
|
||||
->modalDescription('Confirmă că mecanicul ia fizic piesa din depozit. Stocul scade acum, fără să aștepți închiderea fișei.')
|
||||
->action(function (WorkOrderPart $r) {
|
||||
$n = app(WarehouseService::class)->issueNow($r);
|
||||
Notification::make()
|
||||
->title("Eliberat: {$n} rezervări consumate")
|
||||
->success()->send();
|
||||
}),
|
||||
Actions\Action::make('return_part')
|
||||
->label('Restituire')
|
||||
->icon('heroicon-m-arrow-uturn-left')
|
||||
->color('gray')
|
||||
->visible(fn (WorkOrderPart $r) => $r->part_id
|
||||
&& PartReservation::where('work_order_part_id', $r->id)
|
||||
->where('status', PartReservation::STATUS_CONSUMED)
|
||||
->exists())
|
||||
->schema([
|
||||
Forms\Components\TextInput::make('qty')
|
||||
->label('Cantitate restituită')
|
||||
->numeric()
|
||||
->required()
|
||||
->minValue(0.001)
|
||||
->default(fn (WorkOrderPart $r) => (float) $r->qty),
|
||||
Forms\Components\Textarea::make('notes')->rows(2)->label('Observații'),
|
||||
])
|
||||
->action(function (WorkOrderPart $r, array $data) {
|
||||
$batch = app(WarehouseService::class)->returnPart(
|
||||
$r, (float) $data['qty'], $data['notes'] ?? null
|
||||
);
|
||||
Notification::make()
|
||||
->title($batch ? 'Piesa returnată în stoc' : 'Nimic de restituit')
|
||||
->{$batch ? 'success' : 'warning'}()
|
||||
->send();
|
||||
}),
|
||||
Actions\EditAction::make(),
|
||||
Actions\DeleteAction::make(),
|
||||
]);
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\Tenant\Part;
|
||||
use chillerlan\QRCode\QRCode;
|
||||
use chillerlan\QRCode\QROptions;
|
||||
use Illuminate\Http\Request;
|
||||
|
||||
class PartLabelsController extends Controller
|
||||
{
|
||||
public function sheet(Request $request)
|
||||
{
|
||||
$ids = array_filter(array_map('intval', explode(',', (string) $request->query('ids', ''))));
|
||||
if (empty($ids)) abort(400, 'No parts selected.');
|
||||
|
||||
$parts = Part::whereIn('id', $ids)->orderBy('name')->get();
|
||||
|
||||
$opts = new QROptions([
|
||||
'outputType' => QRCode::OUTPUT_MARKUP_SVG,
|
||||
'eccLevel' => QRCode::ECC_M,
|
||||
'scale' => 4,
|
||||
'imageBase64' => false,
|
||||
'addQuietzone' => true,
|
||||
]);
|
||||
|
||||
$labels = $parts->map(function (Part $p) use ($opts) {
|
||||
$payload = 'PART:' . ($p->article ?: $p->id);
|
||||
return [
|
||||
'part' => $p,
|
||||
'svg' => (new QRCode($opts))->render($payload),
|
||||
'payload' => $payload,
|
||||
];
|
||||
});
|
||||
|
||||
return view('parts.labels', ['labels' => $labels]);
|
||||
}
|
||||
}
|
||||
@@ -262,6 +262,95 @@ class WarehouseService
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Issue parts NOW for a single WO line — used when the mechanic physically
|
||||
* 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
|
||||
{
|
||||
return DB::transaction(function () use ($wop) {
|
||||
$active = PartReservation::with(['batch', 'part'])
|
||||
->where('work_order_part_id', $wop->id)
|
||||
->where('status', PartReservation::STATUS_ACTIVE)
|
||||
->lockForUpdate()
|
||||
->get();
|
||||
|
||||
foreach ($active as $r) {
|
||||
$batch = $r->batch;
|
||||
if (! $batch) continue;
|
||||
$take = min((float) $r->qty, (float) $batch->qty_remaining);
|
||||
if ($take <= 0) continue;
|
||||
|
||||
$batch->qty_remaining = (float) $batch->qty_remaining - $take;
|
||||
$batch->save();
|
||||
|
||||
$this->logEvent(
|
||||
$r->part, $batch, $batch->warehouse,
|
||||
'issue', -$take, (float) $batch->buy_price,
|
||||
$wop->workOrder, "WO part #{$wop->id} (issue now)"
|
||||
);
|
||||
|
||||
$r->status = PartReservation::STATUS_CONSUMED;
|
||||
$r->consumed_at = now();
|
||||
$r->save();
|
||||
|
||||
if ($r->part) {
|
||||
$r->part->qty_reserved = max(0.0, (float) $r->part->qty_reserved - (float) $r->qty);
|
||||
$r->part->saveQuietly();
|
||||
}
|
||||
}
|
||||
|
||||
if ($wop->part) $this->syncPartCachedQty($wop->part);
|
||||
return $active->count();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Return parts physically taken back to stock. Creates a NEW batch with
|
||||
* the same buy_price as the original (FIFO-correct re-entry) and writes
|
||||
* a `return` event referencing the WO part.
|
||||
*/
|
||||
public function returnPart(WorkOrderPart $wop, ?float $qty = null, ?string $notes = null): ?PartBatch
|
||||
{
|
||||
if (! $wop->part_id) return null;
|
||||
|
||||
return DB::transaction(function () use ($wop, $qty, $notes) {
|
||||
$consumed = PartReservation::where('work_order_part_id', $wop->id)
|
||||
->where('status', PartReservation::STATUS_CONSUMED)
|
||||
->orderBy('consumed_at', 'desc')
|
||||
->get();
|
||||
|
||||
$totalConsumed = (float) $consumed->sum('qty');
|
||||
$qtyReturn = $qty !== null ? min((float) $qty, $totalConsumed) : $totalConsumed;
|
||||
if ($qtyReturn <= 0) return null;
|
||||
|
||||
$unitCost = (float) ($consumed->first()?->batch?->buy_price ?? $wop->buy_price);
|
||||
$warehouse = $consumed->first()?->batch?->warehouse
|
||||
?? $this->defaultWarehouse($wop->company_id);
|
||||
|
||||
$batch = PartBatch::create([
|
||||
'company_id' => $wop->company_id,
|
||||
'part_id' => $wop->part_id,
|
||||
'warehouse_id' => $warehouse->id,
|
||||
'qty_in' => $qtyReturn,
|
||||
'qty_remaining' => $qtyReturn,
|
||||
'buy_price' => $unitCost,
|
||||
'received_at' => now(),
|
||||
'notes' => $notes ?? "Retur de la WO part #{$wop->id}",
|
||||
]);
|
||||
|
||||
$this->logEvent(
|
||||
$wop->part, $batch, $warehouse,
|
||||
'return', $qtyReturn, $unitCost,
|
||||
$wop->workOrder, $notes ?? "Retur WO #{$wop->workOrder?->number}"
|
||||
);
|
||||
|
||||
$this->syncPartCachedQty($wop->part);
|
||||
return $batch;
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Move stock between warehouses (FIFO from source). Creates one transfer_out
|
||||
* + one transfer_in batch in the destination warehouse.
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
<x-filament-panels::page>
|
||||
@php
|
||||
$cols = $this->getColumns();
|
||||
$counts = $this->getCounts();
|
||||
@endphp
|
||||
|
||||
<style>
|
||||
.mb-stats { display: flex; gap: 12px; margin-bottom: 16px; flex-wrap: wrap; }
|
||||
.mb-stat {
|
||||
background: #fff; border: 1px solid #e5e7eb; border-radius: 10px;
|
||||
padding: 12px 18px; min-width: 140px;
|
||||
}
|
||||
.dark .mb-stat { background: #1f2937; border-color: #374151; }
|
||||
.mb-stat .lbl { font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: .03em; }
|
||||
.mb-stat .val { font-size: 28px; font-weight: 700; color: #111827; }
|
||||
.dark .mb-stat .val { color: #f9fafb; }
|
||||
|
||||
.mb-grid { display: grid; grid-template-columns: repeat(auto-fit, minmax(260px, 1fr)); gap: 14px; }
|
||||
.mb-col {
|
||||
background: #f9fafb; border: 1px solid #e5e7eb; border-radius: 12px;
|
||||
padding: 12px; min-height: 200px;
|
||||
}
|
||||
.dark .mb-col { background: #1f2937; border-color: #374151; }
|
||||
.mb-col-head {
|
||||
font-size: 12px; font-weight: 600; text-transform: uppercase;
|
||||
letter-spacing: .04em; padding-bottom: 10px; margin-bottom: 10px;
|
||||
border-bottom: 2px solid; display: flex; justify-content: space-between;
|
||||
}
|
||||
.mb-card {
|
||||
background: #fff; border-radius: 10px; padding: 12px 14px;
|
||||
margin-bottom: 8px; cursor: pointer; transition: transform .1s, box-shadow .1s;
|
||||
border: 1px solid #e5e7eb; text-decoration: none; color: inherit; display: block;
|
||||
}
|
||||
.dark .mb-card { background: #111827; border-color: #374151; }
|
||||
.mb-card:hover { transform: translateY(-1px); box-shadow: 0 4px 12px rgba(0,0,0,.06); }
|
||||
.mb-card .num { font-size: 13px; font-weight: 700; color: #3b82f6; }
|
||||
.mb-card .plate { font-size: 13px; color: #4b5563; }
|
||||
.dark .mb-card .plate { color: #d1d5db; }
|
||||
.mb-card .client { font-size: 12px; color: #6b7280; margin-top: 2px; }
|
||||
.mb-card .complaint {
|
||||
font-size: 12px; color: #374151; margin-top: 8px;
|
||||
display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden;
|
||||
}
|
||||
.dark .mb-card .complaint { color: #e5e7eb; }
|
||||
.mb-empty { color: #9ca3af; text-align: center; padding: 20px 8px; font-size: 12px; }
|
||||
</style>
|
||||
|
||||
<div class="mb-stats">
|
||||
<div class="mb-stat">
|
||||
<div class="lbl">Active acum</div>
|
||||
<div class="val">{{ $counts['active'] }}</div>
|
||||
</div>
|
||||
<div class="mb-stat">
|
||||
<div class="lbl">Închise azi</div>
|
||||
<div class="val">{{ $counts['closed_today'] }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-grid">
|
||||
@foreach ($cols as $col)
|
||||
<div class="mb-col">
|
||||
<div class="mb-col-head" style="border-color: {{ $col['color'] }}; color: {{ $col['color'] }};">
|
||||
<span>{{ $col['label'] }}</span>
|
||||
<span>{{ $col['items']->count() }}</span>
|
||||
</div>
|
||||
@forelse ($col['items'] as $wo)
|
||||
<a class="mb-card" href="{{ route('filament.tenant.resources.work-orders.edit', $wo) }}">
|
||||
<div style="display:flex;justify-content:space-between;align-items:center;">
|
||||
<span class="num">#{{ $wo->number }}</span>
|
||||
<span class="plate">{{ $wo->vehicle?->plate ?? '—' }}</span>
|
||||
</div>
|
||||
<div class="client">{{ $wo->client?->name ?? 'fără client' }} · {{ $wo->vehicle?->make }} {{ $wo->vehicle?->model }}</div>
|
||||
@if ($wo->complaint)
|
||||
<div class="complaint">{{ $wo->complaint }}</div>
|
||||
@endif
|
||||
</a>
|
||||
@empty
|
||||
<div class="mb-empty">—</div>
|
||||
@endforelse
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</x-filament-panels::page>
|
||||
@@ -0,0 +1,111 @@
|
||||
<x-filament-panels::page>
|
||||
<style>
|
||||
.sc-wrap { display: flex; flex-direction: column; gap: 16px; max-width: 640px; }
|
||||
.sc-cam {
|
||||
background: #111; border-radius: 12px; overflow: hidden;
|
||||
aspect-ratio: 4 / 3; position: relative;
|
||||
}
|
||||
.sc-cam video, .sc-cam canvas, .sc-cam #reader { width: 100% !important; height: 100% !important; object-fit: cover; }
|
||||
.sc-cam .placeholder {
|
||||
position: absolute; inset: 0; display: flex; align-items: center; justify-content: center;
|
||||
color: #94a3b8; font-size: 14px; padding: 24px; text-align: center;
|
||||
}
|
||||
.sc-controls { display: flex; gap: 8px; flex-wrap: wrap; }
|
||||
.sc-btn {
|
||||
padding: 10px 18px; border-radius: 8px; border: 0;
|
||||
background: #3b82f6; color: #fff; font-weight: 500; cursor: pointer;
|
||||
}
|
||||
.sc-btn.gray { background: #64748b; }
|
||||
.sc-btn:disabled { opacity: .5; cursor: not-allowed; }
|
||||
|
||||
.sc-manual {
|
||||
margin-top: 8px; padding: 12px;
|
||||
background: #f9fafb; border: 1px solid #e5e7eb; border-radius: 10px;
|
||||
}
|
||||
.dark .sc-manual { background: #1f2937; border-color: #374151; }
|
||||
.sc-manual input {
|
||||
width: 100%; padding: 10px 12px; border: 1px solid #cbd5e1; border-radius: 8px;
|
||||
font-family: monospace; font-size: 14px;
|
||||
}
|
||||
.dark .sc-manual input { background: #111827; border-color: #374151; color: #f9fafb; }
|
||||
|
||||
.sc-status { padding: 8px 12px; background: #ecfeff; border-left: 3px solid #06b6d4; font-size: 13px; }
|
||||
.dark .sc-status { background: #083344; color: #cffafe; }
|
||||
.sc-status.err { background: #fef2f2; border-left-color: #ef4444; color: #7f1d1d; }
|
||||
</style>
|
||||
|
||||
<div class="sc-wrap" x-data="scanner()" x-init="init()">
|
||||
<div class="sc-cam">
|
||||
<div id="reader"></div>
|
||||
<div class="placeholder" x-show="!running && !error" x-cloak>
|
||||
Apasă „Pornește" pentru a deschide camera.
|
||||
</div>
|
||||
<div class="placeholder" x-show="error" x-text="error" x-cloak></div>
|
||||
</div>
|
||||
|
||||
<div class="sc-controls">
|
||||
<button class="sc-btn" type="button" @click="start" x-show="!running">📷 Pornește scanner</button>
|
||||
<button class="sc-btn gray" type="button" @click="stop" x-show="running">⏹ Oprește</button>
|
||||
</div>
|
||||
|
||||
<div x-show="lastDecoded" class="sc-status" x-cloak>
|
||||
Ultimul cod citit: <strong x-text="lastDecoded"></strong>
|
||||
</div>
|
||||
|
||||
<div class="sc-manual">
|
||||
<form wire:submit="submitManual" style="display:flex;gap:8px;align-items:stretch;">
|
||||
<input type="text" wire:model="manual" placeholder="Sau introdu manual (cod articol / barcode)…" />
|
||||
<button type="submit" class="sc-btn">Caută</button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script src="https://unpkg.com/html5-qrcode@2.3.8/html5-qrcode.min.js"></script>
|
||||
<script>
|
||||
function scanner() {
|
||||
return {
|
||||
running: false,
|
||||
error: '',
|
||||
lastDecoded: '',
|
||||
scanner: null,
|
||||
|
||||
init() {
|
||||
// Nothing on init — wait for user gesture (camera permission).
|
||||
},
|
||||
|
||||
async start() {
|
||||
this.error = '';
|
||||
try {
|
||||
this.scanner = new Html5Qrcode('reader');
|
||||
const cams = await Html5Qrcode.getCameras();
|
||||
if (!cams.length) { this.error = 'Nicio cameră detectată.'; return; }
|
||||
const camId = cams.find(c => /back|rear|environment/i.test(c.label))?.id || cams[0].id;
|
||||
await this.scanner.start(
|
||||
camId,
|
||||
{ fps: 10, qrbox: { width: 250, height: 250 } },
|
||||
(text) => this.onDecoded(text),
|
||||
() => {}
|
||||
);
|
||||
this.running = true;
|
||||
} catch (e) {
|
||||
this.error = 'Nu pot porni camera: ' + (e.message || e);
|
||||
}
|
||||
},
|
||||
|
||||
async stop() {
|
||||
if (this.scanner) {
|
||||
try { await this.scanner.stop(); await this.scanner.clear(); } catch (e) {}
|
||||
}
|
||||
this.running = false;
|
||||
},
|
||||
|
||||
onDecoded(text) {
|
||||
if (text === this.lastDecoded) return; // debounce duplicate
|
||||
this.lastDecoded = text;
|
||||
this.stop();
|
||||
$wire.dispatch('scanner-decoded', { text });
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</x-filament-panels::page>
|
||||
@@ -0,0 +1,12 @@
|
||||
<div class="space-y-3">
|
||||
<div class="flex justify-center bg-white rounded-lg p-4 border border-gray-200 dark:border-gray-700">
|
||||
<div style="max-width: 240px;">{!! $svg !!}</div>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<div class="text-sm font-semibold">{{ $part->name }}</div>
|
||||
@if ($part->article)
|
||||
<div class="text-xs text-gray-500 dark:text-gray-400 font-mono">{{ $part->article }}</div>
|
||||
@endif
|
||||
<div class="text-xs text-gray-400 mt-1">Payload: <code>{{ $payload }}</code></div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -0,0 +1,65 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Etichete piese</title>
|
||||
<style>
|
||||
@page { size: A4; margin: 10mm; }
|
||||
* { box-sizing: border-box; }
|
||||
body { font-family: system-ui, -apple-system, sans-serif; margin: 0; padding: 12px; }
|
||||
|
||||
.toolbar {
|
||||
display: flex; justify-content: space-between; align-items: center;
|
||||
margin-bottom: 16px; padding: 12px;
|
||||
background: #f3f4f6; border-radius: 8px;
|
||||
}
|
||||
@media print { .toolbar { display: none; } }
|
||||
.btn {
|
||||
padding: 8px 16px; background: #3b82f6; color: #fff;
|
||||
border: 0; border-radius: 6px; cursor: pointer; font-size: 14px;
|
||||
}
|
||||
|
||||
.grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr);
|
||||
gap: 6mm;
|
||||
}
|
||||
.label {
|
||||
border: 1px dashed #cbd5e1; padding: 6mm;
|
||||
text-align: center; page-break-inside: avoid;
|
||||
min-height: 60mm; display: flex; flex-direction: column;
|
||||
align-items: center; justify-content: space-between;
|
||||
}
|
||||
.label .qr { width: 80%; max-width: 35mm; }
|
||||
.label .name { font-size: 10pt; font-weight: 600; margin: 4mm 0 1mm; line-height: 1.2; }
|
||||
.label .code { font-family: 'Menlo', 'Consolas', monospace; font-size: 9pt; color: #475569; }
|
||||
.label .brand { font-size: 8pt; color: #94a3b8; }
|
||||
@media print {
|
||||
.label { border-style: solid; border-color: #e2e8f0; }
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="toolbar">
|
||||
<strong>{{ $labels->count() }} etichete</strong>
|
||||
<button class="btn" onclick="window.print()">🖨 Tipărește</button>
|
||||
</div>
|
||||
|
||||
<div class="grid">
|
||||
@foreach ($labels as $lbl)
|
||||
<div class="label">
|
||||
<div class="qr">{!! $lbl['svg'] !!}</div>
|
||||
<div>
|
||||
<div class="name">{{ $lbl['part']->name }}</div>
|
||||
@if ($lbl['part']->article)
|
||||
<div class="code">{{ $lbl['part']->article }}</div>
|
||||
@endif
|
||||
@if ($lbl['part']->brand)
|
||||
<div class="brand">{{ $lbl['part']->brand }}</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@@ -57,6 +57,12 @@ Route::get('/login', function (Request $request) {
|
||||
return redirect($tenant ? '/app/login' : '/admin/login');
|
||||
})->name('login');
|
||||
|
||||
// ─── Print sheets (auth required, tenant-scoped) ───────────────────
|
||||
Route::middleware(['web', 'auth'])->group(function () {
|
||||
Route::get('/parts/labels', [\App\Http\Controllers\PartLabelsController::class, 'sheet'])
|
||||
->name('parts.labels');
|
||||
});
|
||||
|
||||
// ─── Telegram webhook (per-tenant, on central domain) ──────────────
|
||||
Route::post('/telegram/webhook/{slug}', [\App\Http\Controllers\TelegramWebhookController::class, 'handle'])
|
||||
->where('slug', '[a-z0-9\-]+')
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
use App\Models\Central\Company;
|
||||
use App\Models\Central\Plan;
|
||||
use App\Models\Tenant\Part;
|
||||
use App\Tenancy\TenantManager;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
class ScannerLookupTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
public function test_scanner_finds_part_by_part_prefix_payload(): void
|
||||
{
|
||||
[$company, $part] = $this->makePart('FA-001');
|
||||
|
||||
// Simulate the controller-level lookup logic (Scanner::resolveAndRedirect).
|
||||
$code = 'PART:FA-001';
|
||||
$clean = str_starts_with($code, 'PART:') ? substr($code, 5) : $code;
|
||||
|
||||
$found = Part::where(function ($q) use ($clean) {
|
||||
$q->where('article', $clean)->orWhere('barcode', $clean);
|
||||
if (ctype_digit($clean)) $q->orWhere('id', (int) $clean);
|
||||
})->first();
|
||||
|
||||
$this->assertNotNull($found);
|
||||
$this->assertEquals($part->id, $found->id);
|
||||
}
|
||||
|
||||
public function test_scanner_finds_part_by_raw_barcode(): void
|
||||
{
|
||||
[$company, $part] = $this->makePart('FA-002', '4607177921365');
|
||||
|
||||
$code = '4607177921365';
|
||||
$found = Part::where('barcode', $code)->orWhere('article', $code)->first();
|
||||
$this->assertNotNull($found);
|
||||
$this->assertEquals($part->id, $found->id);
|
||||
}
|
||||
|
||||
public function test_scanner_misses_for_unknown_code(): void
|
||||
{
|
||||
$this->makePart('FA-003');
|
||||
|
||||
$found = Part::where('article', 'GHOST-999')->orWhere('barcode', 'GHOST-999')->first();
|
||||
$this->assertNull($found);
|
||||
}
|
||||
|
||||
private function makePart(string $article, ?string $barcode = null): array
|
||||
{
|
||||
$plan = Plan::firstOrCreate(['slug' => 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
|
||||
$company = Company::create([
|
||||
'plan_id' => $plan->id,
|
||||
'slug' => 'sc-' . uniqid(),
|
||||
'name' => 'Scanner Service',
|
||||
'status' => 'active',
|
||||
]);
|
||||
app(TenantManager::class)->setCurrent($company);
|
||||
|
||||
$part = Part::create([
|
||||
'name' => 'Filtru ' . $article,
|
||||
'article' => $article,
|
||||
'barcode' => $barcode,
|
||||
'unit' => 'buc',
|
||||
'qty' => 0,
|
||||
'buy_price' => 0, 'sell_price' => 0,
|
||||
'is_active' => true,
|
||||
]);
|
||||
|
||||
return [$company, $part];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,153 @@
|
||||
<?php
|
||||
|
||||
namespace Tests\Feature;
|
||||
|
||||
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\PartReservation;
|
||||
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\Services\Warehouse\WarehouseService;
|
||||
use App\Tenancy\TenantManager;
|
||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||
use Tests\TestCase;
|
||||
|
||||
class WarehouseIssueReturnTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
private WarehouseService $svc;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
parent::setUp();
|
||||
$this->svc = app(WarehouseService::class);
|
||||
}
|
||||
|
||||
public function test_issue_now_consumes_immediately_without_wo_done(): void
|
||||
{
|
||||
$ctx = $this->ctx();
|
||||
$this->svc->receive($ctx['part'], 10, 25.0);
|
||||
|
||||
$wop = WorkOrderPart::create([
|
||||
'work_order_id' => $ctx['wo']->id,
|
||||
'part_id' => $ctx['part']->id,
|
||||
'name' => $ctx['part']->name,
|
||||
'qty' => 3, 'unit' => 'buc',
|
||||
'buy_price' => 25, 'sell_price' => 40,
|
||||
]);
|
||||
|
||||
$ctx['part']->refresh();
|
||||
$this->assertEquals(3.0, (float) $ctx['part']->qty_reserved);
|
||||
|
||||
$n = $this->svc->issueNow($wop);
|
||||
$this->assertGreaterThan(0, $n);
|
||||
|
||||
$ctx['part']->refresh();
|
||||
$this->assertEquals(7.0, (float) $ctx['part']->qty, 'on-hand decreased without closing WO');
|
||||
$this->assertEquals(0.0, (float) $ctx['part']->qty_reserved, 'reservation no longer counted');
|
||||
|
||||
$r = PartReservation::where('work_order_part_id', $wop->id)->first();
|
||||
$this->assertEquals('consumed', $r->status);
|
||||
}
|
||||
|
||||
public function test_return_part_creates_positive_batch_and_event(): void
|
||||
{
|
||||
$ctx = $this->ctx();
|
||||
$this->svc->receive($ctx['part'], 10, 30.0);
|
||||
|
||||
$wop = WorkOrderPart::create([
|
||||
'work_order_id' => $ctx['wo']->id,
|
||||
'part_id' => $ctx['part']->id,
|
||||
'name' => $ctx['part']->name,
|
||||
'qty' => 4, 'unit' => 'buc',
|
||||
'buy_price' => 30, 'sell_price' => 50,
|
||||
]);
|
||||
$this->svc->issueNow($wop);
|
||||
|
||||
$ctx['part']->refresh();
|
||||
$this->assertEquals(6.0, (float) $ctx['part']->qty);
|
||||
|
||||
$batch = $this->svc->returnPart($wop, 2);
|
||||
$this->assertNotNull($batch);
|
||||
$this->assertEquals(2.0, (float) $batch->qty_in);
|
||||
$this->assertEquals(30.0, (float) $batch->buy_price);
|
||||
|
||||
$ctx['part']->refresh();
|
||||
$this->assertEquals(8.0, (float) $ctx['part']->qty, 'returned 2 restored to on-hand');
|
||||
|
||||
$this->assertEquals(1, WarehouseEvent::where('part_id', $ctx['part']->id)
|
||||
->where('type', 'return')
|
||||
->count());
|
||||
}
|
||||
|
||||
public function test_return_more_than_consumed_is_capped(): void
|
||||
{
|
||||
$ctx = $this->ctx();
|
||||
$this->svc->receive($ctx['part'], 10, 10.0);
|
||||
|
||||
$wop = WorkOrderPart::create([
|
||||
'work_order_id' => $ctx['wo']->id,
|
||||
'part_id' => $ctx['part']->id,
|
||||
'name' => $ctx['part']->name,
|
||||
'qty' => 3, 'unit' => 'buc',
|
||||
'buy_price' => 10, 'sell_price' => 15,
|
||||
]);
|
||||
$this->svc->issueNow($wop);
|
||||
|
||||
$batch = $this->svc->returnPart($wop, 99);
|
||||
$this->assertEquals(3.0, (float) $batch->qty_in, 'capped at consumed total');
|
||||
}
|
||||
|
||||
private function ctx(): array
|
||||
{
|
||||
$plan = Plan::firstOrCreate(['slug' => 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
|
||||
$company = Company::create([
|
||||
'plan_id' => $plan->id,
|
||||
'slug' => 'ir-' . uniqid(),
|
||||
'name' => 'IR Service',
|
||||
'status' => 'active',
|
||||
]);
|
||||
app(TenantManager::class)->setCurrent($company);
|
||||
|
||||
$wh = Warehouse::create([
|
||||
'code' => 'MAIN', 'name' => 'Depozit',
|
||||
'is_default' => true, 'is_active' => true,
|
||||
]);
|
||||
$company->forceFill(['default_warehouse_id' => $wh->id])->saveQuietly();
|
||||
|
||||
$part = Part::create([
|
||||
'name' => 'Filtru aer',
|
||||
'unit' => 'buc',
|
||||
'qty' => 0,
|
||||
'buy_price' => 0, 'sell_price' => 0,
|
||||
'is_active' => true,
|
||||
]);
|
||||
|
||||
$client = Client::create([
|
||||
'name' => 'WO Client',
|
||||
'phone' => '+37399' . random_int(100000, 999999),
|
||||
'type' => 'individual', 'status' => 'active',
|
||||
]);
|
||||
$vehicle = Vehicle::create([
|
||||
'client_id' => $client->id,
|
||||
'make' => 'A', 'model' => 'B',
|
||||
'plate' => 'IR' . random_int(100, 999),
|
||||
]);
|
||||
$wo = WorkOrder::create([
|
||||
'number' => WorkOrder::generateNumber($company->id),
|
||||
'client_id' => $client->id,
|
||||
'vehicle_id' => $vehicle->id,
|
||||
'opened_at' => now(),
|
||||
'status' => 'in_work',
|
||||
]);
|
||||
|
||||
return compact('company', 'wh', 'part', 'client', 'vehicle', 'wo');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user