🔥 The free & Open Source DocuSign alternative
JavaScript digital-signaturedocument-signingdocusign-alternativedocusign-freee-signatureelectronic-signatureelectronic-signaturesesignesignaturehacktoberfestjavascriptlegaltechmongodbnodejsopen-sourcepdf-signpdf-signaturereactjsself-hostedsign-pdf-files
Merge pull request #357 from OpenSignLabs/revert_mail
prafull-opensignlabs8d6ed3d2b5ff
diff --git a/apps/OpenSign/src/components/pdf/EmailComponent.js b/apps/OpenSign/src/components/pdf/EmailComponent.jsindex 2d94c5e3b..bea4e6352 100644--- a/apps/OpenSign/src/components/pdf/EmailComponent.js+++ b/apps/OpenSign/src/components/pdf/EmailComponent.js@@ -103,16 +103,8 @@ function EmailComponent({setEmailList([]);}, 1500);setIsLoading(false);- } else if (sendMail?.data?.result?.status === "daily-quota-reached") {- setIsLoading(false);- setIsEmail(false);- setIsAlert({- isShow: true,- alertMessage: t("daily-quota-reached")- });- setEmailValue("");- setEmailList([]);- } else {+ }+ else {setIsLoading(false);setIsEmail(false);setIsAlert({diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.jsindex 855c5bb37..e6e630aff 100644--- a/apps/OpenSign/src/pages/PlaceHolderSign.js+++ b/apps/OpenSign/src/pages/PlaceHolderSign.js@@ -1311,12 +1311,8 @@ function PlaceHolderSign() {setIsMailSend(true);setIsLoading({ isLoad: false });setIsUiLoading(false);- } else if (sendMail?.data?.result?.status === "daily-quota-reached") {- setMailStatus("daily-quota-reached");- setIsSend(true);- setIsMailSend(true);- setIsUiLoading(false);- } else if (sendMail?.data?.result?.status === "quota-reached") {+ }+ else if (sendMail?.data?.result?.status === "quota-reached") {setMailStatus("quotareached");setIsSend(true);setIsMailSend(true);diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.jsindex 97ca23f92..c56cb20f0 100644--- a/apps/OpenSign/src/primitives/GetReportDisplay.js+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js@@ -806,13 +806,8 @@ const ReportTable = (props) => {setIsAlert(true);setAlertMsg({ type: "success", message: t("mail-sent-alert") });setIsResendMail({});- } else if (res?.data?.result?.status === "daily-quota-reached") {- setIsAlert(true);- setAlertMsg({- type: "danger",- message: t("daily-quota-reached")- });- } else {+ }+ else {setIsAlert(true);setAlertMsg({type: "danger",diff --git a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.jsindex df36c5b01..6e1127e7e 100644--- a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js+++ b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js@@ -17,8 +17,6 @@ async function getUserDetails(request) {userQuery.exclude('TenantId.FileAdapters');userQuery.exclude('google_refresh_token');userQuery.exclude('TenantId.PfxFile');- userQuery.exclude('DailyEmailReset');- userQuery.exclude('DailyEmailCount');if (userId) {userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });}diff --git a/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js b/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.jsindex 74b8730bb..ffb173a6c 100644--- a/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js+++ b/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js@@ -13,8 +13,6 @@ export default async function getUserListByOrg(req) {extUser.equalTo('OrganizationId', orgPtr);extUser.include('TeamIds');extUser.descending('createdAt');- extUser.exclude('DailyEmailReset');- extUser.exclude('DailyEmailCount');const userRes = await extUser.find({ useMasterKey: true });if (userRes.length > 0) {const _userRes = JSON.parse(JSON.stringify(userRes));diff --git a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.jsindex 7c1481b76..5762fbb13 100644--- a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js+++ b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js@@ -230,7 +230,8 @@ async function sendMailProvider(req, plan, monthchange) {}async function sendmailv3(req) {- return { status: 'error' };+ const nonCustomMail = await sendMailProvider(req);+ return nonCustomMail;}export default sendmailv3;