Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 06:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for N+1

Browse Source
This commit is contained in:
David Bomba 2021-10-12 20:45:15 +11:00
parent af8c56a1f1
commit ebca34503b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/PreviewController.php
View File

@ -204,6 +204,7 @@ class PreviewController extends BaseController
if($request->has('entity_id')){ if($request->has('entity_id')){
$entity_obj = $class::on(config('database.default')) $entity_obj = $class::on(config('database.default'))
->with('client.contacts.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()
@ -216,7 +217,7 @@ class PreviewController extends BaseController
if(!$request->has('entity_id')) if(!$request->has('entity_id'))
$entity_obj->service()->fillDefaults()->save(); $entity_obj->service()->fillDefaults()->save();
$entity_obj->load('client.contacts','company'); // $entity_obj->load('client.contacts','client.company');
App::forgetInstance('translator'); App::forgetInstance('translator');
$t = app('translator'); $t = app('translator');

2
app/Services/Invoice/InvoiceService.php
View File

@ -449,6 +449,8 @@ class InvoiceService
public function fillDefaults() public function fillDefaults()
{ {
$this->invoice->load('client.company');
$settings = $this->invoice->client->getMergedSettings(); $settings = $this->invoice->client->getMergedSettings();
if (! $this->invoice->design_id) if (! $this->invoice->design_id)