Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on invoice fields

Browse Source
This commit is contained in:
Hillel Coren 2016-09-05 17:44:01 +03:00
parent d14cf5f9ed
commit 0f5065336a
4 changed files with 24 additions and 19 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

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

@ -564,7 +564,7 @@ NINJA.subtotalsBalance = function(invoice) {
NINJA.accountDetails = function(invoice) { NINJA.accountDetails = function(invoice) {
var account = invoice.account; var account = invoice.account;
if (invoice.features.invoice_settings && account.invoice_fields) { if (invoice.features.invoice_settings && account.invoice_fields) {
var fields = JSON.parse(account.invoice_fields); var fields = JSON.parse(account.invoice_fields).account_fields1;
} else { } else {
var fields = [ var fields = [
'account.company_name', 'account.company_name',
@ -578,8 +578,8 @@ NINJA.accountDetails = function(invoice) {
var data = []; var data = [];
for (var i=0; i < fields.account_fields1.length; i++) { for (var i=0; i < fields.length; i++) {
var field = fields.account_fields1[i]; var field = fields[i];
var value = NINJA.renderClientOrAccountField(invoice, field); var value = NINJA.renderClientOrAccountField(invoice, field);
if (value) { if (value) {
data.push(value); data.push(value);
@ -592,7 +592,7 @@ NINJA.accountDetails = function(invoice) {
NINJA.accountAddress = function(invoice) { NINJA.accountAddress = function(invoice) {
var account = invoice.account; var account = invoice.account;
if (invoice.features.invoice_settings && account.invoice_fields) { if (invoice.features.invoice_settings && account.invoice_fields) {
var fields = JSON.parse(account.invoice_fields); var fields = JSON.parse(account.invoice_fields).account_fields2;
} else { } else {
var fields = [ var fields = [
'account.address1', 'account.address1',
@ -606,8 +606,8 @@ NINJA.accountAddress = function(invoice) {
var data = []; var data = [];
for (var i=0; i < fields.account_fields2.length; i++) { for (var i=0; i < fields.length; i++) {
var field = fields.account_fields2[i]; var field = fields[i];
var value = NINJA.renderClientOrAccountField(invoice, field); var value = NINJA.renderClientOrAccountField(invoice, field);
if (value) { if (value) {
data.push(value); data.push(value);
@ -680,7 +680,7 @@ NINJA.invoiceDetails = function(invoice) {
var account = invoice.account; var account = invoice.account;
if (invoice.features.invoice_settings && account.invoice_fields) { if (invoice.features.invoice_settings && account.invoice_fields) {
var fields = JSON.parse(account.invoice_fields); var fields = JSON.parse(account.invoice_fields).invoice_fields;
} else { } else {
var fields = [ var fields = [
'invoice.invoice_number', 'invoice.invoice_number',
@ -695,8 +695,8 @@ NINJA.invoiceDetails = function(invoice) {
} }
var data = []; var data = [];
for (var i=0; i < fields.invoice_fields.length; i++) { for (var i=0; i < fields.length; i++) {
var field = fields.invoice_fields[i]; var field = fields[i];
var value = NINJA.renderInvoiceField(invoice, field); var value = NINJA.renderInvoiceField(invoice, field);
if (value) { if (value) {
data.push(value); data.push(value);
@ -787,7 +787,7 @@ NINJA.renderClientOrAccountField = function(invoice, field) {
NINJA.clientDetails = function(invoice) { NINJA.clientDetails = function(invoice) {
var account = invoice.account; var account = invoice.account;
if (invoice.features.invoice_settings && account.invoice_fields) { if (invoice.features.invoice_settings && account.invoice_fields) {
var fields = JSON.parse(account.invoice_fields); var fields = JSON.parse(account.invoice_fields).client_fields;
} else { } else {
var fields = [ var fields = [
'client.client_name', 'client.client_name',
@ -804,8 +804,8 @@ NINJA.clientDetails = function(invoice) {
} }
var data = []; var data = [];
for (var i=0; i < fields.client_fields.length; i++) { for (var i=0; i < fields.length; i++) {
var field = fields.client_fields[i]; var field = fields[i];
var value = NINJA.renderClientOrAccountField(invoice, field); var value = NINJA.renderClientOrAccountField(invoice, field);
if (value) { if (value) {
data.push(value); data.push(value);

15
resources/views/accounts/partials/invoice_fields.blade.php
View File

@ -23,25 +23,30 @@ function ViewModel(data) {
self.account_fields2.removeAll(); self.account_fields2.removeAll();
} }
self.onDragged = function() { self.onChange = function() {
refreshPDF(); refreshPDF();
NINJA.formIsChanged = true;
}
self.onDragged = function() {
self.onChange();
} }
self.removeInvoiceFields = function(item) { self.removeInvoiceFields = function(item) {
self.invoice_fields.remove(item); self.invoice_fields.remove(item);
refreshPDF(); self.onChange();
} }
self.removeClientFields = function(item) { self.removeClientFields = function(item) {
self.client_fields.remove(item); self.client_fields.remove(item);
refreshPDF(); self.onChange();
} }
self.removeAccountFields1 = function(item) { self.removeAccountFields1 = function(item) {
self.account_fields1.remove(item); self.account_fields1.remove(item);
refreshPDF(); self.onChange();
} }
self.removeAccountFields2 = function(item) { self.removeAccountFields2 = function(item) {
self.account_fields2.remove(item); self.account_fields2.remove(item);
refreshPDF(); self.onChange();
} }
} }