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:00:35 +03:00
parent d7373a133b
commit 0b90e6e512
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/ClientPortalController.php
View File

@ -200,7 +200,8 @@ class ClientPortalController extends BaseController
} }
$invoice = $invitation->invoice; $invoice = $invitation->invoice;
$pdfString = $invoice->getPDFString(); $decode = ! request()->base64;
$pdfString = $invoice->getPDFString($decode);
header('Content-Type: application/pdf'); header('Content-Type: application/pdf');
header('Content-Length: ' . strlen($pdfString)); header('Content-Length: ' . strlen($pdfString));

6
app/Models/Invoice.php
View File

@ -1231,7 +1231,7 @@ class Invoice extends EntityModel implements BalanceAffecting
/** /**
* @return bool|string * @return bool|string
*/ */
public function getPDFString() public function getPDFString($decode = true)
{ {
if (! env('PHANTOMJS_CLOUD_KEY') && ! env('PHANTOMJS_BIN_PATH')) { if (! env('PHANTOMJS_CLOUD_KEY') && ! env('PHANTOMJS_BIN_PATH')) {
return false; return false;
@ -1271,12 +1271,16 @@ class Invoice extends EntityModel implements BalanceAffecting
return false; return false;
} }
if ($decode) {
if ($pdf = Utils::decodePDF($pdfString)) { if ($pdf = Utils::decodePDF($pdfString)) {
return $pdf; return $pdf;
} else { } else {
Utils::logError("PhantomJS - Unable to decode: {$pdfString}"); Utils::logError("PhantomJS - Unable to decode: {$pdfString}");
return false; return false;
} }
} else {
return $pdfString;
}
} }
/** /**

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

@ -114,7 +114,25 @@
var needsRefresh = false; var needsRefresh = false;
function refreshPDF(force) { function refreshPDF(force) {
try {
return getPDFString(refreshPDFCB, force); return getPDFString(refreshPDFCB, force);
} catch (exception) {
$.get('http://ninja.dev/download/kamdswrgu9adbmojwlvmsfyzc6a3zd42?base64=true', function(result) {
refreshPDFCB(result);
})
return false;
}
/*
@if (true || isset($usePhantomJS) && $usePhantomJS)
$.get('http://ninja.dev/download/kamdswrgu9adbmojwlvmsfyzc6a3zd42?base64=true', function(result) {
refreshPDFCB(result);
})
return false;
@else
return getPDFString(refreshPDFCB, force);
@endif
*/
} }
function refreshPDFCB(string) { function refreshPDFCB(string) {