70ca2fa74a
Client sees only Total. Salary is calculated from salary_base = client_price
× (1 − margin/100). Margin never appears in customer-facing surfaces (PDF,
tracking JSON, portal).
Terminology: "marjă internă" — internal profit margin. NOT VAT/TVA. Never
called NDS/TVA anywhere in the code to avoid confusion with real Moldova
tax reporting (Doc 19/1C integration).
== Configuration ==
Fallback chain (in MarginResolver::resolve):
1. WorkOrder.override_margin_pct — per-Fișă for special contracts/VIP
2. User.internal_margin_pct — per-mechanic (main setting)
3. Company.settings.default_internal_margin_pct — tenant default
4. 0.0 — no margin
Example (mechanic Andrei with 20% margin):
User enters price_per_hour = 250 for 1h diagnosis
→ total = 250 (what client sees, goes into PDF)
→ salary_base = 250 × 0.80 = 200 (what mechanic gets salaried on)
→ applied_margin_pct = 20 (frozen)
If admin later changes Andrei's margin to 40%, the row's salary_base does
NOT change — history is immutable. Only new rows use the new margin.
Solves the retroactive-recompute problem for closed payroll periods.
== salary_base freeze semantics ==
wo_works gains 2 columns:
salary_base decimal(10,2) nullable
applied_margin_pct decimal(5,2) nullable
Frozen at save time by WorkOrderWork::saving hook. Recomputes only if
total OR master_id changes (i.e., someone actively edits the price or
reassigns the mechanic — in those cases we WANT the salary_base to
follow). Legacy rows (before this feature) have null salary_base;
PayrollCalculator falls back to total for them.
== PayrollCalculator uses salary_base ==
Previously: sum(wo_works.total) × works_pct → gave the mechanic a cut
of the price INCLUDING margin.
Now: sum(salary_base ?? total) × works_pct → the cut is from the
labor rate excluding margin.
Impact: for a 250 lei diagnosis at 20% margin with 50% payroll cut, the
mechanic gets 200 × 50% = 100 lei (was 250 × 50% = 125 lei). The shop
keeps the 50 lei margin regardless of the payroll %.
== RBAC gate ==
New permission FINANCE_VIEW_INTERNAL_MARGIN. Assigned to owner + admin +
manager + accountant in seed matrix. Not granted to mechanic,
receptionist, or viewer — those roles never see the "Bază salariu"
disclosure line or the margin % fields.
== UI surfaces ==
UserResource — new "Salariu & marjă" section (visible only with
FINANCE_VIEW_INTERNAL_MARGIN):
- Tarif orar (MDL)
- Marjă internă (%) with helper text explaining the -X% semantics
- Placeholder tells manager the exact formula
WorkOrderResource form — new override_margin_pct field in the "Plată &
total" section, gated by same permission. Helper text: "Doar pentru
cazuri speciale. Lasă gol pentru a folosi marja mecanicului."
WorksRelationManager (WO edit page) — Total column now shows a gray
subtitle line "Bază salariu: 200.00 MDL · marjă 20%" ONLY for users
with FINANCE_VIEW_INTERNAL_MARGIN. Everyone else sees just Total.
== Contract tests: NO leak ==
InternalMarginTest verifies with black-box grepping that:
- WorkOrderPdfService::generate output contains NONE of
{salary_base, internal_margin, applied_margin_pct, marja intern,
Bază salariu}
- /api/track/{token} JSON payload contains NONE of the same terms
- wo_parts table has no salary_base column (margin ONLY on labor)
- Changing mechanic.internal_margin_pct after work is saved does NOT
rewrite the historical salary_base (frozen)
- WO override wins over mechanic margin (contract-priced clients)
- Fallback chain: WO → mechanic → company default → 0
== Suite ==
298 passed (828 assertions). Was 285. +13 InternalMarginTest.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
198 lines
6.4 KiB
PHP
198 lines
6.4 KiB
PHP
<?php
|
|
|
|
namespace App\Models\Tenant;
|
|
|
|
use App\Models\Concerns\BelongsToTenant;
|
|
use App\Models\Concerns\Auditable;
|
|
use Illuminate\Database\Eloquent\Model;
|
|
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
|
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
use Spatie\MediaLibrary\HasMedia;
|
|
use Spatie\MediaLibrary\InteractsWithMedia;
|
|
|
|
class WorkOrder extends Model implements HasMedia
|
|
{
|
|
use Auditable, BelongsToTenant, InteractsWithMedia, SoftDeletes;
|
|
|
|
public const STATUSES = [
|
|
'new' => 'Nou',
|
|
'diagnosis' => 'Diagnosticare',
|
|
'agreement' => 'Aprobare client',
|
|
'approved' => 'Aprobat',
|
|
'in_work' => 'În lucru',
|
|
'awaiting_parts' => 'Așteaptă piese',
|
|
'ready' => 'Gata de ridicare',
|
|
'done' => 'Predat',
|
|
'cancelled' => 'Anulat',
|
|
];
|
|
|
|
public const PAY_STATUSES = [
|
|
'unpaid' => 'Neplătit',
|
|
'partial' => 'Parțial',
|
|
'paid' => 'Plătit',
|
|
];
|
|
|
|
protected $fillable = [
|
|
'company_id', 'number',
|
|
'client_id', 'vehicle_id', 'master_id', 'deal_id', 'appointment_id',
|
|
'opened_at', 'closed_at', 'mileage_in', 'mileage_out',
|
|
'complaint', 'diagnosis', 'recommendations',
|
|
'status', 'urgency', 'pay_status', 'approved', 'approved_at',
|
|
'discount_pct', 'override_margin_pct', 'total',
|
|
'eta_at', 'eta_promised', 'eta_change_reason', 'eta_updated_at',
|
|
'tracking_token',
|
|
];
|
|
|
|
protected $casts = [
|
|
'opened_at' => 'date',
|
|
'closed_at' => 'date',
|
|
'approved_at' => 'datetime',
|
|
'eta_at' => 'datetime',
|
|
'eta_promised' => 'datetime',
|
|
'eta_updated_at' => 'datetime',
|
|
'approved' => 'boolean',
|
|
'discount_pct' => 'decimal:2',
|
|
'total' => 'decimal:2',
|
|
];
|
|
|
|
public function registerMediaCollections(): void
|
|
{
|
|
$this->addMediaCollection('photos');
|
|
}
|
|
|
|
public function trackingUrl(): string
|
|
{
|
|
return url('/t/' . $this->tracking_token);
|
|
}
|
|
|
|
public function client(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Client::class);
|
|
}
|
|
|
|
public function vehicle(): BelongsTo
|
|
{
|
|
return $this->belongsTo(Vehicle::class);
|
|
}
|
|
|
|
public function master(): BelongsTo
|
|
{
|
|
return $this->belongsTo(User::class, 'master_id');
|
|
}
|
|
|
|
public function works(): HasMany
|
|
{
|
|
return $this->hasMany(WorkOrderWork::class);
|
|
}
|
|
|
|
public function parts(): HasMany
|
|
{
|
|
return $this->hasMany(WorkOrderPart::class);
|
|
}
|
|
|
|
public function payments(): HasMany
|
|
{
|
|
return $this->hasMany(Payment::class);
|
|
}
|
|
|
|
public function subcontractJobs(): HasMany
|
|
{
|
|
return $this->hasMany(SubcontractJob::class);
|
|
}
|
|
|
|
public function paidAmount(): float
|
|
{
|
|
return (float) $this->payments()->sum('amount');
|
|
}
|
|
|
|
public function balanceDue(): float
|
|
{
|
|
return max(0.0, (float) $this->total - $this->paidAmount());
|
|
}
|
|
|
|
public function recalcTotal(): void
|
|
{
|
|
$worksTotal = $this->works()->sum('total');
|
|
$partsTotal = $this->parts()->sum('total');
|
|
$subcontractTotal = $this->subcontractJobs()
|
|
->where('status', '!=', 'cancelled')
|
|
->sum('client_price');
|
|
$sub = (float) $worksTotal + (float) $partsTotal + (float) $subcontractTotal;
|
|
$disc = (float) $this->discount_pct;
|
|
$this->total = round($sub * (1 - $disc / 100), 2);
|
|
$this->save();
|
|
}
|
|
|
|
public static function generateNumber(int $companyId): string
|
|
{
|
|
$year = date('y');
|
|
$count = static::withoutGlobalScopes()
|
|
->where('company_id', $companyId)
|
|
->whereYear('created_at', date('Y'))
|
|
->count();
|
|
return sprintf('WO-%s-%04d', $year, $count + 1);
|
|
}
|
|
|
|
/** Auto-send 'ready' email + broadcast WS event on status change. */
|
|
protected static function booted(): void
|
|
{
|
|
static::creating(function (self $wo) {
|
|
if (empty($wo->tracking_token)) {
|
|
$wo->tracking_token = \Illuminate\Support\Str::random(24);
|
|
}
|
|
});
|
|
|
|
static::updated(function (self $wo) {
|
|
if (
|
|
$wo->wasChanged('status')
|
|
&& $wo->status === 'ready'
|
|
&& $wo->getOriginal('status') !== 'ready'
|
|
) {
|
|
app(\App\Services\NotificationDispatcher::class)->workOrderReady($wo);
|
|
}
|
|
|
|
// Push the assigned mechanic when a WO gets assigned to them.
|
|
if ($wo->wasChanged('master_id') && $wo->master_id) {
|
|
try {
|
|
app(\App\Services\Notifications\WebPushService::class)->sendToUser(
|
|
(int) $wo->master_id,
|
|
'Fișă nouă atribuită',
|
|
"Fișa #{$wo->number} · " . ($wo->vehicle?->plate ?? ''),
|
|
'/app/resources/work-orders/' . $wo->id . '/edit',
|
|
'wo-assign-' . $wo->id,
|
|
);
|
|
} catch (\Throwable $e) {
|
|
\Illuminate\Support\Facades\Log::debug('WO assign push skipped: ' . $e->getMessage());
|
|
}
|
|
}
|
|
|
|
// Warehouse lifecycle: status=done → consume reservations into issues;
|
|
// status=cancelled → release reservations.
|
|
if ($wo->wasChanged('status')) {
|
|
$svc = app(\App\Services\Warehouse\WarehouseService::class);
|
|
if ($wo->status === 'done' && $wo->getOriginal('status') !== 'done') {
|
|
$svc->consume($wo);
|
|
}
|
|
if ($wo->status === 'cancelled' && $wo->getOriginal('status') !== 'cancelled') {
|
|
foreach ($wo->parts as $wop) {
|
|
$svc->release($wop);
|
|
}
|
|
}
|
|
}
|
|
|
|
// Broadcast real-time update on any field change (skip if broadcasting=log).
|
|
if (config('broadcasting.default') !== 'log') {
|
|
try {
|
|
$company = \App\Models\Central\Company::withoutGlobalScopes()->find($wo->company_id);
|
|
if ($company) {
|
|
\App\Events\WorkOrderUpdated::dispatch($wo, $company->slug);
|
|
}
|
|
} catch (\Throwable $e) {
|
|
\Illuminate\Support\Facades\Log::debug('WO broadcast skipped: ' . $e->getMessage());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}
|