Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 10:54:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

missing invoice generation callbacks fixed

Browse Source
This commit is contained in:
sigitas 2015-04-14 14:07:50 +03:00
parent 9cb9237981
commit 734a53fefe
4 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/accounts/invoice_design.blade.php
View File

@ -26,7 +26,7 @@
} }
} }
function getPDFString() { function getPDFString(cb) {
invoice.is_pro = {!! Auth::user()->isPro() ? 'true' : 'false' !!}; invoice.is_pro = {!! Auth::user()->isPro() ? 'true' : 'false' !!};
invoice.account.hide_quantity = $('#hide_quantity').is(":checked"); invoice.account.hide_quantity = $('#hide_quantity').is(":checked");
invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked"); invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked");
@ -35,11 +35,7 @@
NINJA.primaryColor = $('#primary_color').val(); NINJA.primaryColor = $('#primary_color').val();
NINJA.secondaryColor = $('#secondary_color').val(); NINJA.secondaryColor = $('#secondary_color').val();
var doc = generatePDF(invoice, getDesignJavascript(), true); generatePDF(invoice, getDesignJavascript(), true, cb);
if (!doc) {
return;
}
return doc.output('datauristring');
} }
$(function() { $(function() {

6
resources/views/invoices/edit.blade.php
View File

@ -730,10 +730,12 @@
var invoice = createInvoiceModel(); var invoice = createInvoiceModel();
var design = getDesignJavascript(); var design = getDesignJavascript();
if (!design) return; if (!design) return;
var doc = generatePDF(invoice, design, true);
$('form.form-horizontal.warn-on-exit').append('<input type="hidden" name="pdfupload" value="'+doc.output('datauristring')+'">'); generatePDF(invoice, design, true, function(pdfString){
$('form.form-horizontal.warn-on-exit').append('<input type="hidden" name="pdfupload" value="'+pdfString+'">');
submitAction(''); submitAction('');
});
} }
} }

8
resources/views/invoices/history.blade.php
View File

@ -13,7 +13,7 @@
var currentInvoice = {{ $invoice }}; var currentInvoice = {{ $invoice }};
var versionsJson = {{ $versionsJson }}; var versionsJson = {{ $versionsJson }};
function getPDFString() { function getPDFString(cb) {
var version = $('#version').val(); var version = $('#version').val();
var invoice; var invoice;
@ -32,11 +32,7 @@
invoiceDesign = invoiceDesigns[0]; invoiceDesign = invoiceDesigns[0];
} }
var doc = generatePDF(invoice, invoiceDesign.javascript, true); generatePDF(invoice, invoiceDesign.javascript, true, cb);
if (!doc) {
return;
}
return doc.output('datauristring');
} }
$(function() { $(function() {

6
resources/views/invoices/view.blade.php
View File

@ -55,10 +55,8 @@
invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }}; invoice.is_quote = {{ $invoice->is_quote ? 'true' : 'false' }};
invoice.contact = {!! $contact->toJson() !!}; invoice.contact = {!! $contact->toJson() !!};
function getPDFString() { function getPDFString(cb) {
var doc = generatePDF(invoice, invoice.invoice_design.javascript); generatePDF(invoice, invoice.invoice_design.javascript, cb);
if (!doc) return;
return doc.output('datauristring');
} }
$(function() { $(function() {