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
tests/Feature/InternalMarginToggleTest.php
+9 -18
View File
@@ -38,22 +38,24 @@ class InternalMarginToggleTest extends TestCase
]);
}
public function test_apply_margin_off_makes_salary_base_equal_to_total(): void
public function test_wo_apply_margin_off_forces_all_lines_at_cost(): void
{
// Toggle now lives on the WorkOrder, not per line
$this->wo->update(['apply_margin' => false]);
$work = WorkOrderWork::create([
'work_order_id' => $this->wo->id, 'master_id' => $this->mechanic->id,
'name' => 'Ulei la cost', 'hours' => 1, 'price_per_hour' => 250,
'apply_margin' => false,
]);
$this->assertEquals(250.00, (float) $work->total);
$this->assertEquals(250.00, (float) $work->salary_base);
$this->assertEquals(0.00, (float) $work->applied_margin_pct);
$this->assertFalse((bool) $work->apply_margin);
}
public function test_apply_margin_on_default_still_applies_margin(): void
public function test_wo_apply_margin_on_default_still_applies_margin(): void
{
// Default WO.apply_margin=true → margin applies
$work = WorkOrderWork::create([
'work_order_id' => $this->wo->id, 'master_id' => $this->mechanic->id,
'name' => 'Diagnoză cu marjă', 'hours' => 1, 'price_per_hour' => 250,
@@ -62,29 +64,18 @@ class InternalMarginToggleTest extends TestCase
$this->assertEquals(250.00, (float) $work->total);
$this->assertEquals(200.00, (float) $work->salary_base);
$this->assertEquals(20.00, (float) $work->applied_margin_pct);
$this->assertTrue((bool) $work->apply_margin);
}
public function test_toggling_apply_margin_recomputes_salary_base(): void
public function test_new_line_after_wo_toggle_off_is_at_cost(): void
{
// Start with margin ON
// WO turned off → subsequent line saves at-cost
$this->wo->update(['apply_margin' => false]);
$work = WorkOrderWork::create([
'work_order_id' => $this->wo->id, 'master_id' => $this->mechanic->id,
'name' => 'X', 'hours' => 1, 'price_per_hour' => 250,
]);
$this->assertEquals(200.00, (float) $work->salary_base);
// Toggle OFF
$work->update(['apply_margin' => false]);
$work->refresh();
$this->assertEquals(250.00, (float) $work->salary_base);
$this->assertEquals(0.00, (float) $work->applied_margin_pct);
// Toggle back ON
$work->update(['apply_margin' => true]);
$work->refresh();
$this->assertEquals(200.00, (float) $work->salary_base);
$this->assertEquals(20.00, (float) $work->applied_margin_pct);
}
public function test_company_default_margin_used_when_mechanic_has_none(): void