Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-09 20:52:56 +01:00
Code Issues Releases Activity

Show pending due date on recurring invoice preview

Browse Source
This commit is contained in:
Hillel Coren 2018-03-22 12:40:01 +02:00
parent 0885253f86
commit f14fc6291c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/pdf.pdfmake.js
View File

@ -1258,9 +1258,7 @@ NINJA.renderField = function(invoice, field, twoColumn) {
value = invoice.invoice_date; value = invoice.invoice_date;
} else if (field == 'invoice.due_date') { } else if (field == 'invoice.due_date') {
label = invoice.is_quote ? invoiceLabels.valid_until : invoiceLabels.due_date; label = invoice.is_quote ? invoiceLabels.valid_until : invoiceLabels.due_date;
if (invoice.is_recurring) { if (invoice.partial_due_date) {
value = false;
} else if (invoice.partial_due_date) {
value = invoice.partial_due_date; value = invoice.partial_due_date;
} else { } else {
value = invoice.due_date; value = invoice.due_date;

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

@ -1170,9 +1170,12 @@
if (invoice.is_recurring) { if (invoice.is_recurring) {
invoice.invoice_number = "{!! trans('texts.assigned_when_sent') !!}"; invoice.invoice_number = "{!! trans('texts.assigned_when_sent') !!}";
invoice.due_date = "{!! trans('texts.assigned_when_sent') !!}";
if (invoice.start_date) { if (invoice.start_date) {
invoice.invoice_date = invoice.start_date; invoice.invoice_date = invoice.start_date;
} } else {
invoice.invoice_date = invoice.due_date;
}
} }
@if (!$invoice->id || $invoice->is_recurring) @if (!$invoice->id || $invoice->is_recurring)