Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for tests

Browse Source
This commit is contained in:
Hillel Coren 2016-06-07 21:13:29 +03:00
parent 8a9061b00e
commit 4976d5b057
3 changed files with 287 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/EntityRequest.php
View File

@ -32,7 +32,7 @@ class EntityRequest extends Request {
$class = Utils::getEntityClass($this->entityType);
if (method_exists($class, 'withTrashed')) {
if (method_exists($class, 'trashed')) {
$this->entity = $class::scope($publicId)->withTrashed()->firstOrFail();
} else {
$this->entity = $class::scope($publicId)->firstOrFail();

2
app/Models/EntityModel.php
View File

@ -33,7 +33,7 @@ class EntityModel extends Eloquent
$entity->setRelation('user', $user);
$entity->setRelation('account', $account);
if (method_exists($className, 'withTrashed')){
if (method_exists($className, 'trashed')){
$lastEntity = $className::withTrashed()
->scope(false, $entity->account_id);
} else {

491
composer.lock generated
View File

File diff suppressed because it is too large Load Diff