Fixes for previews

This commit is contained in:
David Bomba 2023-08-06 15:26:33 +10:00
parent 742d566f27
commit a790101f34
2 changed files with 6 additions and 2 deletions

View File

@ -210,12 +210,16 @@ class PreviewController extends BaseController
if ($request->has('entity_id')) { if ($request->has('entity_id')) {
/** @var \App\Models\Quote | \App\Models\Invoice | \App\Models\RecurringInvoice | \App\Models\Credit $class */ /** @var \App\Models\Quote | \App\Models\Invoice | \App\Models\RecurringInvoice | \App\Models\Credit $class */
$entity_obj = $class::on(config('database.default')) $temp_obj = $class::on(config('database.default'))
->with('client.company') ->with('client.company')
->where('id', $this->decodePrimaryKey($request->input('entity_id'))) ->where('id', $this->decodePrimaryKey($request->input('entity_id')))
->where('company_id', $company->id) ->where('company_id', $company->id)
->withTrashed() ->withTrashed()
->first(); ->first();
/** Prevents null values from being passed into entity_obj */
if($temp_obj)
$entity_obj = $temp_obj;
} }
if ($request->has('footer') && !$request->filled('footer') && $request->input('entity') == 'recurring_invoice') { if ($request->has('footer') && !$request->filled('footer') && $request->input('entity') == 'recurring_invoice') {