From ebca34503be3eb828bc52942e6eb5404026bca46 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 12 Oct 2021 20:45:15 +1100 Subject: [PATCH] Fixes for N+1 --- app/Http/Controllers/PreviewController.php | 3 ++- app/Services/Invoice/InvoiceService.php | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index e5a55fb19c9f..5907397b7e4a 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -204,6 +204,7 @@ class PreviewController extends BaseController if($request->has('entity_id')){ $entity_obj = $class::on(config('database.default')) + ->with('client.contacts.company') ->where('id', $this->decodePrimaryKey($request->input('entity_id'))) ->where('company_id', $company->id) ->withTrashed() @@ -216,7 +217,7 @@ class PreviewController extends BaseController if(!$request->has('entity_id')) $entity_obj->service()->fillDefaults()->save(); - $entity_obj->load('client.contacts','company'); + // $entity_obj->load('client.contacts','client.company'); App::forgetInstance('translator'); $t = app('translator'); diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php index 55754f834210..dd0977a55bc6 100644 --- a/app/Services/Invoice/InvoiceService.php +++ b/app/Services/Invoice/InvoiceService.php @@ -449,6 +449,8 @@ class InvoiceService public function fillDefaults() { + $this->invoice->load('client.company'); + $settings = $this->invoice->client->getMergedSettings(); if (! $this->invoice->design_id)