Skip to content

Commit 20c21cb

Browse files
prafull-opensignlabsprafull-opensignlabs
authored
Merge pull request #1279 from OpenSignLabs/form-layout
fix: unexpected finish button visible after finish signature in disable otp public signing flow
2 parents d2de889 + 05cf3ef commit 20c21cb

File tree

9 files changed

+17
-16
lines changed

9 files changed

+17
-16
lines changed

‎apps/OpenSign/src/pages/PdfRequestFiles.js‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ function PdfRequestFiles(props) {
429429

430430
currUserId = getCurrentSigner?.objectId
431431
? getCurrentSigner.objectId
432-
: contactBookId || "";
432+
: signerObjectId || "";
433433
if (isEnableSubscription) {
434434
await checkIsSubscribed(
435435
documentData[0]?.ExtUserPtr?.objectId,
@@ -1013,7 +1013,7 @@ function PdfRequestFiles(props) {
10131013
receiver_phone: user.Phone,
10141014
expiry_date: localExpireDate,
10151015
company_name: orgName,
1016-
signing_url: `<a href=${signPdf}>Sign here</a>`
1016+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
10171017
};
10181018
replaceVar = replaceMailVaribles(
10191019
requestSubject,
@@ -1047,7 +1047,7 @@ function PdfRequestFiles(props) {
10471047
orgName +
10481048
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
10491049
localExpireDate +
1050-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
1050+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
10511051
signPdf +
10521052
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
10531053
senderEmail +
@@ -1517,10 +1517,11 @@ function PdfRequestFiles(props) {
15171517
} else {
15181518
setIsPublicContact(false);
15191519
setIsPublicTemplate(false);
1520-
setIsLoading({ isLoad: false });
1520+
setLoading(false);
15211521
setDocumentId(userRes.data?.result?.docId);
15221522
getDocumentDetails(userRes?.data?.result?.docId);
1523-
contactBookId = userRes?.data?.result?.contactId || "";
1523+
const contactId = userRes.data.result?.contactId;
1524+
setSignerObjectId(contactId);
15241525
}
15251526
} else {
15261527
console.log("error in public-sign to create user details");

‎apps/OpenSign/src/pages/PlaceHolderSign.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,7 +1121,7 @@ function PlaceHolderSign() {
11211121
receiver_phone: signerMail[i]?.Phone || "",
11221122
expiry_date: localExpireDate,
11231123
company_name: orgName,
1124-
signing_url: `<a href=${signPdf}>Sign here</a>`
1124+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
11251125
};
11261126
replaceVar = replaceMailVaribles(
11271127
requestSubject,
@@ -1155,7 +1155,7 @@ function PlaceHolderSign() {
11551155
orgName +
11561156
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expire on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
11571157
localExpireDate +
1158-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
1158+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
11591159
signPdf +
11601160
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
11611161
senderEmail +

‎apps/OpenSign/src/primitives/GetReportDisplay.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,7 @@ const ReportTable = (props) => {
711711
receiver_phone: userDetails?.Phone || "",
712712
expiry_date: localExpireDate,
713713
company_name: doc.ExtUserPtr.Company,
714-
signing_url: `<a href=${signPdf}>Sign here</a>`
714+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
715715
};
716716
const res = replaceMailVaribles(subject, "", variables);
717717

@@ -740,7 +740,7 @@ const ReportTable = (props) => {
740740
receiver_phone: userDetails?.Phone || "",
741741
expiry_date: localExpireDate,
742742
company_name: doc.ExtUserPtr.Company,
743-
signing_url: `<a href=${signPdf}>Sign here</a>`
743+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
744744
};
745745
const res = replaceMailVaribles("", body, variables);
746746

@@ -781,7 +781,7 @@ const ReportTable = (props) => {
781781
receiver_phone: user?.signerPtr?.Phone || "",
782782
expiry_date: localExpireDate,
783783
company_name: doc?.ExtUserPtr?.Company || "",
784-
signing_url: `<a href=${signPdf}>Sign here</a>`
784+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
785785
};
786786

787787
const subject =

‎apps/OpenSignServer/cloud/customRoute/autoReminder.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ async function sendMail(doc, signer) {
5353
receiver_phone: signer?.Phone || '',
5454
expiry_date: localExpireDate,
5555
company_name: doc?.ExtUserPtr?.Company || '',
56-
signing_url: `<a href=${signPdf}>Sign here</a>`,
56+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
5757
};
5858
const mail = replaceMailVaribles(subject, body, variables);
5959

‎apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ export default async function createDocumentWithTemplate(request, response) {
269269
orgName +
270270
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
271271
localExpireDate +
272-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
272+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
273273
signPdf +
274274
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
275275
sender +

‎apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ export default async function createDocumentwithCoordinate(request, response) {
325325
orgName +
326326
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
327327
localExpireDate +
328-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
328+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
329329
signPdf +
330330
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
331331
sender +

‎apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export default async function resendMail(request, response) {
8686
orgName +
8787
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
8888
localExpireDate +
89-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
89+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
9090
signPdf +
9191
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
9292
sender +

‎apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ const sendMailToAllSigners = async docId => {
168168
receiver_phone: signerMail[i]?.Phone || '',
169169
expiry_date: localExpireDate,
170170
company_name: orgName,
171-
signing_url: `<a href=${signPdf}>Sign here</a>`,
171+
signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
172172
};
173173
replaceVar = replaceMailVaribles(requestSubject, htmlReqBody, variables);
174174
}

‎apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ async function sendMail(document, sessionToken) {
9595
orgName +
9696
"</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
9797
localExpireDate +
98-
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
98+
"</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
9999
signPdf +
100100
"> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white; border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
101101
sender +

0 commit comments

Comments
 (0)