+
diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js
index f4dad1810..f192e34c5 100644
--- a/apps/OpenSign/src/pages/Login.js
+++ b/apps/OpenSign/src/pages/Login.js
@@ -58,11 +58,13 @@ function Login() {
}, []);
const saveLogo = async () => {
- const logo = await getAppLogo();
- if (logo) {
- setImage(logo);
- } else {
- setImage(appInfo?.applogo || undefined);
+ if (isEnableSubscription) {
+ const logo = await getAppLogo();
+ if (logo) {
+ setImage(logo);
+ } else {
+ setImage(appInfo?.applogo || undefined);
+ }
}
};
const handleChange = (event) => {
@@ -1070,7 +1072,6 @@ function Login() {
Digital Signature Request
This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + - sender + - " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ here.
Digital Signature Request
This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + + senderEmail + + " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ here.
Hi {{receiver_name}},
We hope this email finds you well. {{sender_name}} has requested you to review and sign {{document_title}}.
Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.
{{signing_url}}
If you have any questions or need further clarification regarding the document or the signing process, please contact the sender.
Thanks
Team OpenSign™
`; + if (tenantDetails?.RequestBody) { + setRequestBody(tenantDetails?.RequestBody); + setRequestSubject(tenantDetails?.RequestSubject); + + setDefaultBody(defaultRequestBody); + setDefaultSubject( + `{{senderName}} has requested you to sign {{documentName}}` + ); + } else { + setRequestBody(defaultRequestBody); + setRequestSubject( + `{{senderName}} has requested you to sign {{documentName}}` + ); + setDefaultBody(defaultRequestBody); + setDefaultSubject( + `{{senderName}} has requested you to sign {{documentName}}` + ); + } + } + } catch (e) { + alert("User does not exist"); + } + } else { + alert("User does not exist"); + } + }; + useEffect(() => { if (divRef.current) { const pdfWidth = pdfNewWidthFun(divRef); @@ -204,6 +256,7 @@ function PlaceHolderSign() { } //function for get document details const getDocumentDetails = async () => { + fetchTenantDetails(); //getting document details const documentData = await contractDocument(documentId); if (documentData && documentData.length > 0) { @@ -816,6 +869,7 @@ function PlaceHolderSign() { }; const sendEmailToSigners = async () => { + let htmlReqBody; setIsUiLoading(true); const pdfUrl = await embedPrefilllData(); setIsSendAlert({}); @@ -827,12 +881,15 @@ function PlaceHolderSign() { month: "long", year: "numeric" }); - let sender = pdfDetails?.[0].ExtUserPtr.Email; + + let senderEmail = pdfDetails?.[0]?.ExtUserPtr?.Email; + let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone; let signerMail = signersdata.slice(); if (pdfDetails?.[0]?.SendinOrder && pdfDetails?.[0]?.SendinOrder === true) { signerMail.splice(1); } + for (let i = 0; i < signerMail.length; i++) { try { const imgPng = @@ -857,40 +914,77 @@ function PlaceHolderSign() { ? pdfDetails[0].ExtUserPtr.Company : ""; const themeBGcolor = themeColor; + const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`; + const documentName = `${pdfDetails?.[0].Name}`; + let replaceVar; + if ( + requestBody && + requestSubject && + isCustomize && + (isSubscribe || !isEnableSubscription) + ) { + const replacedRequestBody = requestBody.replace(/"/g, "'"); + htmlReqBody = + "" + + replacedRequestBody + + " "; + + const variables = { + document_title: documentName, + sender_name: senderName, + sender_mail: senderEmail, + sender_phone: senderPhone, + receiver_name: signerMail[i].Name, + receiver_email: signerMail[i].Email, + receiver_phone: signerMail[i].Phone, + expiry_date: localExpireDate, + company_name: orgName, + signing_url: `Sign here` + }; + replaceVar = replaceMailVaribles( + requestSubject, + htmlReqBody, + variables + ); + } + let params = { extUserId: extUserId, recipient: signerMail[i].Email, - subject: `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign ${pdfDetails?.[0].Name}`, - from: sender, - html: - "
Digital Signature Request
This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + - sender + - " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ here.
Digital Signature Request
This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " + + senderEmail + + " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ here.
+
{isSendAlert.mssg === "sure" ? (
- {
}, []);
const saveLogo = async () => {
- const logo = await getAppLogo();
- if (logo) {
- setImage(logo);
- } else {
- setImage(appInfo?.applogo || undefined);
+ if (isEnableSubscription) {
+ const logo = await getAppLogo();
+ if (logo) {
+ setImage(logo);
+ } else {
+ setImage(appInfo?.applogo || undefined);
+ }
}
};
@@ -529,12 +531,7 @@ const Signup = () => {
Please add field for all recipients.
+ Please add field for all recipients. ) : isSendAlert.mssg === textWidget ? (Please confirm that you have filled the text field.
) : ( isSendAlert.mssg === "confirm" && ( -- Are you sure you want to send out this document for - signatures? -
+ <> ++ Are you sure you want to send out this document for + signatures? +
+ + <> + {
+ isSubscribe ||
+ (!isEnableSubscription &&
+ setIsCustomize(!isCustomize));
+ }}
+ >
+
+ Cutomize Email
+
+
+ {!isSubscribe && isEnableSubscription && (
+
+
+
+ {isCustomize &&
+ (!isEnableSubscription || isSubscribe) && (
+ <>
+ {
+ setRequestBody(defaultBody);
+ setRequestSubject(defaultSubject);
+ }}
+ >
+ Reset to default
+
+
+ )}
+
)
)}
+
- Yes
+ Send
)}
+
- 
+
diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js
index 3777a2467..3be0dc283 100644
--- a/apps/OpenSign/src/pages/SignyourselfPdf.js
+++ b/apps/OpenSign/src/pages/SignyourselfPdf.js
@@ -1,7 +1,7 @@
import React, { useState, useRef, useEffect } from "react";
import { PDFDocument } from "pdf-lib";
import "../styles/signature.css";
-import { themeColor } from "../constant/const";
+import { isEnableSubscription, themeColor } from "../constant/const";
import axios from "axios";
import Loader from "../primitives/LoaderWithMsg";
import loader from "../assets/images/loader2.gif";
@@ -26,7 +26,9 @@ import {
contactBook,
randomId,
getDate,
- textWidget
+ textWidget,
+ getTenantDetails,
+ checkIsSubscribed
} from "../constant/Utils";
import { useParams } from "react-router-dom";
import Tour from "reactour";
@@ -431,13 +433,13 @@ function SignYourSelf() {
Width: widgetTypeExist
? calculateInitialWidthHeight(dragTypeValue, widgetValue).getWidth
: dragTypeValue === "initials"
- ? defaultWidthHeight(dragTypeValue).width
- : "",
+ ? defaultWidthHeight(dragTypeValue).width
+ : "",
Height: widgetTypeExist
? calculateInitialWidthHeight(dragTypeValue, widgetValue).getHeight
: dragTypeValue === "initials"
- ? defaultWidthHeight(dragTypeValue).height
- : "",
+ ? defaultWidthHeight(dragTypeValue).height
+ : "",
options: addWidgetOptions(dragTypeValue)
};
@@ -595,9 +597,25 @@ function SignYourSelf() {
// console.log("signyourself", xyPostion);
//function for get digital signature
const signPdfFun = async (base64Url, documentId) => {
+ let isCustomCompletionMail = false;
+ const getIsSubscribe = await checkIsSubscribed();
+ const tenantDetails = await getTenantDetails(jsonSender.objectId);
+ if (tenantDetails && tenantDetails === "user does not exist!") {
+ alert("User does not exist");
+ } else {
+ if (
+ tenantDetails?.CompletionBody &&
+ tenantDetails?.CompletionSubject &&
+ (!isEnableSubscription || getIsSubscribe)
+ ) {
+ isCustomCompletionMail = true;
+ }
+ }
+
let singleSign = {
pdfFile: base64Url,
- docId: documentId
+ docId: documentId,
+ isCustomCompletionMail: isCustomCompletionMail
};
await axios
diff --git a/apps/OpenSign/src/primitives/ModalUi.js b/apps/OpenSign/src/primitives/ModalUi.js
index 7a7ef9aca..01b59d94b 100644
--- a/apps/OpenSign/src/primitives/ModalUi.js
+++ b/apps/OpenSign/src/primitives/ModalUi.js
@@ -1,4 +1,6 @@
import React from "react";
+import { isEnableSubscription } from "../constant/const";
+import PremiumAlertHeader from "./PremiumAlertHeader";
const ModalUi = ({
children,
@@ -8,12 +10,13 @@ const ModalUi = ({
handleClose,
showHeader = true,
showClose = true,
- styleClass
+ styleClass,
+ showHeaderMessage
}) => {
return (
<>
{isOpen && (
-
+
diff --git a/apps/OpenSign/src/primitives/Upgrade.js b/apps/OpenSign/src/primitives/Upgrade.js
index b21d43270..2df62fdef 100644
--- a/apps/OpenSign/src/primitives/Upgrade.js
+++ b/apps/OpenSign/src/primitives/Upgrade.js
@@ -1,7 +1,7 @@
import React from "react";
import { useNavigate } from "react-router-dom";
-function Upgrade() {
+function Upgrade({ message }) {
const navigation = useNavigate();
return (
@@ -10,7 +10,7 @@ function Upgrade() {
onClick={() => navigation("/subscription")}
className="text-blue-800 text-sm cursor-pointer hover:underline"
>
- Upgrade now
+ {message ? message : "Upgrade now"}
);
diff --git a/apps/OpenSign/src/styles/signature.css b/apps/OpenSign/src/styles/signature.css
index 7c901ff81..a9e7ef8e4 100644
--- a/apps/OpenSign/src/styles/signature.css
+++ b/apps/OpenSign/src/styles/signature.css
@@ -968,6 +968,9 @@ option {
}
}
+.scroll-hide::-webkit-scrollbar {
+ display: none;
+}
@media screen and (max-width: 350px) and (min-width: 311px) {
.signatureCanvas {
width: 280px;
diff --git a/apps/OpenSignServer/databases/migrations/20240408133151-update_contracts_document_cls.cjs b/apps/OpenSignServer/databases/migrations/20240408133151-update_contracts_document_cls.cjs
new file mode 100644
index 000000000..3c6ec8e71
--- /dev/null
+++ b/apps/OpenSignServer/databases/migrations/20240408133151-update_contracts_document_cls.cjs
@@ -0,0 +1,33 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async Parse => {
+ // TODO: set className here
+ const className = 'contracts_Document';
+ const schema = new Parse.Schema(className);
+ schema.addString('RequestBody');
+ schema.addString('RequestSubject');
+ // TODO: Set the schema here
+ // Example:
+ // schema.addString('name').addNumber('cash');
+
+ return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async Parse => {
+ // TODO: set className here
+ const className = 'contracts_Document';
+ const schema = new Parse.Schema(className);
+ schema.deleteField('RequestBody');
+ schema.deleteField('RequestSubject');
+ // TODO: Set the schema here
+ // Example:
+ // schema.deleteField('name').deleteField('cash');
+
+ return schema.update();
+};
)}
+ {!isEnableSubscription && showHeaderMessage && (
+
{children}