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

Working on product fields

Browse Source
This commit is contained in:
Hillel Coren 2017-10-29 17:36:10 +02:00
parent 044aa6ccaa
commit bd98591ca7
4 changed files with 43 additions and 29 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

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

@ -488,9 +488,9 @@ NINJA.productFields = function(invoice, isTasks) {
var allFields = JSON.parse(account.invoice_fields); var allFields = JSON.parse(account.invoice_fields);
if (allFields) { if (allFields) {
if (isTasks && allFields.task_fields) { if (isTasks && allFields.task_fields && allFields.task_fields.length) {
return allFields.task_fields; return allFields.task_fields;
} else if (! isTasks && allFields.product_fields) { } else if (! isTasks && allFields.product_fields && allFields.product_fields.length) {
return allFields.product_fields; return allFields.product_fields;
} }
} }
@ -506,6 +506,11 @@ NINJA.productFields = function(invoice, isTasks) {
'product.line_total', 'product.line_total',
]; ];
// add backwards compatibility for 'hide qty' setting
if (invoice.account.hide_quantity == '1' && ! isTasks) {
fields.splice(5, 1);
}
return fields; return fields;
} }
@ -527,11 +532,20 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
for (var i=0; i<fields.length; i++) { for (var i=0; i<fields.length; i++) {
var field = fields[i].split('.')[1]; // split to remove 'product.' var field = fields[i].split('.')[1]; // split to remove 'product.'
var headerStyles = styles.concat([snakeToCamel(field), snakeToCamel(field) + 'TableHeader']); var headerStyles = styles.concat([snakeToCamel(field), snakeToCamel(field) + 'TableHeader']);
var value = invoiceLabels[field];
if (field == 'custom_value1' && ! invoice.has_custom_item_value1) { if (field == 'custom_value1') {
if (invoice.has_custom_item_value1) {
value = account.custom_invoice_item_label1;
} else {
continue; continue;
} else if (field == 'custom_value2' && ! invoice.has_custom_item_value1) { }
} else if (field == 'custom_value2') {
if (invoice.has_custom_item_value2) {
value = account.custom_invoice_item_label2;
} else {
continue; continue;
}
} else if (field == 'tax' && ! invoice.has_item_taxes) { } else if (field == 'tax' && ! invoice.has_item_taxes) {
continue; continue;
} else if (field == 'product_key' && ! invoice.has_product_key) { } else if (field == 'product_key' && ! invoice.has_product_key) {
@ -540,7 +554,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
headerStyles.push('cost'); headerStyles.push('cost');
} }
grid[0].push({text: invoiceLabels[field], style: headerStyles}); grid[0].push({text: value, style: headerStyles});
} }
for (var i=0; i<invoice.invoice_items.length; i++) { for (var i=0; i<invoice.invoice_items.length; i++) {