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

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2018-01-31 11:10:29 +02:00
commit 41739d8405
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/BaseAPIController.php
View File

@ -99,15 +99,17 @@ class BaseAPIController extends Controller
$query->with($includes);
if ($updatedAt = intval(Input::get('updated_at'))) {
$query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt));
if (Input::get('updated_at') > 0) {
$updatedAt = intval(Input::get('updated_at'));
$query->where('updated_at', '>=', date('Y-m-d H:i:s', $updatedAt));
}
if ($clientPublicId = Input::get('client_id')) {
$filter = function ($query) use ($clientPublicId) {
if (Input::get('client_id') > 0) {
$clientPublicId = Input::get('client_id');
$filter = function ($query) use ($clientPublicId) {
$query->where('public_id', '=', $clientPublicId);
};
$query->whereHas('client', $filter);
};
$query->whereHas('client', $filter);
}
if (! Utils::hasPermission('view_all')) {