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

Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer.

Browse Source
This commit is contained in:
Raymond 2016-05-07 15:06:56 +02:00
parent 320e11fedb
commit e4ce4e0fc8
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -726,8 +726,8 @@ class InvoiceRepository extends BaseRepository
$invoice->custom_value2 = $recurInvoice->custom_value2 ?: 0; $invoice->custom_value2 = $recurInvoice->custom_value2 ?: 0;
$invoice->custom_taxes1 = $recurInvoice->custom_taxes1 ?: 0; $invoice->custom_taxes1 = $recurInvoice->custom_taxes1 ?: 0;
$invoice->custom_taxes2 = $recurInvoice->custom_taxes2 ?: 0; $invoice->custom_taxes2 = $recurInvoice->custom_taxes2 ?: 0;
$invoice->custom_text_value1 = $recurInvoice->custom_text_value1; $invoice->custom_text_value1 = Utils::processVariables($recurInvoice->custom_text_value1);
$invoice->custom_text_value2 = $recurInvoice->custom_text_value2; $invoice->custom_text_value2 = Utils::processVariables($recurInvoice->custom_text_value2);
$invoice->is_amount_discount = $recurInvoice->is_amount_discount; $invoice->is_amount_discount = $recurInvoice->is_amount_discount;
$invoice->due_date = $recurInvoice->getDueDate(); $invoice->due_date = $recurInvoice->getDueDate();
$invoice->save(); $invoice->save();

27
public/built.js
View File

File diff suppressed because one or more lines are too long

18
public/js/pdf.pdfmake.js
View File

@ -247,13 +247,13 @@ NINJA.notesAndTerms = function(invoice)
var data = []; var data = [];
if (invoice.public_notes) { if (invoice.public_notes) {
data.push({stack:[{text: invoice.public_notes, style: ['notes']}]}); data.push({stack:[{text: invoice.is_recurring ? processVariables(invoice.public_notes) : invoice.public_notes, style: ['notes']}]});
data.push({text:' '}); data.push({text:' '});
} }
if (invoice.terms) { if (invoice.terms) {
data.push({text:invoiceLabels.terms, style: ['termsLabel']}); data.push({text:invoiceLabels.terms, style: ['termsLabel']});
data.push({stack:[{text: invoice.terms, style: ['terms']}]}); data.push({stack:[{text: invoice.is_recurring ? processVariables(invoice.terms) : invoice.terms, style: ['terms']}]});
} }
return NINJA.prepareDataList(data, 'notesAndTerms'); return NINJA.prepareDataList(data, 'notesAndTerms');
@ -293,10 +293,16 @@ NINJA.invoiceColumns = function(invoice)
NINJA.invoiceFooter = function(invoice) NINJA.invoiceFooter = function(invoice)
{ {
var footer = invoice.invoice_footer;
if (invoice.is_recurring) {
footer = processVariables(footer);
}
if (!invoice.features.invoice_settings && invoice.invoice_design_id == 3) { if (!invoice.features.invoice_settings && invoice.invoice_design_id == 3) {
return invoice.invoice_footer ? invoice.invoice_footer.substring(0, 200) : ' '; return footer ? footer.substring(0, 200) : ' ';
} else { } else {
return invoice.invoice_footer || ' '; return footer || ' ';
} }
} }
@ -587,13 +593,13 @@ NINJA.invoiceDetails = function(invoice) {
if (invoice.custom_text_value1) { if (invoice.custom_text_value1) {
data.push([ data.push([
{text: invoice.account.custom_invoice_text_label1}, {text: invoice.account.custom_invoice_text_label1},
{text: invoice.custom_text_value1} {text: invoice.is_recurring ? processVariables(invoice.custom_text_value1) : invoice.custom_text_value1}
]) ])
} }
if (invoice.custom_text_value2) { if (invoice.custom_text_value2) {
data.push([ data.push([
{text: invoice.account.custom_invoice_text_label2}, {text: invoice.account.custom_invoice_text_label2},
{text: invoice.custom_text_value2} {text: invoice.is_recurring ? processVariables(invoice.custom_text_value2) : invoice.custom_text_value2}
]) ])
} }