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

Bug: 4.4.2 - Reoccurring Invoices No Longer Send. #2089

Browse Source
This commit is contained in:
Hillel Coren 2018-05-14 09:20:15 +03:00
parent fb6c6deeba
commit 94296e6642
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/expenses/edit.blade.php
View File

@ -115,13 +115,13 @@
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT)) ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
->appendIcon('calendar') ->appendIcon('calendar')
->addGroupClass('start_date') ->addGroupClass('start_date')
->data_date_start_date($account->formatDate($account->getDateTime())) !!} ->data_date_start_date($expense ? false : $account->formatDate($account->getDateTime())) !!}
{!! Former::text('end_date') {!! Former::text('end_date')
->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'") ->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT)) ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))
->appendIcon('calendar') ->appendIcon('calendar')
->addGroupClass('end_date') ->addGroupClass('end_date')
->data_date_start_date($account->formatDate($account->getDateTime())) !!} ->data_date_start_date($expense ? false : $account->formatDate($account->getDateTime())) !!}
@else @else
@if ((! $expense || ! $expense->transaction_id)) @if ((! $expense || ! $expense->transaction_id))

4
resources/views/invoices/edit.blade.php
View File

@ -216,9 +216,9 @@
<div data-bind="visible: is_recurring" style="display: none"> <div data-bind="visible: is_recurring" style="display: none">
{!! Former::select('frequency_id')->label('frequency')->options($frequencies)->data_bind("value: frequency_id") {!! Former::select('frequency_id')->label('frequency')->options($frequencies)->data_bind("value: frequency_id")
->appendIcon('question-sign')->addGroupClass('frequency_id')->onchange('onFrequencyChange()') !!} ->appendIcon('question-sign')->addGroupClass('frequency_id')->onchange('onFrequencyChange()') !!}
{!! Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'")->data_date_start_date($account->formatDate($account->getDateTime())) {!! Former::text('start_date')->data_bind("datePicker: start_date, valueUpdate: 'afterkeydown'")->data_date_start_date($invoice->id ? false : $account->formatDate($account->getDateTime()))
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('start_date') !!} ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('start_date') !!}
{!! Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")->data_date_start_date($account->formatDate($account->getDateTime())) {!! Former::text('end_date')->data_bind("datePicker: end_date, valueUpdate: 'afterkeydown'")->data_date_start_date($invoice->id ? false : $account->formatDate($account->getDateTime()))
->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('end_date') !!} ->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT, DEFAULT_DATE_PICKER_FORMAT))->appendIcon('calendar')->addGroupClass('end_date') !!}
{!! Former::select('recurring_due_date')->label(trans('texts.due_date'))->options($recurringDueDates)->data_bind("value: recurring_due_date")->appendIcon('question-sign')->addGroupClass('recurring_due_date') !!} {!! Former::select('recurring_due_date')->label(trans('texts.due_date'))->options($recurringDueDates)->data_bind("value: recurring_due_date")->appendIcon('question-sign')->addGroupClass('recurring_due_date') !!}
</div> </div>