diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index e155e65202ff..8801eda1a129 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -69,11 +69,16 @@ class BaseController extends Controller 'company.company_gateways.gateway', 'company.clients.contacts', 'company.clients.gateway_tokens', + 'company.clients.documents', 'company.products', 'company.recurring_invoices', 'company.invoices.invitations.contact', 'company.invoices.invitations.company', 'company.invoices.documents', + 'company.recurring_invoices', + 'company.recurring_invoices.invitations.contact', + 'company.recurring_invoices.invitations.company', + 'company.recurring_invoices.documents', 'company.payments.paymentables', 'company.quotes.invitations.contact', 'company.quotes.invitations.company', @@ -200,7 +205,7 @@ class BaseController extends Controller $query->whereNotNull('updated_at'); }, 'company.clients' => function ($query) use ($updated_at) { - $query->where('clients.updated_at', '>=', $updated_at)->with('contacts'); + $query->where('clients.updated_at', '>=', $updated_at)->with('contacts', 'gateway_tokens','documents'); }, 'company.tax_rates' => function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at); @@ -220,8 +225,11 @@ class BaseController extends Controller 'company.invoices'=> function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at)->with('invitations', 'company', 'documents'); }, + 'company.recurring_invoices'=> function ($query) use ($updated_at) { + $query->where('updated_at', '>=', $updated_at)->with('invitations', 'company', 'documents'); + }, 'company.payments'=> function ($query) use ($updated_at) { - $query->where('updated_at', '>=', $updated_at)->with('paymentables'); + $query->where('updated_at', '>=', $updated_at)->with('paymentables','documents'); }, 'company.quotes'=> function ($query) use ($updated_at) { $query->where('updated_at', '>=', $updated_at)->with('invitations', 'documents'); diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index 1d9e4a740c47..67c8ab016128 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -52,8 +52,8 @@ class QueryLogging Log::info($request->method().' - '.$request->url().": $count queries - ".$time); - // if($count > 100) - // Log::info($queries); + if($count > 50) + Log::info($queries); } } diff --git a/app/Mail/Admin/EntityPaidObject.php b/app/Mail/Admin/EntityPaidObject.php index 8e87975b056d..a3ab38b12b21 100644 --- a/app/Mail/Admin/EntityPaidObject.php +++ b/app/Mail/Admin/EntityPaidObject.php @@ -89,7 +89,7 @@ class EntityPaidObject 'button' => ctrans('texts.view_payment'), 'signature' => $settings->email_signature, 'logo' => $this->company->present()->logo(), - 'setting' => $settings, + 'settings' => $settings, ]; return $data;