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

Feature Request: Nest "Recurring" under invoices #1643

Browse Source
This commit is contained in:
Hillel Coren 2017-08-31 22:04:47 +03:00
parent a6df1955d8
commit dab4b2a48b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/header.blade.php
View File

@ -337,7 +337,6 @@
'products' => false, 'products' => false,
'invoices' => false, 'invoices' => false,
'payments' => false, 'payments' => false,
'recurring_invoices' => 'recurring',
'credits' => false, 'credits' => false,
'quotes' => false, 'quotes' => false,
'tasks' => false, 'tasks' => false,
@ -364,7 +363,6 @@
'products', 'products',
'invoices', 'invoices',
'payments', 'payments',
'recurring_invoices',
'credits', 'credits',
'quotes', 'quotes',
'tasks', 'tasks',

17
resources/views/list.blade.php
View File

@ -49,7 +49,21 @@
<input id="tableFilter_{{ $entityType }}" type="text" style="width:180px;margin-right:17px;background-color: white !important" <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') }}"/> 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')) {!! DropdownButton::normal(trans('texts.recurring'))
->withAttributes(['class'=>'recurringDropdown']) ->withAttributes(['class'=>'recurringDropdown'])
->withContents([ ->withContents([
@ -72,7 +86,6 @@
}); });
}); });
</script> </script>
@elseif ($entityType == ENTITY_TASK) @elseif ($entityType == ENTITY_TASK)
{!! DropdownButton::normal(trans('texts.projects')) {!! DropdownButton::normal(trans('texts.projects'))
->withAttributes(['class'=>'projectsDropdown']) ->withAttributes(['class'=>'projectsDropdown'])