diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 114c52a110ab..d38f492486ae 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -42,8 +42,17 @@ class ExportController extends BaseController $manager = new Manager(); $manager->setSerializer(new ArraySerializer()); + // eager load data, include archived but exclude deleted $account = Auth::user()->account; - $account->load(['clients.contacts', 'clients.invoices.payments', 'clients.invoices.invoice_items']); + $account->load(['clients' => function($query) { + $query->withArchived() + ->with(['contacts', 'invoices' => function($query) { + $query->withArchived() + ->with(['invoice_items', 'payments' => function($query) { + $query->withArchived(); + }]); + }]); + }]); $resource = new Item($account, new AccountTransformer); $data = $manager->parseIncludes('clients.invoices.payments')