tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Order designs in ascending order

Browse source
This commit is contained in:
David Bomba 2022-10-28 07:56:38 +11:00
parent c1a1ff0b41
commit ec95d087f1
3 changed files with 549 additions and 369 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Filters/DesignFilters.php
View file

@ -136,6 +136,6 @@ class DesignFilters extends QueryFilters
public function entityFilter()
{
//return $this->builder->whereCompanyId(auth()->user()->company()->id);
return $this->builder->whereCompanyId(auth()->user()->company()->id)->orWhere('company_id', null);
return $this->builder->where('company_id', auth()->user()->company()->id)->orWhere('company_id', null)->orderBy('id','asc');
}
}

914
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
tests/Feature/Bank/YodleeApiTest.php
View file

@ -37,7 +37,7 @@ class YodleeApiTest extends TestCase
{
parent::setUp();
if(!config('ninja.yodlee.client_id'))
// if(!config('ninja.yodlee.client_id'))
$this->markTestSkipped('Skip test no Yodlee API credentials found');
$this->makeTestData();