diff --git a/app/Services/WorkOrderPdfService.php b/app/Services/WorkOrderPdfService.php index 8db8a26..13cd26e 100644 --- a/app/Services/WorkOrderPdfService.php +++ b/app/Services/WorkOrderPdfService.php @@ -9,7 +9,12 @@ class WorkOrderPdfService { public function generate(WorkOrder $wo): \Barryvdh\DomPDF\PDF { - $wo->load(['client', 'vehicle', 'master', 'works.master', 'parts', 'payments', 'subcontractJobs.subcontractor']); + $wo->load(['client', 'vehicle', 'master', 'works.master', 'parts', 'payments']); + $subcontractJobs = \App\Models\Tenant\SubcontractJob::withoutGlobalScope(\App\Models\Scopes\TenantScope::class) + ->where('work_order_id', $wo->id) + ->where('company_id', $wo->company_id) + ->with('subcontractor') + ->get(); $company = $wo->company ?: \App\Models\Central\Company::find($wo->company_id); $themeColor = $company?->settings['theme_color'] ?? '#3B82F6'; @@ -34,15 +39,16 @@ class WorkOrderPdfService } $html = view('pdf.work-order', [ - 'wo' => $wo, - 'company' => $company, - 'themeColor' => $themeColor, - 'currency' => $currency, - 'worksTotal' => $worksTotal, - 'partsTotal' => $partsTotal, - 'paid' => $paid, - 'balance' => $balance, - 'logoData' => $logoData, + 'wo' => $wo, + 'company' => $company, + 'themeColor' => $themeColor, + 'currency' => $currency, + 'worksTotal' => $worksTotal, + 'partsTotal' => $partsTotal, + 'paid' => $paid, + 'balance' => $balance, + 'logoData' => $logoData, + 'subcontractJobs' => $subcontractJobs, ])->render(); // DejaVu Sans lacks U+0219 (ș) and U+021B (ț) — normalize to cedilla diff --git a/resources/views/pdf/work-order.blade.php b/resources/views/pdf/work-order.blade.php index 06efd9d..fa90266 100644 --- a/resources/views/pdf/work-order.blade.php +++ b/resources/views/pdf/work-order.blade.php @@ -252,7 +252,7 @@ @endif - @if ($wo->subcontractJobs->isNotEmpty()) + @if ($subcontractJobs->isNotEmpty())

{{ __('Lucrări terțe') }}

@@ -264,7 +264,7 @@ - @foreach ($wo->subcontractJobs as $sj) + @foreach ($subcontractJobs as $sj) @@ -276,7 +276,7 @@ - +
{{ $sj->description ?? '—' }} {{ $sj->subcontractor?->name ?? '—' }}
{{ __('Subtotal terțe:') }}{{ number_format((float) $wo->subcontractJobs->sum('client_price'), 2, '.', ' ') }} {{ $currency }}{{ number_format((float) $subcontractJobs->sum('client_price'), 2, '.', ' ') }} {{ $currency }}