feat: WO apply_margin at fișă level + full RO/RU i18n on client portal
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:
@@ -7,7 +7,7 @@
|
||||
$imgs = $part->imageUrls();
|
||||
@endphp
|
||||
|
||||
<a href="/shop" class="muted">← Înapoi la catalog</a>
|
||||
<a href="/shop" class="muted">{{ __('portal.shop.back_to_catalog') }}</a>
|
||||
|
||||
@if (! empty($imgs))
|
||||
<div class="card" style="margin-top:12px;display:grid;grid-template-columns:280px 1fr;gap:20px;align-items:start;">
|
||||
@@ -43,13 +43,15 @@
|
||||
@endif
|
||||
<h1 style="font-size:22px;margin-bottom:8px;">{{ $part->name }}</h1>
|
||||
<div class="muted" style="margin-bottom:14px;">
|
||||
{{ $part->brand ? 'Brand: ' . $part->brand : '' }}
|
||||
{{ $part->article ? ' · Cod: ' . $part->article : '' }}
|
||||
{{ $part->brand ? __('portal.shop.brand_label') . ' ' . $part->brand : '' }}
|
||||
{{ $part->article ? ' · ' . __('portal.shop.code_label') . ' ' . $part->article : '' }}
|
||||
{{ $part->category ? ' · ' . $part->category : '' }}
|
||||
</div>
|
||||
|
||||
<div class="stock {{ $stock > 0 ? 'in' : 'out' }}" style="margin-bottom:8px;">
|
||||
{{ $stock > 0 ? '● În stoc (' . rtrim(rtrim(number_format($stock, 2), '0'), '.') . ' ' . ($part->unit ?? 'buc') . ')' : '○ La comandă' }}
|
||||
{{ $stock > 0
|
||||
? __('portal.shop.in_stock_qty', ['qty' => rtrim(rtrim(number_format($stock, 2), '0'), '.'), 'unit' => $part->unit ?? __('portal.tracking.unit_pcs')])
|
||||
: __('portal.shop.on_order') }}
|
||||
</div>
|
||||
<div style="font-size:26px;font-weight:700;color:{{ $tenant->settings['theme_color'] ?? '#3B82F6' }};margin-bottom:16px;">
|
||||
{{ number_format((float) $part->sell_price, 2) }} {{ $currency }}
|
||||
@@ -58,12 +60,12 @@
|
||||
<form method="POST" action="/shop/part/{{ $part->id }}/add" style="display:flex;gap:8px;align-items:center;max-width:320px;">
|
||||
@csrf
|
||||
<input type="number" name="qty" value="1" min="1" style="width:80px;padding:10px;border:1px solid #d1d5db;border-radius:8px;">
|
||||
<button class="btn" type="submit">Adaugă în coș</button>
|
||||
<button class="btn" type="submit">{{ __('portal.shop.add_to_cart') }}</button>
|
||||
</form>
|
||||
|
||||
@if ($part->crossRefs->isNotEmpty())
|
||||
<div style="margin-top:20px;">
|
||||
<h3 style="font-size:14px;margin-bottom:6px;">Coduri echivalente (cross)</h3>
|
||||
<h3 style="font-size:14px;margin-bottom:6px;">{{ __('portal.shop.cross_refs_title') }}</h3>
|
||||
<div class="muted">
|
||||
@foreach ($part->crossRefs as $cr)
|
||||
<span style="display:inline-block;background:#f3f4f6;border-radius:6px;padding:3px 8px;margin:2px;">
|
||||
@@ -76,11 +78,11 @@
|
||||
|
||||
@if ($part->notes)
|
||||
<div style="margin-top:20px;">
|
||||
<h3 style="font-size:14px;margin-bottom:6px;">Descriere</h3>
|
||||
<h3 style="font-size:14px;margin-bottom:6px;">{{ __('portal.shop.description') }}</h3>
|
||||
<p class="muted" style="white-space:pre-wrap;">{{ $part->notes }}</p>
|
||||
</div>
|
||||
@endif
|
||||
@if ($img)
|
||||
@if ($img ?? null)
|
||||
</div>{{-- /right column --}}
|
||||
</div>{{-- /card grid --}}
|
||||
@else
|
||||
|
||||
Reference in New Issue
Block a user