Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 23:54: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 16:09:42 +02:00
parent 7ecd06921f
commit 044aa6ccaa
3 changed files with 18 additions and 21 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

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

@ -485,18 +485,17 @@ NINJA.taxWidth = function(invoice)
NINJA.productFields = function(invoice, isTasks) { NINJA.productFields = function(invoice, isTasks) {
var account = invoice.account; var account = invoice.account;
var fields = JSON.parse(account.invoice_fields); var allFields = JSON.parse(account.invoice_fields);
if (fields) { if (allFields) {
if (isTasks && fields.task_fields) { if (isTasks && allFields.task_fields) {
fields = fields.task_fields; return allFields.task_fields;
} else if (! isTasks && fields.product_fields) { } else if (! isTasks && allFields.product_fields) {
fields = fields.product_fields; return allFields.product_fields;
} }
} }
if (! fields) { var fields = [
fields = [
isTasks ? 'product.service' : 'product.item', isTasks ? 'product.service' : 'product.item',
'product.description', 'product.description',
'product.custom_value1', 'product.custom_value1',
@ -506,7 +505,6 @@ NINJA.productFields = function(invoice, isTasks) {
'product.tax', 'product.tax',
'product.line_total', 'product.line_total',
]; ];
}
return fields; return fields;
} }
@ -524,7 +522,6 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
var fields = NINJA.productFields(invoice, isTasks); var fields = NINJA.productFields(invoice, isTasks);
consle.log(fields);
var hasDescription = fields.indexOf('product.description') >= 0; var hasDescription = fields.indexOf('product.description') >= 0;
for (var i=0; i<fields.length; i++) { for (var i=0; i<fields.length; i++) {