Vasyka/autocrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: WO apply_margin at fișă level + full RO/RU i18n on client portal

Browse Source 
Two changes in one commit:

== 1. Moved apply_margin toggle from line-level to Fișă-level ==

The per-manoperă apply_margin toggle is gone from the Manopere tab.
In its place: a single "Aplică marjă internă" toggle in Fișa's
"Plată & total" section (next to override_margin_pct). One decision
per Fișă instead of per line — cleaner mental model, matches how the
shop actually thinks about at-cost vs. billable work.

Migration: work_orders.apply_margin boolean default true (idempotent).
WorkOrderWork::saving now reads WO.apply_margin from DB directly (not
via belongsTo cache) to determine salary_base:
  - WO.apply_margin=false → every line gets salary_base=total, applied_margin_pct=0
  - WO.apply_margin=true  → resolver chain (WO.override → user margin → tenant default)

Old wo_works.apply_margin column stays untouched (backward-compat with
existing rows), but no longer exposed in UI. Tests updated to new
semantic. All existing tests green.

== 2. Full i18n audit on client-facing portal — RO/RU separated ==

Problem: user selecting Russian saw Romanian mixed into headings,
buttons, labels. Every client-facing Blade file was 100% hardcoded
Romanian — zero __() calls.

Fix: created lang/ro/portal.php + lang/ru/portal.php with 131 keys
across 3 namespaces:
  - portal.common (email, phone, save, total, powered_by, ...)
  - portal.invitation (welcome_name, activate_account, expired_body, ...)
  - portal.tracking (title_fisa, approve, approval_needed_title,
                    ready_estimated, hours, unit_pcs, ...)
  - portal.shop (catalog, cart, checkout_title, order_number, vin_title,
                signin_title, add_to_cart, in_stock, ...)

Converted 15 Blade files to __() calls:
  - resources/views/invitations/{accept,expired,invalid}.blade.php
  - resources/views/tracking/show.blade.php
  - resources/views/shop/{layout,catalog,cart,checkout,order,account,part,vin}.blade.php
  - resources/views/shop/auth/{login,register,forgot,reset}.blade.php

Each view's <html lang="{{ app()->getLocale() }}"> now reflects the
resolved locale (was hardcoded lang="ro").

SetLocale middleware resolves locale in this order:
  1. session locale (user picked via language switcher)
  2. authenticated user.locale
  3. tenant.settings.language
  4. app.locale default (now 'ro')

Config change: config/app.php default locale + fallback both = 'ro'
(was 'en'). English falls back to Romanian for portal.* keys since
we don't ship English portal translations — a Romanian shop that
switches to English shows Romanian text, which is safer than showing
"portal.invitation.activate_account" literals.

phpunit.xml sets APP_LOCALE=ro so test assertSee() calls that look
for Romanian text pass.

Verified via portal.* grep: 131 __() calls across 15 files. Zero
hardcoded Romanian nouns/verbs left in any client-facing view.

