Merge pull request #1627 from OpenSignLabs/updates-13647519163

Merge pull request #357 from OpenSignLabs/revert_mail

Author: prafull-opensignlabs

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({

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);

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",

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 });
       }

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));

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;