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 23:08:56 +02:00
parent ccd1b8afde
commit 8c22ce5f5c
5 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
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

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

@ -460,7 +460,7 @@ NINJA.invoiceColumns = function(invoice, design, isTasks)
columns.push(width) columns.push(width)
} }
console.log(columns); //console.log(columns);
return columns; return columns;
} }
@ -556,8 +556,6 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} }
} 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) {
continue;
} else if (field == 'unit_cost' || field == 'rate' || field == 'hours') { } else if (field == 'unit_cost' || field == 'rate' || field == 'hours') {
headerStyles.push('cost'); headerStyles.push('cost');
} }
@ -575,7 +573,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
var row = []; var row = [];
var item = invoice.invoice_items[i]; var item = invoice.invoice_items[i];
var cost = NINJA.parseFloat(item.cost) ? formatMoneyInvoice(item.cost, invoice, null, getPrecision(item.cost)) : ' '; var cost = NINJA.parseFloat(item.cost) ? formatMoneyInvoice(item.cost, invoice, null, getPrecision(item.cost)) : ' ';
var qty = NINJA.parseFloat(item.qty) ? roundSignificant(NINJA.parseFloat(item.qty)) + '' : ''; var qty = NINJA.parseFloat(item.qty) ? roundSignificant(NINJA.parseFloat(item.qty)) + '' : ' ';
var notes = item.notes; var notes = item.notes;
var productKey = item.product_key; var productKey = item.product_key;
var tax1 = ''; var tax1 = '';
@ -644,8 +642,6 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
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) {
continue;
} }
if (field == 'item' || field == 'service') { if (field == 'item' || field == 'service') {
@ -654,10 +650,10 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
} else if (field == 'description') { } else if (field == 'description') {
value = item.notes; value = item.notes;
} else if (field == 'unit_cost' || field == 'rate') { } else if (field == 'unit_cost' || field == 'rate') {
value = item.cost; value = cost;
styles.push('cost'); styles.push('cost');
} else if (field == 'quantity' || field == 'hours') { } else if (field == 'quantity' || field == 'hours') {
value = formatAmount(item.qty, invoice.client.currency_id, getPrecision(item.qty)); value = qty;
if (field == 'hours') { if (field == 'hours') {
styles.push('cost'); styles.push('cost');
} }
@ -688,7 +684,7 @@ NINJA.invoiceLines = function(invoice, isSecondTable) {
grid.push(row); grid.push(row);
} }
console.log(JSON.stringify(grid)); //console.log(JSON.stringify(grid));
return NINJA.prepareDataTable(grid, 'invoiceItems'); return NINJA.prepareDataTable(grid, 'invoiceItems');
} }

12
resources/assets/js/script.js
View File

@ -672,15 +672,9 @@ function calculateAmounts(invoice) {
var total = 0; var total = 0;
var hasTaxes = false; var hasTaxes = false;
var taxes = {}; var taxes = {};
invoice.has_product_key = false;
invoice.has_custom_item_value1 = false; invoice.has_custom_item_value1 = false;
invoice.has_custom_item_value2 = false; invoice.has_custom_item_value2 = false;
// Bold designs currently breaks w/o the product column
if (invoice.invoice_design_id == 2) {
invoice.has_product_key = true;
}
var hasStandard = false; var hasStandard = false;
var hasTask = false; var hasTask = false;
@ -713,12 +707,6 @@ function calculateAmounts(invoice) {
var taxRate2 = 0; var taxRate2 = 0;
var taxName2 = ''; var taxName2 = '';
if (item.product_key) {
invoice.has_product_key = true;
} else if (invoice.invoice_items.length == 1 && !item.qty) {
invoice.has_product_key = true;
}
if (invoice.features.invoice_settings) { if (invoice.features.invoice_settings) {
if (item.custom_value1) { if (item.custom_value1) {
invoice.has_custom_item_value1 = true; invoice.has_custom_item_value1 = true;

4
resources/views/invoices/pdf.blade.php
View File

@ -107,9 +107,8 @@
var needsRefresh = false; var needsRefresh = false;
function refreshPDF(force) { function refreshPDF(force) {
//try { try {
return getPDFString(refreshPDFCB, force); return getPDFString(refreshPDFCB, force);
/*
} catch (exception) { } catch (exception) {
@if (Utils::isTravis()) @if (Utils::isTravis())
var message = exception.message || ''; var message = exception.message || '';
@ -131,7 +130,6 @@
} }
@endif @endif
} }
*/
} }
function refreshPDFCB(string) { function refreshPDFCB(string) {