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

Enable adding tasks/expenses to any open invoice #1292

Browse Source
This commit is contained in:
Hillel Coren 2017-06-20 18:10:57 +03:00
parent 91402b2c4e
commit 0d1b9e0dc9
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/ExpenseController.php
View File

@ -105,7 +105,7 @@ class ExpenseController extends BaseController
$actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_expense')]; $actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_expense')];
// check for any open invoices // check for any open invoices
$invoices = $expense->client_id ? $this->invoiceRepo->findOpenInvoices($expense->client_id, ENTITY_EXPENSE) : []; $invoices = $expense->client_id ? $this->invoiceRepo->findOpenInvoices($expense->client_id) : [];
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
$actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])]; $actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])];

2
app/Http/Controllers/TaskController.php
View File

@ -158,7 +158,7 @@ class TaskController extends BaseController
$actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_task')]; $actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_task')];
// check for any open invoices // check for any open invoices
$invoices = $task->client_id ? $this->invoiceRepo->findOpenInvoices($task->client_id, ENTITY_TASK) : []; $invoices = $task->client_id ? $this->invoiceRepo->findOpenInvoices($task->client_id) : [];
foreach ($invoices as $invoice) { foreach ($invoices as $invoice) {
$actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])]; $actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])];

8
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -962,7 +962,7 @@ class InvoiceRepository extends BaseRepository
* *
* @return mixed * @return mixed
*/ */
public function findOpenInvoices($clientId, $entityType = false) public function findOpenInvoices($clientId)
{ {
$query = Invoice::scope() $query = Invoice::scope()
->invoiceType(INVOICE_TYPE_STANDARD) ->invoiceType(INVOICE_TYPE_STANDARD)
@ -971,12 +971,6 @@ class InvoiceRepository extends BaseRepository
->whereDeletedAt(null) ->whereDeletedAt(null)
->where('balance', '>', 0); ->where('balance', '>', 0);
if ($entityType == ENTITY_TASK) {
$query->whereHasTasks(true);
} elseif ($entityType == ENTITY_EXPENSE) {
$query->whereHasTasks(false);
}
return $query->where('invoice_status_id', '<', 5) return $query->where('invoice_status_id', '<', 5)
->select(['public_id', 'invoice_number']) ->select(['public_id', 'invoice_number'])
->get(); ->get();