Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-09 02:34:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
Hillel Coren 2014-04-22 00:25:40 +03:00
parent 40dae71bc4
commit add9cb1569
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/invoices/edit.blade.php
View File

@ -680,7 +680,7 @@
function getPDFString() { function getPDFString() {
var invoice = createInvoiceModel(); var invoice = createInvoiceModel();
var doc = generatePDF(invoice, invoiceLabels); var doc = generatePDF(invoice);
if (!doc) return; if (!doc) return;
return doc.output('datauristring'); return doc.output('datauristring');
} }
@ -724,7 +724,7 @@
function onDownloadClick() { function onDownloadClick() {
var invoice = createInvoiceModel(); var invoice = createInvoiceModel();
var doc = generatePDF(invoice); var doc = generatePDF(invoice, true);
doc.save('Invoice-' + $('#invoice_number').val() + '.pdf'); doc.save('Invoice-' + $('#invoice_number').val() + '.pdf');
} }

4
app/views/invoices/view.blade.php
View File

@ -48,7 +48,7 @@
invoice.imageWidth = {{ $invoice->client->account->getLogoWidth() }}; invoice.imageWidth = {{ $invoice->client->account->getLogoWidth() }};
invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }}; invoice.imageHeight = {{ $invoice->client->account->getLogoHeight() }};
@endif @endif
var doc = generatePDF(invoice, true); var doc = generatePDF(invoice);
if (!doc) return; if (!doc) return;
var string = doc.output('datauristring'); var string = doc.output('datauristring');
@ -77,7 +77,7 @@
var invoiceLabels = {{ json_encode($invoiceLabels) }}; var invoiceLabels = {{ json_encode($invoiceLabels) }};
function onDownloadClick() { function onDownloadClick() {
var doc = generatePDF(invoice); var doc = generatePDF(invoice, true);
doc.save('Invoice-' + invoice.invoice_number + '.pdf'); doc.save('Invoice-' + invoice.invoice_number + '.pdf');
} }

6
public/js/script.js
View File

@ -103,16 +103,16 @@ function GetReportTemplate4(doc, invoice, layout, checkMath) {
var invoiceOld; var invoiceOld;
function generatePDF(invoice, checkMath) { function generatePDF(invoice, force) {
invoice = calculateAmounts(invoice); invoice = calculateAmounts(invoice);
var a = copyInvoice(invoice); var a = copyInvoice(invoice);
var b = copyInvoice(invoiceOld); var b = copyInvoice(invoiceOld);
if (_.isEqual(a, b)) { if (!force && _.isEqual(a, b)) {
return; return;
} }
invoiceOld = invoice; invoiceOld = invoice;
report_id = invoice.invoice_design_id; report_id = invoice.invoice_design_id;
doc = GetPdf(invoice, checkMath, report_id); doc = GetPdf(invoice, false, report_id);
return doc; return doc;
} }