@include('invoices.pdf', ['account' => Auth::user()->account, 'hide_pdf' => ! Auth::user()->account->live_preview])
@@ -913,6 +911,7 @@
item.task_public_id(task.publicId);
}
model.invoice().has_tasks(true);
+ NINJA.formIsChanged = true;
@endif
@if (isset($expenses) && $expenses)
@@ -937,8 +936,31 @@
}
model.invoice().invoice_items_without_tasks.push(blank);
model.invoice().has_expenses(true);
+ NINJA.formIsChanged = true;
@endif
+ @if ($selectedProducts = session('selectedProducts'))
+ // move the blank invoice line item to the end
+ var blank = model.invoice().invoice_items_without_tasks.pop();
+ var productMap = {};
+ for (var i=0; i
- @can('create', 'invoice')
- @if ($entityType == ENTITY_TASK)
+ @if (in_array($entityType, [ENTITY_TASK, ENTITY_INVOICE, ENTITY_PRODUCT]))
+ @can('create', 'invoice')
{!! Button::primary(trans('texts.invoice'))->withAttributes(['class'=>'invoice', 'onclick' =>'submitForm_'.$entityType.'("invoice")'])->appendIcon(Icon::create('check')) !!}
- @endif
- @if ($entityType == ENTITY_EXPENSE)
- {!! Button::primary(trans('texts.invoice'))->withAttributes(['class'=>'invoice', 'onclick' =>'submitForm_'.$entityType.'("invoice")'])->appendIcon(Icon::create('check')) !!}
- @endif
- @endcan
+ @endcan
+ @endif
{!! DropdownButton::normal(trans('texts.archive'))
->withContents($datatable->bulkActions())
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 029631b8cb38..33dc8535f47d 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -171,7 +171,7 @@
@endif
-
+
{!! DropdownButton::primary(trans('texts.export'))
->large()
->withAttributes(array('id' => 'export-button'))
@@ -185,8 +185,7 @@
->submit()
->appendIcon(Icon::create('play'))
->large() !!}
-
-
+
{!! Former::close() !!}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 216f10267724..22d435072e88 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -77,11 +77,11 @@