Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Code Issues Releases Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2019-02-18 13:05:00 +02:00
parent fe81900402
commit aabb32b6ed
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/Traits/HasRecurrence.php
View File

@ -39,7 +39,8 @@ trait HasRecurrence
return false;
}
if ($this->end_date && Carbon::parse($this->end_date, $timezone)->isPast()) {
if ($this->end_date && Carbon::parse($this->end_date, $timezone)->isPast()
&& ! Carbon::parse($this->end_date, $timezone)->isToday()) {
return false;
}

8
app/Ninja/Repositories/InvoiceRepository.php
View File

@ -377,14 +377,6 @@ class InvoiceRepository extends BaseRepository
/** @var Account $account */
$account = $invoice ? $invoice->account : \Auth::user()->account;
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
if (Utils::isNinjaProd() && ! Utils::isReseller()) {
$copy = json_decode( json_encode($data), true);
$copy['data'] = false;
$logMessage = date('r') . ' account_id: ' . $account->id . ' ' . json_encode($copy) . "\n\n";
@file_put_contents(storage_path('logs/invoice-repo.log'), $logMessage, FILE_APPEND);
}
$isNew = ! $publicId || intval($publicId) < 0;
if ($invoice) {

2
resources/views/export/invoices.blade.php
View File

@ -28,7 +28,7 @@
<td>{{ $account->present()->customLabel('invoice_text1') }}</td>
@endif
@if ($account->customLabel('invoice_text2'))
<td>{{ $account->present()->customLabel('invoice_text1') }}</td>
<td>{{ $account->present()->customLabel('invoice_text2') }}</td>
@endif
<td>{{ trans('texts.item_product') }}</td>
<td>{{ trans('texts.item_notes') }}</td>

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

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