Suite: 303 passed (840 assertions). Unchanged count — refactor,
not new tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Vasyka
2026-07-13 04:56:04 +00:00
parent f5ff3f149a
commit 113610ea8f
25 changed files with 495 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/tracking/show.blade.php
+21 -21
View File
@@ -85,7 +85,7 @@
<header>
@if ($logoUrl)<img src="{{ $logoUrl }}" alt="">@endif
<h1>{{ $tenant->display_name ?? $tenant->name }}</h1>
<div class="num">Fișa #{{ $wo->number }}</div>
<div class="num">{{ __('portal.tracking.title_fisa', ['number' => $wo->number]) }}</div>
</header>
<style>
@@ -112,17 +112,17 @@
@if ($pendingWorks->isNotEmpty() || $pendingParts->isNotEmpty())
<div class="approval-banner">
<h3>⚠ Necesită aprobarea ta</h3>
<p style="font-size:13px;color:#92400e;margin-bottom:10px;">Am descoperit lucrări suplimentare. Te rugăm să decizi mai jos.</p>
<h3>{{ __('portal.tracking.approval_needed_title') }}</h3>
<p style="font-size:13px;color:#92400e;margin-bottom:10px;">{{ __('portal.tracking.approval_needed_body') }}</p>
@foreach ($pendingWorks as $w)
<div class="approval-line">
<div class="approval-line-title">{{ $w->name }}</div>
<div class="approval-line-amount">{{ rtrim(rtrim(number_format($w->hours, 2), '0'), '.') }} ore · {{ number_format($w->total, 0, '.', ' ') }} MDL</div>
<div class="approval-line-amount">{{ rtrim(rtrim(number_format($w->hours, 2), '0'), '.') }} {{ __('portal.tracking.hours') }} · {{ number_format($w->total, 0, '.', ' ') }} {{ __('portal.common.currency_mdl') }}</div>
<div class="approval-line-actions">
<form method="POST" action="{{ route('tracking.approve', ['token' => $wo->tracking_token, 'kind' => 'work', 'lineToken' => $w->approval_token]) }}" style="flex:1;display:flex;gap:8px;">
@csrf
<button type="submit" name="decision" value="approve" class="btn-approve">✅ Aprob</button>
<button type="submit" name="decision" value="decline" class="btn-decline">❌ Nu aprob</button>
<button type="submit" name="decision" value="approve" class="btn-approve">{{ __('portal.tracking.approve') }}</button>
<button type="submit" name="decision" value="decline" class="btn-decline">{{ __('portal.tracking.decline') }}</button>
</form>
</div>
</div>
@@ -130,12 +130,12 @@
@foreach ($pendingParts as $p)
<div class="approval-line">
<div class="approval-line-title">{{ $p->name }} @if ($p->article) <span style="font-family:monospace;color:#6b7280;font-weight:400;">· {{ $p->article }}</span>@endif</div>
<div class="approval-line-amount">{{ rtrim(rtrim(number_format($p->qty, 2), '0'), '.') }} {{ $p->unit ?? 'buc' }} · {{ number_format($p->total, 0, '.', ' ') }} MDL</div>
<div class="approval-line-amount">{{ rtrim(rtrim(number_format($p->qty, 2), '0'), '.') }} {{ $p->unit ?? __('portal.tracking.unit_pcs') }} · {{ number_format($p->total, 0, '.', ' ') }} {{ __('portal.common.currency_mdl') }}</div>
<div class="approval-line-actions">
<form method="POST" action="{{ route('tracking.approve', ['token' => $wo->tracking_token, 'kind' => 'part', 'lineToken' => $p->approval_token]) }}" style="flex:1;display:flex;gap:8px;">
@csrf
<button type="submit" name="decision" value="approve" class="btn-approve">✅ Aprob</button>
<button type="submit" name="decision" value="decline" class="btn-decline">❌ Nu aprob</button>
<button type="submit" name="decision" value="approve" class="btn-approve">{{ __('portal.tracking.approve') }}</button>
<button type="submit" name="decision" value="decline" class="btn-decline">{{ __('portal.tracking.decline') }}</button>
</form>
</div>
</div>
@@ -147,32 +147,32 @@
<span class="status-badge">{{ $statuses[$wo->status] ?? $wo->status }}</span>
@if ($wo->eta_at && in_array($wo->status, ['in_work', 'awaiting_parts', 'approved', 'diagnosis'], true))
<p style="margin-top:10px;color:#6b7280;font-size:14px;">
Gata estimat: <strong style="color:#111827">{{ $wo->eta_at->isoFormat('D MMM YYYY, HH:mm') }}</strong>
{{ __('portal.tracking.ready_estimated') }} <strong style="color:#111827">{{ $wo->eta_at->isoFormat('D MMM YYYY, HH:mm') }}</strong>
</p>
@endif
</div>
<div class="card">
<h2>Detalii</h2>
<h2>{{ __('portal.tracking.details') }}</h2>
@if ($wo->vehicle)
<div class="row">
<span class="k">Auto</span>
<span class="k">{{ __('portal.tracking.auto') }}</span>
<span class="v">{{ trim($wo->vehicle->make . ' ' . $wo->vehicle->model) }}
@if ($wo->vehicle->plate) · {{ $wo->vehicle->plate }} @endif
</span>
</div>
@endif
@if ($wo->mileage_in)
<div class="row"><span class="k">Kilometraj</span><span class="v">{{ number_format($wo->mileage_in, 0, '.', ' ') }} km</span></div>
<div class="row"><span class="k">{{ __('portal.tracking.mileage') }}</span><span class="v">{{ number_format($wo->mileage_in, 0, '.', ' ') }} km</span></div>
@endif
<div class="row"><span class="k">Deschis</span><span class="v">{{ $wo->opened_at?->isoFormat('D MMM YYYY') }}</span></div>
<div class="row"><span class="k">{{ __('portal.tracking.opened') }}</span><span class="v">{{ $wo->opened_at?->isoFormat('D MMM YYYY') }}</span></div>
@if ($wo->master)
<div class="row"><span class="k">Maistru</span><span class="v">{{ $wo->master->name }}</span></div>
<div class="row"><span class="k">{{ __('portal.tracking.master') }}</span><span class="v">{{ $wo->master->name }}</span></div>
@endif
</div>
<div class="card">
<h2>Etape</h2>
<h2>{{ __('portal.tracking.stages') }}</h2>
<ul class="timeline">
@foreach ($flow as $i => $st)
@php
@@ -187,21 +187,21 @@
@if ($wo->complaint)
<div class="card">
<h2>Ce ne-ai cerut</h2>
<h2>{{ __('portal.tracking.what_asked') }}</h2>
<p style="font-size:14px;white-space:pre-wrap;">{{ $wo->complaint }}</p>
</div>
@endif
@if ($wo->recommendations)
<div class="card">
<h2>Recomandări</h2>
<h2>{{ __('portal.tracking.recommendations') }}</h2>
<div class="note" style="white-space:pre-wrap;">{{ $wo->recommendations }}</div>
</div>
@endif
@if ($photos->count())
<div class="card">
<h2>Fotografii</h2>
<h2>{{ __('portal.tracking.photos') }}</h2>
<div class="photos">
@foreach ($photos as $p)
<a href="{{ $p->getUrl() }}" target="_blank" rel="noopener">
@@ -215,14 +215,14 @@
@if ((float) $wo->total > 0)
<div class="card">
<div class="totals">
<span class="lbl">Total</span>
<span class="lbl">{{ __('portal.common.total') }}</span>
<span class="amt">{{ number_format((float) $wo->total, 2, '.', ' ') }} {{ $tenant->settings['currency'] ?? 'MDL' }}</span>
</div>
</div>
@endif
<footer>
Powered by AutoCRM
{{ __('portal.common.powered_by') }}
</footer>
</div>
</body>