From dab4b2a48bf3c98e6dd561bbb2acc57464066ce3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 31 Aug 2017 22:04:47 +0300
Subject: [PATCH] Feature Request: Nest "Recurring" under invoices #1643

---
 resources/views/header.blade.php |  2 --
 resources/views/list.blade.php   | 17 +++++++++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index c44e9a1e70b4..17ea78128dd9 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -337,7 +337,6 @@
             'products' => false,
             'invoices' => false,
             'payments' => false,
-            'recurring_invoices' => 'recurring',
             'credits' => false,
             'quotes' => false,
             'tasks' => false,
@@ -364,7 +363,6 @@
                 'products',
                 'invoices',
                 'payments',
-                'recurring_invoices',
                 'credits',
                 'quotes',
                 'tasks',
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 051e43699bc2..44da387b5b54 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -49,7 +49,21 @@
 	<input id="tableFilter_{{ $entityType }}" type="text" style="width:180px;margin-right:17px;background-color: white !important"
         class="form-control pull-left" placeholder="{{ trans('texts.filter') }}" value="{{ Input::get('filter') }}"/>
 
-    @if ($entityType == ENTITY_EXPENSE)
+	@if ($entityType == ENTITY_INVOICE && auth()->user()->account->isModuleEnabled(ENTITY_RECURRING_INVOICE))
+		{!! DropdownButton::normal(trans('texts.recurring'))
+			->withAttributes(['class'=>'recurringDropdown'])
+			->withContents([
+			  ['label' => trans('texts.new_recurring_invoice'), 'url' => url('/recurring_invoices/create')],
+			]
+		  )->split() !!}
+		<script type="text/javascript">
+			$(function() {
+				$('.recurringDropdown:not(.dropdown-toggle)').click(function() {
+					window.location = '{{ url('/recurring_invoices') }}';
+				});
+			});
+		</script>
+    @elseif ($entityType == ENTITY_EXPENSE)
 		{!! DropdownButton::normal(trans('texts.recurring'))
 			->withAttributes(['class'=>'recurringDropdown'])
 			->withContents([
@@ -72,7 +86,6 @@
 		  		});
 			});
 		</script>
-
 	@elseif ($entityType == ENTITY_TASK)
 		{!! DropdownButton::normal(trans('texts.projects'))
 			->withAttributes(['class'=>'projectsDropdown'])