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
app/Models/Tenant/WorkOrder.php
+2 -1
View File
@@ -39,7 +39,7 @@ class WorkOrder extends Model implements HasMedia
'opened_at', 'closed_at', 'mileage_in', 'mileage_out',
'complaint', 'diagnosis', 'recommendations',
'status', 'urgency', 'pay_status', 'approved', 'approved_at',
'discount_pct', 'override_margin_pct', 'total',
'discount_pct', 'override_margin_pct', 'apply_margin', 'total',
'eta_at', 'eta_promised', 'eta_change_reason', 'eta_updated_at',
'tracking_token',
];
@@ -52,6 +52,7 @@ class WorkOrder extends Model implements HasMedia
'eta_promised' => 'datetime',
'eta_updated_at' => 'datetime',
'approved' => 'boolean',
'apply_margin' => 'boolean',
'discount_pct' => 'decimal:2',
'total' => 'decimal:2',
];
app/Models/Tenant/WorkOrderWork.php
+9 -3
View File
@@ -179,9 +179,15 @@ class WorkOrderWork extends Model
}
// Compute internal margin & freeze salary_base at save time.
// Once frozen, changing user.internal_margin_pct later does NOT rewrite history.
// apply_margin=false → this line is at-cost (no reduction); salary_base = total.
if (($row->salary_base === null || $row->isDirty(['total', 'master_id', 'apply_margin'])) && (float) $row->total > 0) {
if ((bool) $row->apply_margin === false) {
// WO.apply_margin=false → toate liniile Fișei devin at-cost (salariu pe Total).
if (($row->salary_base === null || $row->isDirty(['total', 'master_id'])) && (float) $row->total > 0) {
// Citim direct din DB pentru a evita orice cache al relației belongsTo
$applyMargin = true;
if ($row->work_order_id) {
$raw = \DB::table('work_orders')->where('id', $row->work_order_id)->value('apply_margin');
if ($raw !== null) $applyMargin = (bool) $raw;
}
if (! $applyMargin) {
$row->applied_margin_pct = 0;
$row->salary_base = (float) $row->total;
} else {