refactor: change variable from isDisableOTP to isEnableOTP

Author: prafull-opensignlabs

apps/OpenSign/public/locales/en/translation.json

@@ -639,8 +639,8 @@
   "sent-this-month":"Sent this month",
   "available-seats":"Available seats",
   "buy-users":"Buy more users",
-  "isdisable-otp": "Enable OTP verification",
-  "isdisable-otp-help": {
+  "isenable-otp": "Enable OTP verification",
+  "isenable-otp-help": {
     "p1": "Would you like to enable the verification process using a one-time password (OTP)?",
     "p2": "Selecting this option will enable OTP verification. Users will receive a verification code via email, which they must enter to sign the document.",
     "p3": "Selecting this option will disable OTP verification, allowing users to sign the document directly without additional steps.",

apps/OpenSign/public/locales/fr/translation.json

@@ -638,8 +638,8 @@
   "sent-this-month":"envoyé ce mois-ci",
   "available-seats":"Disponible sièges",
   "buy-users":"Acheter plus d'utilisateurs",
-  "isdisable-otp": "Activer la vérification OTP",
-  "isdisable-otp-help": {
+  "isenable-otp": "Activer la vérification OTP",
+  "isenable-otp-help": {
     "p1": "Souhaitez-vous activer le processus de vérification à l'aide d'un mot de passe à usage unique (OTP)?",
     "p2": "La sélection de cette option activera la vérification OTP. Les utilisateurs recevront un code de vérification par e-mail, qu'ils devront saisir pour signer le document.",
     "p3": "La sélection de cette option désactivera la vérification OTP, permettant aux utilisateurs de signer le document directement sans étapes supplémentaires.",

apps/OpenSign/src/components/pdf/EditTemplate.js

@@ -3,6 +3,8 @@ import { checkIsSubscribed, getFileName } from "../../constant/Utils";
 import Upgrade from "../../primitives/Upgrade";
 import { isEnableSubscription } from "../../constant/const";
 import { useTranslation } from "react-i18next";
+import { Tooltip } from "react-tooltip";
+
 // import SelectFolder from "../../premitives/SelectFolder";
 
 const EditTemplate = ({ template, onSuccess }) => {
@@ -14,7 +16,8 @@ const EditTemplate = ({ template, onSuccess }) => {
     Description: template?.Description || "",
     SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
     AutomaticReminders: template?.AutomaticReminders || false,
-    RemindOnceInEvery: template?.RemindOnceInEvery || 5
+    RemindOnceInEvery: template?.RemindOnceInEvery || 5,
+    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false"
   });
   const [isSubscribe, setIsSubscribe] = useState(false);
   useEffect(() => {
@@ -184,6 +187,70 @@ const EditTemplate = ({ template, onSuccess }) => {
               />
             </div>
           )}
+          {isEnableSubscription && (
+            <div className="text-xs mt-2">
+              <label className="block">
+                <span className={isSubscribe ? "" : " text-gray-300"}>
+                  {t("isenable-otp")}{" "}
+                  <a data-tooltip-id="isenableotp-tooltip" className="ml-1">
+                    <sup>
+                      <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                    </sup>
+                  </a>{" "}
+                  {!isSubscribe && isEnableSubscription && <Upgrade />}
+                </span>
+                <Tooltip id="isenableotp-tooltip" className="z-50">
+                  <div className="max-w-[200px] md:max-w-[450px]">
+                    <p className="font-bold">{t("isenable-otp")}</p>
+                    <p>{t("isenable-otp-help.p1")}</p>
+                    <p className="p-[5px]">
+                      <ol className="list-disc">
+                        <li>
+                          <span className="font-bold">{t("yes")}: </span>
+                          <span>{t("isenable-otp-help.p2")}</span>
+                        </li>
+                        <li>
+                          <span className="font-bold">{t("no")}: </span>
+                          <span>{t("isenable-otp-help.p3")}</span>
+                        </li>
+                      </ol>
+                    </p>
+                    <p>{t("isenable-otp-help.p4")}</p>
+                  </div>
+                </Tooltip>
+              </label>
+              <div
+                className={`${
+                  isSubscribe ? "" : "pointer-events-none opacity-50"
+                } flex items-center gap-2 ml-2 mb-1 `}
+              >
+                <input
+                  type="radio"
+                  value={"true"}
+                  className="op-radio op-radio-xs"
+                  name="IsEnableOTP"
+                  checked={formData.IsEnableOTP === "true"}
+                  onChange={handleStrInput}
+                />
+                <div className="text-center">{t("yes")}</div>
+              </div>
+              <div
+                className={`${
+                  isSubscribe ? "" : "pointer-events-none opacity-50"
+                } flex items-center gap-2 ml-2 mb-1 `}
+              >
+                <input
+                  type="radio"
+                  value={"false"}
+                  name="IsEnableOTP"
+                  className="op-radio op-radio-xs"
+                  checked={formData.IsEnableOTP === "false"}
+                  onChange={handleStrInput}
+                />
+                <div className="text-center">{t("no")}</div>
+              </div>
+            </div>
+          )}
           <div className="mt-[1rem] flex justify-start">
             <button type="submit" className="op-btn op-btn-primary">
               {t("submit")}

apps/OpenSign/src/constant/Utils.js

@@ -2045,7 +2045,7 @@ export const handleDownloadPdf = async (
 ) => {
   const pdfName = pdfDetails[0] && pdfDetails[0].Name;
   setIsDownloading("pdf");
-  const docId = pdfDetails?.[0]?.IsDisableOTP ? pdfDetails?.[0]?.objectId : "";
+  const docId = !pdfDetails?.[0]?.IsEnableOTP ? pdfDetails?.[0]?.objectId : "";
   try {
     // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
     const axiosRes = await axios.post(
@@ -2082,10 +2082,8 @@ export const handleToPrint = async (
 ) => {
   event.preventDefault();
   setIsDownloading("pdf");
+  const docId = !pdfDetails?.[0]?.IsEnableOTP ? pdfDetails?.[0]?.objectId : "";
   try {
-    const docId = pdfDetails?.[0]?.IsDisableOTP
-      ? pdfDetails?.[0]?.objectId
-      : "";
     // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
     //`localStorage.getItem("baseUrl")` is also use in public-profile flow for public-sign
     //if we give this `appInfo.baseUrl` as a base url then in public-profile it will create base url of it's window.location.origin ex- opensign.me which is not base url

apps/OpenSign/src/pages/Form.js

@@ -62,7 +62,7 @@ const Forms = (props) => {
     file: "",
     remindOnceInEvery: 5,
     autoreminder: false,
-    IsDisableOTP: "false"
+    IsEnableOTP: "false"
   });
   const [fileupload, setFileUpload] = useState("");
   const [fileload, setfileload] = useState(false);
@@ -404,11 +404,11 @@ const Forms = (props) => {
           object.set("AutomaticReminders", formData.autoreminder);
           object.set("RemindOnceInEvery", parseInt(formData.remindOnceInEvery));
           if (isEnableSubscription) {
-            const IsDisableOTP =
-              formData.IsDisableOTP === "false" ? true : false;
-            object.set("IsDisableOTP", IsDisableOTP);
+            const IsEnableOTP =
+              formData?.IsEnableOTP === "false" ? false : true;
+            object.set("IsEnableOTP", IsEnableOTP);
           } else {
-            object.set("IsDisableOTP", true);
+            object.set("IsEnableOTP", false);
           }
         }
         object.set("URL", fileupload);
@@ -446,7 +446,7 @@ const Forms = (props) => {
             file: "",
             remindOnceInEvery: 5,
             autoreminder: false,
-            IsDisableOTP: "false"
+            IsEnableOTP: "false"
           });
           setFileUpload("");
           setpercentage(0);
@@ -496,7 +496,7 @@ const Forms = (props) => {
       file: "",
       remindOnceInEvery: 5,
       autoreminder: false,
-      IsDisableOTP: "false"
+      IsEnableOTP: "false"
     });
     setFileUpload("");
     setpercentage(0);
@@ -896,9 +896,9 @@ const Forms = (props) => {
                       <div className="text-xs mt-2">
                         <label className="block">
                           <span className={isSubscribe ? "" : " text-gray-300"}>
-                            {t("isdisable-otp")}{" "}
+                            {t("isenable-otp")}{" "}
                             <a
-                              data-tooltip-id="isdisableotp-tooltip"
+                              data-tooltip-id="isenableotp-tooltip"
                               className="ml-1"
                             >
                               <sup>
@@ -909,27 +909,27 @@ const Forms = (props) => {
                               <Upgrade />
                             )}
                           </span>
-                          <Tooltip id="isdisableotp-tooltip" className="z-50">
+                          <Tooltip id="isenableotp-tooltip" className="z-50">
                             <div className="max-w-[200px] md:max-w-[450px]">
-                              <p className="font-bold">{t("isdisable-otp")}</p>
-                              <p>{t("isdisable-otp-help.p1")}</p>
+                              <p className="font-bold">{t("isenable-otp")}</p>
+                              <p>{t("isenable-otp-help.p1")}</p>
                               <p className="p-[5px]">
                                 <ol className="list-disc">
                                   <li>
                                     <span className="font-bold">
                                       {t("yes")}:{" "}
                                     </span>
-                                    <span>{t("isdisable-otp-help.p2")}</span>
+                                    <span>{t("isenable-otp-help.p2")}</span>
                                   </li>
                                   <li>
                                     <span className="font-bold">
                                       {t("no")}:{" "}
                                     </span>
-                                    <span>{t("isdisable-otp-help.p3")}</span>
+                                    <span>{t("isenable-otp-help.p3")}</span>
                                   </li>
                                 </ol>
                               </p>
-                              <p>{t("isdisable-otp-help.p4")}</p>
+                              <p>{t("isenable-otp-help.p4")}</p>
                             </div>
                           </Tooltip>
                         </label>
@@ -942,8 +942,8 @@ const Forms = (props) => {
                             type="radio"
                             value={"true"}
                             className="op-radio op-radio-xs"
-                            name="IsDisableOTP"
-                            checked={formData.IsDisableOTP === "true"}
+                            name="IsEnableOTP"
+                            checked={formData.IsEnableOTP === "true"}
                             onChange={handleStrInput}
                           />
                           <div className="text-center">{t("yes")}</div>
@@ -956,9 +956,9 @@ const Forms = (props) => {
                           <input
                             type="radio"
                             value={"false"}
-                            name="IsDisableOTP"
+                            name="IsEnableOTP"
                             className="op-radio op-radio-xs"
-                            checked={formData.IsDisableOTP === "false"}
+                            checked={formData.IsEnableOTP === "false"}
                             onChange={handleStrInput}
                           />
                           <div className="text-center">{t("no")}</div>
@@ -969,15 +969,16 @@ const Forms = (props) => {
                 )}
               </div>
             )}
-            <div
-              onClick={() => setIsAdvanceOpt(!isAdvanceOpt)}
-              className={`mt-2.5 op-link op-link-primary text-sm`}
-            >
-              {isAdvanceOpt
-                ? t("hide-advanced-options")
-                : t("advanced-options")}
-            </div>
-
+            {props.title !== "Sign Yourself" && (
+              <div
+                onClick={() => setIsAdvanceOpt(!isAdvanceOpt)}
+                className={`mt-2.5 op-link op-link-primary text-sm`}
+              >
+                {isAdvanceOpt
+                  ? t("hide-advanced-options")
+                  : t("advanced-options")}
+              </div>
+            )}
             <div className="flex items-center mt-3 gap-2">
               <button
                 className={`${

apps/OpenSign/src/pages/GuestLogin.js

@@ -194,11 +194,11 @@ function GuestLogin() {
       setLoading(true);
       const linkContactRes = await Parse.Cloud.run("linkcontacttodoc", params);
       setContactId(linkContactRes.contactId);
-      const isDisableOTP = await navigateToDoc(
+      const IsEnableOTP = await navigateToDoc(
         documentId,
         linkContactRes.contactId
       );
-      if (!isDisableOTP) {
+      if (!IsEnableOTP) {
         setEnterOtp(true);
         await SendOtp();
       }

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -579,8 +579,8 @@ function PdfRequestFiles(props) {
         ) {
           setRequestSignTour(true);
         } else {
-          const isDisableOTP = documentData?.[0]?.IsDisableOTP || false;
-          if (isDisableOTP) {
+          const isEnableOTP = documentData?.[0]?.IsEnableOTP || false;
+          if (!isEnableOTP) {
             try {
               const resContact = await axios.post(
                 `${localStorage.getItem("baseUrl")}functions/getcontact`,
@@ -682,9 +682,9 @@ function PdfRequestFiles(props) {
     );
     let currentUser = JSON.parse(localuser);
     let isEmailVerified = currentUser?.emailVerified;
-    const isDisableOTP = pdfDetails?.[0]?.IsDisableOTP || false;
+    const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;
     //if emailVerified data is not present in local user details then fetch again in _User class
-    if (!isDisableOTP) {
+    if (isEnableOTP) {
       try {
         if (!currentUser?.emailVerified) {
           const userQuery = new Parse.Query(Parse.User);
@@ -704,7 +704,7 @@ function PdfRequestFiles(props) {
       }
     }
     //check if isEmailVerified then go on next step
-    if (isDisableOTP || isEmailVerified) {
+    if (!isEnableOTP || isEmailVerified) {
       try {
         const checkUser = signerPos.filter(
           (data) => data.signerObjId === signerObjectId
@@ -1318,8 +1318,8 @@ function PdfRequestFiles(props) {
   const closeRequestSignTour = async () => {
     setRequestSignTour(true);
     if (isDontShow) {
-      const isDisableOTP = pdfDetails?.[0]?.IsDisableOTP || false;
-      if (isDisableOTP) {
+      const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;
+      if (!isEnableOTP) {
         try {
           await axios.post(
             `${localStorage.getItem("baseUrl")}functions/updatecontacttour`,

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -267,7 +267,7 @@ const ReportTable = (props) => {
                 SendinOrder: Doc?.SendinOrder || false,
                 AutomaticReminders: Doc?.AutomaticReminders || false,
                 RemindOnceInEvery: Doc?.RemindOnceInEvery || 5,
-                IsDisableOTP: Doc?.IsDisableOTP || false
+                IsEnableOTP: Doc?.IsEnableOTP || false
               };
               try {
                 const res = await axios.post(

apps/OpenSign/src/script/locales/en/translation.json

@@ -636,8 +636,8 @@
   "sent-this-month": "Sent this month",
   "available-seats": "Available seats",
   "buy-users": "Buy more users",
-  "isdisable-otp": "Enable OTP verification",
-  "isdisable-otp-help": {
+  "isenable-otp": "Enable OTP verification",
+  "isenable-otp-help": {
     "p1": "Would you like to enable the verification process using a one-time password (OTP)?",
     "p2": "Selecting this option will enable OTP verification. Users will receive a verification code via email, which they must enter to sign the document.",
     "p3": "Selecting this option will disable OTP verification, allowing users to sign the document directly without additional steps.",

apps/OpenSign/src/script/locales/fr/translation.json

@@ -635,8 +635,8 @@
   "sent-this-month": "envoyé ce mois-ci",
   "available-seats": "Disponible sièges",
   "buy-users": "Acheter plus d'utilisateurs",
-  "isdisable-otp": "Activer la vérification OTP",
-  "isdisable-otp-help": {
+  "isenable-otp": "Activer la vérification OTP",
+  "isenable-otp-help": {
     "p1": "Souhaitez-vous activer le processus de vérification à l'aide d'un mot de passe à usage unique (OTP)?",
     "p2": "La sélection de cette option activera la vérification OTP. Les utilisateurs recevront un code de vérification par e-mail, qu'ils devront saisir pour signer le document.",
     "p3": "La sélection de cette option désactivera la vérification OTP, permettant aux utilisateurs de signer le document directement sans étapes supplémentaires.",