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>
111 lines
4.6 KiB
PHP
111 lines
4.6 KiB
PHP
<?php
|
|
|
|
namespace Tests\Feature;
|
|
|
|
use App\Models\Central\Company;
|
|
use App\Models\Central\Plan;
|
|
use App\Models\Tenant\Client;
|
|
use App\Models\Tenant\User;
|
|
use App\Models\Tenant\Vehicle;
|
|
use App\Models\Tenant\WorkOrder;
|
|
use App\Models\Tenant\WorkOrderWork;
|
|
use App\Tenancy\TenantManager;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Tests\TestCase;
|
|
|
|
class InternalMarginToggleTest extends TestCase
|
|
{
|
|
use RefreshDatabase;
|
|
|
|
private Company $company;
|
|
private User $mechanic;
|
|
private WorkOrder $wo;
|
|
|
|
protected function setUp(): void
|
|
{
|
|
parent::setUp();
|
|
$plan = Plan::firstOrCreate(['slug' => 'test'], ['name' => 'T', 'price' => 0, 'features' => []]);
|
|
$this->company = Company::create(['plan_id' => $plan->id, 'slug' => 'imt-' . uniqid(), 'name' => 'IMT', 'status' => 'active']);
|
|
app(TenantManager::class)->setCurrent($this->company);
|
|
|
|
$this->mechanic = User::create(['name' => 'Andrei', 'email' => 'a@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active', 'internal_margin_pct' => 20]);
|
|
$client = Client::create(['name' => 'C', 'phone' => '+37399000000', 'type' => 'individual', 'status' => 'active']);
|
|
$vehicle = Vehicle::create(['client_id' => $client->id, 'make' => 'BMW', 'model' => 'X5', 'plate' => 'MT-1']);
|
|
$this->wo = WorkOrder::create([
|
|
'number' => WorkOrder::generateNumber($this->company->id),
|
|
'client_id' => $client->id, 'vehicle_id' => $vehicle->id, 'master_id' => $this->mechanic->id,
|
|
'opened_at' => today(), 'status' => 'in_work', 'total' => 0,
|
|
]);
|
|
}
|
|
|
|
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,
|
|
]);
|
|
|
|
$this->assertEquals(250.00, (float) $work->total);
|
|
$this->assertEquals(250.00, (float) $work->salary_base);
|
|
$this->assertEquals(0.00, (float) $work->applied_margin_pct);
|
|
}
|
|
|
|
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,
|
|
]);
|
|
|
|
$this->assertEquals(250.00, (float) $work->total);
|
|
$this->assertEquals(200.00, (float) $work->salary_base);
|
|
$this->assertEquals(20.00, (float) $work->applied_margin_pct);
|
|
}
|
|
|
|
public function test_new_line_after_wo_toggle_off_is_at_cost(): void
|
|
{
|
|
// 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(250.00, (float) $work->salary_base);
|
|
$this->assertEquals(0.00, (float) $work->applied_margin_pct);
|
|
}
|
|
|
|
public function test_company_default_margin_used_when_mechanic_has_none(): void
|
|
{
|
|
// Set tenant default via Company.settings
|
|
$this->company->update(['settings' => ['default_internal_margin_pct' => 15]]);
|
|
app(TenantManager::class)->setCurrent($this->company->fresh());
|
|
|
|
$bareUser = User::create(['name' => 'X', 'email' => 'x@e.com', 'password' => bcrypt('x'), 'role' => 'mechanic', 'status' => 'active']);
|
|
|
|
$work = WorkOrderWork::create([
|
|
'work_order_id' => $this->wo->id, 'master_id' => $bareUser->id,
|
|
'name' => 'Y', 'hours' => 1, 'price_per_hour' => 100,
|
|
]);
|
|
|
|
// 15% margin applied → salary_base = 85
|
|
$this->assertEquals(85.00, (float) $work->salary_base);
|
|
$this->assertEquals(15.00, (float) $work->applied_margin_pct);
|
|
}
|
|
|
|
public function test_show_internal_margin_details_flag_persists_in_settings(): void
|
|
{
|
|
$this->company->update(['settings' => [
|
|
'default_internal_margin_pct' => 25,
|
|
'show_internal_margin_details' => false,
|
|
]]);
|
|
|
|
$fresh = Company::find($this->company->id);
|
|
$this->assertEquals(25.0, (float) $fresh->settings['default_internal_margin_pct']);
|
|
$this->assertFalse((bool) $fresh->settings['show_internal_margin_details']);
|
|
}
|
|
}
|