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>
57 lines
2.6 KiB
PHP
57 lines
2.6 KiB
PHP
@extends('shop.layout')
|
|
@section('title', __('portal.shop.catalog_title'))
|
|
@section('content')
|
|
@php $currency = $tenant->settings['currency'] ?? 'MDL'; @endphp
|
|
|
|
<form method="GET" action="/shop" class="filters">
|
|
<input type="text" name="q" value="{{ $term }}" placeholder="{{ __('portal.shop.search_placeholder') }}">
|
|
<select name="cat" onchange="this.form.submit()">
|
|
<option value="">{{ __('portal.shop.all_categories') }}</option>
|
|
@foreach ($categories as $c)
|
|
<option value="{{ $c }}" {{ $category === $c ? 'selected' : '' }}>{{ $c }}</option>
|
|
@endforeach
|
|
</select>
|
|
<label style="display:flex;align-items:center;gap:6px;font-size:14px;">
|
|
<input type="checkbox" name="in_stock" value="1" {{ $inStock ? 'checked' : '' }} onchange="this.form.submit()">
|
|
{{ __('portal.shop.in_stock_only') }}
|
|
</label>
|
|
<button class="btn" type="submit">{{ __('portal.common.search') }}</button>
|
|
</form>
|
|
|
|
@if ($parts->isEmpty())
|
|
<div class="card" style="text-align:center;padding:48px;">
|
|
<p class="muted">{{ $term ? __('portal.shop.no_parts_found_for', ['term' => $term]) : __('portal.shop.no_parts_found') }}.</p>
|
|
</div>
|
|
@else
|
|
<div class="grid">
|
|
@foreach ($parts as $p)
|
|
@php $stock = (float) $p->qty; $img = $p->imageUrl(); @endphp
|
|
<div class="product">
|
|
<a href="/shop/part/{{ $p->id }}" class="product-thumb">
|
|
@if ($img)
|
|
<img src="{{ $img }}" alt="{{ $p->name }}" loading="lazy">
|
|
@else
|
|
<div class="product-thumb-empty">📦</div>
|
|
@endif
|
|
</a>
|
|
<a href="/shop/part/{{ $p->id }}">
|
|
<h3>{{ $p->name }}</h3>
|
|
</a>
|
|
<div class="meta">
|
|
{{ $p->brand ? $p->brand . ' · ' : '' }}{{ $p->article ?? '' }}
|
|
</div>
|
|
<div class="stock {{ $stock > 0 ? 'in' : 'out' }}">
|
|
{{ $stock > 0 ? __('portal.shop.in_stock') : __('portal.shop.on_order') }}
|
|
</div>
|
|
<div class="price">{{ number_format((float) $p->sell_price, 2) }} {{ $currency }}</div>
|
|
<form method="POST" action="/shop/part/{{ $p->id }}/add" style="margin-top:10px;">
|
|
@csrf
|
|
<button class="btn block" type="submit">{{ __('portal.shop.add_to_cart') }}</button>
|
|
</form>
|
|
</div>
|
|
@endforeach
|
|
</div>
|
|
<div style="margin-top:20px;">{{ $parts->links() }}</div>
|
|
@endif
|
|
@endsection
|