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

Fix PDF on older IE

Browse Source
This commit is contained in:
Hillel Coren 2017-05-24 11:28:11 +03:00
parent 512c6ebd43
commit 4705c6179c
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,26 +118,12 @@
return getPDFString(refreshPDFCB, force); return getPDFString(refreshPDFCB, force);
} catch (exception) { } catch (exception) {
if (location.href.indexOf('/view/')) { if (location.href.indexOf('/view/')) {
var url = location.href.replace('/view/', '/download/') + '?base64=true&silent=true'; var url = location.href.replace('/view/', '/download/') + '?base64=true';
$.get(url, function(result) { $.get(url, function(result) {
refreshPDFCB(result); refreshPDFCB(result);
}) })
} }
} }
/*
@if (true || isset($usePhantomJS) && $usePhantomJS)
console.log(location.href);
console.log(location.href.indexOf('/view/'));
console.log();
return false;
$.get('http://ninja.dev/download/...?base64=true', function(result) {
refreshPDFCB(result);
})
return false;
@else
return getPDFString(refreshPDFCB, force);
@endif
*/
} }
function refreshPDFCB(string) { function refreshPDFCB(string) {

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

@ -237,9 +237,15 @@
}); });
function onDownloadClick() { function onDownloadClick() {
var doc = generatePDF(invoice, invoice.invoice_design.javascript, true); try {
var fileName = invoice.is_quote ? invoiceLabels.quote : invoiceLabels.invoice; var doc = generatePDF(invoice, invoice.invoice_design.javascript, true);
doc.save(fileName + '-' + invoice.invoice_number + '.pdf'); var fileName = invoice.is_quote ? invoiceLabels.quote : invoiceLabels.invoice;
doc.save(fileName + '-' + invoice.invoice_number + '.pdf');
} catch (exception) {
if (location.href.indexOf('/view/')) {
location.href = location.href.replace('/view/', '/download/');
}
}
} }
function showCustomModal() { function showCustomModal() {