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

Statements

Browse Source
This commit is contained in:
Hillel Coren 2018-05-02 10:30:58 +03:00
parent 0dfdce2f0b
commit fcec465b37
4 changed files with 21 additions and 20 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

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

@ -492,12 +492,11 @@ NINJA.statementDetails = function(invoice) {
var clone = JSON.parse(JSON.stringify(subtotals)); var clone = JSON.parse(JSON.stringify(subtotals));
clone.columns[1].table.body = [[ clone.columns[1].table.body = [[
{ text: invoiceLabels.balance_due, style: ['subtotalsLabel', 'subtotalsBalanceDueLabel'] }, { text: invoiceLabels.balance_due, style: ['subtotalsLabel', 'subtotalsBalanceDueLabel'] },
{ text: formatMoneyInvoice(invoice.balance_amount, invoice), style: ['subtotals', 'subtotalsBalanceDue'] } { text: formatMoneyInvoice(invoice.balance_amount, invoice), style: ['subtotals', 'subtotalsBalanceDue', 'noWrap'] }
]]; ]];
data.stack.push(clone); data.stack.push(clone);
if (hasPayments) { if (hasPayments) {
console.log('hasPayments...');
var clone = JSON.parse(JSON.stringify(table)); var clone = JSON.parse(JSON.stringify(table));
clone.table.body = NINJA.prepareDataTable(NINJA.statementPayments(invoice), 'invoiceItems'); clone.table.body = NINJA.prepareDataTable(NINJA.statementPayments(invoice), 'invoiceItems');
clone.table.widths = ["22%", "22%", "39%", "17%"]; clone.table.widths = ["22%", "22%", "39%", "17%"];
@ -506,7 +505,7 @@ NINJA.statementDetails = function(invoice) {
var clone = JSON.parse(JSON.stringify(subtotals)); var clone = JSON.parse(JSON.stringify(subtotals));
clone.columns[1].table.body = [[ clone.columns[1].table.body = [[
{ text: invoiceLabels.amount_paid, style: ['subtotalsLabel', 'subtotalsBalanceDueLabel'] }, { text: invoiceLabels.amount_paid, style: ['subtotalsLabel', 'subtotalsBalanceDueLabel'] },
{ text: formatMoneyInvoice(paymentTotal, invoice), style: ['subtotals', 'subtotalsBalanceDue'] } { text: formatMoneyInvoice(paymentTotal, invoice), style: ['subtotals', 'subtotalsBalanceDue', 'noWrap'] }
]]; ]];
data.stack.push(clone); data.stack.push(clone);
} }
@ -523,11 +522,11 @@ NINJA.statementDetails = function(invoice) {
NINJA.statementInvoices = function(invoice) { NINJA.statementInvoices = function(invoice) {
var grid = [[]]; var grid = [[]];
grid[0].push({text: invoiceLabels.invoice_number, style: ['tableHeader', 'itemTableHeader']}); grid[0].push({text: invoiceLabels.invoice_number, style: ['tableHeader', 'itemTableHeader', 'firstColumn']});
grid[0].push({text: invoiceLabels.invoice_date, style: ['tableHeader', 'invoiceDateTableHeader']}); grid[0].push({text: invoiceLabels.invoice_date, style: ['tableHeader', 'invoiceDateTableHeader']});
grid[0].push({text: invoiceLabels.due_date, style: ['tableHeader', 'dueDateTableHeader']}); grid[0].push({text: invoiceLabels.due_date, style: ['tableHeader', 'dueDateTableHeader']});
grid[0].push({text: invoiceLabels.total, style: ['tableHeader', 'totalTableHeader']}); grid[0].push({text: invoiceLabels.total, style: ['tableHeader', 'totalTableHeader']});
grid[0].push({text: invoiceLabels.balance, style: ['tableHeader', 'balanceTableHeader']}); grid[0].push({text: invoiceLabels.balance, style: ['tableHeader', 'balanceTableHeader', 'lastColumn']});
var counter = 0; var counter = 0;
for (var i = 0; i < invoice.invoice_items.length; i++) { for (var i = 0; i < invoice.invoice_items.length; i++) {
@ -537,11 +536,11 @@ NINJA.statementInvoices = function(invoice) {
} }
var rowStyle = (counter++ % 2 == 0) ? 'odd' : 'even'; var rowStyle = (counter++ % 2 == 0) ? 'odd' : 'even';
grid.push([ grid.push([
{text: item.product_key, style:['invoiceNumber', 'productKey', rowStyle]}, {text: item.product_key, style:['invoiceNumber', 'productKey', rowStyle, 'firstColumn']},
{text: item.custom_value1 && item.custom_value1 != '0000-00-00' ? moment(item.custom_value1).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['invoiceDate', rowStyle]}, {text: item.custom_value1 && item.custom_value1 != '0000-00-00' ? moment(item.custom_value1).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['invoiceDate', rowStyle]},
{text: item.custom_value2 && item.custom_value2 != '0000-00-00' ? moment(item.custom_value2).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['dueDate', rowStyle]}, {text: item.custom_value2 && item.custom_value2 != '0000-00-00' ? moment(item.custom_value2).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['dueDate', rowStyle]},
{text: formatMoneyInvoice(item.notes, invoice), style:['subtotals', rowStyle]}, {text: formatMoneyInvoice(item.notes, invoice), style:['subtotals', rowStyle]},
{text: formatMoneyInvoice(item.cost, invoice), style:['lineTotal', rowStyle]}, {text: formatMoneyInvoice(item.cost, invoice), style:['lineTotal', rowStyle, 'lastColumn']},
]); ]);
} }
@ -551,11 +550,11 @@ NINJA.statementInvoices = function(invoice) {
NINJA.statementPayments = function(invoice) { NINJA.statementPayments = function(invoice) {
var grid = [[]]; var grid = [[]];
grid[0].push({text: invoiceLabels.invoice_number, style: ['tableHeader', 'itemTableHeader']}); grid[0].push({text: invoiceLabels.invoice_number, style: ['tableHeader', 'itemTableHeader', 'firstColumn']});
grid[0].push({text: invoiceLabels.payment_date, style: ['tableHeader', 'invoiceDateTableHeader']}); grid[0].push({text: invoiceLabels.payment_date, style: ['tableHeader', 'invoiceDateTableHeader']});
grid[0].push({text: invoiceLabels.method, style: ['tableHeader', 'dueDateTableHeader']}); grid[0].push({text: invoiceLabels.method, style: ['tableHeader', 'dueDateTableHeader']});
//grid[0].push({text: invoiceLabels.reference, style: ['tableHeader', 'totalTableHeader']}); //grid[0].push({text: invoiceLabels.reference, style: ['tableHeader', 'totalTableHeader']});
grid[0].push({text: invoiceLabels.amount, style: ['tableHeader', 'balanceTableHeader']}); grid[0].push({text: invoiceLabels.amount, style: ['tableHeader', 'balanceTableHeader', 'lastColumn']});
var counter = 0; var counter = 0;
for (var i = 0; i < invoice.invoice_items.length; i++) { for (var i = 0; i < invoice.invoice_items.length; i++) {
@ -565,25 +564,24 @@ NINJA.statementPayments = function(invoice) {
} }
var rowStyle = (counter++ % 2 == 0) ? 'odd' : 'even'; var rowStyle = (counter++ % 2 == 0) ? 'odd' : 'even';
grid.push([ grid.push([
{text: item.product_key, style:['invoiceNumber', 'productKey', rowStyle]}, {text: item.product_key, style:['invoiceNumber', 'productKey', rowStyle, 'firstColumn']},
{text: item.custom_value1 && item.custom_value1 != '0000-00-00' ? moment(item.custom_value1).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['invoiceDate', rowStyle]}, {text: item.custom_value1 && item.custom_value1 != '0000-00-00' ? moment(item.custom_value1).format(invoice.account.date_format ? invoice.account.date_format.format_moment : 'MMM D, YYYY') : ' ', style:['invoiceDate', rowStyle]},
{text: item.custom_value2 ? item.custom_value2 : ' ', style:['dueDate', rowStyle]}, {text: item.custom_value2 ? item.custom_value2 : ' ', style:['dueDate', rowStyle]},
//{text: item.transaction_reference, style:['subtotals', rowStyle]}, //{text: item.transaction_reference, style:['subtotals', rowStyle]},
{text: formatMoneyInvoice(item.cost, invoice), style:['lineTotal', rowStyle]}, {text: formatMoneyInvoice(item.cost, invoice), style:['lineTotal', rowStyle, 'lastColumn']},
]); ]);
} }
console.log(grid);
return grid; return grid;
} }
NINJA.statementAging = function(invoice) { NINJA.statementAging = function(invoice) {
var grid = [[]]; var grid = [[]];
grid[0].push({text: '0 - 30', style: ['tableHeader', 'alignRight']}); grid[0].push({text: '0 - 30', style: ['tableHeader', 'alignRight', 'firstColumn']});
grid[0].push({text: '30 - 60', style: ['tableHeader', 'alignRight']}); grid[0].push({text: '30 - 60', style: ['tableHeader', 'alignRight']});
grid[0].push({text: '60 - 90', style: ['tableHeader', 'alignRight']}); grid[0].push({text: '60 - 90', style: ['tableHeader', 'alignRight']});
grid[0].push({text: '90 - 120', style: ['tableHeader', 'alignRight']}); grid[0].push({text: '90 - 120', style: ['tableHeader', 'alignRight']});
grid[0].push({text: '120+', style: ['tableHeader', 'alignRight']}); grid[0].push({text: '120+', style: ['tableHeader', 'alignRight', 'lastColumn']});
for (var i = 0; i < invoice.invoice_items.length; i++) { for (var i = 0; i < invoice.invoice_items.length; i++) {
var item = invoice.invoice_items[i]; var item = invoice.invoice_items[i];
@ -591,11 +589,11 @@ NINJA.statementAging = function(invoice) {
continue; continue;
} }
grid.push([ grid.push([
{text: formatMoneyInvoice(item.product_key, invoice), style:['subtotals', 'odd']}, {text: formatMoneyInvoice(item.product_key, invoice), style:['subtotals', 'odd', 'firstColumn']},
{text: formatMoneyInvoice(item.notes, invoice), style:['subtotals', 'odd']}, {text: formatMoneyInvoice(item.notes, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']}, {text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']}, {text: formatMoneyInvoice(item.custom_value1, invoice), style:['subtotals', 'odd']},
{text: formatMoneyInvoice(item.cost, invoice), style:['subtotals', 'odd']}, {text: formatMoneyInvoice(item.cost, invoice), style:['subtotals', 'odd', 'lastColumn']},
]); ]);
} }

5
resources/views/clients/statement.blade.php
View File

@ -14,7 +14,10 @@
<script> <script>
var invoiceDesign = JSON.stringify({!! Utils::getFromCache($account->invoice_design_id ?: 1, 'invoiceDesigns')->pdfmake !!}); var invoiceDesign = JSON.stringify({!!
//Utils::getFromCache($account->invoice_design_id ?: 1, 'invoiceDesigns')->pdfmake
Utils::getFromCache(1, 'invoiceDesigns')->pdfmake
!!});
var invoiceFonts = {!! Cache::get('fonts') !!}; var invoiceFonts = {!! Cache::get('fonts') !!};
var statementStartDate = moment("{{ $startDate }}"); var statementStartDate = moment("{{ $startDate }}");