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

Adjustments for tests

Browse Source
This commit is contained in:
David Bomba 2024-05-29 23:19:03 +10:00
parent 743ff50b82
commit 4852a134da
12 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/ClientExport.php
View File

@ -127,7 +127,7 @@ class ClientExport extends BaseExport
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) if(!$this->input['include_deleted'] ?? false)
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
$query = $this->addDateRange($query); $query = $this->addDateRange($query);

3
app/Export/CSV/InvoiceExport.php
View File

@ -62,7 +62,8 @@ class InvoiceExport extends BaseExport
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) {
if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

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

@ -75,7 +75,7 @@ class InvoiceItemExport extends BaseExport
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

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

@ -76,7 +76,7 @@ class ProductExport extends BaseExport
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

2
app/Export/CSV/PurchaseOrderExport.php
View File

@ -63,7 +63,7 @@ class PurchaseOrderExport extends BaseExport
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

2
app/Export/CSV/PurchaseOrderItemExport.php
View File

@ -67,7 +67,7 @@ class PurchaseOrderItemExport extends BaseExport
}) })
->with('vendor')->where('company_id', $this->company->id); ->with('vendor')->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

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

@ -69,7 +69,7 @@ class QuoteExport extends BaseExport
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

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

@ -70,7 +70,7 @@ class QuoteItemExport extends BaseExport
}) })
->with('client')->where('company_id', $this->company->id); ->with('client')->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

2
app/Export/CSV/RecurringInvoiceExport.php
View File

@ -61,7 +61,7 @@ class RecurringInvoiceExport extends BaseExport
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

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

@ -70,7 +70,7 @@ class TaskExport extends BaseExport
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

2
app/Export/CSV/VendorExport.php
View File

@ -64,7 +64,7 @@ class VendorExport extends BaseExport
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted']) { if(!$this->input['include_deleted'] ?? false){
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

16
app/Http/Requests/Report/GenericReportRequest.php
View File

@ -68,14 +68,14 @@ class GenericReportRequest extends Request
$input['user_id'] = auth()->user()->id; $input['user_id'] = auth()->user()->id;
// if(!$this->checkAuthority()){ if(!$this->checkAuthority()){
// $input['date_range'] = ''; $input['date_range'] = '';
// $input['start_date'] = ''; $input['start_date'] = '';
// $input['end_date'] = ''; $input['end_date'] = '';
// $input['send_email'] = true; $input['send_email'] = true;
// $input['report_keys'] = []; $input['report_keys'] = [];
// $input['document_email_attachment'] = false; $input['document_email_attachment'] = false;
// } }
$this->replace($input); $this->replace($input);
} }