Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 17:24:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7921 from turbo124/v5-develop

Browse Source 
Add trashed records to exports
This commit is contained in:
David Bomba 2022-11-05 08:48:44 +11:00 committed by GitHub
commit a0da78f5f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Export/CSV/InvoiceItemExport.php
View File

@ -116,6 +116,7 @@ class InvoiceItemExport extends BaseExport
$this->csv->insertOne($this->buildHeader()); $this->csv->insertOne($this->buildHeader());
$query = Invoice::query() $query = Invoice::query()
->withTrashed()
->with('client')->where('company_id', $this->company->id) ->with('client')->where('company_id', $this->company->id)
->where('is_deleted',0); ->where('is_deleted',0);

5
app/Export/CSV/PaymentExport.php
View File

@ -89,7 +89,10 @@ class PaymentExport extends BaseExport
//insert the header //insert the header
$this->csv->insertOne($this->buildHeader()); $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); $query = $this->addDateRange($query);

5
app/Export/CSV/ProductExport.php
View File

@ -82,7 +82,10 @@ class ProductExport extends BaseExport
//insert the header //insert the header
$this->csv->insertOne($this->buildHeader()); $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); $query = $this->addDateRange($query);

1
app/Export/CSV/QuoteExport.php
View File

@ -99,6 +99,7 @@ class QuoteExport extends BaseExport
$this->csv->insertOne($this->buildHeader()); $this->csv->insertOne($this->buildHeader());
$query = Quote::query() $query = Quote::query()
->withTrashed()
->with('client') ->with('client')
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->where('is_deleted', 0); ->where('is_deleted', 0);

1
app/Export/CSV/QuoteItemExport.php
View File

@ -116,6 +116,7 @@ class QuoteItemExport extends BaseExport
$this->csv->insertOne($this->buildHeader()); $this->csv->insertOne($this->buildHeader());
$query = Quote::query() $query = Quote::query()
->withTrashed()
->with('client')->where('company_id', $this->company->id) ->with('client')->where('company_id', $this->company->id)
->where('is_deleted', 0); ->where('is_deleted', 0);

5
app/Export/CSV/TaskExport.php
View File

@ -91,7 +91,10 @@ class TaskExport extends BaseExport
//insert the header //insert the header
$this->csv->insertOne($this->buildHeader()); $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); $query = $this->addDateRange($query);