From bfb29a7d50aeb0fdcf884f720804dc9d0cf5f256 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 5 Nov 2022 06:54:05 +1100 Subject: [PATCH] Add trashed records to exports --- app/Export/CSV/InvoiceItemExport.php | 1 + app/Export/CSV/PaymentExport.php | 5 ++++- app/Export/CSV/ProductExport.php | 5 ++++- app/Export/CSV/QuoteExport.php | 1 + app/Export/CSV/QuoteItemExport.php | 1 + app/Export/CSV/TaskExport.php | 5 ++++- 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/Export/CSV/InvoiceItemExport.php b/app/Export/CSV/InvoiceItemExport.php index 31c144d2f232..68bc6f9eeea8 100644 --- a/app/Export/CSV/InvoiceItemExport.php +++ b/app/Export/CSV/InvoiceItemExport.php @@ -116,6 +116,7 @@ class InvoiceItemExport extends BaseExport $this->csv->insertOne($this->buildHeader()); $query = Invoice::query() + ->withTrashed() ->with('client')->where('company_id', $this->company->id) ->where('is_deleted',0); diff --git a/app/Export/CSV/PaymentExport.php b/app/Export/CSV/PaymentExport.php index ccd49d84e109..eaafa2afd59b 100644 --- a/app/Export/CSV/PaymentExport.php +++ b/app/Export/CSV/PaymentExport.php @@ -89,7 +89,10 @@ class PaymentExport extends BaseExport //insert the header $this->csv->insertOne($this->buildHeader()); - $query = Payment::query()->where('company_id', $this->company->id)->where('is_deleted', 0); + $query = Payment::query() + ->withTrashed() + ->where('company_id', $this->company->id) + ->where('is_deleted', 0); $query = $this->addDateRange($query); diff --git a/app/Export/CSV/ProductExport.php b/app/Export/CSV/ProductExport.php index ff96841951d0..2da58f803822 100644 --- a/app/Export/CSV/ProductExport.php +++ b/app/Export/CSV/ProductExport.php @@ -82,7 +82,10 @@ class ProductExport extends BaseExport //insert the header $this->csv->insertOne($this->buildHeader()); - $query = Product::query()->where('company_id', $this->company->id)->where('is_deleted', 0); + $query = Product::query() + ->withTrashed() + ->where('company_id', $this->company->id) + ->where('is_deleted', 0); $query = $this->addDateRange($query); diff --git a/app/Export/CSV/QuoteExport.php b/app/Export/CSV/QuoteExport.php index a48f4c4ef4a8..482b9d685d17 100644 --- a/app/Export/CSV/QuoteExport.php +++ b/app/Export/CSV/QuoteExport.php @@ -99,6 +99,7 @@ class QuoteExport extends BaseExport $this->csv->insertOne($this->buildHeader()); $query = Quote::query() + ->withTrashed() ->with('client') ->where('company_id', $this->company->id) ->where('is_deleted', 0); diff --git a/app/Export/CSV/QuoteItemExport.php b/app/Export/CSV/QuoteItemExport.php index e89d56311601..6e4ea48bcdf3 100644 --- a/app/Export/CSV/QuoteItemExport.php +++ b/app/Export/CSV/QuoteItemExport.php @@ -116,6 +116,7 @@ class QuoteItemExport extends BaseExport $this->csv->insertOne($this->buildHeader()); $query = Quote::query() + ->withTrashed() ->with('client')->where('company_id', $this->company->id) ->where('is_deleted', 0); diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php index 7ee9007f520c..03972e89dddb 100644 --- a/app/Export/CSV/TaskExport.php +++ b/app/Export/CSV/TaskExport.php @@ -91,7 +91,10 @@ class TaskExport extends BaseExport //insert the header $this->csv->insertOne($this->buildHeader()); - $query = Task::query()->where('company_id', $this->company->id)->where('is_deleted', 0); + $query = Task::query() + ->withTrashed() + ->where('company_id', $this->company->id) + ->where('is_deleted', 0); $query = $this->addDateRange($query);