Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #3797 from turbo124/v2

Browse Source 
Fixes for Client Portal Datatables
This commit is contained in:
David Bomba 2020-06-10 23:36:37 +10:00 committed by GitHub
commit 7dfc396ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/CreditsTable.php
View File

@ -17,7 +17,7 @@ class CreditsTable extends Component
public function render()
{
$query = Credit::query()
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', auth('contact')->user()->client->id)
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
->paginate($this->per_page);

3
app/Http/Livewire/InvoicesTable.php
View File

@ -30,6 +30,7 @@ class InvoicesTable extends Component
public function render()
{
$query = Invoice::query()
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc');
@ -48,7 +49,7 @@ class InvoicesTable extends Component
}
$query = $query
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', auth('contact')->user()->client->id)
->paginate($this->per_page);
return render('components.livewire.invoices-table', [

1
app/Http/Livewire/PaymentMethodsTable.php
View File

@ -24,7 +24,6 @@ class PaymentMethodsTable extends Component
{
$query = ClientGatewayToken::query()
->with('gateway_type')
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', $this->client->id)
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
->paginate($this->per_page);

2
app/Http/Livewire/PaymentsTable.php
View File

@ -24,7 +24,7 @@ class PaymentsTable extends Component
{
$query = Payment::query()
->with('type', 'client')
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', auth('contact')->user()->client->id)
->orderBy($this->sort_field, $this->sort_asc ? 'asc' : 'desc')
->paginate($this->per_page);

2
app/Http/Livewire/QuotesTable.php
View File

@ -46,7 +46,7 @@ class QuotesTable extends Component
}
$query = $query
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', auth('contact')->user()->client->id)
->paginate($this->per_page);
return render('components.livewire.quotes-table', [

2
app/Http/Livewire/RecurringInvoicesTable.php
View File

@ -18,7 +18,7 @@ class RecurringInvoicesTable extends Component
$query = RecurringInvoice::query();
$query = $query
->where('company_id', auth('contact')->user()->company->id)
->where('client_id', auth('contact')->user()->client->id)
->whereIn('status_id', [RecurringInvoice::STATUS_PENDING, RecurringInvoice::STATUS_ACTIVE, RecurringInvoice::STATUS_COMPLETED])
->orderBy('status_id', 'asc')
->with('client')