Fix subcontract jobs not appearing in PDF
Load subcontractJobs via explicit query (bypassing TenantScope but scoped manually by work_order_id + company_id) to avoid relation caching issues. Pass as separate blade variable \$subcontractJobs. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user