Vasyka
113610ea8f
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>
61 lines
2.9 KiB
PHP
61 lines
2.9 KiB
PHP
@extends('shop.layout')
|
||
@section('title', __('portal.shop.order_number') . ' ' . $order->number)
|
||
@section('content')
|
||
@php
|
||
$currency = $tenant->settings['currency'] ?? 'MDL';
|
||
$statuses = \App\Models\Tenant\OnlineOrder::STATUSES;
|
||
$delivery = \App\Models\Tenant\OnlineOrder::DELIVERY;
|
||
$flow = ['new', 'confirmed', 'packed', 'shipped', 'delivered'];
|
||
$idx = array_search($order->status, $flow, true);
|
||
@endphp
|
||
|
||
<div class="card" style="text-align:center;">
|
||
<div style="font-size:14px;color:#6b7280;">{{ __('portal.shop.order_number') }}</div>
|
||
<div style="font-size:24px;font-weight:700;margin:4px 0;">#{{ $order->number }}</div>
|
||
<span class="status-pill">{{ $statuses[$order->status] ?? $order->status }}</span>
|
||
</div>
|
||
|
||
@if ($order->status !== 'cancelled')
|
||
<div class="card" style="margin-top:14px;">
|
||
<h3 style="font-size:15px;margin-bottom:12px;">{{ __('portal.shop.status') }}</h3>
|
||
<div style="display:flex;justify-content:space-between;gap:4px;">
|
||
@foreach ($flow as $i => $st)
|
||
<div style="flex:1;text-align:center;">
|
||
<div style="width:22px;height:22px;border-radius:50%;margin:0 auto 6px;
|
||
background:{{ $idx !== false && $i <= $idx ? ($tenant->settings['theme_color'] ?? '#3B82F6') : '#e5e7eb' }};"></div>
|
||
<div style="font-size:11px;color:{{ $idx !== false && $i <= $idx ? '#111827' : '#9ca3af' }};">
|
||
{{ $statuses[$st] }}
|
||
</div>
|
||
</div>
|
||
@endforeach
|
||
</div>
|
||
</div>
|
||
@endif
|
||
|
||
<div class="card" style="margin-top:14px;">
|
||
<h3 style="font-size:15px;margin-bottom:10px;">{{ __('portal.shop.products') }}</h3>
|
||
<table class="cart">
|
||
@foreach ($order->items as $it)
|
||
<tr>
|
||
<td>{{ $it->name }} <span class="muted">×{{ rtrim(rtrim(number_format((float)$it->qty,2),'0'),'.') }}</span></td>
|
||
<td class="r">{{ number_format((float) $it->total, 2) }} {{ $currency }}</td>
|
||
</tr>
|
||
@endforeach
|
||
<tr><td class="muted">{{ __('portal.shop.delivery') }} ({{ $delivery[$order->delivery_method] ?? $order->delivery_method }})</td>
|
||
<td class="r">{{ number_format((float) $order->delivery_fee, 2) }} {{ $currency }}</td></tr>
|
||
<tr><td style="font-weight:700;">{{ __('portal.common.total') }}</td>
|
||
<td class="r" style="font-weight:700;font-size:18px;">{{ number_format((float) $order->total, 2) }} {{ $currency }}</td></tr>
|
||
</table>
|
||
</div>
|
||
|
||
<div class="card" style="margin-top:14px;">
|
||
<h3 style="font-size:15px;margin-bottom:8px;">{{ __('portal.shop.delivery_data') }}</h3>
|
||
<p class="muted">{{ $order->customer_name }} · {{ $order->customer_phone }}</p>
|
||
@if ($order->address)<p class="muted">{{ $order->address }}</p>@endif
|
||
</div>
|
||
|
||
<div style="margin-top:16px;text-align:center;">
|
||
<a class="btn outline" href="/shop">{{ __('portal.shop.continue_shopping') }}</a>
|
||
</div>
|
||
@endsection
|