From b2c1aae5374c8f54a95ad1cff2188e20c65a4685 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 18 Feb 2018 20:15:37 +0200 Subject: [PATCH] Fix for phantomjs w/signature --- resources/views/invoices/view.blade.php | 33 +++++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php index 3c8843df4139..58044328a111 100644 --- a/resources/views/invoices/view.blade.php +++ b/resources/views/invoices/view.blade.php @@ -231,6 +231,25 @@ window['pjsc_meta'].remainingTasks++; } + function waitForSignature() { + if (window.signatureAsPNG) { + writePdfAsString(); + } else { + window.setTimeout(waitForSignature, 100); + } + } + + function writePdfAsString() { + doc = getPDFString(); + doc.getDataUrl(function(pdfString) { + document.write(pdfString); + document.close(); + if (window.hasOwnProperty('pjsc_meta')) { + window['pjsc_meta'].remainingTasks--; + } + }); + } + $(function() { @if (Input::has('phantomjs')) @if (Input::has('phantomjs_balances')) @@ -240,14 +259,12 @@ window['pjsc_meta'].remainingTasks--; } @else - doc = getPDFString(); - doc.getDataUrl(function(pdfString) { - document.write(pdfString); - document.close(); - if (window.hasOwnProperty('pjsc_meta')) { - window['pjsc_meta'].remainingTasks--; - } - }); + @if ($account->signature_on_pdf) + refreshPDF(); + waitForSignature(); + @else + writePdfAsString(); + @endif @endif @else refreshPDF();