0) {
- const checkTourRequest =
- tourData?.some((data) => data?.requestSign) || false;
- setTourStatus(tourData);
- setRequestSignTour(checkTourRequest);
- } else {
- setRequestSignTour(false);
- }
- } catch (err) {
- console.log("err while getting tourstatus", err);
- }
- } else {
- //else condition to check current user exist in contracts_Users class and check tour message status
+ const sessionToken = localStorage.getItem("accesstoken");
+ if (sessionToken) {
+ //condition to check current user exist in contracts_Users class and check tour message status
//if not then check user exist in contracts_Contactbook class and check tour message status
const res = await contractUsers();
if (res === "Error: Something went wrong!") {
@@ -538,6 +512,33 @@ function PdfRequestFiles(
setHandleError(t("user-not-exist"));
}
}
+ } else if (!isEnableOTP) {
+ try {
+ const resContact = await axios.post(
+ `${localStorage.getItem("baseUrl")}functions/getcontact`,
+ { contactId: currUserId },
+ {
+ headers: {
+ "Content-Type": "application/json",
+ "X-Parse-Application-Id": localStorage.getItem("parseAppId")
+ }
+ }
+ );
+ const contact = resContact?.data?.result;
+ setContractName("_Contactbook");
+ setSignerUserId(contact?.objectId);
+ const tourData = contact?.TourStatus && contact?.TourStatus;
+ if (tourData && tourData.length > 0) {
+ const checkTourRequest =
+ tourData?.some((data) => data?.requestSign) || false;
+ setTourStatus(tourData);
+ setRequestSignTour(checkTourRequest);
+ } else {
+ setRequestSignTour(false);
+ }
+ } catch (err) {
+ console.log("err while getting tourstatus", err);
+ }
}
}
setIsUiLoading(false);
diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js
index c31d3c2bba..6d70ce351d 100644
--- a/apps/OpenSign/src/pages/PlaceHolderSign.js
+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js
@@ -246,12 +246,15 @@ function PlaceHolderSign() {
if (documentData && documentData.length > 0) {
if (documentData[0]?.Placeholders?.length > 0) {
const signerNotExist = documentData[0]?.Placeholders.some(
- (data) => !data.signerObjId
+ (data) => !data.signerObjId && data.Role !== "prefill"
);
//condition to check any role does not attach signer
if (signerNotExist) {
+ const filterPrefill = documentData[0]?.Placeholders?.filter(
+ (x) => x.Role !== "prefill"
+ );
let users = [];
- documentData[0]?.Placeholders?.forEach((element) => {
+ filterPrefill?.forEach((element) => {
let label = "";
const signerData = documentData[0]?.Signers.find(
(x) => element.signerObjId && element.signerObjId === x.objectId
@@ -272,6 +275,7 @@ function PlaceHolderSign() {
setForms(users);
}
}
+
const url = documentData[0] && documentData[0]?.URL;
//convert document url in array buffer format to use embed widgets in pdf using pdf-lib
const arrayBuffer = await convertPdfArrayBuffer(url);
@@ -1003,7 +1007,7 @@ function PlaceHolderSign() {
docCls.set("URL", pdfUrl);
}
const res = await docCls.save();
- if (res) {
+ if (res && pdfUrl) {
pdfDetails[0] = { ...pdfDetails[0], URL: pdfUrl };
}
} catch (e) {
@@ -1058,31 +1062,24 @@ function PlaceHolderSign() {
if (updateExpiryDate) {
data["ExpiryDate"] = { iso: updateExpiryDate, __type: "Date" };
}
- await axios
- .put(
- `${localStorage.getItem(
- "baseUrl"
- )}classes/contracts_Document/${documentId}`,
- data,
- {
- headers: {
- "Content-Type": "application/json",
- "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
- "X-Parse-Session-Token": localStorage.getItem("accesstoken")
- }
+ await axios.put(
+ `${localStorage.getItem(
+ "baseUrl"
+ )}classes/contracts_Document/${documentId}`,
+ data,
+ {
+ headers: {
+ "Content-Type": "application/json",
+ "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+ "X-Parse-Session-Token": localStorage.getItem("accesstoken")
}
- )
- .then(() => {
- setIsMailSend(true);
- setIsLoading({ isLoad: false });
- setIsUiLoading(false);
- setSignerPos([]);
- setIsSendAlert({ mssg: "confirm", alert: true });
- })
- .catch((err) => {
- console.log("axois err ", err);
- alert(t("something-went-wrong-mssg"));
- });
+ }
+ );
+ setIsMailSend(true);
+ setIsLoading({ isLoad: false });
+ setIsUiLoading(false);
+ setSignerPos([]);
+ setIsSendAlert({ mssg: "confirm", alert: true });
} catch (e) {
console.log("error", e);
alert(t("something-went-wrong-mssg"));
@@ -1934,7 +1931,9 @@ function PlaceHolderSign() {
}
};
const handleDisable = () => {
- const isAllSigner = signerPos.some((x) => !x.signerObjId);
+ const isAllSigner = signerPos.some(
+ (x) => !x.signerObjId && x.Role !== "prefill"
+ );
return isAllSigner;
};
const handleCloseAttachSigner = () => {
@@ -2133,7 +2132,7 @@ function PlaceHolderSign() {
{pdfDetails[0].SendinOrder ? (
{t("placeholder-mail-alert", {
- name: pdfDetails[0]?.Signers[0]?.Name
+ name: signersdata[0]?.Name
})}
) : (
@@ -2217,7 +2216,7 @@ function PlaceHolderSign() {
<>
{/* grid grid-cols-1 md:grid-cols-2 */}
-
+
{forms?.map((field, id) => {
return (
-
+
-
@@ -1713,7 +1887,6 @@ const TemplatePlaceholder = () => {
handleOnBlur={handleOnBlur}
title={t("roles")}
initial={true}
- isTemplateFlow={true}
sendInOrder={pdfDetails[0].SendinOrder}
setSignersData={setSignersData}
blockColor={blockColor}
@@ -1721,6 +1894,7 @@ const TemplatePlaceholder = () => {
setSignerPos={setSignerPos}
uniqueId={uniqueId}
setSelectWidgetId={setSelectWidgetId}
+ isTemplateFlow={true}
/>
) : (
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index c16c64499d..197ae059f8 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -312,6 +312,7 @@ const ReportTable = (props) => {
AutomaticReminders: Doc?.AutomaticReminders || false,
RemindOnceInEvery: Doc?.RemindOnceInEvery || 5,
IsEnableOTP: Doc?.IsEnableOTP || false,
+ TimeToCompleteDays: parseInt(Doc?.TimeToCompleteDays) || 15,
AllowModifications: Doc?.AllowModifications || false,
...SignatureType,
...NotifyOnSignatures,
diff --git a/apps/OpenSignServer/Utils.js b/apps/OpenSignServer/Utils.js
index ff1cb5c1f4..e29f946349 100644
--- a/apps/OpenSignServer/Utils.js
+++ b/apps/OpenSignServer/Utils.js
@@ -105,20 +105,29 @@ export const updateMailCount = async (extUserId, plan, monthchange) => {
try {
const contractUser = await query.first({ useMasterKey: true });
if (contractUser) {
+ const _extRes = JSON.parse(JSON.stringify(contractUser));
+ let updateDate = new Date();
+ if (_extRes?.LastEmailCountReset?.iso) {
+ updateDate = new Date(_extRes?.LastEmailCountReset?.iso);
+ const newDate = new Date();
+ // Update the month while keeping the same day and year
+ updateDate.setMonth(newDate.getMonth());
+ updateDate.setFullYear(newDate.getFullYear());
+ }
contractUser.increment('EmailCount', 1);
if (plan === 'freeplan') {
if (monthchange) {
- contractUser.set('LastEmailCountReset', new Date());
+ contractUser.set('LastEmailCountReset', updateDate);
contractUser.set('MonthlyFreeEmails', 1);
} else {
if (contractUser?.get('MonthlyFreeEmails')) {
contractUser.increment('MonthlyFreeEmails', 1);
if (contractUser?.get('LastEmailCountReset')) {
- contractUser.set('LastEmailCountReset', new Date());
+ contractUser.set('LastEmailCountReset', updateDate);
}
} else {
contractUser.set('MonthlyFreeEmails', 1);
- contractUser.set('LastEmailCountReset', new Date());
+ contractUser.set('LastEmailCountReset', updateDate);
}
}
}
diff --git a/apps/OpenSignServer/cloud/parsefunction/createDuplicate.js b/apps/OpenSignServer/cloud/parsefunction/createDuplicate.js
index 8877034115..ecfbeafaf7 100644
--- a/apps/OpenSignServer/cloud/parsefunction/createDuplicate.js
+++ b/apps/OpenSignServer/cloud/parsefunction/createDuplicate.js
@@ -71,12 +71,6 @@ export default async function createDuplicate(request) {
if (_templateRes?.SharedWith?.length > 0) {
newTemplate.set('SharedWith', _templateRes.SharedWith);
}
- if (_templateRes?.IsPublic) {
- newTemplate.set('IsPublic', _templateRes?.IsPublic);
- }
- if (_templateRes?.PublicRole?.length > 0) {
- newTemplate.set('PublicRole', _templateRes?.PublicRole);
- }
if (_templateRes?.IsTourEnabled) {
newTemplate.set('IsTourEnabled', _templateRes?.IsTourEnabled);
}
@@ -91,6 +85,9 @@ export default async function createDuplicate(request) {
if (_templateRes?.RedirectUrl) {
newTemplate.set('RedirectUrl', _templateRes?.RedirectUrl);
}
+ if (_templateRes?.TimeToCompleteDays) {
+ newTemplate.set('TimeToCompleteDays', parseInt(_templateRes?.TimeToCompleteDays));
+ }
const acl = templateRes.getACL();
if (acl) {
newTemplate.setACL(acl);
diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js
index 0b4aafbcb4..bc5c1d17da 100644
--- a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js
+++ b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.js
@@ -246,7 +246,7 @@ async function sendMailsaveCertifcate(
P12Buffer,
isCustomMail,
mailProvider,
- filename
+ filename,
) {
const certificate = await GenerateCertificate(doc);
const certificatePdf = await PDFDocument.load(certificate);
@@ -440,7 +440,7 @@ async function PDF(req) {
P12Buffer,
isCustomMail,
mailProvider,
- name
+ name,
);
}
// `fs.unlinkSync` is used to remove exported signed pdf file from exports folder
diff --git a/apps/OpenSignServer/index.js b/apps/OpenSignServer/index.js
index ce4105cd4f..3352e138b2 100644
--- a/apps/OpenSignServer/index.js
+++ b/apps/OpenSignServer/index.js
@@ -148,6 +148,8 @@ export const config = {
: {}),
filesAdapter: fsAdapter,
auth: { google: { enabled: true }, sso: SSOAuth },
+ // for fix Adapter prototype don't match expected prototype
+ push: { queueOptions: { disablePushWorker: true } },
};
// Client-keys like the javascript key or the .NET key are not necessary with parse-server
// If you wish you require them, you can set them as options in the initialization above: