Vasyka/autocrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hide margin text + recompute lines when WO.apply_margin flips

Browse Source 
Two related fixes for the WO-level "Aplică marjă internă" toggle:

== 1. Hide description text when WO toggle is off ==

WorksRelationManager's Total column showed a gray subtitle line
"Bază salariu: 320 MDL · marjă 20%" that persisted even after
apply_margin was toggled OFF at the WO level. Confusing — the user
expected "off means invisible".

Fix: description callback now short-circuits to null when
$record->workOrder->apply_margin === false, hiding the entire text.
Also hides when applied_margin_pct is 0 (nothing meaningful to show).

Result: OFF at WO level → zero margin details anywhere in the
Manopere tab. ON → same as before.

== 2. Auto-recompute salary_base on all lines when toggle flips ==

Previously, salary_base was frozen at line save-time. Flipping
apply_margin from on→off left existing lines with the old
20%-reduced salary_base, so payroll still used the reduced amount
even though the user had visually decided "no margin".

Fix: WorkOrder::updated hook detects wasChanged(['apply_margin',
'override_margin_pct']) and iterates through works():
- apply_margin=false → salary_base = total, applied_margin_pct = 0
- apply_margin=true  → resolver chain (WO override → mechanic → default)

saveQuietly() on each line so we don't retrigger the works() booted
hooks that would recompute again.

This is DIFFERENT semantic from user.internal_margin_pct changes —
those DON'T rewrite history (test still passes). The distinction:
- User margin change: personnel decision, must not touch closed WOs
- WO apply_margin change: explicit per-Fișă decision, must affect
  every line on that same Fișă

InternalMarginRecomputeTest (3):
- Flipping WO.apply_margin off recomputes both existing lines to at-cost
- Flipping back on recomputes to margined
- Changing WO.override_margin_pct recomputes with new % (40 → 60% base)

Suite: 306 passed (853 assertions). Was 303. +3 recompute tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Vasyka
2026-07-13 20:07:51 +00:00
parent 57bdc1b594
commit 7769ab7737
3 changed files with 111 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Tenant/WorkOrder.php
+19
View File
@@ -153,6 +153,25 @@ class WorkOrder extends Model implements HasMedia
app(\App\Services\NotificationDispatcher::class)->workOrderReady($wo);
}
// WO.apply_margin sau override_margin_pct s-a schimbat → recomputăm salary_base
// pe toate manoperele existente (spre deosebire de user.internal_margin_pct,
// decizia la nivel de Fișă e explicită și trebuie să afecteze toate liniile ei).
if ($wo->wasChanged(['apply_margin', 'override_margin_pct'])) {
$resolver = app(\App\Services\MarginResolver::class);
foreach ($wo->works()->get() as $line) {
if ($wo->apply_margin === false) {
$line->applied_margin_pct = 0;
$line->salary_base = (float) $line->total;
} else {
$mechanic = $line->master_id ? \App\Models\Tenant\User::find($line->master_id) : null;
$marginPct = $resolver->resolve($wo, $mechanic);
$line->applied_margin_pct = $marginPct;
$line->salary_base = $resolver->computeSalaryBase((float) $line->total, $marginPct);
}
$line->saveQuietly();
}
}
// Push the assigned mechanic when a WO gets assigned to them.
if ($wo->wasChanged('master_id') && $wo->master_id) {
try {