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>
199 lines
6.4 KiB
PHP
199 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', 'apply_margin', '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',
|
|
'apply_margin' => '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());
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}
|