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

Handle second user signature

Browse Source
This commit is contained in:
Hillel Coren 2017-12-28 10:02:59 +02:00
parent 7012b6c87e
commit 39f206245c
4 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
public/built.js
View File

File diff suppressed because one or more lines are too long

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

26
resources/assets/js/pdf.pdfmake.js
View File

@ -370,7 +370,18 @@ NINJA.signatureImage = function(invoice) {
return blankImage; return blankImage;
} }
return invoice.invitations[0].signature_base64 || blankImage; for (var i=0; i<invoice.invitations.length; i++) {
var invitation = invoice.invitations[i];
if (invitation.signature_base64) {
break;
}
}
if (! invitation.signature_base64) {
return blankImage;
}
return invitation.signature_base64 || blankImage;
} }
NINJA.signatureDate = function(invoice) { NINJA.signatureDate = function(invoice) {
@ -382,7 +393,18 @@ NINJA.signatureDate = function(invoice) {
return ''; return '';
} }
var date = invoice.invitations[0].signature_date; for (var i=0; i<invoice.invitations.length; i++) {
var invitation = invoice.invitations[i];
if (invitation.signature_base64) {
break;
}
}
if (! invitation.signature_base64) {
return '';
}
var date = invitation.signature_date;
return NINJA.formatDateTime(date, invoice.account); return NINJA.formatDateTime(date, invoice.account);
} }

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

@ -187,7 +187,18 @@
return invoice; return invoice;
} }
var sourceSVG = invoice.invitations[0].signature_base64; for (var i=0; i<invoice.invitations.length; i++) {
var invitation = invoice.invitations[i];
if (invitation.signature_base64) {
break;
}
}
if (! invitation.signature_base64) {
return invoice;
}
var sourceSVG = invitation.signature_base64;
if (! sourceSVG || sourceSVG.indexOf('data:image') == 0) { if (! sourceSVG || sourceSVG.indexOf('data:image') == 0) {
return invoice; return invoice;
} }