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

Working on task invoices

Browse Source
This commit is contained in:
Hillel Coren 2017-06-20 13:10:56 +03:00
parent 7137cf4676
commit eee064e500
5 changed files with 21 additions and 11 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

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

@ -462,29 +462,33 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
var isTasks = isSecondTable || (invoice.hasTasks && !invoice.hasStandard);
var grid = [[]];
var styles = ['tableHeader'];
if (isSecondTable) {
styles.push('secondTableHeader');
}
if (invoice.has_product_key) {
grid[0].push({text: invoiceLabels.item, style: ['tableHeader', 'itemTableHeader']});
grid[0].push({text: invoiceLabels.item, style: styles.concat('itemTableHeader')});
}
grid[0].push({text: invoiceLabels.description, style: ['tableHeader', 'descriptionTableHeader']});
grid[0].push({text: invoiceLabels.description, style: styles.concat('descriptionTableHeader')});
if (invoice.features.invoice_settings && account.custom_invoice_item_label1) {
grid[0].push({text: account.custom_invoice_item_label1, style: ['tableHeader', 'custom1TableHeader']});
grid[0].push({text: account.custom_invoice_item_label1, style: styles.concat('custom1TableHeader')});
}
if (invoice.features.invoice_settings && account.custom_invoice_item_label2) {
grid[0].push({text: account.custom_invoice_item_label2, style: ['tableHeader', 'custom2TableHeader']});
grid[0].push({text: account.custom_invoice_item_label2, style: styles.concat('custom2TableHeader')});
}
if (!hideQuantity) {
grid[0].push({text: isTasks ? invoiceLabels.rate : invoiceLabels.unit_cost, style: ['tableHeader', 'costTableHeader']});
grid[0].push({text: isTasks ? invoiceLabels.hours : invoiceLabels.quantity, style: ['tableHeader', 'qtyTableHeader']});
grid[0].push({text: isTasks ? invoiceLabels.rate : invoiceLabels.unit_cost, style: styles.concat('costTableHeader')});
grid[0].push({text: isTasks ? invoiceLabels.hours : invoiceLabels.quantity, style: styles.concat('qtyTableHeader')});
}
if (showItemTaxes) {
grid[0].push({text: invoiceLabels.tax, style: ['tableHeader', 'taxTableHeader']});
grid[0].push({text: invoiceLabels.tax, style: styles.concat('taxTableHeader')});
}
grid[0].push({text: invoiceLabels.line_total, style: ['tableHeader', 'lineTotalTableHeader']});
grid[0].push({text: invoiceLabels.line_total, style: styles.concat('lineTotalTableHeader')});
for (var i = 0; i < invoice.invoice_items.length; i++) {

3
storage/templates/business.js
View File

@ -178,6 +178,9 @@
"fontSize": "$fontSizeLargest",
"bold": true
},
"secondTableHeader": {
"color": "$secondaryColor:#374e6b"
},
"costTableHeader": {
"alignment": "right"
},

5
storage/templates/playful.js
View File

@ -192,6 +192,9 @@
"fontSize": "$fontSizeLargest",
"color": "#FFFFFF"
},
"secondTableHeader": {
"color": "$primaryColor:#009d91"
},
"costTableHeader": {
"alignment": "right"
},
@ -266,4 +269,4 @@
}
},
"pageMargins": [40, 40, 40, 40]
}
}