Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-08 12:12:48 +01:00
Code Issues Releases Activity

Convert line item date variable in PDF preview #1743

Browse Source
This commit is contained in:
Hillel Coren 2018-01-16 13:03:04 +02:00
parent cb8871d3f2
commit 131e50d02e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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

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

@ -683,8 +683,8 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
var productKey = item.product_key; var productKey = item.product_key;
var tax1 = ''; var tax1 = '';
var tax2 = ''; var tax2 = '';
var custom_value1 = item.custom_value1; var customValue1 = item.custom_value1;
var custom_value2 = item.custom_value2; var customValue2 = item.custom_value2;
if (isTasks) { if (isTasks) {
if (item.invoice_item_type_id != 2) { if (item.invoice_item_type_id != 2) {
@ -714,8 +714,8 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
if (invoice.is_recurring) { if (invoice.is_recurring) {
notes = processVariables(notes); notes = processVariables(notes);
productKey = processVariables(productKey); productKey = processVariables(productKey);
custom_value1 = processVariables(item.custom_value1); customValue1 = processVariables(item.custom_value1);
custom_value2 = processVariables(item.custom_value2); customValue2 = processVariables(item.custom_value2);
} }
var lineTotal = roundSignificant(NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty)); var lineTotal = roundSignificant(NINJA.parseFloat(item.cost) * NINJA.parseFloat(item.qty));
@ -766,10 +766,10 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
if (field == 'item' || field == 'service') { if (field == 'item' || field == 'service') {
value = item.product_key; value = productKey;
styles.push('productKey'); styles.push('productKey');
} else if (field == 'description') { } else if (field == 'description') {
value = item.notes; value = notes;
} else if (field == 'unit_cost' || field == 'rate') { } else if (field == 'unit_cost' || field == 'rate') {
value = cost; value = cost;
styles.push('cost'); styles.push('cost');
@ -778,6 +778,10 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
if (field == 'hours') { if (field == 'hours') {
styles.push('cost'); styles.push('cost');
} }
} else if (field == 'custom_value1') {
value = customValue1;
} else if (field == 'custom_value2') {
value = customValue2;
} else if (field == 'discount') { } else if (field == 'discount') {
if (parseInt(invoice.is_amount_discount)) { if (parseInt(invoice.is_amount_discount)) {
value = formatMoneyInvoice(discount, invoice); value = formatMoneyInvoice(discount, invoice);