From 0d1b9e0dc981061921a5f48cfc74ad50799b7e9f Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 20 Jun 2017 18:10:57 +0300
Subject: [PATCH] Enable adding tasks/expenses to any open invoice #1292

---
 app/Http/Controllers/ExpenseController.php   | 2 +-
 app/Http/Controllers/TaskController.php      | 2 +-
 app/Ninja/Repositories/InvoiceRepository.php | 8 +-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index 7e22973d81e3..80316b2330d8 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -105,7 +105,7 @@ class ExpenseController extends BaseController
             $actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_expense')];
 
             // 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) {
                 $actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])];
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index f15c36286435..fbf39dd19f44 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -158,7 +158,7 @@ class TaskController extends BaseController
             $actions[] = ['url' => 'javascript:submitAction("invoice")', 'label' => trans('texts.invoice_task')];
 
             // 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) {
                 $actions[] = ['url' => 'javascript:submitAction("add_to_invoice", '.$invoice->public_id.')', 'label' => trans('texts.add_to_invoice', ['invoice' => $invoice->invoice_number])];
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 4f65b1ea460d..b72915c62097 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -962,7 +962,7 @@ class InvoiceRepository extends BaseRepository
      *
      * @return mixed
      */
-    public function findOpenInvoices($clientId, $entityType = false)
+    public function findOpenInvoices($clientId)
     {
         $query = Invoice::scope()
                     ->invoiceType(INVOICE_TYPE_STANDARD)
@@ -971,12 +971,6 @@ class InvoiceRepository extends BaseRepository
                     ->whereDeletedAt(null)
                     ->where('balance', '>', 0);
 
-        if ($entityType == ENTITY_TASK) {
-            $query->whereHasTasks(true);
-        } elseif ($entityType == ENTITY_EXPENSE) {
-            $query->whereHasTasks(false);
-        }
-
         return $query->where('invoice_status_id', '<', 5)
                 ->select(['public_id', 'invoice_number'])
                 ->get();