mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Working on kanban
This commit is contained in:
parent
eaafca64de
commit
c0f7ff272c
@ -243,7 +243,7 @@ class Task extends EntityModel
|
|||||||
$taskStatues = TaskStatus::scope()->orderBy('sort_order')->get();
|
$taskStatues = TaskStatus::scope()->orderBy('sort_order')->get();
|
||||||
|
|
||||||
foreach ($taskStatues as $status) {
|
foreach ($taskStatues as $status) {
|
||||||
$statuses[$status->id] = $status->name;
|
$statuses[$status->public_id] = $status->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! $taskStatues->count()) {
|
if (! $taskStatues->count()) {
|
||||||
|
@ -89,7 +89,7 @@ class TaskRepository extends BaseRepository
|
|||||||
$query->orWhere('invoices.balance', '=', 0);
|
$query->orWhere('invoices.balance', '=', 0);
|
||||||
}
|
}
|
||||||
$query->orWhere(function ($query) use ($statuses) {
|
$query->orWhere(function ($query) use ($statuses) {
|
||||||
$query->whereIn('tasks.task_status_id', $statuses)
|
$query->whereIn('task_statuses.public_id', $statuses)
|
||||||
->whereNull('tasks.invoice_id');
|
->whereNull('tasks.invoice_id');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user