Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into raktima-patch-2

.all-contributorsrc

@@ -232,15 +232,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "1024mb",
-      "name": "1024mb",
-      "avatar_url": "https://avatars.githubusercontent.com/u/9301204?v=4",
-      "profile": "https://github.com/1024mb",
-      "contributions": [
-        "translation"
-      ]
     }
   ]
 }

README.md

@@ -147,8 +147,7 @@ We would like to thank all our contributors and users for their support and feed
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/VikramNagwal"><img src="https://avatars.githubusercontent.com/u/123088024?v=4?s=100" width="100px;" alt="Vikram"/><br /><sub><b>Vikram</b></sub></a><br /><a href="#code-VikramNagwal" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ugoconsonni"><img src="https://avatars.githubusercontent.com/u/13661702?v=4?s=100" width="100px;" alt="ugoconsonni"/><br /><sub><b>ugoconsonni</b></sub></a><br /><a href="#code-ugoconsonni" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/daniel-mutwiri"><img src="https://avatars.githubusercontent.com/u/8936960?v=4?s=100" width="100px;" alt="Daniel Mutwiri"/><br /><sub><b>Daniel Mutwiri</b></sub></a><br /><a href="#code-daniel-mutwiri" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a><a href="#security-Zathiel" title="Security">🛡️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/1024mb"><img src="https://avatars.githubusercontent.com/u/9301204?v=4?s=100" width="100px;" alt="1024mb"/><br /><sub><b>1024mb</b></sub></a><br /><a href="#translation-1024mb" title="Translation">🌍</a></td>
     </tr>
   </tbody>
 </table>

apps/OpenSign/package.json

@@ -4,16 +4,16 @@
   "private": true,
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.9.3",
+    "@lottiefiles/dotlottie-react": "^0.9.0",
     "@pdf-lib/fontkit": "^1.1.1",
-    "@radix-ui/themes": "^3.1.4",
+    "@radix-ui/themes": "^3.1.3",
     "@react-pdf/renderer": "^4.0.0",
-    "@reduxjs/toolkit": "^2.3.0",
+    "@reduxjs/toolkit": "^2.2.7",
     "axios": "^1.7.7",
     "file-saver": "^2.0.5",
-    "i18next": "^23.16.5",
+    "i18next": "^23.15.1",
     "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^2.6.2",
+    "i18next-http-backend": "^2.6.1",
     "jszip": "^3.10.1",
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
@@ -23,10 +23,10 @@
     "print-js": "^1.6.0",
     "radix-ui": "^1.0.1",
     "react": "^18.2.0",
-    "react-bootstrap": "^2.10.5",
+    "react-bootstrap": "^2.10.4",
     "react-confetti": "^6.1.0",
-    "react-cookie": "^7.2.2",
+    "react-cookie": "^7.2.0",
-    "react-datepicker": "^7.5.0",
+    "react-datepicker": "^7.4.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dnd-multi-backend": "^8.0.3",
@@ -34,25 +34,25 @@
     "react-dom": "^18.2.0",
     "react-gtm-module": "^2.0.11",
     "react-helmet": "^6.1.0",
-    "react-i18next": "^15.0.3",
+    "react-i18next": "^15.0.2",
     "react-konva": "^18.2.10",
     "react-pdf": "^9.1.1",
-    "react-quill-new": "^3.3.3",
+    "react-quill-new": "^3.3.2",
     "react-redux": "^9.1.2",
     "react-rnd": "^10.4.13",
-    "react-router-dom": "^6.27.0",
+    "react-router-dom": "^6.26.2",
     "react-scripts": "5.0.1",
     "react-scrollbars-custom": "^4.1.1",
-    "react-select": "^5.8.3",
+    "react-select": "^5.8.1",
     "react-signature-canvas": "^1.0.6",
-    "react-syntax-highlighter": "^15.6.1",
+    "react-syntax-highlighter": "^15.5.0",
     "react-tooltip": "^5.28.0",
     "react-web-share": "^2.0.2",
     "reactour": "^1.19.4",
     "redux": "^5.0.1",
     "redux-thunk": "^3.1.0",
     "regex-parser": "^2.3.0",
-    "serve": "^14.2.4",
+    "serve": "^14.2.3",
     "styled-components": "^5.3.0",
     "web-vitals": "^4.2.3",
     "ws": "^8.18.0"
@@ -95,36 +95,33 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.25.9",
+    "@babel/preset-react": "^7.24.7",
-    "@babel/runtime-corejs2": "^7.26.0",
+    "@babel/runtime-corejs2": "^7.25.6",
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
     "clean-webpack-plugin": "^4.0.0",
-    "commitizen": "^4.3.1",
+    "commitizen": "^4.3.0",
     "concurrently": "^9.0.1",
     "css-loader": "^7.1.2",
-    "daisyui": "^4.12.14",
+    "daisyui": "^4.12.10",
     "dotenv": "^16.4.5",
     "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.13.0",
+    "eslint": "^9.11.1",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react": "^7.36.1",
     "lint-staged": "^15.2.10",
     "mini-css-extract-plugin": "^2.9.1",
-    "postcss": "^8.4.48",
+    "postcss": "^8.4.47",
     "prettier": "^3.3.3",
     "pretty-quick": "^4.0.0",
-    "tailwindcss": "^3.4.14",
+    "tailwindcss": "^3.4.13",
     "terser-webpack-plugin": "^5.3.10",
     "webpack-cli": "^5.1.4"
   },
   "overrides": {
     "nth-check": "$nth-check",
     "ws": "$ws"
-  },
-  "engines": {
-    "node": "18 || 20 || 22"
   }
 }

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

@@ -94,7 +94,6 @@
       "My Signature": "My Signature",
       "API Token": "API Token",
       "Webhook": "Webhook",
-      "Preferences": "Preferences",
       "Teams": "Teams",
       "Team-update-successfully": "Team Updated successfully.",
       "Users": "Users"
@@ -133,8 +132,7 @@
     "View": "View",
     "option": "Option",
     "Embed": "Embed",
-    "Copy TemplateId":"Copy TemplateId",
+    "Copy TemplateId":"Copy TemplateId"
-    "Copy Public URL":"Copy Public URL"
   },
   "report-heading": {
     "Sr.No": "Sr.No",
@@ -266,10 +264,10 @@
   "make-template-public-alert": "Are you sure you want to make this template public?",
   "make-template-private-alert": "Are you sure you want to make this template private? This will remove it from your public profile.",
   "public-role": "Public role",
-  "public-url": "Public profile needed",
+  "public-url": "Public URL",
   "public-url-copy": "Here’s your public URL: ",
   "public-url-copy-mssg":"Copy it or share it with the signer, and you will be able to see all your publicly set templates.",
-  "add-public-url-alert": "Please complete your OpenSign public profile setup. Once done, you’ll be able to make templates public. This process only needs to be completed once.",
+  "add-public-url-alert": "Please add your public URL, and you will be able to make a public template.",
   "share-with-alert": "You cannot share a template if any roles already have contacts assigned. Please remove all contact assignments from the roles before sharing the template.",
   "share-with": "Share with",
   "team-not-found": "Team not found",
@@ -292,7 +290,7 @@
   "subject": "Subject",
   "body": "Body",
   "add-contact": "Add Contact",
-  "add-signer-alert": "Contact already exist! Please select it from ‘Signers’ dropdown",
+  "add-signer-alert": "Contact already exist!",
   "record-delete-alert": "Record deleted successfully!",
   "record-revoke-alert": "Record revoked successfully!",
   "mail-sent-alert": "Mail sent successfully.",
@@ -446,8 +444,7 @@
   "cutomize-email": "Cutomize Email",
   "upgrade-to-customize-email": "Upgrade to customize Email",
   "sign-url": "Sign url",
-  "mails-sent": "Mails sent",
+  "Mails Sent": "Mails Sent",
-  "mail-not-delivered": "Mail not delivered",
   "document-alert": "Document Alert",
   "owner-subscription-expired": "Owner's subscription has expired.",
   "subscription-expired": "Subscription Expired",
@@ -642,7 +639,7 @@
   "public-template-mssg-3"  :"Need more details or examples?",
   "public-template-mssg-4": "Visit the",
   "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
-  "public-template-mssg-6" :"Before you can use this code snippet, you must make this template public.",
+  "public-template-mssg-6" :"You need to set this template as public before you can utilize this code snippet.",
   "copy-code":"COPY",
   "copied-code":"COPIED",
   "Installation":"Installation",
@@ -671,31 +668,6 @@
   "download-files":"Download files",
   "download-pdf":"Download Pdf",
   "pdf-certificate":"Download Pdf + Certificate",
-  "document-logs":"Document logs",
+  "document-logs":"Document logs"
-  "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
+
-  "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
-   "enable-tour":"Enable Tour",
-   "istourenabled-help":{
-     "p1":"This will enable a guided tour for signers, providing instructions during the signing process.",
-     "p2":"This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
-     "p3":"Tip: If your signers are familiar with OpenSign and frequently use it, you may want to disable the guided tour for a more seamless experience. Choose the option that best fits your document signing needs."
-   },
-   "form-title-1":"Document Flow Setting",
-   "form-title-2":"Security Settings",
-  "public-tour-message":"The template needs to be public before you can generate a shareable link.",
-  "add-user-template": "You need to add a role before you can add fields for it.",
-  "pdf-uncompatible": "This pdf is not compatible with opensign, please contact <support@opensignlabs.com>",
-  "text-field-tour":"Fields of type 'Text' must be filled in advance before the document is sent. If you need the signers to provide input, use the 'Text Input' field instead.",
-  "attach-signer-tour":"You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour.",
-  "allowed-signature-types": "Allowed signature types",
-  "at-least-one-signature-type": "At least one signature type should be enabled.",
-  "expect-default-one-more-signature-type": "Please enable one additional signature type apart from the default.",
-  "add-signer-note": "Note - This contact will be added to your contact list",
-  "allowed-signature-types-help": {
-    "p1": "This signature preference controls which signing options are available to your signers. Only the signature types you select will appear in the signature widget when a document is signed. For example, if you choose only the 'Draw' option in preferences, your signer will see only the 'Draw' option in the signature widget, while the other three options will not be available.",
-    "l1": "Create a handwritten signature directly on the screen using your finger or a stylus.",
-    "l2": "Enter your name and choose from various font styles to create a signature.",
-    "l3": "Upload an existing digital version of your signature.",
-    "l4": "Use a pre-set signature style saved under 'My Signature' in your settings."
-  }
 }

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

@@ -1,701 +0,0 @@
-{
-  "header-news": "Nueva funcionalidad: ¡Los perfiles públicos ahora están disponibles! Crea y comparte plantillas públicas fácilmente",
-  "header-news-btn": "Configurar ahora",
-  "create-account": "Crear cuenta",
-  "login": "Iniciar sesión",
-  "language": "Idioma",
-  "name": "Nombre",
-  "phone": "Teléfono",
-  "phone-optional": "opcional",
-  "email": "Correo",
-  "company": "Compañía",
-  "job-title": "Título del puesto",
-  "profile": "Perfil",
-  "log-out": "Cerrar sesión",
-  "is-email-verified": "El correo está verificado",
-  "public-profile": "Perfil público",
-  "tagline": "Eslogan ",
-  "has-requested-you-to-sign": "ha solicitado que firmes",
-  "has-requested-you-to-review-and-sign": " ha solicitado que revises y firmes",
-  "input-required": "Por favor, rellena este campo.",
-  "sort-order": {
-    "Ascending": "Ascendente",
-    "Descending": "Descendente",
-    "Name": "Nombre",
-    "Date": "Fecha"
-  },
-  "context-menu": {
-    "Download": "Descargar",
-    "Rename": "Renombrar",
-    "Move": "Mover",
-    "Delete": "Eliminar"
-  },
-  "action": "Acción",
-  "add": "Agregar",
-  "add-new-folder": "Agregar nueva carpeta",
-  "disable-documentId": "Desactivar ID de documento",
-  "edit": "Editar",
-  "change-password": "Cambiar contraseña",
-  "save": "Guardar",
-  "cancel": "Cancelar",
-  "upgrade-now": "Mejorar ahora",
-  "upgrade-to": "Mejorar a",
-  "plan": "Plan",
-  "subscribe-card-teamplan": "¡Libera todo el poder de la colaboración! Crea organizaciones, equipos y jerarquías ilimitadas. Comparte plantillas sin problemas entre equipos y asigna funciones de usuario personalizadas. ¡Mejora tu flujo de trabajo hoy mismo!",
-  "subscribe-card-plan": "Desbloquea funciones premium desde solo {{premiumPrice}}/mes. Disfruta de un rendimiento mejorado y solo {{addonPrice}} por crédito adicional después de tus créditos premium incluidos.",
-  "user-name-limit-char": "Para tener un nombre de usuario menor a 8 caracteres por favor suscríbete",
-  "tour-content": "No mostrar esto otra vez",
-  "pro": "PRO",
-  "team": "EQUIPO",
-  "user": "Usuario",
-  "docs": "Documentación",
-  "session-expired": "Tu sesión ha expirado.",
-  "public-profile-help": "Esta es tu URL pública. Cópiala o compártela con el firmante, y podrás ver todas tus plantillas públicas.",
-  "tagline-help": "Este eslogan aparecerá en tu perfil público de OpenSign, por ejem. https://opensign.me/alex",
-  "welcome": "¡Bienvenido de nuevo!",
-  "Login-to-your-account": "Ingresa a tu cuenta",
-  "password": "Contraseña",
-  "forgot-password": "¿Olvidaste la contraseña?",
-  "loading": "Cargando...",
-  "of": "de",
-  "sign-SSO": "Ingresar con SSO",
-  "login-page": "Página de inicio de sesión",
-  "or": "O",
-  "signup-page": "Página de registro",
-  "password-length": "La contraseña debe tener 8 caracteres",
-  "password-case": "La contraseña debe incluir mayúsculas, minúsculas y números",
-  "password-special-char": " La contraseña debe incluir caracteres especiales",
-  "agreee": "Estoy de acuerdo con los",
-  "term": "Términos de Servicio",
-  "subscribe-to-opensign": "Suscribirse al boletín de OpenSign",
-  "register": "Registrarse",
-  "sidebar": {
-    "Dashboard": "Panel",
-    "Sign yourself": "Firma tu mismo",
-    "Request signatures": "Solicitar firmas",
-    "Templates": "Plantillas",
-    "Templates-Children": {
-      "Create template": "Crear plantilla",
-      "Manage templates": "Administrar plantillas"
-    },
-    "OpenSign™ Drive": "OpenSign™ Drive",
-    "Reports": "Reportes",
-    "Reports-Children": {
-      "Need your sign": "Necesitan tu firma",
-      "In Progress": "En progreso",
-      "Completed": "Completado",
-      "Drafts": "Borradores",
-      "Declined": "Rechazados",
-      "Expired": "Expirados",
-      "Contactbook": "Agenda de contactos"
-    },
-    "Settings": "Ajustes",
-    "Settings-Children": {
-      "My Signature": "Mi firma",
-      "API Token": "Token API",
-      "Webhook": "Webhook",
-      "Preferences": "Preferencias",
-      "Teams": "Equipos",
-      "Team-update-successfully": "Equipo actualizado correctamente.",
-      "Users": "Usuarios"
-    }
-  },
-  "dashboard-card": {
-    "Need your Signature": "Necesitan tu firma",
-    "Out for signatures": "En espera de ser firmados"
-  },
-  "report-name": {
-    "Draft Documents": "Documentos borradores",
-    "Need your sign": "Necesitan tu firma",
-    "In-progress documents": "Documentos en progreso",
-    "Completed Documents": "Documentos completados",
-    "Declined Documents": "Documentos rechazados",
-    "Expired Documents": "Documentos expirados",
-    "Recently sent for signatures": "Recientemente enviados para ser firmados",
-    "Recent signature requests": "Solicitudes de firma recientes",
-    "Drafts": "Borradores",
-    "Contactbook": "Agenda de contactos",
-    "Templates": "Plantillas",
-    "Teams": "Equipos",
-    "Users": "Usuarios"
-  },
-  "btnLabel": {
-    "sign": "firmar",
-    "Sign": "FIRMAR",
-    "Resend": "Reenviar",
-    "Revoke": "Revocar",
-    "Delete": "Eliminar",
-    "Use": "Usar",
-    "Quick send": "Envío rápido",
-    "Edit": "Editar",
-    "Share with team": "Compartir con el equipo",
-    "Share": "Compartir",
-    "View": "Ver",
-    "option": "Opción",
-    "Embed": "Incrustar",
-    "Copy TemplateId": "Copiar ID de plantilla",
-    "Copy Public URL": "Copiar URL pública"
-  },
-  "report-heading": {
-    "Sr.No": "Nº",
-    "Title": "Título",
-    "Email": "Correo",
-    "Phone": "Teléfono",
-    "File": "Archivo",
-    "Owner": "Propietario",
-    "Signers": "Firmantes",
-    "Note": "Nota",
-    "Folder": "Carpeta",
-    "Reason": "Razón",
-    "Parent Team": "Equipo padre",
-    "Active": "Activo",
-    "Role": "Rol",
-    "Team": "Equipo",
-    "Name": "Nombre",
-    "Status": "Estado",
-    "created-date": "Fecha de creación",
-    "Type": "Tipo",
-    "Logs": "Registros"
-  },
-  "report-help": {
-    "Draft Documents": "Estos son documentos que has iniciado pero no has finalizado para su envío.",
-    "Need your sign": "Esta es una lista de documentos que esperan tu firma.",
-    "In-progress documents": "Esta es una lista de documentos que has enviado a otras partes para su firma.",
-    "Completed Documents": "Esta es una lista de documentos en los que todas las partes han firmado.",
-    "Declined Documents": "Esta es una lista de documentos que han sido rechazados por uno de los firmantes.",
-    "Expired Documents": "Esta es una lista de documentos que han alcanzado su fecha de caducidad.",
-    "Contactbook": "Esta es una lista de contactos/firmantes añadidos por ti. Aparecerán como sugerencias cuando intentes añadir firmantes a un nuevo documento.",
-    "Templates": "Esta es una lista de plantillas que están a tu disposición para crear documentos. Puedes hacer clic en el botón «usar» para crear un nuevo documento utilizando una plantilla, modifica el documento y añade firmantes en el siguiente paso."
-  },
-  "form-name": {
-    "Sign Yourself": "Firmar",
-    "Request Signatures": "Solicitar firmas",
-    "New Template": "Nueva plantilla"
-  },
-  "file-type": "pdf, png, jpg, jpeg",
-  "docx": "docx",
-  "file-selected": "archivo seleccionado",
-  "template-title": "Título de la plantilla",
-  "document-title": "Título del documento",
-  "description": "Descripción",
-  "time-to-complete": "Plazo de finalización (días)",
-  "send-in-order": "Enviar en orden",
-  "send-in-order-help": {
-    "p1": "Elige cómo quieres que se envíen las solicitudes de firma a los firmantes del documento:",
-    "p2": "Seleccionando esta opción se enviará inicialmente la solicitud de firma al primer firmante. Una vez que el primer firmante complete su parte, el siguiente firmante en la secuencia recibirá la solicitud. Este proceso continúa hasta que todos los firmantes hayan firmado el documento. Este método garantiza que el documento se firme en un orden específico.",
-    "p3": "Seleccionando esta opción se enviarán los enlaces para la firma a todos los firmantes simultáneamente. Cada firmante puede firmar el documento cuando le convenga, independientemente de si otros firmantes han completado sus firmas. Este método es más rápido, pero no impone ningún orden de firma entre los participantes.",
-    "p4": "Selecciona la opción que mejor se adapte a las necesidades de tu tramitación de documentos."
-  },
-  "no": "No",
-  "auto-reminder": "Recordatorio automático",
-  "remind-once": " Recordar una vez cada (Días)",
-  "next": "Siguiente",
-  "select-folder": "Seleccionar carpeta",
-  "OpenSign-drive": "OpenSign™ Drive",
-  "drive-document-status": {
-    "Completed": "Completado",
-    "Declined": "Rechazado",
-    "Draft": "Borrador",
-    "Expired": "Expirado",
-    "In Progress": "En progreso"
-  },
-  "select-folder-help": "Si no seleccionas una carpeta, tu documento firmado se guardará en la carpeta principal de OpenSign Drive.",
-  "no-data": "No se encontraron datos",
-  "save-here": "Guardar aquí",
-  "back": "Atrás",
-  "add-folder": "Añadir carpeta",
-  "create-folder": "Crear carpeta",
-  "parent-folder": "Carpeta superior",
-  "create": "Crear",
-  "signers": "Firmantes",
-  "signers-help": "Empieza a escribir el nombre de un contacto para ver los firmantes sugeridos entre tus contactos guardados o añade otros nuevos. Organiza el orden de firma añadiendo firmantes en la secuencia deseada. Utiliza el botón «+» para añadir nuevos firmantes y la «X» para quitar todos. Cada firmante recibirá una solicitud por correo electrónico para que firme el documento según el orden indicado.",
-  "add-signer": "Añadir firmante",
-  "contact-not-found": "Contacto no encontrado",
-  "add-yourself": "Añadirte a ti mismo",
-  "submit": "Enviar",
-  "reset": "Volver a empezar",
-  "my-signature": "Mi firma",
-  "signature": "Firma",
-  "upload-image": " Subir imagen",
-  "clear": "Limpiar",
-  "upload-signature/Image": "Por favor, sube la firma/imagen",
-  "initials": "Iniciales",
-  "API": "API",
-  "api-token": "Token API",
-  "regenerate-token": "Regenerar token activo",
-  "generate-token": "Generar token activo",
-  "view-docs": "Ver documentación",
-  "generate-token-alert": "¿En definitiva quieres regenerar el token? Esto expirará el token antiguo.",
-  "yes": "Sí",
-  "copied": "Copiado",
-  "something-went-wrong-mssg": "Algo salió mal, por favor, intenta de nuevo más tarde.",
-  "token-generated": "Token generado exitosamente.",
-  "webhook": "Webhook",
-  "update-webhook": "Actualizar webhook",
-  "add-webhook": "Agregar webhook",
-  "webhook-added": "Webhook agregado exitosamente.",
-  "team-disabled": "Equipo deshabilitado",
-  "Team enabled": "Equipo habilitado",
-  "are-you-sure": "¿En definitiva quieres ",
-  "disable": "deshabilitar",
-  "enable": "habilitar",
-  "this-team": " este equipo?",
-  "edit-team": "Editar equipo",
-  "name-of-team": "Nombre del equipo",
-  "prev": "Anterior",
-  "no-data-avaliable": "No hay datos disponibles",
-  "add-team": "Agregar equipo",
-  "page-not-found": "Página no encontrada",
-  "users-from-teams": "usuarios de equipos",
-  "user-status": "Estado del usuario",
-  "activate": "activar",
-  "deactivate": "desactivar",
-  "this-user": " este usuario",
-  "delete-user": "Eliminar usuario",
-  "delete": "eliminar",
-  "add-user": "Agregar usuario",
-  "password-generateed": "La contraseña solo será generada una vez; asegúrate de copiarla.",
-  "Team status": "Estado del equipo",
-  "user-deactivated": "Usuario desactivado.",
-  "user-activated": "Usuario activado.",
-  "public": "Público",
-  "download": "Descargar",
-  "view": "Ver",
-  "make-template-public": "Convertir la plantilla en pública",
-  "make-template-private": "Convertir la plantilla en privada",
-  "make-template-public-alert": "¿En definitiva quieres convertir esta plantilla en pública?",
-  "make-template-private-alert": "¿En definitiva quieres convertir esta plantilla en privada? Esto lo removerá de tu perfil público.",
-  "public-role": "Rol público",
-  "public-url": "Se requiere perfil público",
-  "public-url-copy": "Aquí está tu URL pública: ",
-  "public-url-copy-mssg": "Cópiala o compártela con el firmante y podrás ver todas tus plantillas públicas.",
-  "add-public-url-alert": "Por favor, completa la configuración de tu perfil público OpenSign. Una vez terminado, podrás crear plantillas públicas. Este proceso solo necesita ser completado una vez.",
-  "share-with-alert": "No puedes compartir una plantilla si alguno de los roles ya tiene contactos asignados. Elimina todas las asignaciones de contactos de los roles antes de compartir la plantilla.",
-  "share-with": "Compartir con",
-  "team-not-found": "Equipo no encontrado",
-  "roles": "Roles",
-  "delete-document": "Eliminar documento",
-  "delete-document-alert": "¿En definitiva quieres eliminar este documento?",
-  "quick-send": "Envío rápido",
-  "add-new": "Agregar nuevo",
-  "send": "Enviar",
-  "quick-send-alert-1": "Todos los roles de este documento están actualmente vinculados a contactos. Para enviar rápidamente copias de esta plantilla a varios firmantes, por favor, asegúrate de que al menos un rol no esté vinculado a ningún contacto.",
-  "quick-send-alert-2": "Por favor, asegúrate de que hay al menos un widget de firma añadido para cada destinatario.",
-  "quick-send-alert-3": "Por favor, añade al menos un rol a esta plantilla para poder hacer un «envío rápido» de copias a varios firmantes.",
-  "quick-send-alert-4": "El envío rápido ha alcanzado el límite.",
-  "copy-link": "Copiar enlace",
-  "copy": "Copiar",
-  "revoke-document": "Revocar documento",
-  "revoke-document-alert": "¿En definitiva quieres revocar este documento?",
-  "resend-mail": "Reenviar correo",
-  "resend-mail-help": "Puedes usar las siguientes variables que serán reemplazadas por sus valores reales:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
-  "subject": "Asunto",
-  "body": "Cuerpo",
-  "add-contact": "Agregar contacto",
-  "add-signer-alert": "¡El contacto ya existe! Selecciónelo en el menú desplegable 'Firmantes'",
-  "record-delete-alert": "¡Entrada eliminada exitosamente!",
-  "record-revoke-alert": "¡Entrada revocada exitosamente!",
-  "mail-sent-alert": "Correo enviado exitosamente.",
-  "document-sent-alert": "¡Documento enviado exitosamente!",
-  "template-share-alert": "Plantilla compartida exitosamente.",
-  "template-public-alert-1": "Has convertido exitosamente la plantilla en pública.",
-  "template-public-alert-2": "Has convertido exitosamente la plantilla en privada.",
-  "template-public-alert-3": "Tienes que seleccionar un rol para los firmantes públicos.",
-  "template-public-alert-4": "Por favor, asegúrate de que has añadido al menos un widget de firma para cada firmante.",
-  "template-public-alert-5": "Dado que esta plantilla tiene «enviar en orden» habilitado, el rol público debe estar posicionado arriba al inicio.",
-  "template-public-alert-6": "Por favor, enlaza firmantes a todos los roles excepto al usuario de rol público.",
-  "template-public-alert-7": "Por favor, asigna al menos un rol público para convertir está plantilla en pública.",
-  "loader": " Esto podría llevar algún tiempo",
-  "pages": "Páginas",
-  "document-signed": "Documento firmado",
-  "close": "Cerrar",
-  "validation-alert": "Alerta de validación",
-  "validate-alert-mssg": " Los datos ingresados no cumplen con los criterios establecidos por la expresión regular.",
-  "otp-verification": "Verificación OTP",
-  "enter-otp": "Ingresar OTP",
-  "verify": "Verificar",
-  "verify-email-1": "Verificar correo",
-  "resend": "Reenviar",
-  "contact-details": "Detalles del contacto",
-  "verify-email": "¡Por favor, verifica tu correo!",
-  "send-otp": " Enviar OTP",
-  "otp-placeholder": "Ingresa el código de verificación enviado por correo",
-  "loading-doc": "Cargando documento...",
-  "widgets-name": {
-    "signature": "firma",
-    "stamp": "sello",
-    "initials": "iniciales",
-    "name": "nombre",
-    "job title": "título del puesto",
-    "company": "compañía",
-    "date": "fecha",
-    "text": "texto",
-    "text input": "entrada de texto",
-    "checkbox": "casilla",
-    "dropdown": "desplegable",
-    "radio button": "botón de radio",
-    "image": "imagen",
-    "email": "correo"
-  },
-  "fields": "Campos",
-  "recipients": "Destinatarios",
-  "please-add": "Por favor, agrega un",
-  "signed-by": "Firmado por",
-  "more": "más",
-  "sent": "enviado",
-  "print": "Imprimir",
-  "certificate": "Certificado",
-  "decline": "Rechazar",
-  "finish": "Finalizar",
-  "mail": "Correo",
-  "sign-now": "Firmar ahora",
-  "successfully-signed": "¡Firmado exitosamente!",
-  "email-mssg": " Los destinatarios agregados aquí recibirán una copia del documento firmado.",
-  "email-error-1": " por favor, proporciona una dirección de correo correcta",
-  "email-error-2": "Solo puedes enviar hasta a 10 destinatarios a la vez.",
-  "Email-verified-alert-1": "El correo está verificado.",
-  "Email-verified-alert-2": "El correo ya ha sido verificado.",
-  "upload-stamp-image": "Subir imagen del sello",
-  "draw": "Dibujar",
-  "type": "Escribir",
-  "color-type": {
-    "red": "rojo",
-    "blue": "azul",
-    "black": "negro",
-    "yellow": "amarillo"
-  },
-  "my-initials": "Mis iniciales",
-  "upload": "Subir",
-  "initial-teb": "Iniciales",
-  "signature-tab": "Firma",
-  "your-signature": "Tu firma",
-  "copy-title": "Copiar widget a",
-  "contact-delete-alert": "¿En definitiva quieres eliminar este contacto?",
-  "reset-password-alert-1": "El enlace para restablecer la contraseña ha sido enviado a tu correo electrónico",
-  "reset-password-alert-2": "Por favor, configura un adaptador de correo ",
-  "reset-password-alert-3": "Restablece tu contraseña",
-  "faild-animation": "Error al cargar la animación",
-  "apply": "Aplicar",
-  "copy-type": {
-    "All pages": "Todas las páginas",
-    "All pages but last": "Todas las páginas menos la última",
-    "All pages but first": "Todas las páginas menos la primera",
-    "Next to current widget": "Junto al widget actual"
-  },
-  "options": "Opciones",
-  "minimun-check": "Chequeo mínimo",
-  "maximum-check": "Chequeo máximo",
-  "default-value": "Valor por defecto",
-  "select": "Seleccionar",
-  "read-only": "Es de solo lectura",
-  "hide-labels": "Esconder etiquetas",
-  "checkbox": "Casilla",
-  "alert": "Alerta",
-  "zoom-in": "Acercar",
-  "zoom-out": "Alejar",
-  "document-signed-alert": "¡Felicitaciones! 🎉 ¡Este documento ha sido firmado por ti exitosamente!",
-  "otp-sent-alert": "OTP enviado a tu correo",
-  "fields-required": "Campos requeridos",
-  "signature-widget-alert-1": "Por favor, asegúrate de que hay al menos un widget de firma agregado",
-  "signature-widget-alert-2": "Por favor, asegúrate de que todos los campos están correctamente rellenados y de que cumplen todos los requisitos.",
-  "encrypted-pdf-alert": "Actualmente los archivos PDF encriptados no están soportados.",
-  "encrypted-pdf-alert-1": "La contraseña del archivo PFX es inválida.",
-  "user-not-exist": "El usuario no existe",
-  "template-signature-field": "Por favor, agrega al menos un campo de firma para todos los roles.",
-  "template-role-alert": "Por favor, primero agrega roles",
-  "create-document": "Crear documento",
-  "template-created-alert": "¿Quieres crear un documento usando la plantilla que acabas de crear?",
-  "signers-alert": "alerta de firmantes",
-  "template-creation-alert-1": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
-  "ok": "OK",
-  "radio-group": "Grupo de radio",
-  "dropdown-options": "Opciones del desplegable",
-  "add-role": "Agregar rol",
-  "role-ex": " por ejem.: Cliente, RRHH, Director, Administrador, Estudiante, etc.",
-  "add/choose-signer": "Agregar/Elegir firmante",
-  "choose-from-contacts": "Elegir desde los contactos",
-  "select-signer": " Por favor, selecciona el firmante",
-  "edit-template": "Editar plantilla",
-  "widget-info": "Información del widget",
-  "validation": "Validación",
-  "invalid-default-value": "valor por defecto inválido",
-  "hint": "Pista",
-  "color": "color",
-  "role-help": {
-    "p1": "¿Qué son los roles de una plantilla?",
-    "p2": "Empieza por especificar cada uno de los roles necesarios para completar el documento. Piensa en las partes implicadas en el proceso de firma y cuáles son sus responsabilidades. Los roles más habituales son RRHH para los documentos internos, Cliente para los contratos o Proveedor para los convenios comerciales.",
-    "p3": "¿Por qué preasignar usuarios a algunos roles?",
-    "p4": "Para los roles que consistentemente involucran al mismo individuo (por ejem., la firma del Gerente en las ofertas de empleo), puedes preasignar un usuario a un rol dentro de una plantilla. Este paso es opcional pero recomendado para la eficiencia y consistencia entre documentos",
-    "p5": "¿Cuando especifico el usuario asignado a cada rol?",
-    "p6": "Cuando crees un documento usando tu plantilla, se te pedirá que asignes usuarios a cada rol definido. Si un rol ya tiene un usuario asignado, este será rellenado con anticipación, pero puedes modificarlo según lo necesites antes de enviar el documento."
-  },
-  "add-recipients": "Agregar destinatarios",
-  "loading-mssg": "Esto podría llevar algún tiempo",
-  "send-mail": "Enviar correo",
-  "placeholder-alert-1": "Por favor, asegúrate de que hay al menos un widget de firma para cada destinatario.",
-  "placeholder-alert-2": "Por favor, confirma que hayas rellenado el campo de texto.",
-  "placeholder-alert-3": " ¿En definitiva quieres enviar este documento para ser firmado?",
-  "placeholder-alert-4": "¡Has enviado exitosamente correos a todos los destinatarios!",
-  "placeholder-alert-5": "¿Quieres firmar documentos ahora mismo?",
-  "placeholder-alert-6": "¡Por favor, configura el adaptador de correo para enviar correos!",
-  "placeholder-alert-7": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
-  "email-subject": "asunto del correo",
-  "email-body": "cuerpo del correo",
-  "email-placeholder": "agregar cuerpo del correo",
-  "reset-to-default": "Restablecer a por defecto",
-  "cutomize-email": "Personalizar correo",
-  "upgrade-to-customize-email": "Mejora para personalizar el correo",
-  "sign-url": "URL de firma",
-  "mails-sent": "Correos enviados",
-  "mail-not-delivered": "correo no entregado",
-  "document-alert": "Alerta de documento",
-  "owner-subscription-expired": "La suscripción del propietario ha expirado.",
-  "subscription-expired": "Suscripción expirada",
-  "alert-message": "Mensaje de alerta",
-  "document-decline": "Rechazar documento",
-  "decline-alert-1": "¿En definitiva quieres rechazar este documento?",
-  "decline-alert-2": "¡Has rechazado este documento!",
-  "decline-alert-3": "No puedes firmar este documento ya que ha sido rechazado/revocado.",
-  "sign here": "Firma aquí",
-  "guest-email-alert": "el código de verificación ha sido enviado a tu correo",
-  "get-otp-alert": "recibirás un código de verificación por correo",
-  "user-already-exist": "El usuario ya existe.",
-  "server-error": "¡Error interno del servidor!",
-  "fill-required-details!": "¡Por favor, rellena los detalles requeridos!",
-  "sign-up-form": "Formulario de registro",
-  "sign-up": "Registrarse",
-  "folder-already-exist!": "¡la carpeta ya existe!",
-  "please-select-position!": "¡por favor, selecciona una posición!",
-  "default-sign-alert": "¿En definitiva quieres firmar automáticamente en todos los lugares solicitados?",
-  "Your-Signature": "Tu firma",
-  "auto-sign-all": "Firmar todo automáticamente",
-  "generating-certificate": "Generando certificado",
-  "pdf-download": "Descargar PDF",
-  "generate-certificate-alert": " Tu certificado de finalización se está generando. Por favor, espera un momento. Si la descarga no inicia pronto, presiona el botón otra vez.",
-  "folder-already-exist": "¡La carpeta ya existe!",
-  "folder-created-successfully": "¡Carpeta creada exitosamente!",
-  "fill-folder-name": "Por favor, rellena el nombre de la carpeta",
-  "already-exists-this-username": "¡Un usuario con este nombre de usuario ya existe!",
-  "verification-code-sent": "¡El correo de verificación ha sido enviado a tu correo!",
-  "registered-user-successfully": "Usuario registrado exitosamente.",
-  "role-not-found": "Rol no encontrado.",
-  "do-not-access": "No tienes acceso, por favor, contacta al administrador.",
-  "add-admin": "Agregar administrador",
-  "opensign-setup": "Instalación de OpenSign",
-  "join-discord": "Únete a nuestro servidor de Discord",
-  "admin-already-exist": "El administrador ya existe.",
-  "password-update-alert-1": "Contraseña actualizada exitosamente.",
-  "password-update-alert-2": "Tu contraseña actual es incorrecta o falta.",
-  "password-update-alert-3": "Tu contraseña actual es incorrecta o falta.",
-  "password-update-alert-4": "Tu contraseña y su confirmación no son iguales.",
-  "current-password": "Contraseña actual",
-  "new-password": "Contraseña nueva",
-  "confirm-password": "Confirmar contraseña",
-  "file-alert-1": "El tamaño del archivo seleccionado es muy grande. Por favor, selecciona un archivo con un tamaño menor a",
-  "file-alert-2": "Por favor, selecciona un archivo.",
-  "file-alert-3": "Por favor, espera mientras se sube el documento.",
-  "enter-pdf-password": "Ingresa la contraseña del PDF",
-  "correct-password": "Por favor, proporciona la contraseña correcta",
-  "decrypting-pdf": " Desencriptando PDF, por favor, espera...",
-  "invalid-otp": "OTP inválido",
-  "user-not-found": "¡Usuario no encontrado!",
-  "enter-otp-alert": "¡Por favor, ingresa el OTP!",
-  "get-verification-code": "Obtener código de verificación",
-  "get-verification-code-2": "Obtendrás un código de verificación por correo",
-  "enter-verification-code": "Ingresar código de verificación",
-  "provide-your-details": "Proporciona tus detalles",
-  "provide-email": "Por favor, proporciona un correo.",
-  "additional-info": "Información adicional",
-  "signature-saved-alert": "Firma guardada exitosamente.",
-  "fill-field": "Por favor, rellena este campo",
-  "error-template": "Error: ¡Plantilla no encontrada!",
-  "error": "Error",
-  "invalid-document": "Error: ¡Documento inválido!",
-  "document-not-found": "¡Documento no encontrado!",
-  "document-signed-alert-1": "Has firmado el documento exitosamente. Puedes descargar o imprimir una copia del documento parcialmente firmado. Una copia del documento firmado digitalmente será enviada al propietario mediante correo electrónico una vez haya sido firmado por todos los firmantes.",
-  "encrypted-pdf-not-support": "Los archivos PDF encriptados no están soportados actualmente.",
-  "document-signed-alert-4": " ¡Felicitaciones! 🎉 ¡Este documento ha sido firmado exitosamente por todos los participantes!",
-  "document-signed-alert-5": "Este documento ha sido firmado por todos los firmantes.",
-  "document-signed-alert-6": "Este documento ha sido rechazado por uno o más destinatarios.",
-  "document-signed-alert-7": "Este documento ya no está disponible.",
-  "document-signed-alert-8": "Este documento ya ha sido enviado para ser firmado.",
-  "yet-to-sign": "Todavía por firmar",
-  "validation-alert-1": "Los datos ingresados no cumplen con los criterios establecidos por la expresión regular.",
-  "account-already-exists": "¡La cuenta ya existe!",
-  "choose-password": "Elegir contraseña",
-  "enter-password": "Ingresar contraseña",
-  "sure": "claro",
-  "subscribed-alert": "¡Ya te has suscrito al plan!",
-  "monthly": "Mensual",
-  "yearly-upto": "Anual (hasta 66% de descuento)",
-  "billed-yearly": "Facturado anualmente",
-  "billed-monthly": "Facturado mensualmente",
-  "plansubscription-1": "Alójalo por tu cuenta gratuitamente",
-  "visit-github": "Visitar GitHub",
-  "user-already-exist-name": "¡Un usuario con este nombre de usuario ya existe!",
-  "do-not-access-contact-admin": "No tienes acceso, por favor, contacta a un administrador.",
-  "filed-required-correctly": "Por favor, rellena correctamente los detalles requeridos.",
-  "admin-created": "Administrador creado",
-  "invalid-masterkey": "Llave maestra inválida",
-  "opensign-Setup": "Instalación de OpenSign",
-  "master-key": " Llave maestra",
-  "profile-update-alert": "Perfil actualizado exitosamente.",
-  "date": "Fecha",
-  "report-not-found": "Reporte no encontrado",
-  "please-wait": "por favor, espera",
-  "select-foler": "Seleccionar carpeta",
-  "generated-on": "Generado el",
-  "text-field": "Campo de texto",
-  "font-size": "Tamaño de la fuente",
-  "widget-status": {
-    "Required": "Requerido",
-    "Optional": "Opcional"
-  },
-  "all-right": "Todos los derechos reservados",
-  "version": "versión",
-  "social-media": {
-    "github": "GitHub",
-    "linked-in": "LinkedIn",
-    "twitter": "Twitter",
-    "discord": "Discord"
-  },
-  "tour-mssg": {
-    "home-layout-1": "¡Has iniciado sesión exitosamente! Echemos un vistazo.",
-    "home-layout-2": "Para subir documentos para firmar tú mismo o para solicitar la firma de otros, simplemente selecciona los botones correspondientes.",
-    "home-layout-3": "¡Ya puedes empezar a utilizar OpenSign! Si necesitas soporte siéntete libre de contactarnos.",
-    "generate-token": "Mejora ahora para generar un token API de producción.",
-    "opensign-drive-1": "Haz clic en los enlaces para navegar fácilmente por la estructura jerárquica de carpetas y ver los documentos de cada carpeta.",
-    "opensign-drive-2": "Haz clic en el botón «Agregar» para crear una nueva carpeta o documento.",
-    "opensign-drive-3": "Ordena tus documentos por «Fecha» o «Nombre» usando este menú.",
-    "opensign-drive-4": "Haz clic en este menú para mostrar los documentos en vista de lista.",
-    "opensign-drive-5": "La lista de documentos es mostrada de acuerdo a la opción de ordenamiento seleccionada. Los íconos situados junto a cada documento indican su estado actual.",
-    "opensign-drive-6": "Haz clic con el botón derecho en un documento para ver opciones como «Descargar», «Renombrar», «Mover» y «Eliminar». Haz clic en el documento para abrirlo.",
-    "opensign-drive-7": "Haz clic con el botón derecho en cualquier carpeta para ver las opciones. Elige «Renombrar» para cambiar el nombre de la carpeta o haz clic en ella para navegar por su contenido.",
-    "pdf-request-file-1": "Lista de firmantes que todavía tienen que firmar este documento.",
-    "pdf-request-file-2": "Haz clic en cualquiera de los marcadores de posición que aparecen en el documento para firmar. A continuación, verás opciones para dibujar tu firma, escribirla o subir una imagen .",
-    "pdf-request-file-3": "Haz clic en los botones «Atrás», «Rechazar» o «Finalizar» para navegar por el documento. Utiliza el menú de tres puntos para ver otras opciones, como el botón «Descargar».",
-    "pdf-request-file-4": "Lista de firmantes que ya han firmado el documento.",
-    "pdf-request-file-5": "Puedes hacer clic en «Firmar todo automáticamente» para firmar de manera automática en todos los lugares que deban ser firmados por ti. Asegúrate de revisar correctamente el documento antes de hacer clic en ese botón.",
-    "placeholder-sign-1": "Selecciona un destinatario de esta lista para agregar un marcador de posición dónde este destinatario tendrá que firmar. El marcador de posición aparecerá con el mismo color que el nombre del destinatario una vez lo sueltes en el documento.",
-    "placeholder-sign-2": "Hacer clic en el botón «Agregar destinatarios» te permitirá añadir más firmantes.",
-    "placeholder-sign-3": "Haz clic en este botón para agregar más destinatarios/firmantes al documento.",
-    "placeholder-sign-4": "Arrastra o haz clic en un capo para agregarlo al documento.",
-    "placeholder-sign-5": "El área de contenido del PDF ya muestra los marcadores de posición existentes en la plantilla. Para tu comodidad, estos marcadores de posición coincidirán con el color del nombre del destinatario, haciéndolos fácilmente identificables.",
-    "placeholder-sign-6": "Hacer clic en «Enviar» guardará el documento. En el siguiente paso podrás personalizar los correos que serán enviados a los destinatarios o copiar los enlaces para firmar y compartirlos con los destinatarios por tu cuenta.",
-    "report-1": "Haz clic en el botón «Agregar» para crear una nueva plantilla. Las plantillas son documentos reusables diseñados para generar rápidamente nuevos documentos con la misma estructura pero diferentes firmantes. Por ejemplo, una plantilla de RR.HH. para el proceso de incorporación podría tener roles predefinidos como «Director de RR.HH.» y «Nuevo empleado». Cada vez que utilices la plantilla, puedes asignar el rol de «Nuevo empleado» a los distintos miembros del personal que se incorporen, mientras que el rol de « Director de RR.HH.» permanece constante, lo que facilita un proceso de incorporación fluido para cada persona contratada.",
-    "redirect": "Haz clic en el botón «Usar» para crear un nuevo documento desde una plantilla existente.",
-    "bulksend": "Para crear y enviar rápidamente múltiples documentos usando una plantilla existente, haz clic en el botón «Envío rápido».",
-    "option": "Este menú revela más opciones como «Editar» y «Eliminar». Usa el botón «Editar» para agregar roles, modificar campos y actualizar tu plantilla. Los cambios aplicarán para todos los documentos futuros que sean creados usando esta plantilla pero no afectarán a los documentos ya existentes. Con el botón «Eliminar» puedes eliminar la plantilla.",
-    "signyour-self-1": "Para personalizar el documento antes de que sea firmado, selecciona y arrastra al documento los widgets que prefieras. Escoge el espacio perfecto para cada modificación para adaptar el documento a tus necesidades.",
-    "signyour-self-2": "Arrastra y suelta en cualquier lugar de esta área. Después podrás cambiar el tamaño y moverlo.",
-    "template-placeholder-1": "Hacer clic en el botón «Agregar rol» te permitirá agregar varios roles de firmantes. Puedes asociar usuarios a cada rol en los siguientes pasos.",
-    "template-placeholder-2": "Una vez que los roles hayan sido agregados, selecciona un rol de la lista para agregar un marcador de posición donde éste tendrá que firmar. El marcador de posición aparecerá con el mismo color que el nombre del rol una vez lo sueltes en el documento.",
-    "template-placeholder-3": "Arrastra o haz clic en un capo para agregarlo al documento.",
-    "template-placeholder-4": "Arrastra el marcador de posición para un rol a cualquier lugar del documento. Recuerda, aparecerá con el mismo color que el nombre del rol para poder referenciarlo fácilmente.",
-    "template-placeholder-5": "Hacer clic en «Siguiente» guardará la plantilla actual. Luego de guardar, se te consultará si deseas crear un nuevo documento usando esta plantilla.",
-    "webhook-1": "Mejora ahora para configurar un webhook",
-    "Need your Signature": "Hacer clic en esta tarjeta te llevará a la lista de documentos que esperan por tu revisión.",
-    "Out for signatures": "Hacer clic en esta tarjeta te llevará a la lista de documentos que esperan tu firma.",
-    "Recent signature requests": "Esta es una lista de documentos que esperan por tu firma.",
-    "Recently sent for signatures": "Esta es una lista de documentos que has enviado a otras partes para que sea firmado.",
-    "Drafts": "Estos son documentos que has empezado pero que todavía no finalizas para su envío.",
-    "public-template": "Este video muestra cómo puedes configurar tu perfil público personalizado, como «https://opensign.me/tu-nombre-de-usuario». También aprenderás cómo personalizar tu eslogan y cómo hacer tus plantillas disponibles para su firmado público."
-  },
-  "enter-email-plaholder": "Agrega una dirección de correo y presiona «Enter»",
-  "success-email-alert": "¡Correo enviado exitosamente!",
-  "expired-doc-title": "Documento expirado",
-  "expired-on-mssg": "Este documento expiro el {{expiredDate}} y ya no está disponible para ser firmado.",
-  "signature-validate-alert": "Por favor, confirma que has seleccionado al menos {{minRequiredCount}} casillas.",
-  "signature-validate-alert-2": "Asegúrate de que este campo esté correctamente rellenado y que cumpla con todos los requisitos.",
-  "remaing-users": "Usuarios restantes",
-  "Role": "Rol",
-  "additional-users": "Por favor, compra el complemento Usuarios.",
-  "Quantity-of-users": "Cantidad de usuarios",
-  "Price": "Precio",
-  "Total-price-for-next-time": "Precio total para la próxima vez",
-  "Proceed": "Proceder",
-  "Select": "Seleccionar",
-  "Add-seats": "Agregar plazas",
-  "user-name-exist": "el nombre de usuario ya existe",
-  "format": "formato",
-  "select-date-format": "Selecciona un formato de fecha",
-  "quantity-of-credits": "Cantidad de créditos premium",
-  "remaining-credits": "Créditos premium disponibles:",
-  "remaining-credits-help": "Usa créditos premium para la API para la firma de documentos, envío en masa, o para incorporar la integración de OpenSign en tu página web. Te quedan {{allowedcredits}} créditos incluidos y {{addoncredits}} créditos comprados adicionalmente.",
-  "additional-credits": "Por favor, compra créditos premium",
-  "quota-err-quicksend": "Cuota alcanzada, no tienes créditos suficientes.",
-  "buy-credits": "Comprar créditos premium",
-  "rotate-right": "Rotar a la derecha",
-  "rotate-left": "Rotar a la izquierda",
-  "rotate-alert-mssg": "Todos los widgets de esta página se perderán. ¿En definitiva quieres proceder?",
-  "templateid": "ID de plantilla",
-  "bulk-send-subcription-alert": "Por favor, mejora al plan a Professional o Team para usar envío en masa.",
-  "generate-test-token": "Generar token de prueba",
-  "regenerate-test-token": "Regenerar token de prueba",
-  "help-test-token": "Este token puede ser usado para probar las API en el punto de acceso «https://sandbox.opensignlabs.com/api/v1», permitiéndote realizar firmas de documentos ilimitadas. Por favor, ten en cuenta que el API de pruebas firmará tus documentos con certificados autofirmados, que podrían no ser reconocidos por Adobe como válidos. Una vez hayas completado tus pruebas, puedes mejorar a uno de nuestros planes de pago para generar un token de producción.",
-  "help-api-token": "Este token puede ser usado para acceder a las API de producción en el punto de acceso «{{origin}}/api/v1». Solo puede ser generado con uno de nuestros planes de pago.",
-  "reason": "Razón",
-  "decline-by": "Rechazado/revocado por",
-  "document-declined": "Documento rechazado",
-  "public-template-mssg-1": "Para integrar OpenSign a tu proyecto React o Next.js, simplemente ejecuta los siguientes comandos:",
-  "public-template-mssg-2": "Asegúrate de tener «npm» o «yarn» configurado en tu proyecto. Si estás usando «yarn», puedes reemplazar «npm install» con «yarn add @opensign/react».",
-  "public-template-mssg-3": "¿Necesitas más detalles o ejemplos?",
-  "public-template-mssg-4": "Visita la",
-  "public-template-mssg-5": " «npm» para las últimas actualizaciones, documentación detallada e historial de versiones.",
-  "public-template-mssg-6": "Antes de que puedas usar este fragmento de código, debes convertir esta plantilla en pública.",
-  "copy-code": "COPIAR",
-  "copied-code": "COPIADO",
-  "Installation": "Instalación",
-  "Usage": "Uso",
-  "insufficient-credits": "Créditos de firma insuficientes",
-  "insufficient-credits-mssg": "El propietario de este documento actualmente carece de los créditos OpenSign necesarios para que puedas firmarlo. Por favor, contacta al propietario si necesitas más detalles.",
-  "angular-npm-mssg-1": "Para integrar OpenSign a tu proyecto Angular, simplemente ejecuta los siguientes comandos:",
-  "quota-mail-info-head": "Límite mensual de solicitudes de firma por correo",
-  "quota-mail-info": "Puedes enviar hasta 15 solicitudes de firma por correo cada mes. Mejora ahora para enviar solicitudes de firma sin límite.",
-  "quota-mail": "Has alcanzado tu límite de 15 solicitudes de firma por correo para este mes. Mejora ahora para continuar enviando correos.",
-  "quota-mail-tip": "Consejo: Todavía puedes solciitar la firma de <1>documentos ilimitados</1> compartiendo manualmente los enlaces de solicitud de firma.",
-  "quota-mail-head": "Cuota alcanzada",
-  "unauthorized-modal": "No tienes permisos para realizar esta acción, por favor, contacta a {{adminEmail}}.",
-  "sent-this-month": "Enviados este mes",
-  "available-seats": "Plazas disponibles",
-  "buy-users": "Comprar más usuarios",
-  "isenable-otp": "Habilitar verificación con OTP",
-  "isenable-otp-help": {
-    "p1": "¿Te gustaría habilitar el proceso de verificación usando una contraseña de un solo uso (OTP)?",
-    "p2": "Seleccionar esta opción habilitará la verificación con OTP. Los usuarios recibirán un código de verificación por correo, la cual tendrán que ingresar para poder firmar el documento.",
-    "p3": "Seleccionar esta opción deshabilitará la verificación con OTP, lo cual permitirá a los usuarios firmar el documento directamente sin pasos adicionales.",
-    "p4": "Por favor, selecciona la opción que mejor se adapte a tus requisitos para la firma de documentos."
-  },
-  "advanced-options": "Opciones avanzadas",
-  "hide-advanced-options": "Ocultar las opciones avanzadas",
-  "download-files": "Descargar archivos",
-  "download-pdf": "Descargar PDF",
-  "pdf-certificate": "Descargar PDF + Certificado",
-  "document-logs": "Registros de documentos",
-  "server-down": "No se pudo conectar al servidor de OpenSign. Si estás alojando OpenSign por tu cuenta, por favor, asegúrate de que todos los pasos de la documentación han sido seguidos correctamente. Si estás ejecutando OpenSign localmente, puedes estar accediendo a OpenSign por un número de puerto incorrecto.",
-  "admin-exists": "El administrador ya existe. Por favor, inicia sesión en la aplicación usando las credenciales de administrador para poder administrar los usuarios.",
-  "public-tour-message": "Por favor, convierte la plantilla en pública para copiar la URL pública",
-  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos.",
-  "pdf-uncompatible": "Este pdf no es compatible con opensign, comuníquese con <support@opensignlabs.com>",
-  "enable-tour": "Habilitar recorrido",
-   "istourenabled-help":{
-     "p1": "Esto permitirá realizar una visita guiada para los firmantes, brindando instrucciones durante el proceso de firma.",
-     "p2": "Esto desactivará la visita guiada, lo que garantizará una experiencia de firma más rápida e ininterrumpida.",
-     "p3": "Consejo: si sus firmantes están familiarizados con OpenSign y lo utilizan con frecuencia, es posible que desee desactivar la visita guiada para disfrutar de una experiencia más fluida. Elija la opción que mejor se adapte a sus necesidades de firma de documentos"
-   },
-   "form-title-1": "Configuración del flujo de documentos",
-   "form-title-2": "Configuración de seguridad",
-   "text-field-tour":"Los campos de tipo 'Texto' deben completarse con anticipación antes de enviar el documento. Si necesita que los firmantes proporcionen información, utilice el campo 'Entrada de texto'",
-   "attach-signer-tour" :"Debe adjuntar un firmante a cada función. Puede hacerlo haciendo clic en este icono. Una vez que seleccione un Firmante, se adjuntará a todos los campos asociados con ese rol que aparecen en el mismo color.",
-   "allowed-signature-types": "Tipos de firma permitidos",
-   "at-least-one-signature-type": "Se debe habilitar al menos un tipo de firma.",
-   "expect-default-one-signature-type": "Habilite un tipo de firma adicional aparte del predeterminado.",
-   "add-signer-note": "Nota - Este contacto se agregará a su lista de contactos",
-   "allowed-signature-types-help": {
-    "p1": "Esta preferencia de firma controla qué opciones de firma están disponibles para sus firmantes. Solo los tipos de firma que seleccione aparecerán en el widget de firma cuando se firme un documento. Por ejemplo, si elige sólo la opción 'Draw' en las preferencias, su firmante verá sólo la opción 'Draw' en el widget de firma, mientras que las otras tres opciones no estarán disponibles.",
-    "l1": "Cree una firma manuscrita directamente en la pantalla usando su dedo o un lápiz.",
-    "l2": "Ingrese su nombre y elija entre varios estilos de fuente para crear una firma.",
-    "l3": "Cargue una versión digital existente de su firma.",
-    "l4": "Utilice un estilo de firma preestablecido guardado en 'Mi firma' en su configuración."
-  }
-}

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

@@ -94,7 +94,6 @@
       "My Signature": "Ma signature",
       "API Token": "Jeton API",
       "Webhook": "Webhook",
-      "Preferences": "Préférences",
       "Teams": "Équipe",
       "Team-update-successfully": "Équipe mise à jour avec succès.",
       "Users": "Utilisateurs"
@@ -153,8 +152,7 @@
     "View": "Voir",
     "option": "Option",
     "Embed": "Intégrer",
-    "Copy TemplateId": "Copier l'ID du modèle",
+    "Copy TemplateId": "Copier l'ID du modèle"
-    "Copy Public URL":"Copier l'URL publique"
   },
   "report-help": {
     "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -265,10 +263,10 @@
   "make-template-public-alert": "Êtes-vous sûr de vouloir rendre ce modèle public ?",
   "make-template-private-alert": "Êtes-vous sûr de vouloir rendre ce modèle privé ? Cela le supprimera de votre profil public.",
   "public-role": "Rôle public",
-  "public-url": "Profil public requis",
+  "public-url": "URL publique",
   "public-url-copy": "Voici votre URL publique : ",
   "public-url-copy-mssg": "copiez-la ou partagez-le avec le signataire et vous pouvoir voir tous vos paramètres publics modèles.",
-  "add-public-url-alert": "Veuillez terminer la configuration de votre profil public OpenSign. Une fois cela fait, vous pourrez rendre les modèles publics. Ce processus ne doit être effectué qu’une seule fois.",
+  "add-public-url-alert": "Veuillez ajouter votre URL publique et vous pourra rendre public modèle.",
   "share-with-alert": "Vous ne pouvez pas partager un modèle si des contacts sont déjà attribués à des rôles. Veuillez supprimer toutes les attributions de contacts des rôles avant de partager le modèle.",
   "share-with": "Partager avec",
   "team-not-found": "Équipe introuvable",
@@ -291,7 +289,7 @@
   "subject": "Sujet",
   "body": "Corps",
   "add-contact": "Ajouter le contact",
-  "add-signer-alert": "Le contact existe déjà ! Veuillez le sélectionner dans la liste déroulante 'Signataires'",
+  "add-signer-alert": "Le contact existe déjà !",
   "record-delete-alert": "Enregistrement supprimé avec succès !",
   "record-revoke-alert": " Enregistrement révoqué avec succès ! ",
   "mail-sent-alert": "Courriel envoyé avec succès.",
@@ -445,8 +443,7 @@
   "cutomize-email": "Personnaliser l'e-mail",
   "upgrade-to-customize-email": "Mise à niveau pour personnaliser l'e-mail",
   "sign-url": "Signer l'URL",
-  "mails-sent": "Mails envoyés avec succès !",
+  "Mails Sent": "Mails envoyés avec succès !",
-  "mail-not-delivered": "Courrier non distribué",
   "document-alert": "Alerte document",
   "owner-subscription-expired": "L'abonnement du propriétaire a expiré.",
   "subscription-expired": "Abonnement expiré",
@@ -641,7 +638,7 @@
   "public-template-mssg-3" :"Besoin de plus de détails ou d'exemples ?",
   "public-template-mssg-4": "Visitez le",
   "public-template-mssg-5":  "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
-  "public-template-mssg-6":"Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
+  "public-template-mssg-6":"Vous devez définir ce modèle comme public avant de pouvoir utiliser cet extrait de code.",
   "copy-code":"COPIE",
   "copied-code":"COPIÉ",
   "Installation":"Installation",
@@ -670,31 +667,6 @@
    "download-files" :"Télécharger des fichiers",
    "download-pdf" :"Télécharger le PDF",
   "pdf-certificate"  :"Télécharger Pdf + Certificat",
-  "document-logs":"Journaux de documents",
+  "document-logs":"Journaux de documents"
-  "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.",
+
-  "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.",
-  "enable-tour": "Activer la visite",
-  "istourenabled-otp-help":{
-    "p1": "Cela permettra une visite guidée pour les signataires, fournissant des instructions pendant le processus de signature.",
-    "p2": "Cela désactivera la visite guidée, garantissant ainsi une expérience de signature plus rapide et ininterrompue.",
-    "p3":  "Conseil : si vos signataires connaissent OpenSign et l'utilisent fréquemment, vous souhaiterez peut-être désactiver la visite guidée pour une expérience plus fluide. Choisissez l'option qui correspond le mieux à vos besoins en matière de signature de documents."
-  },
-   "form-title-1": "Paramètre du flux de documents",
-   "form-title-2": "Paramètre de sécurité",
-  "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.",
-  "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. ",
-  "pdf-uncompatible":"Ce pdf n'est pas compatible avec opensign, veuillez contacter <support@opensignlabs.com>",
-  "text-field-tour" :"Les champs de type 'Texte' doivent être remplis à l'avance avant l'envoi du document. Si vous avez besoin que les signataires fournissent des informations, utilisez plutôt le champ 'Saisie de texte'.",
-  "attach-signer-tour" :"Vous devez associer un signataire à chaque rôle. Vous pouvez le faire en cliquant sur cette icône. Une fois que vous avez sélectionné un signataire, il sera attaché à tous les champs associés à ce rôle qui apparaissent dans la même couleur.",
-  "allowed-signature-types": "Types de signature autorisés",
-  "at-least-one-signature-type": "Au moins un type de signature doit être activé.",
-  "expect-default-one-signature-type": "Veuillez activer un type de signature supplémentaire en plus de celui par défaut.",
-  "add-signer-note": "Remarque - Ce contact sera ajouté à votre liste de contacts",
-  "allowed-signature-types-help": {
-    "p1": "Cette préférence de signature contrôle les options de signature disponibles pour vos signataires. Seuls les types de signature que vous sélectionnez apparaîtront dans le widget de signature lorsqu'un document est signé. Par exemple, si vous choisissez uniquement l'option 'Draw' dans les préférences, votre signataire ne verra que l'option 'Draw' dans le widget de signature, tandis que les trois autres options ne seront pas disponibles.",
-    "l1": "Créez une signature manuscrite directement sur l'écran à l'aide de votre doigt ou d'un stylet.",
-    "l2": "Entrez votre nom et choisissez parmi différents styles de police pour créer une signature.",
-    "l3": "Téléchargez une version numérique existante de votre signature.",
-    "l4": "Utilisez un style de signature prédéfini enregistré sous 'Ma signature' ​​dans vos paramètres."
-  }
 }

apps/OpenSign/src/App.js

@@ -35,8 +35,6 @@ const GenerateToken = lazy(() => import("./pages/GenerateToken"));
 const Webhook = lazy(() => import("./pages/Webhook"));
 const AddAdmin = lazy(() => import("./pages/AddAdmin"));
 const UpdateExistUserAdmin = lazy(() => import("./pages/UpdateExistUserAdmin"));
-const DraftTemplate = lazy(() => import("./pages/DraftTemplate"));
-const Preferences = lazy(() => import("./pages/Preferences"));
 
 pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/legacy/build/pdf.worker.min.mjs`;
 const AppLoader = () => {
@@ -200,16 +198,8 @@ function App() {
                 </>
               )}
               <Route path="/users" element={<UserList />} />
-              <Route
-                path="/preferences"
-                element={<LazyPage Page={Preferences} />}
-              />
             </Route>
             <Route path="/sso" element={<SSOVerify />} />
-            <Route
-              path="/drafttemplate/:jwttoken"
-              element={<DraftTemplate />}
-            />
             <Route path="*" element={<PageNotFound />} />
           </Routes>
         </BrowserRouter>

apps/OpenSign/src/components/AddSigner.js

@@ -2,7 +2,6 @@ import React, { useState, useEffect } from "react";
 import Parse from "parse";
 import Loader from "../primitives/Loader";
 import { useTranslation } from "react-i18next";
-import { emailRegex } from "../constant/const";
 
 const AddSigner = (props) => {
   const { t } = useTranslation();
@@ -48,143 +47,139 @@ const AddSigner = (props) => {
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
-    if (!emailRegex.test(email)) {
+    setIsLoader(true);
-      alert("Please enter a valid email address.");
+    if (localStorage.getItem("TenantId")) {
-    } else {
+      try {
-      setIsLoader(true);
+        const user = Parse.User.current();
-      if (localStorage.getItem("TenantId")) {
+        const query = new Parse.Query("contracts_Contactbook");
-        try {
+        query.equalTo("CreatedBy", user);
-          const user = Parse.User.current();
+        query.notEqualTo("IsDeleted", true);
-          const query = new Parse.Query("contracts_Contactbook");
+        query.equalTo("Email", email);
-          query.equalTo("CreatedBy", user);
+        const res = await query.first();
-          query.notEqualTo("IsDeleted", true);
+        // console.log(res);
-          query.equalTo("Email", email);
+        if (!res) {
-          const res = await query.first();
+          const contactQuery = new Parse.Object("contracts_Contactbook");
-          // console.log(res);
+          contactQuery.set("Name", name);
-          if (!res) {
+          if (phone) {
-            const contactQuery = new Parse.Object("contracts_Contactbook");
+            contactQuery.set("Phone", phone);
-            contactQuery.set("Name", name);
-            if (phone) {
-              contactQuery.set("Phone", phone);
-            }
-            contactQuery.set("Email", email);
-            contactQuery.set("UserRole", "contracts_Guest");
-
-            contactQuery.set("TenantId", {
-              __type: "Pointer",
-              className: "partners_Tenant",
-              objectId: localStorage.getItem("TenantId")
-            });
-
-            try {
-              const _users = Parse.Object.extend("User");
-              const _user = new _users();
-              _user.set("name", name);
-              _user.set("username", email);
-              _user.set("email", email);
-              _user.set("password", email);
-              if (phone) {
-                _user.set("phone", phone);
-              }
-              const user = await _user.save();
-              if (user) {
-                const currentUser = Parse.User.current();
-                contactQuery.set(
-                  "CreatedBy",
-                  Parse.User.createWithoutData(currentUser.id)
-                );
-
-                contactQuery.set("UserId", user);
-                const acl = new Parse.ACL();
-                acl.setPublicReadAccess(true);
-                acl.setPublicWriteAccess(true);
-                acl.setReadAccess(currentUser.id, true);
-                acl.setWriteAccess(currentUser.id, true);
-
-                contactQuery.setACL(acl);
-
-                const res = await contactQuery.save();
-
-                const parseData = JSON.parse(JSON.stringify(res));
-                if (props.details) {
-                  props.details({
-                    value: parseData[props.valueKey],
-                    label: parseData[props.displayKey]
-                  });
-                }
-                if (props.closePopup) {
-                  props.closePopup();
-                }
-                if (props.handleUserData) {
-                  props.handleUserData(parseData);
-                }
-
-                setIsLoader(false);
-                // Reset the form fields
-                setAddYourself(false);
-                setName("");
-                setPhone("");
-                setEmail("");
-              }
-            } catch (err) {
-              console.log("err ", err);
-              if (err.code === 202) {
-                const params = { email: email };
-                const userRes = await Parse.Cloud.run("getUserId", params);
-                const currentUser = Parse.User.current();
-                contactQuery.set(
-                  "CreatedBy",
-                  Parse.User.createWithoutData(currentUser.id)
-                );
-
-                contactQuery.set("UserId", {
-                  __type: "Pointer",
-                  className: "_User",
-                  objectId: userRes.id
-                });
-                const acl = new Parse.ACL();
-                acl.setPublicReadAccess(true);
-                acl.setPublicWriteAccess(true);
-                acl.setReadAccess(currentUser.id, true);
-                acl.setWriteAccess(currentUser.id, true);
-
-                contactQuery.setACL(acl);
-                const res = await contactQuery.save();
-
-                const parseData = JSON.parse(JSON.stringify(res));
-                if (props.details) {
-                  props.details({
-                    value: parseData[props.valueKey],
-                    label: parseData[props.displayKey]
-                  });
-                }
-                if (props.closePopup) {
-                  props.closePopup();
-                }
-                if (props.handleUserData) {
-                  props.handleUserData(parseData);
-                }
-                setIsLoader(false);
-                // Reset the form fields
-                setAddYourself(false);
-                setName("");
-                setPhone("");
-                setEmail("");
-              }
-            }
-          } else {
-            alert(t("add-signer-alert"));
-            setIsLoader(false);
           }
-        } catch (err) {
+          contactQuery.set("Email", email);
-          console.log("err in fetch contact", err);
+          contactQuery.set("UserRole", "contracts_Guest");
+
+          contactQuery.set("TenantId", {
+            __type: "Pointer",
+            className: "partners_Tenant",
+            objectId: localStorage.getItem("TenantId")
+          });
+
+          try {
+            const _users = Parse.Object.extend("User");
+            const _user = new _users();
+            _user.set("name", name);
+            _user.set("username", email);
+            _user.set("email", email);
+            _user.set("password", email);
+            if (phone) {
+              _user.set("phone", phone);
+            }
+            const user = await _user.save();
+            if (user) {
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", user);
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              if (props.details) {
+                props.details({
+                  value: parseData[props.valueKey],
+                  label: parseData[props.displayKey]
+                });
+              }
+              if (props.closePopup) {
+                props.closePopup();
+              }
+              if (props.handleUserData) {
+                props.handleUserData(parseData);
+              }
+
+              setIsLoader(false);
+              // Reset the form fields
+              setAddYourself(false);
+              setName("");
+              setPhone("");
+              setEmail("");
+            }
+          } catch (err) {
+            console.log("err ", err);
+            if (err.code === 202) {
+              const params = { email: email };
+              const userRes = await Parse.Cloud.run("getUserId", params);
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", {
+                __type: "Pointer",
+                className: "_User",
+                objectId: userRes.id
+              });
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              if (props.details) {
+                props.details({
+                  value: parseData[props.valueKey],
+                  label: parseData[props.displayKey]
+                });
+              }
+              if (props.closePopup) {
+                props.closePopup();
+              }
+              if (props.handleUserData) {
+                props.handleUserData(parseData);
+              }
+              setIsLoader(false);
+              // Reset the form fields
+              setAddYourself(false);
+              setName("");
+              setPhone("");
+              setEmail("");
+            }
+          }
+        } else {
+          alert(t("add-signer-alert"));
           setIsLoader(false);
-          alert(t("something-went-wrong-mssg"));
         }
-      } else {
+      } catch (err) {
+        console.log("err in fetch contact", err);
         setIsLoader(false);
         alert(t("something-went-wrong-mssg"));
       }
+    } else {
+      setIsLoader(false);
+      alert(t("something-went-wrong-mssg"));
     }
   };
 
@@ -211,7 +206,6 @@ const AddSigner = (props) => {
         </div>
       )}
       <div className="w-full mx-auto p-2 text-base-content">
-        <p className="mb-3">{t("add-signer-note")}</p>
         {isUserExist && (
           <div className="mb-3 flex items-center">
             <input

apps/OpenSign/src/components/AddUser.js

@@ -3,7 +3,7 @@ import Parse from "parse";
 import Title from "./Title";
 import Loader from "../primitives/Loader";
 import { copytoData, fetchSubscriptionInfo } from "../constant/Utils";
-import { emailRegex, isEnableSubscription } from "../constant/const";
+import { isEnableSubscription } from "../constant/const";
 import { useTranslation } from "react-i18next";
 function generatePassword(length) {
   const characters =
@@ -115,172 +115,149 @@ const AddUser = (props) => {
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
-    if (!emailRegex.test(formdata.email)) {
+    const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
-      alert("Please enter a valid email address.");
+    setIsFormLoader(true);
+    const res = await checkUserExist();
+    if (res) {
+      props.setIsAlert({ type: "danger", msg: t("user-already-exist") });
+      setIsFormLoader(false);
+      setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1000);
     } else {
-      const localUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+      try {
-      setIsFormLoader(true);
+        const extUser = new Parse.Object("contracts_Users");
-      const res = await checkUserExist();
+        extUser.set("Name", formdata.name);
-      if (res) {
+        if (formdata.phone) {
-        props.setIsAlert({ type: "danger", msg: t("user-already-exist") });
+          extUser.set("Phone", formdata.phone);
-        setIsFormLoader(false);
+        }
-        setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1000);
+        extUser.set("Email", formdata.email);
-      } else {
+        extUser.set("UserRole", `contracts_${formdata.role}`);
+        if (formdata?.team) {
+          extUser.set("TeamIds", [
+            {
+              __type: "Pointer",
+              className: "contracts_Teams",
+              objectId: formdata.team
+            }
+          ]);
+        }
+        if (localUser && localUser.OrganizationId) {
+          extUser.set("OrganizationId", {
+            __type: "Pointer",
+            className: "contracts_Organizations",
+            objectId: localUser.OrganizationId.objectId
+          });
+        }
+        if (localUser && localUser.Company) {
+          extUser.set("Company", localUser.Company);
+        }
+
+        if (localStorage.getItem("TenantId")) {
+          extUser.set("TenantId", {
+            __type: "Pointer",
+            className: "partners_Tenant",
+            objectId: localStorage.getItem("TenantId")
+          });
+        }
+
         try {
-          const extUser = new Parse.Object("contracts_Users");
+          const _users = Parse.Object.extend("User");
-          extUser.set("Name", formdata.name);
+          const _user = new _users();
+          _user.set("name", formdata.name);
+          _user.set("username", formdata.email);
+          _user.set("email", formdata.email);
+          _user.set("password", formdata.password);
           if (formdata.phone) {
-            extUser.set("Phone", formdata.phone);
+            _user.set("phone", formdata.phone);
           }
-          extUser.set("Email", formdata.email);
+
-          extUser.set("UserRole", `contracts_${formdata.role}`);
+          const user = await _user.save();
-          if (formdata?.team) {
+          if (user) {
-            extUser.set("TeamIds", [
+            const currentUser = Parse.User.current();
-              {
+            extUser.set(
-                __type: "Pointer",
+              "CreatedBy",
-                className: "contracts_Teams",
+              Parse.User.createWithoutData(currentUser.id)
-                objectId: formdata.team
+            );
+
+            extUser.set("UserId", user);
+            const acl = new Parse.ACL();
+            acl.setPublicReadAccess(true);
+            acl.setPublicWriteAccess(true);
+            acl.setReadAccess(currentUser.id, true);
+            acl.setWriteAccess(currentUser.id, true);
+
+            extUser.setACL(acl);
+
+            const res = await extUser.save();
+
+            const parseData = JSON.parse(JSON.stringify(res));
+
+            if (props.closePopup) {
+              props.closePopup();
+            }
+            if (props.handleUserData) {
+              if (formdata?.team) {
+                const team = teamList.find((x) => x.objectId === formdata.team);
+                parseData.TeamIds = parseData.TeamIds.map((y) =>
+                  y.objectId === team.objectId ? team : y
+                );
               }
-            ]);
+              props.handleUserData(parseData);
-          }
-          if (localUser && localUser.OrganizationId) {
-            extUser.set("OrganizationId", {
-              __type: "Pointer",
-              className: "contracts_Organizations",
-              objectId: localUser.OrganizationId.objectId
-            });
-          }
-          if (localUser && localUser.Company) {
-            extUser.set("Company", localUser.Company);
-          }
-
-          if (localStorage.getItem("TenantId")) {
-            extUser.set("TenantId", {
-              __type: "Pointer",
-              className: "partners_Tenant",
-              objectId: localStorage.getItem("TenantId")
-            });
-          }
-
-          try {
-            const _users = Parse.Object.extend("User");
-            const _user = new _users();
-            _user.set("name", formdata.name);
-            _user.set("username", formdata.email);
-            _user.set("email", formdata.email);
-            _user.set("password", formdata.password);
-            if (formdata.phone) {
-              _user.set("phone", formdata.phone);
             }
 
-            const user = await _user.save();
+            setIsFormLoader(false);
-            if (user) {
+            setFormdata({ name: "", email: "", phone: "", team: "", role: "" });
-              const currentUser = Parse.User.current();
-              extUser.set(
-                "CreatedBy",
-                Parse.User.createWithoutData(currentUser.id)
-              );
-
-              extUser.set("UserId", user);
-              const acl = new Parse.ACL();
-              acl.setPublicReadAccess(true);
-              acl.setPublicWriteAccess(true);
-              acl.setReadAccess(currentUser.id, true);
-              acl.setWriteAccess(currentUser.id, true);
-
-              extUser.setACL(acl);
-
-              const res = await extUser.save();
-
-              const parseData = JSON.parse(JSON.stringify(res));
-
-              if (props.closePopup) {
-                props.closePopup();
-              }
-              if (props.handleUserData) {
-                if (formdata?.team) {
-                  const team = teamList.find(
-                    (x) => x.objectId === formdata.team
-                  );
-                  parseData.TeamIds = parseData.TeamIds.map((y) =>
-                    y.objectId === team.objectId ? team : y
-                  );
-                }
-                props.handleUserData(parseData);
-              }
-
-              setIsFormLoader(false);
-              setFormdata({
-                name: "",
-                email: "",
-                phone: "",
-                team: "",
-                role: ""
-              });
-            }
-          } catch (err) {
-            console.log("err ", err);
-            if (err.code === 202) {
-              const params = { email: formdata.email };
-              const userRes = await Parse.Cloud.run("getUserId", params);
-              const currentUser = Parse.User.current();
-              extUser.set(
-                "CreatedBy",
-                Parse.User.createWithoutData(currentUser.id)
-              );
-
-              extUser.set("UserId", {
-                __type: "Pointer",
-                className: "_User",
-                objectId: userRes.id
-              });
-              const acl = new Parse.ACL();
-              acl.setPublicReadAccess(true);
-              acl.setPublicWriteAccess(true);
-              acl.setReadAccess(currentUser.id, true);
-              acl.setWriteAccess(currentUser.id, true);
-
-              extUser.setACL(acl);
-              const res = await extUser.save();
-
-              const parseData = JSON.parse(JSON.stringify(res));
-              if (props.closePopup) {
-                props.closePopup();
-              }
-              if (props.handleUserData) {
-                if (formdata?.team) {
-                  const team = teamList.find(
-                    (x) => x.objectId === formdata.team
-                  );
-                  parseData.TeamIds = parseData.TeamIds.map((y) =>
-                    y.objectId === team.objectId ? team : y
-                  );
-                }
-                props.handleUserData(parseData);
-              }
-              setIsFormLoader(false);
-              setFormdata({
-                name: "",
-                email: "",
-                phone: "",
-                team: "",
-                role: ""
-              });
-            }
           }
         } catch (err) {
-          console.log("err", err);
+          console.log("err ", err);
-          setIsFormLoader(false);
+          if (err.code === 202) {
-          props.setIsAlert({
+            const params = { email: formdata.email };
-            type: "danger",
+            const userRes = await Parse.Cloud.run("getUserId", params);
-            msg: t("something-went-wrong-mssg")
+            const currentUser = Parse.User.current();
-          });
+            extUser.set(
-        } finally {
+              "CreatedBy",
-          setTimeout(
+              Parse.User.createWithoutData(currentUser.id)
-            () => props.setIsAlert({ type: "success", msg: "" }),
+            );
-            1500
+
-          );
+            extUser.set("UserId", {
+              __type: "Pointer",
+              className: "_User",
+              objectId: userRes.id
+            });
+            const acl = new Parse.ACL();
+            acl.setPublicReadAccess(true);
+            acl.setPublicWriteAccess(true);
+            acl.setReadAccess(currentUser.id, true);
+            acl.setWriteAccess(currentUser.id, true);
+
+            extUser.setACL(acl);
+            const res = await extUser.save();
+
+            const parseData = JSON.parse(JSON.stringify(res));
+            if (props.closePopup) {
+              props.closePopup();
+            }
+            if (props.handleUserData) {
+              if (formdata?.team) {
+                const team = teamList.find((x) => x.objectId === formdata.team);
+                parseData.TeamIds = parseData.TeamIds.map((y) =>
+                  y.objectId === team.objectId ? team : y
+                );
+              }
+              props.handleUserData(parseData);
+            }
+            setIsFormLoader(false);
+            setFormdata({ name: "", email: "", phone: "", team: "", role: "" });
+          }
         }
+      } catch (err) {
+        console.log("err", err);
+        setIsFormLoader(false);
+        props.setIsAlert({
+          type: "danger",
+          msg: t("something-went-wrong-mssg")
+        });
+      } finally {
+        setTimeout(() => props.setIsAlert({ type: "success", msg: "" }), 1500);
       }
     }
   };

apps/OpenSign/src/components/BulkSendUi.js

@@ -5,7 +5,7 @@ import Loader from "../primitives/Loader";
 import { useTranslation } from "react-i18next";
 import Parse from "parse";
 import ModalUi from "../primitives/ModalUi";
-import { emailRegex, isEnableSubscription } from "../constant/const";
+import { isEnableSubscription } from "../constant/const";
 import { fetchSubscription } from "../constant/Utils";
 import { useNavigate } from "react-router-dom";
 const BulkSendUi = (props) => {
@@ -69,21 +69,7 @@ const BulkSendUi = (props) => {
         if (subscription?.plan === "freeplan") {
           setIsFreePlan(true);
         }
-        const token = props.jwttoken
+        const resCredits = await Parse.Cloud.run("allowedcredits");
-          ? { jwttoken: props.jwttoken }
-          : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
-        const axiosres = await axios.post(
-          `${localStorage.getItem("baseUrl")}functions/allowedcredits`,
-          {},
-          {
-            headers: {
-              "Content-Type": "application/json",
-              "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-              ...token
-            }
-          }
-        );
-        const resCredits = axiosres.data && axiosres.data.result;
         if (resCredits) {
           const allowedcredits = resCredits?.allowedcredits || 0;
           const addoncredits = resCredits?.addoncredits || 0;
@@ -95,7 +81,7 @@ const BulkSendUi = (props) => {
           }
           setAmount((obj) => ({ ...obj, totalcredits: totalcredits }));
         }
-        const getPlaceholder = props?.Placeholders;
+        const getPlaceholder = props.item?.Placeholders;
         const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
           placeholderObj?.placeHolder?.some((holder) =>
             holder?.pos?.some((posItem) => posItem?.type === "signature")
@@ -111,7 +97,7 @@ const BulkSendUi = (props) => {
     } else {
       setIsBulkAvailable(true);
       setAdmin((obj) => ({ ...obj, isAdmin: true }));
-      const getPlaceholder = props?.Placeholders;
+      const getPlaceholder = props.item?.Placeholders;
       const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
         placeholderObj?.placeHolder?.some((holder) =>
           holder?.pos?.some((posItem) => posItem?.type === "signature")
@@ -202,99 +188,75 @@ const BulkSendUi = (props) => {
     const updatedForms = forms.filter((_, i) => i !== index);
     setForms(updatedForms);
   };
-
-  function validateEmails(data) {
-    for (const item of data) {
-      for (const field of item.fields) {
-        if (!emailRegex.test(field.email)) {
-          alert(`Invalid email found: ${field.email}`);
-          return false;
-        }
-      }
-    }
-
-    return true;
-  }
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
     setIsSubmit(true);
-    if (validateEmails(forms)) {
-      // Create a copy of Placeholders array from props.item
-      let Placeholders = [...props.Placeholders];
-      // Initialize an empty array to store updated documents
-      let Documents = [];
-      // Loop through each form
-      forms.forEach((form) => {
-        //checking if user enter email which already exist as a signer then add user in a signers array
-        let existSigner = [];
-        form.fields.map((data) => {
-          if (data.signer) {
-            existSigner.push(data.signer);
-          }
-        });
-        // Map through the copied Placeholders array to update email values
-        const updatedPlaceholders = Placeholders.map((placeholder) => {
-          // Find the field in the current form that matches the placeholder Id
-          const field = form.fields.find(
-            (element) => parseInt(element.fieldId) === placeholder.Id
-          );
-          // If a matching field is found, update the email value in the placeholder
-          const signer = field?.signer?.objectId ? field.signer : "";
-          if (field) {
-            if (signer) {
-              return {
-                ...placeholder,
-                signerObjId: field?.signer?.objectId || "",
-                signerPtr: signer
-              };
-            } else {
-              return {
-                ...placeholder,
-                email: field.email,
-                signerObjId: field?.signer?.objectId || "",
-                signerPtr: signer
-              };
-            }
-          }
-          // If no matching field is found, keep the placeholder as is
-          return placeholder;
-        });
 
-        // Push a new document object with updated Placeholders into the Documents array
+    // Create a copy of Placeholders array from props.item
-        if (existSigner?.length > 0) {
+    let Placeholders = [...props.item.Placeholders];
-          Documents.push({
+    // Initialize an empty array to store updated documents
-            ...props.item,
+    let Documents = [];
-            Placeholders: updatedPlaceholders,
+    // Loop through each form
-            Signers: props.item.Signers
+    forms.forEach((form) => {
-              ? [...props.item.Signers, ...existSigner]
+      //checking if user enter email which already exist as a signer then add user in a signers array
-              : [...existSigner]
+      let existSigner = [];
-          });
+      form.fields.map((data) => {
-        } else {
+        if (data.signer) {
-          Documents.push({
+          existSigner.push(data.signer);
-            ...props.item,
-            Placeholders: updatedPlaceholders,
-            SignatureType: props.signatureType
-          });
         }
       });
-      await batchQuery(Documents);
+      // Map through the copied Placeholders array to update email values
-    } else {
+      const updatedPlaceholders = Placeholders.map((placeholder) => {
-      setIsSubmit(false);
+        // Find the field in the current form that matches the placeholder Id
-    }
+        const field = form.fields.find(
+          (element) => parseInt(element.fieldId) === placeholder.Id
+        );
+        // If a matching field is found, update the email value in the placeholder
+        const signer = field?.signer?.objectId ? field.signer : "";
+        if (field) {
+          if (signer) {
+            return {
+              ...placeholder,
+              signerObjId: field?.signer?.objectId || "",
+              signerPtr: signer
+            };
+          } else {
+            return {
+              ...placeholder,
+              email: field.email,
+              signerObjId: field?.signer?.objectId || "",
+              signerPtr: signer
+            };
+          }
+        }
+        // If no matching field is found, keep the placeholder as is
+        return placeholder;
+      });
+
+      // Push a new document object with updated Placeholders into the Documents array
+      if (existSigner?.length > 0) {
+        Documents.push({
+          ...props.item,
+          Placeholders: updatedPlaceholders,
+          Signers: props.item.Signers
+            ? [...props.item.Signers, ...existSigner]
+            : [...existSigner]
+        });
+      } else {
+        Documents.push({ ...props.item, Placeholders: updatedPlaceholders });
+      }
+    });
+    await batchQuery(Documents);
   };
 
   const batchQuery = async (Documents) => {
-    const token = props.jwttoken
+    const serverUrl = localStorage.getItem("baseUrl");
-      ? { jwttoken: props.jwttoken }
+    const functionsUrl = `${serverUrl}functions/batchdocuments`;
-      : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
-    const functionsUrl = `${localStorage.getItem(
-      "baseUrl"
-    )}functions/batchdocuments`;
     const headers = {
       "Content-Type": "application/json",
       "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-      ...token
+      sessionToken: localStorage.getItem("accesstoken")
     };
     const params = { Documents: JSON.stringify(Documents) };
     try {
@@ -400,7 +362,6 @@ const BulkSendUi = (props) => {
                                           fieldIndex
                                         )
                                       }
-                                      jwttoken={props?.jwttoken}
                                     />
                                   </div>
                                 ))}

apps/OpenSign/src/components/Header.js

@@ -16,7 +16,7 @@ import { useTranslation } from "react-i18next";
 import ModalUi from "../primitives/ModalUi";
 import QuotaCard from "../primitives/QuotaCard";
 
-const Header = ({ showSidebar, setIsMenu }) => {
+const Header = ({ showSidebar }) => {
   const { t, i18n } = useTranslation();
   const navigate = useNavigate();
   const { width } = useWindowSize();
@@ -40,7 +40,7 @@ const Header = ({ showSidebar, setIsMenu }) => {
   const toggleDropdown = () => {
     setIsOpen(!isOpen);
     if (width <= 768) {
-      setIsMenu(false);
+      showSidebar();
     }
   };
   useEffect(() => {

apps/OpenSign/src/components/opensigndrive/DriveBody.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from "react";
 import "../../styles/opensigndrive.css";
 import axios from "axios";
 import * as ContextMenu from "@radix-ui/react-context-menu";
+import { saveAs } from "file-saver";
 import { useNavigate } from "react-router-dom";
 import Table from "react-bootstrap/Table";
 import * as HoverCard from "@radix-ui/react-hover-card";
@@ -263,6 +264,12 @@ function DriveBody(props) {
       setIsOpenMoveModal(false);
     }
   };
+
+  const sanitizeFileName = (pdfName) => {
+    // Replace spaces with underscore
+    return pdfName.replace(/ /g, "_");
+  };
+
   const handleEnterPress = (e, data) => {
     if (e.key === "Enter") {
       handledRenameDoc(data);

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

@@ -1,24 +1,11 @@
 import React from "react";
 
-function BorderResize(props) {
+function BorderResize({ right, top }) {
-  const getHeight = () => {
-    const height = props.posHeight(props.pos, props.isSignYourself);
-    if (height > 14) {
-      return "14px";
-    } else {
-      return `${height}px`;
-    }
-  };
-
   return (
     <div
-      style={{
+      className={`${right ? `-right-[12px]` : "-right-[1px]"} ${
-        width: getHeight() || "14px",
+        top ? `-bottom-[11px]` : "-bottom-[1px]"
-        height: getHeight() || "14px"
+      } absolute inline-block w-[14px] h-[14px] hover:cursor-sw-resize border-r-[3px] border-b-[3px] border-[#188ae2]`}
-      }}
-      className={`${props.right ? `-right-[12px]` : "-right-[2px]"} ${
-        props.top ? `-bottom-[12px]` : "-bottom-[2px] "
-      } absolute inline-block hover:cursor-sw-resize border-r-[3px] border-b-[3px] border-[#188ae2]`}
     ></div>
   );
 }

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

@@ -1,16 +1,16 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-function DefaultSignature(props) {
+function DefaultSignature({ defaultSignImg, xyPostion, setDefaultSignAlert }) {
   const { t } = useTranslation();
 
   const confirmToaddDefaultSign = () => {
-    if (props?.xyPostion.length > 0) {
+    if (xyPostion.length > 0) {
-      props?.setDefaultSignAlert({
+      setDefaultSignAlert({
         isShow: true,
         alertMessage: t("default-sign-alert")
       });
     } else {
-      props?.setDefaultSignAlert({
+      setDefaultSignAlert({
         isShow: true,
         alertMessage: t("please-select-position!")
       });
@@ -22,30 +22,22 @@ function DefaultSignature(props) {
       <div className="mx-2 pr-2 pt-2 pb-1 text-[15px] text-base-content font-semibold border-b-[1px] border-base-300">
         {t("signature")}
       </div>
-      <div className="flex flex-col items-center mt-[10px] font-semibold relative">
+      <div className="flex flex-col items-center mt-[10px] font-semibold">
         <p className="text-base-content">{t("Your-Signature")}</p>
         <div className="op-card shadow-md h-[111px] w-[90%] p-2">
           <img
             alt="signature"
             className="w-full h-full object-contain"
-            src={props?.defaultSignImg}
+            src={defaultSignImg}
           />
         </div>
         <button
           type="button"
           className="op-btn op-btn-primary op-btn-sm mt-[10px]"
           onClick={() => confirmToaddDefaultSign()}
-          disabled={!props?.isDefault}
         >
           {t("auto-sign-all")}
         </button>
-        {!props.isDefault && (
-          <div className="absolute bg-black/70 text-white w-full h-full flex items-center justify-center text-[11px] cursor-default">
-            <span className="-rotate-45">
-              Document creator has disabled this option
-            </span>
-          </div>
-        )}
       </div>
     </div>
   );

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

@@ -339,9 +339,9 @@ function DropdownWidgetOption(props) {
                 value={
                   props.fontSize ||
                   props.currWidgetsDetails?.options?.fontSize ||
-                  12
+                  "12"
                 }
-                onChange={(e) => props.setFontSize(parseInt(e.target.value))}
+                onChange={(e) => props.setFontSize(e.target.value)}
               >
                 {fontsizeArr.map((size, ind) => {
                   return (

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

@@ -5,8 +5,11 @@ import { isEnableSubscription } from "../../constant/const";
 import { useTranslation } from "react-i18next";
 import { Tooltip } from "react-tooltip";
 
-const EditTemplate = ({ template, onSuccess, jwttoken }) => {
+// import SelectFolder from "../../premitives/SelectFolder";
+
+const EditTemplate = ({ template, onSuccess }) => {
   const { t } = useTranslation();
+  // const [folder, setFolder] = useState({ ObjectId: "", Name: "" });
   const [formData, setFormData] = useState({
     Name: template?.Name || "",
     Note: template?.Note || "",
@@ -14,10 +17,7 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
     SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
     AutomaticReminders: template?.AutomaticReminders || false,
     RemindOnceInEvery: template?.RemindOnceInEvery || 5,
-    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false",
+    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false"
-    IsTourEnabled: template?.IsTourEnabled
-      ? `${template?.IsTourEnabled}`
-      : "false"
   });
   const [isSubscribe, setIsSubscribe] = useState(false);
   useEffect(() => {
@@ -26,20 +26,23 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
   }, []);
   const fetchSubscription = async () => {
     if (isEnableSubscription) {
-      const subscribe = await checkIsSubscribed(jwttoken);
+      const subscribe = await checkIsSubscribed();
       setIsSubscribe(subscribe.isValid);
     }
   };
   const handleStrInput = (e) => {
     setFormData({ ...formData, [e.target.name]: e.target.value });
   };
+  // const handleFolder = (data) => {
+  //   console.log("handleFolder ", data)
+  //   setFolder(data);
+  // };
 
   // Define a function to handle form submission
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
     const isChecked = formData.SendinOrder === "true" ? true : false;
-    const isTourEnabled = formData?.IsTourEnabled === "false" ? false : true;
     const AutoReminder = formData?.AutomaticReminders || false;
     const IsEnableOTP = formData.IsEnableOTP === "true" ? true : false;
     let reminderDate = {};
@@ -53,7 +56,6 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
       ...formData,
       SendinOrder: isChecked,
       IsEnableOTP: IsEnableOTP,
-      IsTourEnabled: isTourEnabled,
       ...reminderDate
     };
     onSuccess(data);
@@ -78,7 +80,7 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
           </div>
           <div className="mb-[0.35rem]">
             <label htmlFor="name" className="text-[13px]">
-              {t("Title")}
+              {t("name")}
               <span className="text-[13px] text-[red]"> *</span>
             </label>
             <input
@@ -151,6 +153,7 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
                 }
               >
                 {t("auto-reminder")}
+                {"  "}
                 {!isSubscribe && isEnableSubscription && <Upgrade />}
               </span>
               <label
@@ -253,59 +256,6 @@ const EditTemplate = ({ template, onSuccess, jwttoken }) => {
               </div>
             </div>
           )}
-
-          <div className="text-xs mt-2">
-            <label className="block">
-              <span>
-                {t("enable-tour")}
-                <a data-tooltip-id="istourenabled-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>{" "}
-              </span>
-              <Tooltip id="istourenabled-tooltip" className="z-50">
-                <div className="max-w-[200px] md:max-w-[450px]">
-                  <p className="font-bold">{t("enable-tour")}</p>
-                  <p className="p-[5px]">
-                    <ol className="list-disc">
-                      <li>
-                        <span className="font-bold">{t("yes")}: </span>
-                        <span>{t("istourenabled-help.p1")}</span>
-                      </li>
-                      <li>
-                        <span className="font-bold">{t("no")}: </span>
-                        <span>{t("istourenabled-help.p2")}</span>
-                      </li>
-                    </ol>
-                  </p>
-                  <p>{t("istourenabled-help.p3")}</p>
-                </div>
-              </Tooltip>
-            </label>
-            <div className={`  flex items-center gap-2 ml-2 mb-1 `}>
-              <input
-                type="radio"
-                value={"true"}
-                className="op-radio op-radio-xs"
-                name="IsTourEnabled"
-                checked={formData.IsTourEnabled === "true"}
-                onChange={handleStrInput}
-              />
-              <div className="text-center">{t("yes")}</div>
-            </div>
-            <div className={` flex items-center gap-2 ml-2 mb-1 `}>
-              <input
-                type="radio"
-                value={"false"}
-                name="IsTourEnabled"
-                className="op-radio op-radio-xs"
-                checked={formData.IsTourEnabled === "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/components/pdf/EmailComponent.js

@@ -30,15 +30,16 @@ function EmailComponent({
     const pdfName = pdfDetails[0]?.Name;
     setIsLoading(true);
     let sendMail;
-    const docId = pdfDetails?.[0]?.objectId || "";
+
-    const FileAdapterId = pdfDetails?.[0]?.FileAdapterId
+    const docId = !pdfDetails?.[0]?.IsEnableOTP
-      ? pdfDetails?.[0]?.FileAdapterId
+      ? pdfDetails?.[0]?.objectId
       : "";
     let presignedUrl = pdfUrl;
     try {
+      // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
       const axiosRes = await axios.post(
         `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
-        { url: pdfUrl, docId: docId, fileAdapterId: FileAdapterId },
+        { url: pdfUrl, docId: docId },
         {
           headers: {
             "content-type": "Application/json",

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

@@ -34,7 +34,7 @@ export function App() {
       <Opensign
         onLoad={() => console.log("success")}
         onLoadError={(error) => console.log(error)}
-        templateId= "${props.templateId}"
+        templateId= {"${props.templateId}"}
       />
     </div>
   );
@@ -63,10 +63,10 @@ import {OpensignComponent} from "@opensign/angular"
   selector:'app-root',
   standalone: true,
   imports: [OpensignComponent], 
-  template:\`<opensign templateId="${props.templateId}"
+  template: '<opensign templateId={"${props.templateId}"}
             (onLoad)="handleLoad()"
             (onLoadError)="handleError($event)"
-             ></opensign>\`,
+             ></opensign>',
 })
 export class AppComponent{
   handleLoad() {
@@ -129,11 +129,9 @@ export class AppComponent{
                   <p className="font-medium text-[18px]">
                     {t(`${data.title}`)}
                   </p>
-                  {ind === 0 && (
+                  <p className="text-[13px] mt-2">
-                    <p className="text-[13px] mt-2">
+                    {t("public-template-mssg-1")}
-                      {t("public-template-mssg-1")}
+                  </p>
-                    </p>
-                  )}
                   <div className="relative p-1">
                     <div
                       onClick={() => handleCopy(data.codeString, ind)}
@@ -212,11 +210,11 @@ export class AppComponent{
                     <p className="font-medium text-[18px]">
                       {t(`${data.title}`)}
                     </p>
-                    {ind === 0 && (
+
-                      <p className="text-[13px] mt-2">
+                    <p className="text-[13px] mt-2">
-                        {t("angular-npm-mssg-1")}
+                      {t("angular-npm-mssg-1")}
-                      </p>
+                    </p>
-                    )}
+
                     <div className="relative p-1">
                       <div
                         onClick={() => handleCopy(data.codeString, ind)}

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

@@ -40,8 +40,7 @@ function Header({
   handleRotationFun,
   isDisableRotate,
   templateId,
-  setIsDownloadModal,
+  setIsDownloadModal
-  disabledBackBtn
 }) {
   const { t } = useTranslation();
   const filterPrefill =
@@ -49,7 +48,6 @@ function Header({
   const isMobile = window.innerWidth < 767;
   const [isDownloading, setIsDownloading] = useState("");
   const isGuestSigner = localStorage.getItem("isGuestSigner");
-  const enabledBackBtn = disabledBackBtn === true ? false : true;
 
   //function for show decline alert
   const handleDeclinePdfAlert = async () => {
@@ -334,15 +332,13 @@ function Header({
                     <i className="fa-light fa-gear fa-lg"></i>
                   </button>
                 )}
-                {enabledBackBtn && (
+                <button
-                  <button
+                  onClick={() => window.history.go(-2)}
-                    onClick={() => window.history.go(-2)}
+                  type="button"
-                    type="button"
+                  className="op-btn op-btn-ghost op-btn-sm mr-[3px]"
-                    className="op-btn op-btn-ghost op-btn-sm mr-[3px]"
+                >
-                  >
+                  {t("back")}
-                    {t("back")}
+                </button>
-                  </button>
-                )}
                 <button
                   disabled={isMailSend && true}
                   data-tut="headerArea"
@@ -422,7 +418,11 @@ function Header({
                     {templateId && (
                       <button
                         onClick={() =>
-                          handleDownloadPdf(pdfDetails, setIsDownloading)
+                          handleDownloadPdf(
+                            pdfDetails,
+                            pdfUrl,
+                            setIsDownloading
+                          )
                         }
                         type="button"
                         className="op-btn op-btn-ghost op-btn-sm mr-[3px]"

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

@@ -331,9 +331,10 @@ function Placeholder(props) {
     //condition for only placeholder and template flow
     if (props.data && props?.pos?.type !== textWidget) {
       props.setUniqueId(props?.data?.Id);
-      const checkIndex = props.xyPostion
+      const checkIndex = props.xyPostion.findIndex(
-        .filter((data) => data.Role !== "prefill")
+        (data) => data.Id === props.data.Id
-        .findIndex((data) => data.Id === props.data.Id);
+      );
+
       props.setIsSelectId(checkIndex || 0);
     }
     //condition to handle in placeholder and template flow for text widget signerId for text widgets i have to set uniqueId in tempSignerId because
@@ -341,6 +342,10 @@ function Placeholder(props) {
     else if (props.data && props.pos.type === textWidget) {
       props.setTempSignerId(props.uniqueId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+      props.setIsSelectId(checkIndex || 0);
     }
     props.setSignKey(props.pos.key);
     props.setWidgetType(props.pos.type);
@@ -356,13 +361,18 @@ function Placeholder(props) {
 
     if (props.data && props?.pos?.type !== textWidget) {
       props.setUniqueId(props?.data?.Id);
-      const checkIndex = props.xyPostion
+      const checkIndex = props.xyPostion.findIndex(
-        .filter((data) => data.Role !== "prefill")
+        (data) => data.Id === props.data.Id
-        .findIndex((data) => data.Id === props.data.Id);
+      );
+
       props.setIsSelectId(checkIndex || 0);
     } else if (props.data && props.pos.type === textWidget) {
       props.setTempSignerId(props.uniqueId);
       props.setUniqueId(props?.data?.Id);
+      const checkIndex = props.xyPostion.findIndex(
+        (data) => data.Id === props.data.Id
+      );
+      props.setIsSelectId(checkIndex || 0);
     }
 
     //checking widget's type and open widget copy modal for required widgets
@@ -412,7 +422,7 @@ function Placeholder(props) {
       data?.format,
       null,
       null,
-      props.fontSize || props.pos?.options?.fontSize || 12,
+      props.fontSize || props.pos?.options?.fontSize || "12",
       props.fontColor || props.pos?.options?.fontColor || "black"
     );
     setSelectDate({ date: date, format: data?.format });
@@ -445,13 +455,17 @@ function Placeholder(props) {
                     handleOnClickSettingIcon();
                   }}
                   className="fa-light fa-gear icon"
-                  style={{ color: "#188ae2", right: "29px", top: "-19px" }}
+                  style={{
+                    color: "#188ae2",
+                    right: "29px",
+                    top: "-19px"
+                  }}
                 ></i>
               ) : (
                 /* condition to add setting icon for placeholder & template flow for all widgets except signature and date */
                 ((!props?.pos?.type && props.pos.isStamp) ||
                   (props?.pos?.type &&
-                    !["date"].includes(props.pos.type) &&
+                    !["date", "signature"].includes(props.pos.type) &&
                     !props.isSignYourself)) && (
                   <i
                     onClick={(e) => {
@@ -465,7 +479,7 @@ function Placeholder(props) {
                     className="fa-light fa-gear icon"
                     style={{
                       color: "#188ae2",
-                      right: props?.pos?.type === textWidget ? "32px" : "51px",
+                      right: props?.pos?.type === textWidget ? "32px" : "47px",
                       top: "-19px"
                     }}
                   ></i>
@@ -637,21 +651,6 @@ function Placeholder(props) {
       }
     }
   };
-  //function to calculate font size
-  const calculateFont = (size, isMinHeight) => {
-    const containerScale = getContainerScale(
-      props.pdfOriginalWH,
-      props.pageNumber,
-      props.containerWH
-    );
-    const fontSize = (size || 12) * containerScale * props.scale;
-    //isMinHeight to set text box minimum height
-    if (isMinHeight) {
-      return fontSize * 1.2 + "px";
-    } else {
-      return fontSize + "px";
-    }
-  };
 
   const getCursor = () => {
     if (props.data && props.isNeedSign) {
@@ -726,9 +725,7 @@ function Placeholder(props) {
               : props?.pos?.zIndex
                 ? props.pos.zIndex
                 : "5",
-          background: props.data
+          background: props.data ? props.data.blockColor : "rgb(203 233 237)"
-            ? props.data?.blockColor + "b0"
-            : "rgba(203, 233, 237, 0.69)"
         }}
         onDrag={() => {
           setDraggingEnabled(true);
@@ -746,16 +743,12 @@ function Placeholder(props) {
               ? "auto"
               : props.posHeight(props.pos, props.isSignYourself)
         }}
-        minHeight={calculateFont(props.pos.options?.fontSize, true)}
-        maxHeight="auto"
         onResizeStart={() => {
           setDraggingEnabled(true);
           props.setIsResize && props.setIsResize(true);
         }}
         onResizeStop={(e, direction, ref) => {
-          setTimeout(() => {
+          props.setIsResize && props.setIsResize(false);
-            props.setIsResize && props.setIsResize(false);
-          }, 50);
           props.handleSignYourselfImageResize &&
             props.handleSignYourselfImageResize(
               ref,
@@ -790,28 +783,18 @@ function Placeholder(props) {
             h: ref.offsetHeight / (props.scale * containerScale)
           });
         }}
-        onClick={() => !props.isResize && handleOnClickPlaceholder()}
+        onClick={() => handleOnClickPlaceholder()}
       >
         {props.isShowBorder &&
         props.pos.type !== radioButtonWidget &&
         props.pos.type !== "checkbox" &&
         props.pos.key === props.selectWidgetId ? (
-          <BorderResize
+          <BorderResize right={-12} top={-11} />
-            right={-12}
-            top={-11}
-            pos={props.pos}
-            posHeight={props.posHeight}
-            isSignYourself={props.isSignYourself}
-          />
         ) : props.data && props.isNeedSign && props.pos.type !== "checkbox" ? (
           props.data?.signerObjId === props.signerObjId &&
           props.pos.type !== radioButtonWidget &&
           props.pos.type !== "checkbox" ? (
-            <BorderResize
+            <BorderResize />
-              posHeight={props.posHeight}
-              isSignYourself={props.isSignYourself}
-              pos={props.pos}
-            />
           ) : (
             <></>
           )
@@ -834,7 +817,7 @@ function Placeholder(props) {
         )}
         {isTabAndMobile ? (
           <div
-            className="flex items-stretch justify-center"
+            className="flex items-stretch"
             style={{
               left: xPos(props.pos, props.isSignYourself),
               top: yPos(props.pos, props.isSignYourself),
@@ -877,7 +860,6 @@ function Placeholder(props) {
               startDate={startDate}
               handleSaveDate={handleSaveDate}
               xPos={props.xPos}
-              calculateFont={calculateFont}
             />
           </div>
         ) : (
@@ -905,7 +887,6 @@ function Placeholder(props) {
               startDate={startDate}
               handleSaveDate={handleSaveDate}
               xPos={props.xPos}
-              calculateFont={calculateFont}
             />
           </>
         )}
@@ -944,8 +925,8 @@ function Placeholder(props) {
             <span>{t("font-size")} :</span>
             <select
               className="ml-[3px] md:ml:[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
-              value={props.fontSize || clickonWidget.options?.fontSize || 12}
+              value={props.fontSize || clickonWidget.options?.fontSize || "12"}
-              onChange={(e) => props.setFontSize(parseInt(e.target.value))}
+              onChange={(e) => props.setFontSize(e.target.value)}
             >
               {fontsizeArr.map((size, ind) => {
                 return (

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

@@ -29,7 +29,7 @@ function PlaceholderType(props) {
   const [textValue, setTextValue] = useState();
   const [selectedCheckbox, setSelectedCheckbox] = useState([]);
   const years = range(1990, getYear(new Date()) + 16, 1);
-  const fontSize = props.calculateFont(props.pos.options?.fontSize);
+  const fontSize = (props.pos.options?.fontSize || "12") + "px";
   const fontColor = props.pos.options?.fontColor || "black";
   const months = [
     "January",

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

@@ -65,8 +65,7 @@ function RenderPdf({
   fontSize,
   setFontSize,
   fontColor,
-  setFontColor,
+  setFontColor
-  isResize
 }) {
   const { t } = useTranslation();
   const isMobile = window.innerWidth < 767;
@@ -105,7 +104,6 @@ function RenderPdf({
       }
     }
   };
-
   const posHeight = (pos, signYourself) => {
     const containerScale = getContainerScale(
       pdfOriginalWH,
@@ -209,7 +207,6 @@ function RenderPdf({
                         pageNumber={pageNumber}
                         ispublicTemplate={ispublicTemplate}
                         handleUserDetails={handleUserDetails}
-                        isResize={isResize}
                       />
                     </React.Fragment>
                   )
@@ -360,8 +357,6 @@ function RenderPdf({
                                             setFontSize={setFontSize}
                                             fontColor={fontColor}
                                             setFontColor={setFontColor}
-                                            isResize={isResize}
-                                            unSignedWidgetId={unSignedWidgetId}
                                           />
                                         </React.Fragment>
                                       );
@@ -422,8 +417,6 @@ function RenderPdf({
                                     setFontSize={setFontSize}
                                     fontColor={fontColor}
                                     setFontColor={setFontColor}
-                                    isResize={isResize}
-                                    setIsResize={setIsResize}
                                   />
                                 )
                               );
@@ -555,8 +548,6 @@ function RenderPdf({
                                             setFontSize={setFontSize}
                                             fontColor={fontColor}
                                             setFontColor={setFontColor}
-                                            isResize={isResize}
-                                            unSignedWidgetId={unSignedWidgetId}
                                           />
                                         </React.Fragment>
                                       );
@@ -620,8 +611,6 @@ function RenderPdf({
                                     setFontSize={setFontSize}
                                     fontColor={fontColor}
                                     setFontColor={setFontColor}
-                                    isResize={isResize}
-                                    setIsResize={setIsResize}
                                   />
                                 </React.Fragment>
                               );

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

@@ -6,16 +6,17 @@ function SelectLanguage(props) {
   const { i18n } = useTranslation();
   const languages = [
     { value: "en", text: "English" },
-    { value: "es", text: "Española" },
     { value: "fr", text: "Français" }
   ];
-  const defaultLanguage = i18next.language || "en";
+  const [lang, setLang] = useState(i18next.language || "en");
-  const [lang, setLang] = useState(defaultLanguage);
   // This function put query that helps to change the language
   const handleChangeLang = (e) => {
     setLang(e.target.value);
     i18n.changeLanguage(e.target.value);
-    props?.updateExtUser && props.updateExtUser({ language: e.target.value });
+    props?.updateExtUser &&
+      props.updateExtUser({
+        language: e.target.value
+      });
   };
   return (
     <div
@@ -30,7 +31,9 @@ function SelectLanguage(props) {
           !props.isProfile ? " md:w-[15%] w-[50%]" : "w-[180px]"
         } op-select op-select-bordered  bg-white op-select-sm `}
       >
-        <option disabled>select</option>
+        <option disabled selected>
+          select
+        </option>
         {languages.map((item) => {
           return (
             <option key={item.value} value={item.value}>

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

@@ -1,20 +1,39 @@
 import React, { useRef, useState, useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import SignatureCanvas from "react-signature-canvas";
-
+function SignPad({
-function SignPad(props) {
+  isSignPad,
+  isStamp,
+  setIsImageSelect,
+  onSaveSign,
+  setIsSignPad,
+  setImage,
+  isImageSelect,
+  imageRef,
+  onImageChange,
+  onSaveImage,
+  image,
+  defaultSign,
+  setSignature,
+  myInitial,
+  isInitial,
+  setIsInitial,
+  setIsStamp,
+  widgetType,
+  currWidgetsDetails,
+  setCurrWidgetsDetails
+}) {
   const { t } = useTranslation();
   const [penColor, setPenColor] = useState("blue");
   const allColor = ["blue", "red", "black"];
   const canvasRef = useRef(null);
   const [isDefaultSign, setIsDefaultSign] = useState(false);
-  const [isTab, setIsTab] = useState("");
+  const [isTab, setIsTab] = useState("draw");
   const [isSignImg, setIsSignImg] = useState("");
   const [signValue, setSignValue] = useState("");
   const [textWidth, setTextWidth] = useState(0);
   const [textHeight, setTextHeight] = useState(0);
-  const [signatureType, setSignatureType] = useState("");
+  const [signatureType, setSignatureType] = useState("draw");
-  const [isSignTypes, setIsSignTypes] = useState(true);
   const fontOptions = [
     { value: "Fasthand" },
     { value: "Dancing Script" },
@@ -34,58 +53,24 @@ function SignPad(props) {
   const jsonSender = JSON.parse(senderUser);
   const currentUserName = jsonSender && jsonSender?.name;
 
-  useEffect(() => {
-    handleTab();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.signatureTypes]);
-
-  function handleTab() {
-    const signtypes = props?.signatureTypes || [];
-    const index = signtypes?.findIndex((x) => x.enabled === true);
-    if (index !== -1) {
-      setIsSignTypes(true);
-      const tab = props?.signatureTypes[index].name;
-      if (tab === "draw") {
-        setIsTab("draw");
-        setSignatureType("draw");
-      } else if (tab === "upload") {
-        props?.setIsImageSelect(true);
-        setIsTab("uploadImage");
-      } else if (tab === "typed") {
-        setIsTab("type");
-      } else if (tab === "default") {
-        setIsTab("mysignature");
-      } else {
-        setIsTab(true);
-      }
-    } else {
-      setIsSignTypes(false);
-    }
-  }
-  function isTabEnabled(tabName) {
-    const isEnabled = props?.signatureTypes.find(
-      (x) => x.name === tabName
-    )?.enabled;
-    return isEnabled;
-  }
-
   //function for clear signature image
   const handleClear = () => {
-    props?.setCurrWidgetsDetails({});
+    setCurrWidgetsDetails({});
     if (isTab === "draw") {
       if (canvasRef.current) {
         canvasRef.current.clear();
-      } else if (props?.isStamp) {
+      } else if (isStamp) {
-        props?.setImage("");
+        setImage("");
       }
       setIsSignImg("");
     } else if (isTab === "uploadImage") {
-      props?.setImage("");
+      setImage("");
     }
+    // setIsInitial(false);
   };
   //function for set signature url
   const handleSignatureChange = (data) => {
-    props?.setSignature(data);
+    setSignature(data);
     setIsSignImg(data);
   };
   //save button component
@@ -103,57 +88,58 @@ function SignPad(props) {
         )}
         <button
           onClick={() => {
-            props?.setCurrWidgetsDetails({});
+            setCurrWidgetsDetails({});
-            if (!props?.image) {
+            if (!image) {
               if (isTab === "mysignature") {
                 setIsSignImg("");
-                if (props?.isInitial) {
+                if (isInitial) {
-                  props?.onSaveSign(signatureType, "initials");
+                  onSaveSign(signatureType, "initials");
                 } else {
-                  props?.onSaveSign(null, "default");
+                  onSaveSign(null, "default");
                 }
               } else {
                 if (isTab === "type") {
                   setIsSignImg("");
-                  props?.onSaveSign(
+                  onSaveSign(
                     null,
                     false,
-                    !props?.isInitial && textWidth > 150 ? 150 : textWidth,
+                    !isInitial && textWidth > 150 ? 150 : textWidth,
-                    !props?.isInitial && textHeight > 35 ? 35 : textHeight
+                    !isInitial && textHeight > 35 ? 35 : textHeight
                   );
                 } else {
                   setIsSignImg("");
                   canvasRef.current.clear();
-                  props?.onSaveSign(signatureType);
+                  onSaveSign(signatureType);
                 }
               }
+
               setPenColor("blue");
             } else {
               setIsSignImg("");
-              props?.onSaveImage(signatureType);
+              onSaveImage(signatureType);
             }
-            props?.setIsSignPad(false);
+            setIsSignPad(false);
-            props?.setIsInitial(false);
+            setIsInitial(false);
-            props?.setIsImageSelect(false);
+            setIsImageSelect(false);
             setIsDefaultSign(false);
-            props?.setImage();
+            setImage();
-            handleTab();
+            setIsTab("draw");
             setSignValue("");
-            props?.setIsStamp(false);
+            setIsStamp(false);
           }}
           type="button"
           className={`${
-            isSignImg || props?.image || isDefaultSign || textWidth
+            isSignImg || image || isDefaultSign || textWidth
               ? ""
               : "pointer-events-none"
           } op-btn op-btn-primary shadow-lg`}
           disabled={
             (isTab === "draw" && isSignImg) ||
-            (isTab === "image" && props?.image) ||
+            (isTab === "image" && image) ||
             (isTab === "mysignature" && isDefaultSign) ||
             (isTab === "type" && signValue)
               ? false
-              : props?.image
+              : image
                 ? false
                 : true
           }
@@ -165,12 +151,12 @@ function SignPad(props) {
   };
   //useEffect for set already draw or save signature url/text url of signature text type and draw type for initial type and signature type widgets
   useEffect(() => {
-    if (props?.currWidgetsDetails && canvasRef.current) {
+    if (currWidgetsDetails && canvasRef.current) {
-      const isWidgetType = props?.currWidgetsDetails?.type;
+      const isWidgetType = currWidgetsDetails?.type;
-      const signatureType = props?.currWidgetsDetails?.signatureType;
+      const signatureType = currWidgetsDetails?.signatureType;
-      const url = props?.currWidgetsDetails?.SignUrl;
+      const url = currWidgetsDetails?.SignUrl;
       //checking widget type and draw type signature url
-      if (props?.isInitial) {
+      if (isInitial) {
         if (isWidgetType === "initials" && signatureType === "draw" && url) {
           canvasRef.current.fromDataURL(url);
         }
@@ -185,12 +171,12 @@ function SignPad(props) {
 
     const trimmedName = currentUserName && currentUserName?.trim();
     const firstCharacter = trimmedName?.charAt(0);
-    const userName = props?.isInitial ? firstCharacter : currentUserName;
+    const userName = isInitial ? firstCharacter : currentUserName;
     setSignValue(userName || "");
     setFontSelect("Fasthand");
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [props.isSignPad]);
+  }, [isSignPad]);
   useEffect(() => {
     const loadFont = async () => {
       try {
@@ -218,7 +204,7 @@ function SignPad(props) {
         ? signValue?.trim()
         : currentUserName?.trim();
       const firstCharacter = trimmedName?.charAt(0);
-      const userName = props?.isInitial ? firstCharacter : signValue;
+      const userName = isInitial ? firstCharacter : signValue;
       setSignValue(userName);
       convertToImg(fontSelect, userName);
     }
@@ -247,7 +233,7 @@ function SignPad(props) {
     // Draw the text content on the canvas
     const ctx = canvasElement.getContext("2d");
     const pixelRatio = window.devicePixelRatio || 1;
-    const addExtraWidth = props?.isInitial ? 10 : 50;
+    const addExtraWidth = isInitial ? 10 : 50;
     const width = span.offsetWidth + addExtraWidth;
     const height = span.offsetHeight;
     setTextWidth(width);
@@ -269,7 +255,7 @@ function SignPad(props) {
     document.body.removeChild(span);
     // Convert the canvas to image data
     const dataUrl = canvasElement.toDataURL("image/png");
-    props?.setSignature(dataUrl);
+    setSignature(dataUrl);
   };
 
   const PenColorComponent = (props) => {
@@ -311,365 +297,319 @@ function SignPad(props) {
       </div>
     );
   };
-
-  // `handleCancelBtn` function trigger when user click on cross button
-  const handleCancelBtn = () => {
-    setPenColor("blue");
-    props?.setIsSignPad(false);
-    props?.setIsInitial(false);
-    props?.setIsImageSelect(false);
-    setIsDefaultSign(false);
-    props?.setImage();
-    handleTab();
-    setSignValue("");
-    props?.setIsStamp(false);
-  };
   return (
     <div>
-      {props?.isSignPad && (
+      {isSignPad && (
         <div className="op-modal op-modal-open">
           <div className="op-modal-box px-[13px] pt-2 pb-0">
-            {isSignTypes ? (
+            <div className="flex justify-between text-base-content items-center">
-              <>
+              <div className="text-[1.2rem]">
-                <div className="flex justify-between text-base-content items-center">
+                <div className="flex flex-row justify-between mt-[3px]">
-                  <div className="text-[1.2rem]">
+                  <div className="flex flex-row justify-between gap-[5px] md:gap-[8px] text-[11px] md:text-base">
-                    <div className="flex flex-row justify-between mt-[3px]">
+                    {isStamp ? (
-                      <div className="flex flex-row justify-between gap-[5px] md:gap-[8px] text-[11px] md:text-base">
+                      <span className="text-base-content font-bold text-lg">
-                        {props?.isStamp ? (
+                        {widgetType === "image" ||
-                          <span className="text-base-content font-bold text-lg">
+                        currWidgetsDetails?.type === "image"
-                            {props?.widgetType === "image" ||
+                          ? t("upload-image")
-                            props?.currWidgetsDetails?.type === "image"
+                          : t("upload-stamp-image")}
-                              ? t("upload-image")
+                      </span>
-                              : t("upload-stamp-image")}
-                          </span>
-                        ) : (
-                          <>
-                            {isTabEnabled("draw") && (
-                              <div>
-                                <span
-                                  onClick={() => {
-                                    setIsDefaultSign(false);
-                                    props?.setIsImageSelect(false);
-                                    setIsTab("draw");
-                                    props?.setImage();
-                                    if (isSignImg) {
-                                      props?.setSignature(isSignImg);
-                                    }
-                                  }}
-                                  className={`${
-                                    isTab === "draw"
-                                      ? "op-link-primary"
-                                      : "no-underline"
-                                  } op-link underline-offset-8 ml-[2px]`}
-                                >
-                                  {t("draw")}
-                                </span>
-                              </div>
-                            )}
-                            {isTabEnabled("upload") && (
-                              <div>
-                                <span
-                                  onClick={() => {
-                                    setIsDefaultSign(false);
-                                    props?.setIsImageSelect(true);
-                                    setIsTab("uploadImage");
-                                    setSignatureType("");
-                                  }}
-                                  className={`${
-                                    isTab === "uploadImage"
-                                      ? "op-link-primary"
-                                      : "no-underline"
-                                  } op-link underline-offset-8 ml-[2px]`}
-                                >
-                                  {t("upload-image")}
-                                </span>
-                              </div>
-                            )}
-                            {isTabEnabled("typed") && (
-                              <div>
-                                <span
-                                  onClick={() => {
-                                    setIsDefaultSign(false);
-                                    props?.setIsImageSelect(false);
-                                    setIsTab("type");
-                                    setSignatureType("");
-                                    props?.setImage();
-                                  }}
-                                  className={`${
-                                    isTab === "type"
-                                      ? "op-link-primary"
-                                      : "no-underline"
-                                  } op-link underline-offset-8 ml-[2px]`}
-                                >
-                                  {t("type")}
-                                </span>
-                              </div>
-                            )}
-                            {!props?.isInitial &&
-                            props?.defaultSign &&
-                            isTabEnabled("default") ? (
-                              <div>
-                                <span
-                                  onClick={() => {
-                                    setIsDefaultSign(true);
-                                    props?.setIsImageSelect(true);
-                                    setIsTab("mysignature");
-                                    setSignatureType("");
-                                    props?.setImage();
-                                  }}
-                                  className={`${
-                                    isTab === "mysignature"
-                                      ? "op-link-primary"
-                                      : "no-underline"
-                                  } op-link underline-offset-8 ml-[2px]`}
-                                >
-                                  {t("my-signature")}
-                                </span>
-                              </div>
-                            ) : (
-                              props?.isInitial &&
-                              props?.myInitial &&
-                              isTabEnabled("default") && (
-                                <div>
-                                  <span
-                                    onClick={() => {
-                                      setIsDefaultSign(true);
-                                      props?.setIsImageSelect(true);
-                                      setIsTab("mysignature");
-                                      setSignatureType("");
-                                      props?.setImage();
-                                    }}
-                                    className={`${
-                                      isTab === "mysignature"
-                                        ? "op-link-primary"
-                                        : "no-underline"
-                                    } op-link underline-offset-8 ml-[2px]`}
-                                  >
-                                    {t("my-initials")}
-                                  </span>
-                                </div>
-                              )
-                            )}
-                          </>
-                        )}
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    className="text-[1.5rem] cursor-pointer"
-                    onClick={handleCancelBtn}
-                  >
-                    &times;
-                  </div>
-                </div>
-                <div className="p-[20px] h-full">
-                  {isDefaultSign ? (
-                    <>
-                      <div className="flex justify-center">
-                        <div
-                          style={{
-                            border: "1.3px solid #007bff",
-                            borderRadius: "2px",
-                            display: "flex",
-                            flexDirection: "column",
-                            justifyContent: "center",
-                            alignItems: "center",
-                            marginBottom: 6,
-                            cursor: "pointer"
-                          }}
-                          className={
-                            props?.isInitial
-                              ? "intialSignatureCanvas"
-                              : "signatureCanvas"
-                          }
-                        >
-                          <img
-                            alt="stamp img"
-                            className="w-full h-full object-contain bg-white"
-                            draggable="false"
-                            src={
-                              props?.isInitial
-                                ? props?.myInitial
-                                : props?.defaultSign
-                            }
-                          />
-                        </div>
-                      </div>
-                      <div className="flex justify-end">
-                        <SaveBtn />
-                      </div>
-                    </>
-                  ) : props?.isImageSelect || props?.isStamp ? (
-                    !props?.image ? (
-                      <div className="flex justify-center">
-                        <div
-                          style={{
-                            border: "1.3px solid #007bff",
-                            borderRadius: "2px",
-                            display: "flex",
-                            flexDirection: "column",
-                            justifyContent: "center",
-                            alignItems: "center",
-                            marginBottom: 6,
-                            cursor: "pointer"
-                          }}
-                          className={
-                            props?.isInitial
-                              ? "intialSignatureCanvas"
-                              : "signatureCanvas"
-                          }
-                          onClick={() => props?.imageRef.current.click()}
-                        >
-                          <input
-                            type="file"
-                            onChange={props?.onImageChange}
-                            className="filetype"
-                            accept="image/png,image/jpeg"
-                            ref={props?.imageRef}
-                            hidden
-                          />
-                          <i className="fa-light fa-cloud-upload-alt uploadImgLogo"></i>
-                          <div className="text-[10px]">{t("upload")}</div>
-                        </div>
-                      </div>
                     ) : (
                       <>
-                        <div className="flex justify-center">
+                        <div>
-                          <div
+                          <span
-                            style={{
+                            onClick={() => {
-                              border: "1.3px solid #007bff",
+                              setIsDefaultSign(false);
-                              borderRadius: "2px",
+                              setIsImageSelect(false);
-                              marginBottom: 6,
+                              setIsTab("draw");
-                              overflow: "hidden"
+                              setImage();
+                              if (isSignImg) {
+                                setSignature(isSignImg);
+                              }
                             }}
-                            className={
+                            className={`${
-                              props?.isInitial
+                              isTab === "draw"
-                                ? "intialSignatureCanvas"
+                                ? "op-link-primary"
-                                : "signatureCanvas"
+                                : "no-underline"
-                            }
+                            } op-link underline-offset-8 ml-[2px]`}
                           >
-                            <img
+                            {t("draw")}
-                              alt="print img"
+                          </span>
-                              ref={props?.imageRef}
-                              src={props?.image.src}
-                              draggable="false"
-                              className=" object-contain h-full w-full"
-                            />
-                          </div>
                         </div>
-                        <div className="flex justify-end">
+                        <div>
-                          <SaveBtn />
+                          <span
+                            onClick={() => {
+                              setIsDefaultSign(false);
+                              setIsImageSelect(true);
+                              setIsTab("uploadImage");
+                              setSignatureType("");
+                            }}
+                            className={`${
+                              isTab === "uploadImage"
+                                ? "op-link-primary"
+                                : "no-underline"
+                            } op-link underline-offset-8 ml-[2px]`}
+                          >
+                            {t("upload-image")}
+                          </span>
                         </div>
-                      </>
+                        <div>
-                    )
+                          <span
-                  ) : isTab === "type" ? (
+                            onClick={() => {
-                    <div>
+                              setIsDefaultSign(false);
-                      <div className="flex justify-between items-center">
+                              setIsImageSelect(false);
-                        <span className="mr-[5px] text-[12px]">
+                              setIsTab("type");
-                          {props?.isInitial
+                              setSignatureType("");
-                            ? t("initial-teb")
+                              setImage();
-                            : t("signature-tab")}
+                            }}
-                          :
+                            className={`${
-                        </span>
+                              isTab === "type"
-                        <input
+                                ? "op-link-primary"
-                          maxLength={props?.isInitial ? 3 : 30}
+                                : "no-underline"
-                          style={{ fontFamily: fontSelect, color: penColor }}
+                            } op-link underline-offset-8 ml-[2px]`}
-                          type="text"
+                          >
-                          className="ml-1 op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-[20px]"
+                            {t("type")}
-                          placeholder="Your signature"
+                          </span>
-                          value={signValue}
+                        </div>
-                          onChange={(e) => {
+                        {!isInitial && defaultSign ? (
-                            setSignValue(e.target.value);
+                          <div>
-                            convertToImg(fontSelect, e.target.value);
+                            <span
-                          }}
-                        />
-                      </div>
-                      <div className="border-[1px] border-[#d6d3d3] mt-[10px] ml-[5px]">
-                        {fontOptions.map((font, ind) => {
-                          return (
-                            <div
-                              key={ind}
-                              style={{
-                                cursor: "pointer",
-                                fontFamily: font.value,
-                                backgroundColor:
-                                  fontSelect === font.value &&
-                                  "rgb(206 225 247)"
-                              }}
                               onClick={() => {
-                                setFontSelect(font.value);
+                                setIsDefaultSign(true);
-                                convertToImg(font.value, signValue);
+                                setIsImageSelect(true);
+                                setIsTab("mysignature");
+                                setSignatureType("");
+                                setImage();
                               }}
+                              className={`${
+                                isTab === "mysignature"
+                                  ? "op-link-primary"
+                                  : "no-underline"
+                              } op-link underline-offset-8 ml-[2px]`}
                             >
-                              <div
+                              {t("my-signature")}
-                                style={{
+                            </span>
-                                  padding: "5px 10px 5px 10px",
+                          </div>
-                                  fontSize: "20px",
+                        ) : (
-                                  color: penColor
+                          isInitial &&
+                          myInitial && (
+                            <div>
+                              <span
+                                onClick={() => {
+                                  setIsDefaultSign(true);
+                                  setIsImageSelect(true);
+                                  setIsTab("mysignature");
+                                  setSignatureType("");
+                                  setImage();
                                 }}
+                                className={`${
+                                  isTab === "mysignature"
+                                    ? "op-link-primary"
+                                    : "no-underline"
+                                } op-link underline-offset-8 ml-[2px]`}
                               >
-                                {signValue ? signValue : "Your signature"}
+                                {t("my-initials")}
-                              </div>
+                              </span>
                             </div>
-                          );
+                          )
-                        })}
+                        )}
-                      </div>
+                      </>
-
+                    )}
-                      <div className="flex flex-row justify-between mt-[10px]">
-                        <PenColorComponent convertToImg={convertToImg} />
-                        <SaveBtn />
-                      </div>
-                    </div>
-                  ) : (
-                    <>
-                      <div className="flex justify-center">
-                        <SignatureCanvas
-                          ref={canvasRef}
-                          penColor={penColor}
-                          canvasProps={{
-                            className: props?.isInitial
-                              ? "intialSignatureCanvas"
-                              : "signatureCanvas",
-                            style: {
-                              border: "1.6px solid #007bff",
-                              borderRadius: "2px"
-                            }
-                          }}
-                          // backgroundColor="rgb(255, 255, 255)"
-                          onEnd={() =>
-                            handleSignatureChange(
-                              canvasRef.current?.toDataURL()
-                            )
-                          }
-                          dotSize={1}
-                        />
-                      </div>
-                      <div className="flex flex-row justify-between mt-[10px]">
-                        <PenColorComponent />
-                        <SaveBtn />
-                      </div>
-                    </>
-                  )}
-                </div>
-              </>
-            ) : (
-              <div className="">
-                <div className="relative flex flex-row items-center justify-between">
-                  <div className="text-base-content font-bold text-lg">
-                    Signature
                   </div>
-                  <div
-                    className="text-[1.5rem] cursor-pointer"
-                    onClick={handleCancelBtn}
-                  >
-                    &times;
-                  </div>
-                </div>
-                <div className="mx-3 mb-6 mt-3">
-                  <p>{t("at-least-one-signature-type")}</p>
                 </div>
               </div>
-            )}
+              <div
+                className="text-[1.5rem] cursor-pointer"
+                onClick={() => {
+                  setPenColor("blue");
+                  setIsSignPad(false);
+                  setIsInitial(false);
+                  setIsImageSelect(false);
+                  setIsDefaultSign(false);
+                  setImage();
+                  setIsTab("draw");
+                  setSignatureType("draw");
+                  setSignValue("");
+                  setIsStamp(false);
+                }}
+              >
+                &times;
+              </div>
+            </div>
+            <div className="p-[20px] h-full">
+              {isDefaultSign ? (
+                <>
+                  <div className="flex justify-center">
+                    <div
+                      style={{
+                        border: "1.3px solid #007bff",
+                        borderRadius: "2px",
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        marginBottom: 6,
+                        cursor: "pointer"
+                      }}
+                      className={
+                        isInitial ? "intialSignatureCanvas" : "signatureCanvas"
+                      }
+                    >
+                      <img
+                        alt="stamp img"
+                        className="w-full h-full object-contain bg-white"
+                        draggable="false"
+                        src={isInitial ? myInitial : defaultSign}
+                      />
+                    </div>
+                  </div>
+                  <div className="flex justify-end">
+                    <SaveBtn />
+                  </div>
+                </>
+              ) : isImageSelect || isStamp ? (
+                !image ? (
+                  <div className="flex justify-center">
+                    <div
+                      style={{
+                        border: "1.3px solid #007bff",
+                        borderRadius: "2px",
+                        display: "flex",
+                        flexDirection: "column",
+                        justifyContent: "center",
+                        alignItems: "center",
+                        marginBottom: 6,
+                        cursor: "pointer"
+                      }}
+                      className={
+                        isInitial ? "intialSignatureCanvas" : "signatureCanvas"
+                      }
+                      onClick={() => imageRef.current.click()}
+                    >
+                      <input
+                        type="file"
+                        onChange={onImageChange}
+                        className="filetype"
+                        accept="image/png,image/jpeg"
+                        ref={imageRef}
+                        hidden
+                      />
+                      <i className="fa-light fa-cloud-upload-alt uploadImgLogo"></i>
+                      <div className="text-[10px]">{t("upload")}</div>
+                    </div>
+                  </div>
+                ) : (
+                  <>
+                    <div className="flex justify-center">
+                      <div
+                        style={{
+                          border: "1.3px solid #007bff",
+                          borderRadius: "2px",
+                          marginBottom: 6,
+                          overflow: "hidden"
+                        }}
+                        className={
+                          isInitial
+                            ? "intialSignatureCanvas"
+                            : "signatureCanvas"
+                        }
+                      >
+                        <img
+                          alt="print img"
+                          ref={imageRef}
+                          src={image.src}
+                          draggable="false"
+                          className=" object-contain h-full w-full"
+                        />
+                      </div>
+                    </div>
+                    <div className="flex justify-end">
+                      <SaveBtn />
+                    </div>
+                  </>
+                )
+              ) : isTab === "type" ? (
+                <div>
+                  <div className="flex justify-between items-center">
+                    <span className="mr-[5px] text-[12px]">
+                      {isInitial ? t("initial-teb") : t("signature-tab")}:
+                    </span>
+                    <input
+                      maxLength={isInitial ? 3 : 30}
+                      style={{ fontFamily: fontSelect, color: penColor }}
+                      type="text"
+                      className="ml-1 op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-[20px]"
+                      placeholder="Your signature"
+                      value={signValue}
+                      onChange={(e) => {
+                        setSignValue(e.target.value);
+                        convertToImg(fontSelect, e.target.value);
+                      }}
+                    />
+                  </div>
+                  <div className="border-[1px] border-[#d6d3d3] mt-[10px] ml-[5px]">
+                    {fontOptions.map((font, ind) => {
+                      return (
+                        <div
+                          key={ind}
+                          style={{
+                            cursor: "pointer",
+                            fontFamily: font.value,
+                            backgroundColor:
+                              fontSelect === font.value && "rgb(206 225 247)"
+                          }}
+                          onClick={() => {
+                            setFontSelect(font.value);
+                            convertToImg(font.value, signValue);
+                          }}
+                        >
+                          <div
+                            style={{
+                              padding: "5px 10px 5px 10px",
+                              fontSize: "20px",
+                              color: penColor
+                            }}
+                          >
+                            {signValue ? signValue : "Your signature"}
+                          </div>
+                        </div>
+                      );
+                    })}
+                  </div>
+
+                  <div className="flex flex-row justify-between mt-[10px]">
+                    <PenColorComponent convertToImg={convertToImg} />
+                    <SaveBtn />
+                  </div>
+                </div>
+              ) : (
+                <>
+                  <div className="flex justify-center">
+                    <SignatureCanvas
+                      ref={canvasRef}
+                      penColor={penColor}
+                      canvasProps={{
+                        className: isInitial
+                          ? "intialSignatureCanvas"
+                          : "signatureCanvas",
+                        style: {
+                          border: "1.6px solid #007bff",
+                          borderRadius: "2px"
+                        }
+                      }}
+                      backgroundColor="rgb(255, 255, 255)"
+                      onEnd={() =>
+                        handleSignatureChange(canvasRef.current?.toDataURL())
+                      }
+                      dotSize={1}
+                    />
+                  </div>
+                  <div className="flex flex-row justify-between mt-[10px]">
+                    <PenColorComponent />
+                    <SaveBtn />
+                  </div>
+                </>
+              )}
+            </div>
           </div>
         </div>
       )}

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

@@ -21,11 +21,9 @@ function TextFontSetting(props) {
             value={
               props.fontSize ||
               props.currWidgetsDetails?.options?.fontSize ||
-              12
+              "12"
             }
-            onChange={(e) => {
+            onChange={(e) => props.setFontSize(e.target.value)}
-              props.setFontSize(parseInt(e.target.value));
-            }}
           >
             {fontsizeArr.map((size, ind) => {
               return (

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

@@ -4,7 +4,6 @@ import RecipientList from "./RecipientList";
 import { useDrag } from "react-dnd";
 import WidgetList from "./WidgetList";
 import {
-  color,
   radioButtonWidget,
   textInputWidget,
   textWidget,
@@ -44,69 +43,163 @@ function WidgetComponent({
   const [isSignersModal, setIsSignersModal] = useState(false);
   const [, dropdown] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 5, text: "dropdown" },
+    item: {
+      type: "BOX",
+      id: 5,
+      text: "dropdown"
+    },
+
     collect: (monitor) => ({
       isDragDropdown: !!monitor.isDragging()
     })
   });
   const [, checkbox] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 6, text: "checkbox" },
+    item: {
-    collect: (monitor) => ({ isDragCheck: !!monitor.isDragging() })
+      type: "BOX",
+      id: 6,
+      text: "checkbox"
+    },
+
+    collect: (monitor) => ({
+      isDragCheck: !!monitor.isDragging()
+    })
   });
   const [, textInput] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 7, text: textInputWidget },
+    item: {
-    collect: (monitor) => ({ isDragTextInput: !!monitor.isDragging() })
+      type: "BOX",
+      id: 7,
+      text: textInputWidget
+    },
+    collect: (monitor) => ({
+      isDragTextInput: !!monitor.isDragging()
+    })
   });
   const [, initials] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 8, text: "initials" },
+    item: {
-    collect: (monitor) => ({ isDragInitial: !!monitor.isDragging() })
+      type: "BOX",
+      id: 8,
+      text: "initials"
+    },
+
+    collect: (monitor) => ({
+      isDragInitial: !!monitor.isDragging()
+    })
   });
   const [, name] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 9, text: "name" },
+    item: {
-    collect: (monitor) => ({ isDragName: !!monitor.isDragging() })
+      type: "BOX",
+      id: 9,
+      text: "name"
+    },
+
+    collect: (monitor) => ({
+      isDragName: !!monitor.isDragging()
+    })
   });
   const [, company] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 10, text: "company" },
+    item: {
-    collect: (monitor) => ({ isDragCompany: !!monitor.isDragging() })
+      type: "BOX",
+      id: 10,
+      text: "company"
+    },
+
+    collect: (monitor) => ({
+      isDragCompany: !!monitor.isDragging()
+    })
   });
   const [, jobTitle] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 11, text: "job title" },
+    item: {
-    collect: (monitor) => ({ isDragJobtitle: !!monitor.isDragging() })
+      type: "BOX",
+      id: 11,
+      text: "job title"
+    },
+
+    collect: (monitor) => ({
+      isDragJobtitle: !!monitor.isDragging()
+    })
   });
   const [, date] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 12, text: "date" },
+    item: {
-    collect: (monitor) => ({ isDragDate: !!monitor.isDragging() })
+      type: "BOX",
+      id: 12,
+      text: "date"
+    },
+
+    collect: (monitor) => ({
+      isDragDate: !!monitor.isDragging()
+    })
   });
   const [, image] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 13, text: "image" },
+    item: {
-    collect: (monitor) => ({ isDragImage: !!monitor.isDragging() })
+      type: "BOX",
+      id: 13,
+      text: "image"
+    },
+
+    collect: (monitor) => ({
+      isDragImage: !!monitor.isDragging()
+    })
   });
   const [, email] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 14, text: "email" },
+    item: {
-    collect: (monitor) => ({ isDragEmail: !!monitor.isDragging() })
+      type: "BOX",
+      id: 14,
+      text: "email"
+    },
+    collect: (monitor) => ({
+      isDragEmail: !!monitor.isDragging()
+    })
   });
   const [, radioButton] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 15, text: radioButtonWidget },
+
-    collect: (monitor) => ({ isDragRadiotton: !!monitor.isDragging() })
+    item: {
+      type: "BOX",
+      id: 15,
+      text: radioButtonWidget
+    },
+    collect: (monitor) => ({
+      isDragRadiotton: !!monitor.isDragging()
+    })
   });
   const [, text] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 16, text: textWidget },
+
-    collect: (monitor) => ({ isDragText: !!monitor.isDragging() })
+    item: {
+      type: "BOX",
+      id: 16,
+      text: textWidget
+    },
+    collect: (monitor) => ({
+      isDragText: !!monitor.isDragging()
+    })
   });
   const isMobile = window.innerWidth < 767;
   const scrollContainerRef = useRef(null);
   const [widget, setWidget] = useState([]);
+  const color = [
+    "#93a3db",
+    "#e6c3db",
+    "#c0e3bc",
+    "#bce3db",
+    "#b8ccdb",
+    "#ceb8db",
+    "#ffccff",
+    "#99ffcc",
+    "#cc99ff",
+    "#ffcc99",
+    "#66ccff",
+    "#ffffcc"
+  ];
   const handleModal = () => {
     setIsSignersModal(!isSignersModal);
   };

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

@@ -2,11 +2,7 @@ import React, { useEffect, useState } from "react";
 import ModalUi from "../../primitives/ModalUi";
 import "../../styles/AddUser.css";
 import RegexParser from "regex-parser";
-import {
+import { textInputWidget, textWidget } from "../../constant/Utils";
-  signatureTypes,
-  textInputWidget,
-  textWidget
-} from "../../constant/Utils";
 import Upgrade from "../../primitives/Upgrade";
 import { isEnableSubscription } from "../../constant/const";
 import Tooltip from "../../primitives/Tooltip";
@@ -15,7 +11,6 @@ import { useTranslation } from "react-i18next";
 
 const WidgetNameModal = (props) => {
   const { t } = useTranslation();
-  const signTypes = props?.signatureType || signatureTypes;
   const [formdata, setFormdata] = useState({
     name: "",
     defaultValue: "",
@@ -26,7 +21,6 @@ const WidgetNameModal = (props) => {
   const [isValid, setIsValid] = useState(true);
   const statusArr = ["Required", "Optional"];
   const inputOpt = ["text", "email", "number"];
-  const [signatureType, setSignatureType] = useState([]);
 
   useEffect(() => {
     if (props.defaultdata) {
@@ -46,32 +40,12 @@ const WidgetNameModal = (props) => {
         name: props.defaultdata?.options?.name || ""
       });
     }
-
-    if (signTypes.length > 0) {
-      const defaultSignatureType = signTypes || [];
-      setSignatureType(defaultSignatureType);
-    }
     // eslint-disable-next-line
   }, [props.defaultdata]);
   const handleSubmit = (e) => {
     e.preventDefault();
     if (props.handleData) {
-      if (["signature", "initials"].includes(props.defaultdata?.type)) {
+      props.handleData(formdata);
-        const enabledSignTypes = signatureType?.filter((x) => x.enabled);
-        const isDefaultSignTypeOnly =
-          enabledSignTypes?.length === 1 &&
-          enabledSignTypes[0]?.name === "default";
-        if (enabledSignTypes.length === 0) {
-          alert(t("at-least-one-signature-type"));
-        } else if (isDefaultSignTypeOnly) {
-          alert(t("expect-default-one-more-signature-type"));
-        } else {
-          const data = { ...formdata, signatureType };
-          props.handleData(data, props.defaultdata?.type);
-        }
-      } else {
-        props.handleData(formdata);
-      }
       setFormdata({
         name: "",
         defaultValue: "",
@@ -79,7 +53,6 @@ const WidgetNameModal = (props) => {
         hint: "",
         textvalidate: ""
       });
-      setSignatureType(signTypes);
     }
   };
   const handleChange = (e) => {
@@ -129,15 +102,6 @@ const WidgetNameModal = (props) => {
       }
     }
   }
-
-  const handleCheckboxChange = (index) => {
-    // Create a copy of the signatureType array
-    const updatedSignatureType = [...signatureType];
-    // Toggle the enabled value for the clicked item
-    updatedSignatureType[index].enabled = !updatedSignatureType[index].enabled;
-    // Update the state with the modified array
-    setSignatureType(updatedSignatureType);
-  };
   return (
     <ModalUi
       isOpen={props.isOpen}
@@ -147,30 +111,24 @@ const WidgetNameModal = (props) => {
       <form
         onSubmit={handleSubmit}
         className={`${
-          props.defaultdata?.type === textInputWidget
+          props.defaultdata?.type === textInputWidget ? "pt-0" : ""
-            ? "pt-0"
-            : ["signature", "initials"].includes(props.defaultdata?.type)
-              ? "pt-2"
-              : ""
         } p-[20px] text-base-content`}
       >
-        {!["signature", "initials"].includes(props.defaultdata?.type) && (
+        <div className="mb-[0.75rem] text-[13px]">
-          <div className="mb-[0.75rem] text-[13px]">
+          <label htmlFor="name">
-            <label htmlFor="name">
+            {t("name")}
-              {t("name")}
+            <span className="text-[red]"> *</span>
-              <span className="text-[red]"> *</span>
+          </label>
-            </label>
+          <input
-            <input
+            className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
-              className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
+            name="name"
-              name="name"
+            value={formdata.name}
-              value={formdata.name}
+            onChange={(e) => handleChange(e)}
-              onChange={(e) => handleChange(e)}
+            onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
+            onInput={(e) => e.target.setCustomValidity("")}
-              onInput={(e) => e.target.setCustomValidity("")}
+            required
-              required
+          />
-            />
+        </div>
-          </div>
-        )}
         {props.defaultdata?.type === textInputWidget && (
           <>
             {isEnableSubscription && (
@@ -268,63 +226,30 @@ const WidgetNameModal = (props) => {
             </div>
           </>
         )}
-        {!["signature", "initials"].includes(props.defaultdata?.type) && (
+        <div className="mb-[0.75rem]">
-          <div className="mb-[0.75rem]">
+          <div className="flex flex-row gap-[10px] mb-[0.5rem]">
-            <div className="flex flex-row gap-[10px] mb-[0.5rem]">
+            {statusArr.map((data, ind) => {
-              {statusArr.map((data, ind) => {
+              return (
-                return (
+                <div key={ind} className="flex flex-row gap-[5px] items-center">
-                  <div
+                  <input
-                    key={ind}
+                    className="mr-[2px] op-radio op-radio-xs"
-                    className="flex flex-row gap-[5px] items-center"
+                    type="radio"
-                  >
+                    name="status"
-                    <input
+                    onChange={() =>
-                      className="mr-[2px] op-radio op-radio-xs"
+                      setFormdata({ ...formdata, status: data.toLowerCase() })
-                      type="radio"
+                    }
-                      name="status"
+                    checked={
-                      onChange={() =>
+                      formdata.status.toLowerCase() === data.toLowerCase()
-                        setFormdata({ ...formdata, status: data.toLowerCase() })
+                    }
-                      }
+                  />
-                      checked={
+                  <div className="text-[13px] font-medium">
-                        formdata.status.toLowerCase() === data.toLowerCase()
+                    {t(`widget-status.${data}`)}
-                      }
-                    />
-                    <div className="text-[13px] font-medium">
-                      {t(`widget-status.${data}`)}
-                    </div>
                   </div>
-                );
+                </div>
-              })}
+              );
-            </div>
+            })}
           </div>
-        )}
+        </div>
-        {["signature", "initials"].includes(props.defaultdata?.type) && (
-          <div className="mb-[0.75rem]">
-            <label htmlFor="signaturetype" className="text-[14px] mb-[0.7rem]">
-              {t("allowed-signature-types")}
-            </label>
-            <div className=" ml-[7px] flex flex-col md:flex-row gap-[10px] mb-[0.7rem]">
-              {signatureType.map((type, i) => {
-                return (
-                  <div key={i} className="flex flex-row gap-[5px] items-center">
-                    <input
-                      className="mr-[2px] op-checkbox op-checkbox-xs"
-                      type="checkbox"
-                      name="signaturetype"
-                      onChange={() => handleCheckboxChange(i)}
-                      checked={type.enabled}
-                    />
-                    <div
-                      className="text-[13px] font-medium hover:underline underline-offset-2 cursor-default capitalize"
-                      title={`Enabling this allow signers to ${type.name} signature`}
-                    >
-                      {type.name}
-                    </div>
-                  </div>
-                );
-              })}
-            </div>
-          </div>
-        )}
         {props.defaultdata?.type === textInputWidget && (
           <div className="mb-[0.75rem]">
             <label htmlFor="hint" className="text-[13px]">
@@ -351,9 +276,9 @@ const WidgetNameModal = (props) => {
             <select
               className="ml-[7px] op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content text-xs"
               value={
-                props.fontSize || props.defaultdata?.options?.fontSize || 12
+                props.fontSize || props.defaultdata?.options?.fontSize || "12"
               }
-              onChange={(e) => props.setFontSize(parseInt(e.target.value))}
+              onChange={(e) => props.setFontSize(e.target.value)}
             >
               {fontsizeArr.map((size, ind) => {
                 return (

apps/OpenSign/src/components/shared/fields/SelectSigners.js

@@ -1,7 +1,7 @@
 import React, { useState } from "react";
+import Parse from "parse";
 import AsyncSelect from "react-select/async";
 import { useTranslation } from "react-i18next";
-import axios from "axios";
 
 const SelectSigners = (props) => {
   const { t } = useTranslation();
@@ -31,19 +31,17 @@ const SelectSigners = (props) => {
 
   const loadOptions = async (inputValue) => {
     try {
-      const baseURL = localStorage.getItem("baseUrl");
+      const currentUser = Parse.User.current();
-      const url = `${baseURL}functions/getsigners`;
+      const contactbook = new Parse.Query("contracts_Contactbook");
-      const token = props.jwttoken
+      contactbook.equalTo(
-        ? { jwttoken: props.jwttoken }
+        "CreatedBy",
-        : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
+        Parse.User.createWithoutData(currentUser.id)
-      const headers = {
+      );
-        "Content-Type": "application/json",
+      if (inputValue.length > 1) {
-        "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+        contactbook.matches("Name", new RegExp(inputValue, "i"));
-        ...token
+      }
-      };
+      contactbook.notEqualTo("IsDeleted", true);
-      const searchEmail = inputValue ? inputValue : "";
+      const contactRes = await contactbook.find();
-      const axiosRes = await axios.post(url, { searchEmail }, { headers });
-      const contactRes = axiosRes?.data?.result || [];
       if (contactRes) {
         const res = JSON.parse(JSON.stringify(contactRes));
         //compareArrays is a function where compare between two array (total signersList and dcument signers list)
@@ -54,9 +52,11 @@ const SelectSigners = (props) => {
               !signerObj.find((item2) => item2.objectId === item1.objectId)
           );
         };
+
         //get update signer's List if signersdata is present
         const updateSignersList =
           props?.signersData && compareArrays(res, props?.signersData);
+
         const result = updateSignersList ? updateSignersList : res;
         setUserList(result);
         return await result.map((item) => ({
@@ -68,6 +68,7 @@ const SelectSigners = (props) => {
       console.log("err", error);
     }
   };
+
   return (
     <div className="h-full px-[20px] py-[10px] text-base-content">
       <div className="w-full mx-auto p-[8px]">
@@ -84,7 +85,6 @@ const SelectSigners = (props) => {
             loadOptions={loadOptions}
             onChange={handleOptions}
             unstyled
-            onFocus={() => loadOptions()}
             classNames={{
               control: () =>
                 "op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full h-full text-[11px]",

apps/OpenSign/src/components/shared/fields/SuggestionInput.js

@@ -25,7 +25,7 @@ const SuggestionInput = (props) => {
       if (timer) clearTimeout(timer);
       timer = setTimeout(() => {
         (async () => {
-          const res = await findContact(inputValue, props.jwttoken);
+          const res = await findContact(inputValue);
           if (res?.length > 0) {
             setSuggestions(res);
             setShowSuggestions(true);
@@ -37,14 +37,13 @@ const SuggestionInput = (props) => {
       }, 1000);
     }
     return () => clearTimeout(timer);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inputValue]);
 
   const handleInputChange = async (e) => {
     const value = e.target.value;
-    setInputValue(value?.toLowerCase()?.replace(/\s/g, ""));
+    setInputValue(value?.toLowerCase());
     if (props.onChange) {
-      props.onChange(value?.toLowerCase()?.replace(/\s/g, ""));
+      props.onChange(value);
     }
 
     if (value.trim() === "") {

apps/OpenSign/src/i18n.js

@@ -25,7 +25,7 @@ i18n
     interpolation: {
       escapeValue: false // Not needed for react as it escapes by default
     },
-    whitelist: ["en", "es", "fr"] // List of allowed languages
+    whitelist: ["en", "fr"] // List of allowed languages
   });
 
 export default i18n;

apps/OpenSign/src/json/ReportJson.js

@@ -27,25 +27,18 @@ export default function reportJson(id) {
   const templateSubAction = isEnableSubscription
     ? [
         {
-          btnId: "2435",
+          btnId: "2434",
           btnLabel: "Embed",
           hoverLabel: "Embed",
           btnIcon: "fa-light fa-code",
           action: "Embed"
         },
         {
-          btnId: "2436",
+          btnId: "2434",
           btnLabel: "Copy TemplateId",
           hoverLabel: "Copy TemplateId",
           btnIcon: "fa-light fa-copy",
           action: "CopyTemplateId"
-        },
-        {
-          btnId: "2437",
-          btnLabel: "Copy Public URL",
-          hoverLabel: "Copy Public URL",
-          btnIcon: "fa-light fa-copy",
-          action: "CopyPublicURL"
         }
       ]
     : [];
@@ -412,15 +405,18 @@ export default function reportJson(id) {
             if (item.action === "option") {
               // Make a shallow copy of the item
               const newItem = { ...item };
-              //splice method used to add `Share with team` option on second index of list
+              newItem.subaction = [
-              newItem.subaction.splice(1, 0, {
+                {
-                btnId: "1873",
+                  btnId: "1873",
-                btnLabel: "Share with team",
+                  btnLabel: "Share with team",
-                hoverLabel: "Share with team",
+                  hoverLabel: "Share with team",
-                btnIcon: "fa-light fa-share-nodes",
+                  btnIcon: "fa-light fa-share-nodes",
-                redirectUrl: "",
+                  redirectUrl: "",
-                action: "sharewith"
+                  action: "sharewith"
-              });
+                },
+                ...newItem.subaction
+              ];
+
               return newItem;
             }
             return item;

apps/OpenSign/src/json/menuJson.js

@@ -154,14 +154,6 @@ const sidebarList = [
         pageType: "",
         description: "",
         objectId: "webhook"
-      },
-      {
-        icon: "fa-light fa-sliders",
-        title: "Preferences",
-        target: "_self",
-        pageType: "",
-        description: "",
-        objectId: "preferences"
       }
     ]
   }

apps/OpenSign/src/json/plansArr.js

@@ -16,18 +16,17 @@ const plans = [
       "Unlimited digital signatures",
       "Sign documents yourself",
       "Request signatures from others",
-      "Unlimited templates",
       "14 field types",
       "Automatic e-signatures",
       "Completion certificates",
       "Send in order",
-      "Organize docs in OpenSign™ Drive",
       "Document templates",
       "Import from Dropbox",
       "Contact book",
       "Document expiry support",
       "Decline document support",
       "Email notifications",
+      "Recipient authentication using OTP",
       "Public profiles",
       "And much more"
     ],
@@ -35,18 +34,17 @@ const plans = [
       "Unlimited digital signatures",
       "Sign documents yourself",
       "Request signatures from others",
-      "Unlimited templates",
       "14 field types",
       "Automatic e-signatures",
       "Completion certificates",
       "Send in order",
-      "Organize docs in OpenSign™ Drive",
       "Document templates",
       "Import from Dropbox",
       "Contact book",
       "Document expiry support",
       "Decline document support",
       "Email notifications",
+      "Recipient authentication using OTP",
       "Public profiles",
       "And much more"
     ]
@@ -63,10 +61,10 @@ const plans = [
     subtitle: "Exclusive Access to advanced features.",
     btn: { text: "Subscribe", color: "op-btn-primary" },
     url: isStaging
-      ? "https://billing.zohosecure.in/subscribe/9627f62a09df1c8ce500f2f4dc8328dd84ecda20eeae13878ce581d60240f206/pro-weekly"
+      ? "https://billing.zoho.in/subscribe/9627f62a09df1c8ce500f2f4dc8328dd84ecda20eeae13878ce581d60240f206/pro-weekly"
       : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901d1a09dfa8085585cdd4ec4d7f32137f3/professional-monthly",
     yearlyUrl: isStaging
-      ? "https://billing.zohosecure.in/subscribe/9627f62a09df1c8ce500f2f4dc8328ddc184411129224f1f29ed84f6cef3b862/pro-yearly"
+      ? "https://billing.zoho.in/subscribe/9627f62a09df1c8ce500f2f4dc8328ddc184411129224f1f29ed84f6cef3b862/pro-yearly"
       : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901d8ad1135190dff951330360e47585a71/professional-yearly",
     target: "_self",
     benefits: [
@@ -79,12 +77,10 @@ const plans = [
       "API Access",
       "upto 100 API signatures",
       "Custom email templates",
-      "Connect your own Gmail or SMTP account for sending emails",
       "Auto reminders",
       "Bulk send (upto 100 docs)",
       "Premium Public profile usernames",
-      "Enforce email-based verification to confirm signer identity",
+      "Embedding (coming soon)"
-      "Embedded signing"
     ],
     yearlyBenefits: [
       "Everything in OpenSign™ free",
@@ -96,12 +92,10 @@ const plans = [
       "API Access",
       "upto 240 API signatures",
       "Custom email templates",
-      "Connect your own Gmail or SMTP account for sending emails",
       "Auto reminders",
       "Bulk send (upto 240 docs)",
       "Premium Public profile usernames",
-      "Enforce email-based verification to confirm signer identity",
+      "Embedding (coming soon)"
-      "Embedded signing"
     ]
   },
   {
@@ -114,10 +108,10 @@ const plans = [
     subtitle: "Exclusive Access to advanced features.",
     btn: { text: "Subscribe", color: "op-btn-accent" },
     url: isStaging
-      ? "https://billing.zohosecure.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-monthly"
+      ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-monthly"
       : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901237d0702bfaa959406306635d80f138c/teams-monthly",
     yearlyUrl: isStaging
-      ? "https://billing.zohosecure.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-yearly"
+      ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-yearly"
       : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af9011a864994bbeeec71fcf106188630199d/teams-yearly",
     target: "_self",
     benefits: [
@@ -126,7 +120,6 @@ const plans = [
       "Teams and Organizations",
       "Share Templates with teams",
       "Share Templates with individuals",
-      "BYOC - Store your documents in your own cloud storage",
       "DocumentId removal from signed docs",
       "Bulk send (upto 100 docs)",
       "Request Payments (coming soon)",
@@ -138,7 +131,6 @@ const plans = [
       "Teams and Organizations",
       "Share Templates with teams",
       "Share Templates with individuals",
-      "BYOC - Store your documents in your own cloud storage",
       "DocumentId removal from signed docs",
       "Bulk send (upto 500 docs)",
       "Request Payments (coming soon)",
@@ -239,10 +231,10 @@ export const paidUrl = (plan) => {
     }
     const url = {
       monthly: isStaging
-        ? "https://billing.zohosecure.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-monthly"
+        ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-monthly"
         : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901237d0702bfaa959406306635d80f138c/teams-monthly",
       yearly: isStaging
-        ? "https://billing.zohosecure.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-yearly"
+        ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/teams-yearly"
         : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af9011a864994bbeeec71fcf106188630199d/teams-yearly"
     };
 

apps/OpenSign/src/layout/HomeLayout.js

@@ -224,13 +224,23 @@ const HomeLayout = () => {
 
   async function checkTourStatus() {
     const cloudRes = await Parse.Cloud.run("getUserDetails");
-    if (cloudRes) {
+    const res = { data: cloudRes.toJSON() };
-      const extUser = JSON.parse(JSON.stringify(cloudRes));
+    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = res.data.TourStatus;
-      const tourStatus = extUser?.TourStatus || [];
+      // console.log("res ", res.data.TourStatus);
       setTourStatusArr(tourStatus);
-      const loginTour = tourStatus.find((obj) => obj.loginTour)?.loginTour;
+      const filteredtourStatus = tourStatus.filter((obj) => obj["loginTour"]);
-      setIsTour(!loginTour);
+      if (filteredtourStatus.length > 0) {
+        const loginTour = filteredtourStatus[0]["loginTour"];
+        // console.log("loginTour", loginTour);
+        if (loginTour) {
+          setIsTour(false);
+        } else {
+          setIsTour(true);
+        }
+      } else {
+        setIsTour(true);
+      }
     } else {
       setIsTour(true);
     }
@@ -255,9 +265,7 @@ const HomeLayout = () => {
   return (
     <div>
       <div className="sticky top-0 z-[501]">
-        {!isLoader && (
+        {!isLoader && <Header showSidebar={showSidebar} />}
-          <Header showSidebar={showSidebar} setIsMenu={setIsOpen} />
-        )}
       </div>
       {isUserValid ? (
         <>

apps/OpenSign/src/pages/AddAdmin.js

@@ -12,7 +12,6 @@ import { showTenant } from "../redux/reducers/ShowTenant";
 import Loader from "../primitives/Loader";
 import Title from "../components/Title";
 import { useTranslation } from "react-i18next";
-import { emailRegex } from "../constant/const";
 
 const AddAdmin = () => {
   const { t, i18n } = useTranslation();
@@ -46,10 +45,8 @@ const AddAdmin = () => {
     setState((prev) => ({ ...prev, loading: true }));
     try {
       const app = await getAppLogo();
-      if (app?.error === "invalid_json") {
+      if (app?.user === "exist") {
-        setErrMsg(t("server-down"));
+        setErrMsg(t("admin-already-exist"));
-      } else if (app?.user === "exist") {
-        setErrMsg(t("admin-exists"));
       }
     } catch (err) {
       setErrMsg(t("something-went-wrong-mssg"));
@@ -85,82 +82,78 @@ const AddAdmin = () => {
 
   const handleSubmit = async (event) => {
     event.preventDefault();
-    if (!emailRegex.test(email)) {
+    if (lengthValid && caseDigitValid && specialCharValid) {
-      alert("Please enter a valid email address.");
+      clearStorage();
-    } else {
+      setState({ loading: true });
-      if (lengthValid && caseDigitValid && specialCharValid) {
+      const userDetails = {
-        clearStorage();
+        name: name,
-        setState({ loading: true });
+        email: email,
-        const userDetails = {
+        phone: phone,
-          name: name,
+        company: company,
-          email: email,
+        jobTitle: jobTitle
-          phone: phone,
+      };
-          company: company,
+      localStorage.setItem("userDetails", JSON.stringify(userDetails));
-          jobTitle: jobTitle
+      try {
-        };
+        event.preventDefault();
-        localStorage.setItem("userDetails", JSON.stringify(userDetails));
+        const user = new Parse.User();
-        try {
+        user.set("name", name);
-          event.preventDefault();
+        user.set("email", email);
-          const user = new Parse.User();
+        user.set("password", password);
-          user.set("name", name);
+        user.set("phone", phone);
-          user.set("email", email);
+        user.set("username", email);
-          user.set("password", password);
+        const userRes = await user.save();
-          user.set("phone", phone);
+        if (userRes) {
-          user.set("username", email);
+          const params = {
-          const userRes = await user.save();
+            userDetails: {
-          if (userRes) {
+              jobTitle: jobTitle,
-            const params = {
+              company: company,
-              userDetails: {
+              name: name,
-                jobTitle: jobTitle,
+              email: email,
-                company: company,
+              phone: phone,
-                name: name,
+              role: "contracts_Admin"
-                email: email,
-                phone: phone,
-                role: "contracts_Admin"
-              }
-            };
-            try {
-              const usersignup = await Parse.Cloud.run("addadmin", params);
-              if (usersignup) {
-                if (isSubscribeNews) {
-                  subscribeNewsletter();
-                }
-                handleNavigation(userRes.getSessionToken());
-              }
-            } catch (err) {
-              alert(err.message);
-              setState({ loading: false });
             }
-          }
+          };
-        } catch (error) {
+          try {
-          console.log("err ", error);
+            const usersignup = await Parse.Cloud.run("addadmin", params);
-          if (error.code === 202) {
+            if (usersignup) {
-            const params = { email: email };
+              if (isSubscribeNews) {
-            const res = await Parse.Cloud.run("getUserDetails", params);
+                subscribeNewsletter();
-            // console.log("Res ", res);
-            if (res) {
-              alert(t("already-exists-this-username"));
-              setState({ loading: false });
-            } else {
-              // console.log("state.email ", email);
-              try {
-                await Parse.User.requestPasswordReset(email).then(
-                  async function (res) {
-                    if (res.data === undefined) {
-                      alert(t("verification-code-sent"));
-                    }
-                  }
-                );
-              } catch (err) {
-                console.log(err);
               }
-              setState({ loading: false });
+              handleNavigation(userRes.getSessionToken());
             }
-          } else {
+          } catch (err) {
-            alert(error.message);
+            alert(err.message);
             setState({ loading: false });
           }
         }
+      } catch (error) {
+        console.log("err ", error);
+        if (error.code === 202) {
+          const params = { email: email };
+          const res = await Parse.Cloud.run("getUserDetails", params);
+          // console.log("Res ", res);
+          if (res) {
+            alert(t("already-exists-this-username"));
+            setState({ loading: false });
+          } else {
+            // console.log("state.email ", email);
+            try {
+              await Parse.User.requestPasswordReset(email).then(
+                async function (res) {
+                  if (res.data === undefined) {
+                    alert(t("verification-code-sent"));
+                  }
+                }
+              );
+            } catch (err) {
+              console.log(err);
+            }
+            setState({ loading: false });
+          }
+        } else {
+          alert(error.message);
+          setState({ loading: false });
+        }
       }
     }
   };

apps/OpenSign/src/pages/ForgetPassword.js

@@ -7,7 +7,7 @@ import Alert from "../primitives/Alert";
 import { appInfo } from "../constant/appinfo";
 import { useDispatch } from "react-redux";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
-import { emailRegex, isEnableSubscription } from "../constant/const";
+import { isEnableSubscription } from "../constant/const";
 import { getAppLogo } from "../constant/Utils";
 import { useTranslation } from "react-i18next";
 
@@ -36,22 +36,18 @@ function ForgotPassword() {
 
   const handleSubmit = async (event) => {
     event.preventDefault();
-    if (!emailRegex.test(state.email)) {
+    localStorage.setItem("appLogo", appInfo.applogo);
-      alert("Please enter a valid email address.");
+    localStorage.setItem("userSettings", JSON.stringify(appInfo.settings));
-    } else {
+    if (state.email) {
-      localStorage.setItem("appLogo", appInfo.applogo);
+      const username = state.email;
-      localStorage.setItem("userSettings", JSON.stringify(appInfo.settings));
+      try {
-      if (state.email) {
+        await Parse.User.requestPasswordReset(username);
-        const username = state.email;
+        setSentStatus("success");
-        try {
+      } catch (err) {
-          await Parse.User.requestPasswordReset(username);
+        console.log("err ", err.code);
-          setSentStatus("success");
+        setSentStatus("failed");
-        } catch (err) {
+      } finally {
-          console.log("err ", err.code);
+        setTimeout(() => setSentStatus(""), 1000);
-          setSentStatus("failed");
-        } finally {
-          setTimeout(() => setSentStatus(""), 1000);
-        }
       }
     }
   };

apps/OpenSign/src/pages/Login.js

@@ -9,7 +9,7 @@ import { NavLink, useNavigate, useLocation } from "react-router-dom";
 import login_img from "../assets/images/login_img.svg";
 import { useWindowSize } from "../hook/useWindowSize";
 import ModalUi from "../primitives/ModalUi";
-import { emailRegex, isEnableSubscription } from "../constant/const";
+import { isEnableSubscription } from "../constant/const";
 import Alert from "../primitives/Alert";
 import { appInfo } from "../constant/appinfo";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
@@ -51,7 +51,6 @@ function Login() {
   const [isModal, setIsModal] = useState(false);
   const [image, setImage] = useState();
   const [isLoginSSO, setIsLoginSSO] = useState(false);
-  const [errMsg, setErrMsg] = useState();
 
   useEffect(() => {
     checkUserExt();
@@ -60,9 +59,7 @@ function Login() {
 
   const checkUserExt = async () => {
     const app = await getAppLogo();
-    if (app?.error === "invalid_json") {
+    if (!isEnableSubscription && app?.user === "not_exist") {
-      setErrMsg(t("server-down"));
-    } else if (!isEnableSubscription && app?.user === "not_exist") {
       navigate("/addadmin");
     }
     if (app?.logo) {
@@ -89,174 +86,167 @@ function Login() {
   const handleSubmit = async (event) => {
     localStorage.removeItem("accesstoken");
     event.preventDefault();
-    if (!emailRegex.test(state.email)) {
+    const { email, password } = state;
-      alert("Please enter a valid email address.");
+    if (email && password) {
-    } else {
+      try {
-      const { email, password } = state;
+        setState({ ...state, loading: true });
-      if (email && password) {
+        localStorage.setItem("appLogo", appInfo.applogo);
-        try {
+        // Pass the username and password to logIn function
-          setState({ ...state, loading: true });
+        const user = await Parse.User.logIn(email, password);
-          localStorage.setItem("appLogo", appInfo.applogo);
+        if (user) {
-          // Pass the username and password to logIn function
+          let _user = user.toJSON();
-          const user = await Parse.User.logIn(email, password);
+          localStorage.setItem("UserInformation", JSON.stringify(_user));
-          if (user) {
+          localStorage.setItem("userEmail", email);
-            let _user = user.toJSON();
+          localStorage.setItem("accesstoken", _user.sessionToken);
-            localStorage.setItem("UserInformation", JSON.stringify(_user));
+          localStorage.setItem("scriptId", true);
-            localStorage.setItem("userEmail", email);
+          if (_user.ProfilePic) {
-            localStorage.setItem("accesstoken", _user.sessionToken);
+            localStorage.setItem("profileImg", _user.ProfilePic);
-            localStorage.setItem("scriptId", true);
+          } else {
-            if (_user.ProfilePic) {
+            localStorage.setItem("profileImg", "");
-              localStorage.setItem("profileImg", _user.ProfilePic);
+          }
-            } else {
+          // Check extended class user role and tenentId
-              localStorage.setItem("profileImg", "");
+          try {
-            }
+            const userSettings = appInfo.settings;
-            // Check extended class user role and tenentId
+            await Parse.Cloud.run("getUserDetails")
-            try {
+              .then(async (extUser) => {
-              const userSettings = appInfo.settings;
+                if (extUser) {
-              await Parse.Cloud.run("getUserDetails")
+                  // console.log("extUser", extUser, extUser?.get("IsDisabled"));
-                .then(async (extUser) => {
+                  const IsDisabled = extUser?.get("IsDisabled") || false;
-                  if (extUser) {
+                  if (!IsDisabled) {
-                    // console.log("extUser", extUser, extUser?.get("IsDisabled"));
+                    const userRole = extUser?.get("UserRole");
-                    const IsDisabled = extUser?.get("IsDisabled") || false;
+                    const menu =
-                    if (!IsDisabled) {
+                      userRole &&
-                      const userRole = extUser?.get("UserRole");
+                      userSettings.find((menu) => menu.role === userRole);
-                      const menu =
+                    if (menu) {
-                        userRole &&
+                      const _currentRole = userRole;
-                        userSettings.find((menu) => menu.role === userRole);
+                      const redirectUrl =
-                      if (menu) {
+                        location?.state?.from ||
-                        const _currentRole = userRole;
+                        `/${menu.pageType}/${menu.pageId}`;
-                        const redirectUrl =
+                      let _role = _currentRole.replace("contracts_", "");
-                          location?.state?.from ||
+                      localStorage.setItem("_user_role", _role);
-                          `/${menu.pageType}/${menu.pageId}`;
+                      const checkLanguage = extUser?.get("Language");
-                        let _role = _currentRole.replace("contracts_", "");
+                      if (checkLanguage) {
-                        localStorage.setItem("_user_role", _role);
+                        checkLanguage && i18n.changeLanguage(checkLanguage);
-                        const checkLanguage = extUser?.get("Language");
+                      }
-                        if (checkLanguage) {
-                          checkLanguage && i18n.changeLanguage(checkLanguage);
-                        }
 
-                        const results = [extUser];
+                      const results = [extUser];
-                        const extUser_str = JSON.stringify(results);
+                      const extUser_str = JSON.stringify(results);
 
-                        localStorage.setItem("Extand_Class", extUser_str);
+                      localStorage.setItem("Extand_Class", extUser_str);
-                        const extInfo = JSON.parse(JSON.stringify(extUser));
+                      const extInfo = JSON.parse(JSON.stringify(extUser));
-                        localStorage.setItem("userEmail", extInfo.Email);
+                      localStorage.setItem("userEmail", extInfo.Email);
-                        localStorage.setItem("username", extInfo.Name);
+                      localStorage.setItem("username", extInfo.Name);
-                        if (extInfo?.TenantId) {
+                      if (extInfo?.TenantId) {
-                          const tenant = {
+                        const tenant = {
-                            Id: extInfo?.TenantId?.objectId || "",
+                          Id: extInfo?.TenantId?.objectId || "",
-                            Name: extInfo?.TenantId?.TenantName || ""
+                          Name: extInfo?.TenantId?.TenantName || ""
-                          };
+                        };
-                          localStorage.setItem("TenantId", tenant?.Id);
+                        localStorage.setItem("TenantId", tenant?.Id);
-                          dispatch(showTenant(tenant?.Name));
+                        dispatch(showTenant(tenant?.Name));
-                          localStorage.setItem("TenantName", tenant?.Name);
+                        localStorage.setItem("TenantName", tenant?.Name);
-                        }
+                      }
-                        localStorage.setItem("PageLanding", menu.pageId);
+                      localStorage.setItem("PageLanding", menu.pageId);
-                        localStorage.setItem("defaultmenuid", menu.menuId);
+                      localStorage.setItem("defaultmenuid", menu.menuId);
-                        localStorage.setItem("pageType", menu.pageType);
+                      localStorage.setItem("pageType", menu.pageType);
-                        if (isEnableSubscription) {
+                      if (isEnableSubscription) {
-                          const LocalUserDetails = {
+                        const LocalUserDetails = {
-                            name: results[0].get("Name"),
+                          name: results[0].get("Name"),
-                            email: results[0].get("Email"),
+                          email: results[0].get("Email"),
-                            phone: results[0]?.get("Phone") || "",
+                          phone: results[0]?.get("Phone") || "",
-                            company: results[0].get("Company")
+                          company: results[0].get("Company")
-                          };
+                        };
-                          localStorage.setItem(
+                        localStorage.setItem(
-                            "userDetails",
+                          "userDetails",
-                            JSON.stringify(LocalUserDetails)
+                          JSON.stringify(LocalUserDetails)
-                          );
+                        );
-                          const res = await fetchSubscription();
+                        const res = await fetchSubscription();
-                          const plan = res.plan;
+                        const plan = res.plan;
-                          const billingDate = res.billingDate;
+                        const billingDate = res.billingDate;
-                          if (plan === "freeplan") {
+                        if (plan === "freeplan") {
+                          setState({ ...state, loading: false });
+                          navigate(redirectUrl);
+                        } else if (billingDate) {
+                          if (new Date(billingDate) > new Date()) {
+                            localStorage.removeItem("userDetails");
+                            // Redirect to the appropriate URL after successful login                              setState({ ...state, loading: false });
                             setState({ ...state, loading: false });
                             navigate(redirectUrl);
-                          } else if (billingDate) {
-                            if (new Date(billingDate) > new Date()) {
-                              localStorage.removeItem("userDetails");
-                              // Redirect to the appropriate URL after successful login                              setState({ ...state, loading: false });
-                              setState({ ...state, loading: false });
-                              navigate(redirectUrl);
-                            } else {
-                              setState({ ...state, loading: false });
-                              handlePaidRoute(plan);
-                            }
                           } else {
                             setState({ ...state, loading: false });
                             handlePaidRoute(plan);
                           }
                         } else {
                           setState({ ...state, loading: false });
-                          // Redirect to the appropriate URL after successful login
+                          handlePaidRoute(plan);
-                          navigate(redirectUrl);
                         }
                       } else {
                         setState({ ...state, loading: false });
-                        setIsModal(true);
+                        // Redirect to the appropriate URL after successful login
+                        navigate(redirectUrl);
                       }
                     } else {
-                      setState({
-                        ...state,
-                        loading: false,
-                        alertType: "danger",
-                        alertMsg:
-                          "You don't have access, please contact the admin."
-                      });
-                      logOutUser();
-                    }
-                  } else {
-                    if (isEnableSubscription) {
                       setState({ ...state, loading: false });
                       setIsModal(true);
-                    } else {
-                      setState({ ...state, loading: false });
-                      setState({
-                        ...state,
-                        loading: false,
-                        alertType: "danger",
-                        alertMsg: "User not found."
-                      });
-                      logOutUser();
                     }
+                  } else {
+                    setState({
+                      ...state,
+                      loading: false,
+                      alertType: "danger",
+                      alertMsg:
+                        "You don't have access, please contact the admin."
+                    });
+                    logOutUser();
                   }
-                })
+                } else {
-                .catch((error) => {
+                  if (isEnableSubscription) {
-                  // const payload = { sessionToken: user.getSessionToken() };
+                    setState({ ...state, loading: false });
-                  // handleSubmitbtn(payload);
+                    setIsModal(true);
-                  setState({
+                  } else {
-                    ...state,
+                    setState({ ...state, loading: false });
-                    loading: false,
+                    setState({
-                    alertType: "danger",
+                      ...state,
-                    alertMsg: `Something went wrong.`
+                      loading: false,
-                  });
+                      alertType: "danger",
-                  setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
+                      alertMsg: "User not found."
-                  console.error("Error while fetching Follow", error);
+                    });
+                    logOutUser();
+                  }
+                }
+              })
+              .catch((error) => {
+                // const payload = { sessionToken: user.getSessionToken() };
+                // handleSubmitbtn(payload);
+                setState({
+                  ...state,
+                  loading: false,
+                  alertType: "danger",
+                  alertMsg: `Something went wrong.`
                 });
-            } catch (error) {
+                setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
-              setState({
+                console.error("Error while fetching Follow", error);
-                ...state,
-                loading: false,
-                alertType: "danger",
-                alertMsg: `${error.message}`
               });
-              console.log(error);
+          } catch (error) {
-              setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
+            setState({
-            }
+              ...state,
+              loading: false,
+              alertType: "danger",
+              alertMsg: `${error.message}`
+            });
+            console.log(error);
+            setTimeout(() => setState({ ...state, alertMsg: "" }), 2000);
           }
-        } catch (error) {
-          setState({
-            ...state,
-            loading: false,
-            alertType: "danger",
-            alertMsg: "Invalid username or password!"
-          });
-          console.error("Error while logging in user", error);
-        } finally {
-          setTimeout(
-            () => setState((prev) => ({ ...prev, alertMsg: "" })),
-            2000
-          );
         }
+      } catch (error) {
+        setState({
+          ...state,
+          loading: false,
+          alertType: "danger",
+          alertMsg: "Invalid username or password!"
+        });
+        console.error("Error while logging in user", error);
+      } finally {
+        setTimeout(() => setState((prev) => ({ ...prev, alertMsg: "" })), 2000);
       }
     }
   };
@@ -630,11 +620,7 @@ function Login() {
     }
   };
 
-  return errMsg ? (
+  return (
-    <div className="h-screen flex justify-center text-center items-center p-4 text-gray-500 text-base">
-      {errMsg}
-    </div>
-  ) : (
     <div>
       <Title title={"Login Page"} />
       {state.loading && (

apps/OpenSign/src/pages/Managesign.js

@@ -2,13 +2,12 @@ import React, { useState, useRef, useEffect } from "react";
 import SignatureCanvas from "react-signature-canvas";
 import "../styles/managesign.css";
 import "../styles/signature.css";
-import { generateTitleFromFilename, toDataUrl } from "../constant/Utils";
+import { toDataUrl } from "../constant/Utils";
 import Parse from "parse";
 import { SaveFileSize } from "../constant/saveFileSize";
 import Alert from "../primitives/Alert";
 import Loader from "../primitives/Loader";
 import { useTranslation } from "react-i18next";
-import sanitizeFileName from "../primitives/sanitizeFileName";
 const ManageSign = () => {
   const { t } = useTranslation();
   const [penColor, setPenColor] = useState("blue");
@@ -24,11 +23,9 @@ const ManageSign = () => {
   const [Initials, setInitials] = useState("");
   const [isInitials, setIsInitials] = useState(false);
   const [id, setId] = useState("");
-  const [imgInitials, setImgInitials] = useState("");
   const canvasRef = useRef(null);
   const imageRef = useRef(null);
   const initailsRef = useRef(null);
-  const imgInitialsRef = useRef(null);
   useEffect(() => {
     fetchUserSign();
     // eslint-disable-next-line
@@ -49,23 +46,14 @@ const ManageSign = () => {
         if (signRes) {
           const res = signRes.toJSON();
           setId(res.objectId);
-          if (res?.SignatureName) {
+          setSignName(res?.SignatureName);
-            const sanitizename = generateTitleFromFilename(res?.SignatureName);
+          setImage(res.ImageURL);
-            const replaceSpace = sanitizeFileName(sanitizename);
-            setSignName(replaceSpace);
-          }
-          setImage(res?.ImageURL);
           if (res && res.Initials) {
-            // setInitials(res.Initials);
+            setInitials(res.Initials);
             setIsInitials(true);
-            setImgInitials(res?.Initials);
           }
         } else {
-          if (User?.get("name")) {
+          setSignName(User?.get("name") || "");
-            const sanitizename = generateTitleFromFilename(User?.get("name"));
-            const replaceSpace = sanitizeFileName(sanitizename);
-            setSignName(replaceSpace);
-          }
         }
         setIsLoader(false);
       } catch (err) {
@@ -98,14 +86,8 @@ const ManageSign = () => {
     if (initailsRef.current) {
       initailsRef.current.clear();
     }
-    if (imgInitialsRef.current) {
-      imgInitialsRef.current.value = "";
-    }
-    setImgInitials("");
     setInitials("");
-    if (image) {
+    setIsValue(true);
-      setIsValue(true);
-    }
     setIsInitials(false);
   };
 
@@ -119,54 +101,40 @@ const ManageSign = () => {
       const base64Img = await toDataUrl(file);
       setImage(base64Img);
       setIsValue(true);
-    } else {
-      setImage("");
-      setIsValue(false);
     }
   };
   const handleSubmit = async (e) => {
     e.preventDefault();
-    const isUrl = image?.includes("https") || image?.includes("http");
+    const isUrl = image.includes("https");
+
     if (!isvalue) {
       setWarning(true);
       setTimeout(() => setWarning(false), 1000);
     } else {
       setIsLoader(true);
-      const sanitizename = generateTitleFromFilename(signName);
+      const replaceSpace = signName.replace(/ /g, "_");
-      const replaceSpace = sanitizeFileName(sanitizename);
       let file;
       if (signature) {
-        file = base64StringtoFile(signature, `${replaceSpace}_sign`);
+        file = base64StringtoFile(signature, `${replaceSpace}_sign.png`);
       } else {
-        if (image && !isUrl) {
+        if (!isUrl) {
-          file = base64StringtoFile(image, `${replaceSpace}__sign`);
+          file = base64StringtoFile(image, `${replaceSpace}__sign.png`);
         }
       }
       let imgUrl;
-      if (file && !isUrl) {
+      if (!isUrl) {
         imgUrl = await uploadFile(file);
       } else {
         imgUrl = image;
       }
-      const isInitialsUrl =
+      let initialsUrl = "";
-        imgInitials?.includes("https") || imgInitials?.includes("http");
+      const isInitialsUrl = Initials.includes("https");
-
+      if (!isInitialsUrl && Initials) {
-      let initialFile;
+        const initialsImg = base64StringtoFile(
-      if (Initials) {
+          Initials,
-        initialFile = base64StringtoFile(Initials, `${replaceSpace}_sign`);
+          `${replaceSpace}_initials.png`
-      } else {
+        );
-        if (imgInitials && !isInitialsUrl) {
+        initialsUrl = await uploadFile(initialsImg);
-          initialFile = base64StringtoFile(
-            imgInitials,
-            `${replaceSpace}__sign`
-          );
-        }
-      }
-      let initialsUrl;
-      if (initialFile && !isInitialsUrl) {
-        initialsUrl = await uploadFile(initialFile);
-      } else {
-        initialsUrl = imgInitials;
       }
       if (imgUrl) {
         await saveEntry({
@@ -178,19 +146,15 @@ const ManageSign = () => {
     }
   };
   function base64StringtoFile(base64String, filename) {
-    let arr = base64String.split(","),
+    var arr = base64String.split(","),
-      // type of uploaded image
       mime = arr[0].match(/:(.*?);/)[1],
-      // decode base64
       bstr = atob(arr[1]),
       n = bstr.length,
       u8arr = new Uint8Array(n);
     while (n--) {
       u8arr[n] = bstr.charCodeAt(n);
     }
-    const ext = mime.split("/").pop();
+    return new File([u8arr], filename, { type: mime });
-    const name = `${filename}.${ext}`;
-    return new File([u8arr], name, { type: mime });
   }
 
   const uploadFile = async (file) => {
@@ -211,24 +175,31 @@ const ManageSign = () => {
 
   const saveEntry = async (obj) => {
     const signCls = "contracts_Signature";
-    const User = Parse?.User?.current()?.id;
+    const User = Parse.User.current().id;
     const userId = { __type: "Pointer", className: "_User", objectId: User };
     if (id) {
       try {
         const updateSign = new Parse.Object(signCls);
         updateSign.id = id;
         updateSign.set("Initials", obj.initialsUrl ? obj.initialsUrl : "");
-        updateSign.set("ImageURL", obj.url ? obj.url : "");
+        updateSign.set("ImageURL", obj.url);
         updateSign.set("SignatureName", obj.name);
         updateSign.set("UserId", userId);
         const res = await updateSign.save();
-        setIsAlert({ type: "success", message: t("signature-saved-alert") });
+        setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: t("signature-saved-alert")
+        });
+        setTimeout(() => setIsAlert({}), 2000);
         return res;
       } catch (err) {
         console.log(err);
-        setIsAlert({ type: "danger", message: `${err.message}` });
-      } finally {
         setIsLoader(false);
+        setIsAlert({
+          type: "danger",
+          message: `${err.message}`
+        });
         setTimeout(() => setIsAlert({}), 2000);
       }
     } else {
@@ -239,13 +210,20 @@ const ManageSign = () => {
         updateSign.set("SignatureName", obj.name);
         updateSign.set("UserId", userId);
         const res = await updateSign.save();
-        setIsAlert({ type: "success", message: t("signature-saved-alert") });
+        setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: t("signature-saved-alert")
+        });
+        setTimeout(() => setIsAlert({}), 2000);
         return res;
       } catch (err) {
         console.log(err);
-        setIsAlert({ type: "success", message: `${err.message}` });
-      } finally {
         setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: `${err.message}`
+        });
         setTimeout(() => setIsAlert({}), 2000);
       }
     }
@@ -256,29 +234,7 @@ const ManageSign = () => {
   };
   const handleInitialsChange = () => {
     setInitials(initailsRef.current.toDataURL());
-    if (image || signature) {
+    setIsValue(true);
-      setIsValue(true);
-    }
-  };
-  const handleUploadInitials = () => {
-    imgInitialsRef.current.click();
-  };
-  const onImgInitialsChange = async (event) => {
-    if (initailsRef.current) {
-      initailsRef.current.clear();
-    }
-    setInitials("");
-    if (event.target.files && event.target.files[0]) {
-      const file = event.target.files[0];
-      const base64Img = await toDataUrl(file);
-      setImgInitials(base64Img);
-      if (image || signature) {
-        setIsValue(true);
-      }
-    } else {
-      setImgInitials("");
-      setIsValue(false);
-    }
   };
   return (
     <div className="relative h-full bg-base-100 text-base-content flex shadow-md rounded-box overflow-auto">
@@ -325,7 +281,7 @@ const ManageSign = () => {
                         height: "180px",
                         className: "signatureCanvas rounded-box"
                       }}
-                      // backgroundColor="rgb(255, 255, 255)"
+                      backgroundColor="rgb(255, 255, 255)"
                       onEnd={() =>
                         handleSignatureChange(canvasRef.current.toDataURL())
                       }
@@ -376,7 +332,7 @@ const ManageSign = () => {
                         className="op-link"
                         onClick={() => handleUploadBtn()}
                       >
-                        {t("upload")}
+                        {t("upload-image")}
                       </div>
                       <div
                         type="button"
@@ -400,21 +356,17 @@ const ManageSign = () => {
               <span className="font-medium select-none flex mb-[10px] pl-[10px]">
                 {t("initials")}
               </span>
-              <input
-                type="file"
-                onChange={onImgInitialsChange}
-                className="filetype"
-                accept="image/*"
-                ref={imgInitialsRef}
-                hidden
-              />
               <div>
-                {imgInitials ? (
+                {isInitials ? (
                   <div className="intialSignature relative border-[1px] border-[#888] rounded-box overflow-hidden">
                     <img
                       alt="inititals"
-                      src={imgInitials}
+                      src={Initials}
-                      className="w-[100%] h-[100%] object-contain"
+                      style={{
+                        width: "100%",
+                        height: "100%",
+                        objectFit: "contain"
+                      }}
                     />
                   </div>
                 ) : (
@@ -424,8 +376,10 @@ const ManageSign = () => {
                     canvasProps={{
                       className: "intialSignature rounded-box"
                     }}
-                    // backgroundColor="rgb(255, 255, 255)"
+                    backgroundColor="rgb(255, 255, 255)"
-                    onEnd={() => handleInitialsChange()}
+                    onEnd={() =>
+                      handleInitialsChange(initailsRef.current.toDataURL())
+                    }
                     dotSize={1}
                   />
                 )}
@@ -448,7 +402,6 @@ const ManageSign = () => {
                                         ? "2px solid black"
                                         : "2px solid white"
                               }}
-                              className="fa-light fa-pen-nib"
                               onClick={() => {
                                 if (key === 0) {
                                   setInitialPen("blue");
@@ -459,6 +412,7 @@ const ManageSign = () => {
                                 }
                               }}
                               key={key}
+                              className="fa-light fa-pen-nib"
                               width={20}
                               height={20}
                             ></i>
@@ -467,22 +421,13 @@ const ManageSign = () => {
                       </div>
                     )}
                   </div>
-                  <div className="flex flex-row gap-1">
+                  <div>
                     <div
                       type="button"
                       className="op-link text-sm md:text-base mr-1"
-                      onClick={() => handleUploadInitials()}
+                      onClick={() => handleClearInitials()}
                     >
-                      {t("upload")}
+                      {t("clear")}
-                    </div>
-                    <div>
-                      <div
-                        type="button"
-                        className="op-link text-sm md:text-base mr-1"
-                        onClick={() => handleClearInitials()}
-                      >
-                        {t("clear")}
-                      </div>
                     </div>
                   </div>
                 </div>

apps/OpenSign/src/pages/Opensigndrive.js

@@ -499,13 +499,22 @@ function Opensigndrive() {
   //function to use check tour status of open sign drive
   async function checkTourStatus() {
     const cloudRes = await Parse.Cloud.run("getUserDetails");
-    if (cloudRes) {
+    const res = { data: cloudRes.toJSON() };
-      const extUser = JSON.parse(JSON.stringify(cloudRes));
+    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = res.data.TourStatus;
-      const tourStatus = extUser?.TourStatus || [];
       setTourStatusArr(tourStatus);
-      const driveTour = tourStatus.find((obj) => obj.driveTour)?.driveTour;
+      const filteredtourStatus = tourStatus.filter((obj) => obj["driveTour"]);
-      setIsTour(!driveTour);
+      if (filteredtourStatus.length > 0) {
+        const driveTour = filteredtourStatus[0]["driveTour"];
+        // console.log("loginTour", loginTour);
+        if (driveTour) {
+          setIsTour(false);
+        } else {
+          setIsTour(true);
+        }
+      } else {
+        setIsTour(true);
+      }
     } else {
       setIsTour(true);
     }

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -1,10 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import {
+import { isEnableSubscription, isStaging, themeColor } from "../constant/const";
-  emailRegex,
-  isEnableSubscription,
-  isStaging,
-  themeColor
-} from "../constant/const";
 import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
 import Parse from "parse";
@@ -38,10 +33,7 @@ import {
   getDefaultSignature,
   onClickZoomIn,
   onClickZoomOut,
-  fetchUrl,
+  fetchUrl
-  signatureTypes,
-  handleSignatureType,
-  getTenantDetails
 } from "../constant/Utils";
 import Header from "../components/pdf/PdfHeader";
 import RenderPdf from "../components/pdf/RenderPdf";
@@ -59,6 +51,7 @@ import LoaderWithMsg from "../primitives/LoaderWithMsg";
 import DownloadPdfZip from "../primitives/DownloadPdfZip";
 import Loader from "../primitives/Loader";
 import PdfDeclineModal from "../primitives/PdfDeclineModal";
+import Agreement from "../primitives/Agreement";
 
 function PdfRequestFiles(props) {
   const { t } = useTranslation();
@@ -81,7 +74,7 @@ function PdfRequestFiles(props) {
   const [selectWidgetId, setSelectWidgetId] = useState("");
   const [otpLoader, setOtpLoader] = useState(false);
   const [isCelebration, setIsCelebration] = useState(false);
-  const [requestSignTour, setRequestSignTour] = useState(true);
+  const [requestSignTour, setRequestSignTour] = useState(false);
   const [tourStatus, setTourStatus] = useState([]);
   const [isLoading, setIsLoading] = useState({
     isLoad: true,
@@ -137,14 +130,17 @@ function PdfRequestFiles(props) {
   const [contact, setContact] = useState({ name: "", phone: "", email: "" });
   const [isOtp, setIsOtp] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [publicRes, setPublicRes] = useState({});
+  const [res, setRes] = useState({});
   const [documentId, setDocumentId] = useState("");
   const [isPublicContact, setIsPublicContact] = useState(false);
+  const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
   const [plancode, setPlanCode] = useState("");
   const isHeader = useSelector((state) => state.showHeader);
   const divRef = useRef(null);
   const [isDownloadModal, setIsDownloadModal] = useState(false);
-  const [signatureType, setSignatureType] = useState([]);
+  const [isAgree, setIsAgree] = useState(false);
+  const [isAgreeTour, setIsAgreeTour] = useState(false);
+
   const isMobile = window.innerWidth < 767;
 
   let isGuestSignFlow = false;
@@ -291,7 +287,6 @@ function PdfRequestFiles(props) {
     }
   }
   //function for get document details for perticular signer with signer'object id
-  //whenever change anything in this function check react/angular packages also in plan js
   const getTemplateDetails = async () => {
     try {
       const params = { templateId: props.templateId, ispublic: true };
@@ -311,13 +306,16 @@ function PdfRequestFiles(props) {
         : [];
       if (documentData && documentData[0]?.error) {
         props?.setTemplateStatus &&
-          props?.setTemplateStatus({ status: "Invalid" });
+          props?.setTemplateStatus({
+            status: "Invalid"
+          });
         throw new Error("error: Invalid TemplateId");
       } else if (documentData && documentData.length > 0) {
         if (documentData[0]?.IsPublic) {
-          //handle condition when someone use plan js then setTemplateStatus is not supporting
           props?.setTemplateStatus &&
-            props?.setTemplateStatus({ status: "Success" });
+            props?.setTemplateStatus({
+              status: "Success"
+            });
           const url =
             documentData[0] &&
             (documentData[0]?.SignedUrl || documentData[0]?.URL);
@@ -326,6 +324,8 @@ function PdfRequestFiles(props) {
             const arrayBuffer = await convertPdfArrayBuffer(url);
             if (arrayBuffer === "Error") {
               setHandleError(t("something-went-wrong-mssg"));
+            } else {
+              setPdfArrayBuffer(arrayBuffer);
             }
           } else {
             setHandleError(t("something-went-wrong-mssg"));
@@ -355,18 +355,24 @@ function PdfRequestFiles(props) {
           }
           setUnSignedSigners(placeholdersOrSigners);
           setPdfDetails(documentData);
-          setIsLoading({ isLoad: false });
+          setIsLoading({
+            isLoad: false
+          });
         } else {
           props?.setTemplateStatus &&
-            props?.setTemplateStatus({ status: "Private" });
+            props?.setTemplateStatus({
-          setIsLoading({ isLoad: false });
+              status: "Private"
+            });
+          setIsLoading(false);
           setHandleError(t("something-went-wrong-mssg"));
           console.error("error:  TemplateId is not public");
           return;
         }
       } else {
         props?.setTemplateStatus &&
-          props?.setTemplateStatus({ status: "Invalid" });
+          props?.setTemplateStatus({
+            status: "Invalid"
+          });
         setIsLoading(false);
         setHandleError(t("something-went-wrong-mssg"));
         console.error("error: Invalid TemplateId");
@@ -383,33 +389,6 @@ function PdfRequestFiles(props) {
       return;
     }
   };
-  const fetchTenantDetails = async (contactId) => {
-    const user = JSON.parse(
-      localStorage.getItem(
-        `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-      )
-    );
-    try {
-      const tenantDetails = await getTenantDetails(
-        user?.objectId, // userId
-        "", // jwttoken
-        contactId // contactId
-      );
-      if (tenantDetails && tenantDetails === "user does not exist!") {
-        alert(t("user-not-exist"));
-      } else if (tenantDetails) {
-        const signatureType = tenantDetails?.SignatureType || [];
-        const filterSignTypes = signatureType?.filter(
-          (x) => x.enabled === true
-        );
-
-        return filterSignTypes;
-      }
-    } catch (e) {
-      alert(t("user-not-exist"));
-    }
-  };
-
   //function for get document details for perticular signer with signer'object id
   const getDocumentDetails = async (docId, isNextUser) => {
     try {
@@ -417,27 +396,11 @@ function PdfRequestFiles(props) {
         `Parse/${localStorage.getItem("parseAppId")}/currentUser`
       );
       const jsonSender = JSON.parse(senderUser);
-      const contactId = jsonSender?.objectId
-        ? ""
-        : contactBookId || signerObjectId || "";
-      const tenantSignTypes = await fetchTenantDetails(contactId);
       // `currUserId` will be contactId or extUserId
       let currUserId;
       //getting document details
       const documentData = await contractDocument(docId);
       if (documentData && documentData.length > 0) {
-        const userSignatureType =
-          documentData[0]?.ExtUserPtr?.SignatureType || signatureTypes;
-        const docSignTypes =
-          documentData?.[0]?.SignatureType || userSignatureType;
-        const updatedSignatureType = await handleSignatureType(
-          tenantSignTypes,
-          docSignTypes
-        );
-        setSignatureType(updatedSignatureType);
-        const updatedPdfDetails = [...documentData];
-        updatedPdfDetails[0].SignatureType = updatedSignatureType;
-        setPdfDetails(updatedPdfDetails);
         const url =
           documentData[0] &&
           (documentData[0]?.SignedUrl || documentData[0]?.URL);
@@ -446,6 +409,8 @@ function PdfRequestFiles(props) {
           const arrayBuffer = await convertPdfArrayBuffer(url);
           if (arrayBuffer === "Error") {
             setHandleError(t("something-went-wrong-mssg"));
+          } else {
+            setPdfArrayBuffer(arrayBuffer);
           }
         } else {
           setHandleError(t("something-went-wrong-mssg"));
@@ -459,15 +424,13 @@ function PdfRequestFiles(props) {
         const expireUpdateDate = new Date(expireDate).getTime();
         const currDate = new Date().getTime();
         const getSigners = documentData[0].Signers;
-        const isTourEnabled =
-          documentData[0]?.IsTourEnabled === true ? true : false;
         const getCurrentSigner = getSigners?.find(
           (data) => data.UserId.objectId === jsonSender?.objectId
         );
 
         currUserId = getCurrentSigner?.objectId
           ? getCurrentSigner.objectId
-          : contactBookId || signerObjectId || ""; //signerObjectId is contactBookId refer from public template flow
+          : contactBookId || "";
         if (isEnableSubscription) {
           await checkIsSubscribed(
             documentData[0]?.ExtUserPtr?.objectId,
@@ -636,8 +599,7 @@ function PdfRequestFiles(props) {
           checkAlreadySign ||
           !currUserId ||
           declined ||
-          currDate > expireUpdateDate ||
+          currDate > expireUpdateDate
-          !isTourEnabled
         ) {
           setRequestSignTour(true);
         } else {
@@ -665,8 +627,6 @@ function PdfRequestFiles(props) {
                   tourData?.some((data) => data?.requestSign) || false;
                 setTourStatus(tourData);
                 setRequestSignTour(checkTourRequest);
-              } else {
-                setRequestSignTour(false);
               }
             } catch (err) {
               console.log("err while getting tourstatus", err);
@@ -688,8 +648,6 @@ function PdfRequestFiles(props) {
                 );
                 setTourStatus(tourData);
                 setRequestSignTour(checkTourRequest[0]?.requestSign || false);
-              } else {
-                setRequestSignTour(false);
               }
             } else if (res?.length === 0) {
               const res = await contactBook(currUserId);
@@ -706,8 +664,6 @@ function PdfRequestFiles(props) {
                   );
                   setTourStatus(tourData);
                   setRequestSignTour(checkTourRequest[0]?.requestSign || false);
-                } else {
-                  setRequestSignTour(false);
                 }
               } else if (res.length === 0) {
                 setHandleError(t("user-not-exist"));
@@ -927,29 +883,9 @@ function PdfRequestFiles(props) {
             setIsUiLoading(true);
             // `widgets` is Used to return widgets details with page number of current user
             const widgets = checkUser?.[0]?.placeHolder;
-            let pdfArrBuffer;
+
-            //`contractDocument` function used to get updated SignedUrl
-            // to resolve issue of widgets get remove automatically when more than 1 signers try to sign doc at a time
-            const documentData = await contractDocument(documentId);
-            if (documentData && documentData.length > 0) {
-              const url = documentData[0]?.SignedUrl || documentData[0]?.URL;
-              //convert document url in array buffer format to use embed widgets in pdf using pdf-lib
-              const arrayBuffer = await convertPdfArrayBuffer(url);
-              if (arrayBuffer === "Error") {
-                setHandleError("Error: invalid document!");
-              } else {
-                pdfArrBuffer = arrayBuffer;
-              }
-            } else if (
-              documentData === "Error: Something went wrong!" ||
-              (documentData.result && documentData.result.error)
-            ) {
-              setHandleError("Error: Something went wrong!");
-            } else {
-              setHandleError("Document not Found!");
-            }
             // Load a PDFDocument from the existing PDF bytes
-            const existingPdfBytes = pdfArrBuffer;
+            const existingPdfBytes = pdfArrayBuffer;
             try {
               const pdfDoc = await PDFDocument.load(existingPdfBytes);
               const isSignYourSelfFlow = false;
@@ -966,175 +902,169 @@ function PdfRequestFiles(props) {
                 widgets,
                 pdfDoc,
                 isSignYourSelfFlow,
-                scale
+                scale,
+                pdfOriginalWH,
+                containerWH
               );
               // console.log("pdfte", pdfBytes);
               //get ExistUserPtr object id of user class to get tenantDetails
-              if (!pdfBytes?.error) {
+              const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
-                const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
+              let activeMailAdapter =
-                let activeMailAdapter =
+                pdfDetails?.[0]?.ExtUserPtr?.active_mail_adapter;
-                  pdfDetails?.[0]?.ExtUserPtr?.active_mail_adapter;
+
-                //function for call to embed signature in pdf and get digital signature pdf
+              //function for call to embed signature in pdf and get digital signature pdf
-                const resSign = await signPdfFun(
+              const resSign = await signPdfFun(
-                  pdfBytes,
+                pdfBytes,
-                  documentId,
+                documentId,
-                  signerObjectId,
+                signerObjectId,
-                  objectId,
+                objectId,
-                  isSubscribed,
+                isSubscribed,
-                  activeMailAdapter,
+                activeMailAdapter,
-                  widgets
+                widgets
+              );
+              if (resSign && resSign.status === "success") {
+                setPdfUrl(resSign.data);
+                setIsSigned(true);
+                setSignedSigners([]);
+                setUnSignedSigners([]);
+                getDocumentDetails(documentId, true);
+                const index = pdfDetails?.[0]?.Signers.findIndex(
+                  (x) => x.objectId === signerObjectId
                 );
-                if (resSign && resSign.status === "success") {
+                const newIndex = index + 1;
-                  setPdfUrl(resSign.data);
+                const usermail = {
-                  setIsSigned(true);
+                  Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
-                  setSignedSigners([]);
+                };
-                  setUnSignedSigners([]);
+                const user = usermail?.Email
-                  getDocumentDetails(documentId, true);
+                  ? usermail
-                  const index = pdfDetails?.[0]?.Signers.findIndex(
+                  : pdfDetails?.[0]?.Signers[newIndex];
-                    (x) => x.objectId === signerObjectId
+                if (sendmail !== "false" && sendInOrder) {
-                  );
+                  const requestBody = pdfDetails?.[0]?.RequestBody;
-                  const newIndex = index + 1;
+                  const requestSubject = pdfDetails?.[0]?.RequestSubject;
-                  const usermail = {
+                  if (user) {
-                    Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
+                    const expireDate = pdfDetails?.[0].ExpiryDate.iso;
-                  };
+                    const newDate = new Date(expireDate);
-                  const user = usermail?.Email
+                    const localExpireDate = newDate.toLocaleDateString(
-                    ? usermail
+                      "en-US",
-                    : pdfDetails?.[0]?.Signers[newIndex];
+                      {
-                  if (sendmail !== "false" && sendInOrder) {
+                        day: "numeric",
-                    const requestBody = pdfDetails?.[0]?.RequestBody;
+                        month: "long",
-                    const requestSubject = pdfDetails?.[0]?.RequestSubject;
+                        year: "numeric"
-                    if (user) {
-                      const expireDate = pdfDetails?.[0].ExpiryDate.iso;
-                      const newDate = new Date(expireDate);
-                      const localExpireDate = newDate.toLocaleDateString(
-                        "en-US",
-                        { day: "numeric", month: "long", year: "numeric" }
-                      );
-                      let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
-                      let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
-                      const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;
-
-                      try {
-                        const imgPng =
-                          "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
-                        let url = `${localStorage.getItem(
-                          "baseUrl"
-                        )}functions/sendmailv3`;
-                        const headers = {
-                          "Content-Type": "application/json",
-                          "X-Parse-Application-Id":
-                            localStorage.getItem("parseAppId"),
-                          sessionToken: localStorage.getItem("accesstoken")
-                        };
-                        const objectId = user?.objectId;
-                        const hostUrl = window.location.origin;
-                        //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
-                        let encodeBase64;
-                        if (objectId) {
-                          encodeBase64 = btoa(
-                            `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
-                          );
-                        } else {
-                          encodeBase64 = btoa(
-                            `${pdfDetails?.[0].objectId}/${user.Email}`
-                          );
-                        }
-                        const hostPublicUrl = isStaging
-                          ? "https://staging-app.opensignlabs.com"
-                          : "https://app.opensignlabs.com";
-                        let signPdf = props?.templateId
-                          ? `${hostPublicUrl}/login/${encodeBase64}`
-                          : `${hostUrl}/login/${encodeBase64}`;
-                        const openSignUrl =
-                          "https://www.opensignlabs.com/contact-us";
-                        const orgName = pdfDetails[0]?.ExtUserPtr.Company
-                          ? pdfDetails[0].ExtUserPtr.Company
-                          : "";
-                        const themeBGcolor = themeColor;
-                        let replaceVar;
-                        if (requestBody && requestSubject && isSubscribed) {
-                          const replacedRequestBody = requestBody.replace(
-                            /"/g,
-                            "'"
-                          );
-                          const htmlReqBody =
-                            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
-                            replacedRequestBody +
-                            "</body> </html>";
-
-                          const variables = {
-                            document_title: pdfDetails?.[0].Name,
-                            sender_name: senderName,
-                            sender_mail: senderEmail,
-                            sender_phone: senderPhone,
-                            receiver_name: user.Name,
-                            receiver_email: user.Email,
-                            receiver_phone: user.Phone,
-                            expiry_date: localExpireDate,
-                            company_name: orgName,
-                            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
-                          };
-                          replaceVar = replaceMailVaribles(
-                            requestSubject,
-                            htmlReqBody,
-                            variables
-                          );
-                        }
-
-                        let params = {
-                          mailProvider: activeMailAdapter,
-                          extUserId: extUserId,
-                          recipient: user.Email,
-                          subject: requestSubject
-                            ? replaceVar?.subject
-                            : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign "${pdfDetails?.[0].Name}"`,
-                          from: senderEmail,
-                          plan: plancode,
-                          html: requestBody
-                            ? replaceVar?.body
-                            : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
-                              imgPng +
-                              " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
-                              themeBGcolor +
-                              ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
-                              pdfDetails?.[0].ExtUserPtr.Name +
-                              " has requested you to review and sign <strong> " +
-                              pdfDetails?.[0].Name +
-                              "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
-                              senderEmail +
-                              "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
-                              orgName +
-                              "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
-                              localExpireDate +
-                              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
-                              signPdf +
-                              "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> 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™   <a href= " +
-                              openSignUrl +
-                              " target=_blank>here</a>.</p> </div></div></body> </html>"
-                        };
-                        await axios.post(url, params, { headers: headers });
-                      } catch (error) {
-                        console.log("error", error);
                       }
+                    );
+                    let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
+                    let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
+                    const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;
+
+                    try {
+                      const imgPng =
+                        "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
+                      let url = `${localStorage.getItem(
+                        "baseUrl"
+                      )}functions/sendmailv3`;
+                      const headers = {
+                        "Content-Type": "application/json",
+                        "X-Parse-Application-Id":
+                          localStorage.getItem("parseAppId"),
+                        sessionToken: localStorage.getItem("accesstoken")
+                      };
+                      const objectId = user?.objectId;
+                      const hostUrl = window.location.origin;
+                      //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
+                      let encodeBase64;
+                      if (objectId) {
+                        encodeBase64 = btoa(
+                          `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
+                        );
+                      } else {
+                        encodeBase64 = btoa(
+                          `${pdfDetails?.[0].objectId}/${user.Email}`
+                        );
+                      }
+                      const hostPublicUrl = isStaging
+                        ? "https://staging-app.opensignlabs.com"
+                        : "https://app.opensignlabs.com";
+                      let signPdf = props?.templateId
+                        ? `${hostPublicUrl}/login/${encodeBase64}`
+                        : `${hostUrl}/login/${encodeBase64}`;
+                      const openSignUrl =
+                        "https://www.opensignlabs.com/contact-us";
+                      const orgName = pdfDetails[0]?.ExtUserPtr.Company
+                        ? pdfDetails[0].ExtUserPtr.Company
+                        : "";
+                      const themeBGcolor = themeColor;
+                      let replaceVar;
+                      if (requestBody && requestSubject && isSubscribed) {
+                        const replacedRequestBody = requestBody.replace(
+                          /"/g,
+                          "'"
+                        );
+                        const htmlReqBody =
+                          "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
+                          replacedRequestBody +
+                          "</body> </html>";
+
+                        const variables = {
+                          document_title: pdfDetails?.[0].Name,
+                          sender_name: senderName,
+                          sender_mail: senderEmail,
+                          sender_phone: senderPhone,
+                          receiver_name: user.Name,
+                          receiver_email: user.Email,
+                          receiver_phone: user.Phone,
+                          expiry_date: localExpireDate,
+                          company_name: orgName,
+                          signing_url: `<a href=${signPdf}>Sign here</a>`
+                        };
+                        replaceVar = replaceMailVaribles(
+                          requestSubject,
+                          htmlReqBody,
+                          variables
+                        );
+                      }
+
+                      let params = {
+                        mailProvider: activeMailAdapter,
+                        extUserId: extUserId,
+                        recipient: user.Email,
+                        subject: requestSubject
+                          ? replaceVar?.subject
+                          : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign "${pdfDetails?.[0].Name}"`,
+                        from: senderEmail,
+                        plan: plancode,
+                        html: requestBody
+                          ? replaceVar?.body
+                          : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
+                            imgPng +
+                            " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
+                            themeBGcolor +
+                            ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
+                            pdfDetails?.[0].ExtUserPtr.Name +
+                            " has requested you to review and sign <strong> " +
+                            pdfDetails?.[0].Name +
+                            "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
+                            senderEmail +
+                            "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
+                            orgName +
+                            "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
+                            localExpireDate +
+                            "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+                            signPdf +
+                            "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> 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™   <a href= " +
+                            openSignUrl +
+                            " target=_blank>here</a>.</p> </div></div></body> </html>"
+                      };
+                      await axios.post(url, params, { headers: headers });
+                    } catch (error) {
+                      console.log("error", error);
                     }
                   }
-                } else {
-                  setIsUiLoading(false);
-                  setIsAlert({
-                    title: "Error",
-                    isShow: true,
-                    alertMessage: resSign.message
-                  });
                 }
               } else {
                 setIsUiLoading(false);
-                setIsAlert({
+                setIsAlert({ isShow: true, alertMessage: resSign.message });
-                  title: "Error",
-                  isShow: true,
-                  alertMessage: t("pdf-uncompatible")
-                });
               }
             } catch (err) {
               setIsUiLoading(false);
@@ -1417,7 +1347,9 @@ function PdfRequestFiles(props) {
         try {
           await axios.post(
             `${localStorage.getItem("baseUrl")}functions/updatecontacttour`,
-            { contactId: signerObjectId },
+            {
+              contactId: signerObjectId
+            },
             {
               headers: {
                 "Content-Type": "application/json",
@@ -1558,69 +1490,56 @@ function PdfRequestFiles(props) {
   //`handlePublicUser` function to use create user from public role and create document from public template
   const handlePublicUser = async (e) => {
     e.preventDefault();
-    if (!emailRegex.test(contact.email)) {
+    setLoading(true);
-      alert("Please enter a valid email address.");
+    try {
-    } else {
+      const params = {
-      setLoading(true);
+        ...contact,
-      try {
+        templateid: pdfDetails[0]?.objectId,
-        const params = {
+        role: pdfDetails[0]?.PublicRole[0]
-          ...contact,
+      };
-          templateid: pdfDetails[0]?.objectId,
+      const userRes = await axios.post(
-          role: pdfDetails[0]?.PublicRole[0]
+        `${localStorage.getItem(
-        };
+          "baseUrl"
-        const userRes = await axios.post(
+        )}/functions/publicuserlinkcontacttodoc`,
-          `${localStorage.getItem(
+        params,
-            "baseUrl"
+        {
-          )}/functions/publicuserlinkcontacttodoc`,
+          headers: {
-          params,
+            "Content-Type": "application/json",
-          {
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId")
-            headers: {
-              "Content-Type": "application/json",
-              "X-Parse-Application-Id": localStorage.getItem("parseAppId")
-            }
           }
-        );
+        }
+      );
 
-        if (userRes?.data?.result) {
+      if (userRes?.data?.result) {
-          setPublicRes(userRes.data.result);
+        setRes(userRes.data.result);
-          const isEnableOTP = pdfDetails?.[0]?.IsEnableOTP || false;
+        await SendOtp();
-          if (isEnableOTP) {
+      } else {
-            await SendOtp();
+        console.log("error in public-sign to create user details");
-          } else {
+        setIsAlert({
-            setIsPublicContact(false);
+          title: "Error",
-            setIsPublicTemplate(false);
+          isShow: true,
-            setDocumentId(userRes.data?.result?.docId);
+          alertMessage: t("something-went-wrong-mssg")
-            const contactId = userRes.data.result?.contactId;
+        });
-            setSignerObjectId(contactId);
+      }
-          }
+    } catch (e) {
-        } else {
+      console.log("e", e);
-          console.log("error in public-sign to create user details");
+      if (
-          setIsAlert({
+        e?.response?.data?.error === "Insufficient Credit" ||
-            title: "Error",
+        e?.response?.data?.error === "Plan expired"
-            isShow: true,
+      ) {
-            alertMessage: t("something-went-wrong-mssg")
+        handleCloseOtp();
-          });
+        setIsAlert({
-        }
+          title: t("insufficient-credits"),
-      } catch (e) {
+          isShow: true,
-        console.log("e", e);
+          alertMessage: t("insufficient-credits-mssg")
-        if (
+        });
-          e?.response?.data?.error === "Insufficient Credit" ||
+      } else {
-          e?.response?.data?.error === "Plan expired"
+        handleCloseOtp();
-        ) {
+        setIsAlert({
-          handleCloseOtp();
+          title: "Error",
-          setIsAlert({
+          isShow: true,
-            title: t("insufficient-credits"),
+          alertMessage: t("something-went-wrong-mssg")
-            isShow: true,
+        });
-            alertMessage: t("insufficient-credits-mssg")
-          });
-        } else {
-          handleCloseOtp();
-          setIsAlert({
-            title: "Error",
-            isShow: true,
-            alertMessage: t("something-went-wrong-mssg")
-          });
-        }
       }
     }
   };
@@ -1635,7 +1554,7 @@ function PdfRequestFiles(props) {
 
   const SendOtp = async () => {
     try {
-      const params = { email: contact.email, docId: publicRes?.docId };
+      const params = { email: contact.email, docId: res.docId };
       const Otp = await axios.post(
         `${localStorage.getItem("baseUrl")}/functions/SendOTPMailV1`,
         params,
@@ -1701,13 +1620,17 @@ function PdfRequestFiles(props) {
               JSON.stringify(contractUserDetails)
             );
           }
+
           localStorage.setItem("username", _user.name);
           localStorage.setItem("accesstoken", _user.sessionToken);
           setLoading(false);
+          // navigate(`/load/recipientSignPdf/${res?.docId}/${res?.contactId}`);
+          // document.getElementById("my_modal").close();
           setIsPublicContact(false);
           setIsPublicTemplate(false);
           setIsLoading({ isLoad: false });
-          setDocumentId(publicRes?.docId);
+          setDocumentId(res?.docId);
+          getDocumentDetails(res?.docId);
         }
       } catch (error) {
         console.log("err ", error);
@@ -1752,6 +1675,17 @@ function PdfRequestFiles(props) {
       </div>
     );
   };
+  const AgreementTour = [
+    {
+      selector: '[data-tut="IsAgree"]',
+      content: "Please agree & continue to start signing",
+      position: "top",
+      style: { fontSize: "13px" }
+    }
+  ];
+  const handleCloseAgreeTour = () => {
+    setIsAgreeTour(false);
+  };
   return (
     <DndProvider backend={HTML5Backend}>
       <Title title={props.templateId ? "Public Sign" : "Request Sign"} />
@@ -1774,7 +1708,23 @@ function PdfRequestFiles(props) {
           ) : handleError ? (
             <HandleError handleError={handleError} />
           ) : (
-            <div>
+            <div onClick={() => !isAgree && setIsAgreeTour(true)}>
+              {!isAgree && (
+                <Agreement
+                  setIsAgree={setIsAgree}
+                  setIsAgreeTour={setIsAgreeTour}
+                />
+              )}
+              <Tour
+                showNumber={false}
+                showNavigation={false}
+                showNavigationNumber={false}
+                onRequestClose={handleCloseAgreeTour}
+                steps={AgreementTour}
+                isOpen={isAgreeTour}
+                rounded={5}
+                closeWithMask={false}
+              />
               {isUiLoading && (
                 <div className="absolute h-[100vh] w-full flex flex-col justify-center items-center z-[999] bg-[#e6f2f2] bg-opacity-80">
                   <Loader />
@@ -1793,6 +1743,7 @@ function PdfRequestFiles(props) {
                   />
                 </div>
               )}
+
               <div
                 style={{
                   pointerEvents:
@@ -2002,7 +1953,7 @@ function PdfRequestFiles(props) {
                             })
                           }
                           type="button"
-                          className="op-btn op-btn-secondary ml-1"
+                          className="op-btn op-btn-secondary"
                         >
                           {t("close")}
                         </button>
@@ -2145,30 +2096,27 @@ function PdfRequestFiles(props) {
                       </div>
                     </ModalUi>
                     {/* this component is used for signature pad modal */}
-                    {documentId && (
+                    <SignPad
-                      <SignPad
+                      isSignPad={isSignPad}
-                        signatureTypes={signatureType}
+                      isStamp={isStamp}
-                        isSignPad={isSignPad}
+                      setIsImageSelect={setIsImageSelect}
-                        isStamp={isStamp}
+                      setIsSignPad={setIsSignPad}
-                        setIsImageSelect={setIsImageSelect}
+                      setImage={setImage}
-                        setIsSignPad={setIsSignPad}
+                      isImageSelect={isImageSelect}
-                        setImage={setImage}
+                      imageRef={imageRef}
-                        isImageSelect={isImageSelect}
+                      onImageChange={onImageChange}
-                        imageRef={imageRef}
+                      setSignature={setSignature}
-                        onImageChange={onImageChange}
+                      image={image}
-                        setSignature={setSignature}
+                      onSaveImage={saveImage}
-                        image={image}
+                      onSaveSign={saveSign}
-                        onSaveImage={saveImage}
+                      defaultSign={defaultSignImg}
-                        onSaveSign={saveSign}
+                      myInitial={myInitial}
-                        defaultSign={defaultSignImg}
+                      isInitial={isInitial}
-                        myInitial={myInitial}
+                      setIsInitial={setIsInitial}
-                        isInitial={isInitial}
+                      setIsStamp={setIsStamp}
-                        setIsInitial={setIsInitial}
+                      currWidgetsDetails={currWidgetsDetails}
-                        setIsStamp={setIsStamp}
+                      setCurrWidgetsDetails={setCurrWidgetsDetails}
-                        currWidgetsDetails={currWidgetsDetails}
+                    />
-                        setCurrWidgetsDetails={setCurrWidgetsDetails}
-                      />
-                    )}
                     {/* pdf header which contain funish back button */}
                     <Header
                       isPdfRequestFiles={isPublicTemplate ? false : true}
@@ -2297,10 +2245,6 @@ function PdfRequestFiles(props) {
                         setIsLoading={setIsLoading}
                         xyPostion={signerPos}
                         setDefaultSignAlert={setDefaultSignAlert}
-                        isDefault={
-                          signatureType?.find((x) => x.name === "default")
-                            ?.enabled || false
-                        }
                       />
                     )}
                   </div>

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -38,9 +38,7 @@ import {
   onClickZoomOut,
   rotatePdfPage,
   handleRemoveWidgets,
-  handleRotateWarning,
+  handleRotateWarning
-  signatureTypes,
-  handleSignatureType
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import { useNavigate } from "react-router-dom";
@@ -153,23 +151,28 @@ function PlaceHolderSign() {
   const [scale, setScale] = useState(1);
   const [pdfRotateBase64, setPdfRotatese64] = useState("");
   const [planCode, setPlanCode] = useState("");
-  const [unSignedWidgetId, setUnSignedWidgetId] = useState("");
-  const [signatureType, setSignatureType] = useState(signatureTypes);
   const isMobile = window.innerWidth < 767;
   const [, drop] = useDrop({
     accept: "BOX",
     drop: (item, monitor) => addPositionOfSignature(item, monitor),
-    collect: (monitor) => ({ isOver: !!monitor.isOver() })
+    collect: (monitor) => ({
+      isOver: !!monitor.isOver()
+    })
   });
+
   const [{ isDragSign }, dragSignature] = useDrag({
     type: "BOX",
     item: { type: "BOX", id: 1, text: "signature" },
-    collect: (monitor) => ({ isDragSign: !!monitor.isDragging() })
+    collect: (monitor) => ({
+      isDragSign: !!monitor.isDragging()
+    })
   });
   const [{ isDragStamp }, dragStamp] = useDrag({
     type: "BOX",
     item: { type: "BOX", id: 2, text: "stamp" },
-    collect: (monitor) => ({ isDragStamp: !!monitor.isDragging() })
+    collect: (monitor) => ({
+      isDragStamp: !!monitor.isDragging()
+    })
   });
   const documentId = docId;
   useEffect(() => {
@@ -198,15 +201,10 @@ function PlaceHolderSign() {
         if (tenantDetails && tenantDetails === "user does not exist!") {
           alert(t("user-not-exist"));
         } else if (tenantDetails) {
-          const signatureType = tenantDetails?.SignatureType || [];
-          const filterSignTypes = signatureType?.filter(
-            (x) => x.enabled === true
-          );
           if (tenantDetails?.RequestBody) {
             setRequestBody(tenantDetails?.RequestBody);
             setRequestSubject(tenantDetails?.RequestSubject);
           }
-          return filterSignTypes;
         }
       } catch (e) {
         alert(t("user-not-exist"));
@@ -257,7 +255,7 @@ function PlaceHolderSign() {
   }
   //function for get document details
   const getDocumentDetails = async () => {
-    const tenantSignTypes = await fetchTenantDetails();
+    fetchTenantDetails();
     //getting document details
     const documentData = await contractDocument(documentId);
     if (documentData && documentData.length > 0) {
@@ -314,18 +312,7 @@ function PlaceHolderSign() {
           });
         }
       }
-      const userSignatureType =
+      setPdfDetails(documentData);
-        documentData[0]?.ExtUserPtr?.SignatureType || signatureTypes;
-      const docSignTypes =
-        documentData?.[0]?.SignatureType || userSignatureType;
-      const updatedSignatureType = await handleSignatureType(
-        tenantSignTypes,
-        docSignTypes
-      );
-      setSignatureType(updatedSignatureType);
-      const updatedPdfDetails = [...documentData];
-      updatedPdfDetails[0].SignatureType = updatedSignatureType;
-      setPdfDetails(updatedPdfDetails);
       //condition when placeholder have empty array with role details and signers array have signers data
       //and both array length are same
       //this case happen using placeholder form in auto save funtionality to save draft type document without adding any placehlder
@@ -488,10 +475,8 @@ function PlaceHolderSign() {
       let dropData = [];
       let placeHolder;
       const dragTypeValue = item?.text ? item.text : monitor.type;
-      const widgetWidth =
+      const widgetWidth = defaultWidthHeight(dragTypeValue).width;
-        defaultWidthHeight(dragTypeValue).width * containerScale;
+      const widgetHeight = defaultWidthHeight(dragTypeValue).height;
-      const widgetHeight =
-        defaultWidthHeight(dragTypeValue).height * containerScale;
       //adding and updating drop position in array when user drop signature button in div
       if (item === "onclick") {
         const divHeight = divRef.current.getBoundingClientRect().height;
@@ -828,7 +813,9 @@ function PlaceHolderSign() {
           placeholder,
           pdfDoc,
           isSignYourSelfFlow,
-          scale
+          scale,
+          pdfOriginalWH,
+          containerWH
         );
         const pdfUrl = await convertBase64ToFile(pdfDetails[0].Name, pdfBase64);
         const tenantId = localStorage.getItem("TenantId");
@@ -857,24 +844,17 @@ function PlaceHolderSign() {
   };
   const alertSendEmail = async () => {
     const filterPrefill = signerPos?.filter((data) => data.Role !== "prefill");
-    const getPrefill = signerPos?.find((data) => data.Role === "prefill");
+    const getPrefill = signerPos?.filter((data) => data.Role === "prefill");
     let isLabel = false;
-    let unfilledTextWidgetId = "";
     //checking all signers placeholder exist or not
     const isPlaceholderExist = filterPrefill.every((data) => data.placeHolder);
-    const prefillPlaceholder = getPrefill?.placeHolder;
+    const prefillPlaceholder = getPrefill[0]?.placeHolder;
     //condition is used to check text widget data is empty or have response
-    if (getPrefill) {
+    if (getPrefill && getPrefill.length > 0) {
       if (prefillPlaceholder) {
         prefillPlaceholder.map((data) => {
           if (!isLabel) {
-            const unfilledTextWidgets = data.pos.find(
+            isLabel = data.pos.some((position) => !position.options.response);
-              (position) => !position.options.response
-            );
-            if (unfilledTextWidgets) {
-              isLabel = true;
-              unfilledTextWidgetId = unfilledTextWidgets.key;
-            }
           }
         });
       }
@@ -902,7 +882,6 @@ function PlaceHolderSign() {
     }
     if (getPrefill && isLabel) {
       setIsSendAlert({ mssg: textWidget, alert: true });
-      setUnSignedWidgetId(unfilledTextWidgetId);
     } else if (isSignatureExist) {
       if (isPlaceholderExist) {
         const IsSignerNotExist = filterPrefill?.filter((x) => !x.signerObjId);
@@ -922,32 +901,30 @@ function PlaceHolderSign() {
 
   useEffect(() => {
     const timer = setTimeout(() => {
-      if (signerPos?.length > 0 && !pdfDetails?.[0]?.IsCompleted) {
+      if (signerPos?.length > 0) {
         autosavedetails();
       }
     }, 2000);
     return () => clearTimeout(timer);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [signerPos, signersdata, signatureType]);
+  }, [signerPos, signersdata]);
 
   // `autosavedetails` is used to save doc details after every 2 sec when changes are happern in placeholder like drag-drop widgets, remove signers
   const autosavedetails = async () => {
-    const signers = signersdata?.reduce((acc, x) => {
+    const signers = signersdata?.filter(
-      if (x.objectId) {
+      (x) =>
-        acc.push({
+        x?.Role !== "prefill" &&
+        x.objectId && {
           __type: "Pointer",
           className: "contracts_Contactbook",
           objectId: x.objectId
-        });
+        }
-      }
+    );
-      return acc;
-    }, []);
     try {
       const docCls = new Parse.Object("contracts_Document");
       docCls.id = documentId;
       docCls.set("Placeholders", signerPos);
       docCls.set("Signers", signers);
-      docCls.set("SignatureType", signatureType);
       await docCls.save();
     } catch (e) {
       console.log("error", e);
@@ -987,15 +964,21 @@ function PlaceHolderSign() {
     //filter label widgets after add label widgets data on pdf
     const filterPrefill = signerPos.filter((data) => data.Role !== "prefill");
     try {
-      data = {
-        Placeholders: filterPrefill,
-        SignedUrl: pdfUrl,
-        Signers: signers,
-        SentToOthers: true,
-        SignatureType: pdfDetails?.[0]?.SignatureType
-      };
       if (updateExpiryDate) {
-        data["ExpiryDate"] = { iso: updateExpiryDate, __type: "Date" };
+        data = {
+          Placeholders: filterPrefill,
+          SignedUrl: pdfUrl,
+          Signers: signers,
+          SentToOthers: true,
+          ExpiryDate: { iso: updateExpiryDate, __type: "Date" }
+        };
+      } else {
+        data = {
+          Placeholders: filterPrefill,
+          SignedUrl: pdfUrl,
+          Signers: signers,
+          SentToOthers: true
+        };
       }
       await axios
         .put(
@@ -1138,7 +1121,7 @@ function PlaceHolderSign() {
             receiver_phone: signerMail[i]?.Phone || "",
             expiry_date: localExpireDate,
             company_name: orgName,
-            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+            signing_url: `<a href=${signPdf}>Sign here</a>`
           };
           replaceVar = replaceMailVaribles(
             requestSubject,
@@ -1172,7 +1155,7 @@ function PlaceHolderSign() {
               orgName +
               "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expire on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
               localExpireDate +
-              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
               signPdf +
               "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
               senderEmail +
@@ -1347,7 +1330,7 @@ function PlaceHolderSign() {
                     isHideLabel: isHideLabel || false,
                     defaultValue: defaultValue,
                     fontSize:
-                      fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                      fontSize || currWidgetsDetails?.options?.fontSize || "12",
                     fontColor:
                       fontColor ||
                       currWidgetsDetails?.options?.fontColor ||
@@ -1385,7 +1368,7 @@ function PlaceHolderSign() {
                     isReadOnly: isReadOnly || false,
                     isHideLabel: isHideLabel || false,
                     fontSize:
-                      fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                      fontSize || currWidgetsDetails?.options?.fontSize || "12",
                     fontColor:
                       fontColor ||
                       currWidgetsDetails?.options?.fontColor ||
@@ -1403,7 +1386,7 @@ function PlaceHolderSign() {
                   values: dropdownOptions,
                   defaultValue: defaultValue,
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1437,15 +1420,7 @@ function PlaceHolderSign() {
     setFontSize();
     setFontColor();
   };
-  const handleWidgetdefaultdata = (defaultdata, isSignWidget) => {
+  const handleWidgetdefaultdata = (defaultdata) => {
-    if (isSignWidget) {
-      const updatedPdfDetails = [...pdfDetails];
-      const signtypes = defaultdata.signatureType || signatureType;
-      updatedPdfDetails[0].SignatureType = signtypes;
-      // Update the SignatureType with the modified array
-      setPdfDetails(updatedPdfDetails);
-      setSignatureType(signtypes);
-    }
     const options = ["email", "number", "text"];
     let inputype;
     if (defaultdata.textvalidate) {
@@ -1484,7 +1459,7 @@ function PlaceHolderSign() {
                         }
                       : {},
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1500,7 +1475,7 @@ function PlaceHolderSign() {
                   status: defaultdata.status,
                   defaultValue: defaultdata.defaultValue,
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1566,12 +1541,14 @@ function PlaceHolderSign() {
       } else {
         updatedTourStatus = [{ placeholder: true }];
       }
-      try {
+      await axios
-        await axios.put(
+        .put(
           `${localStorage.getItem(
             "baseUrl"
           )}classes/contracts_Users/${signerUserId}`,
-          { TourStatus: updatedTourStatus },
+          {
+            TourStatus: updatedTourStatus
+          },
           {
             headers: {
               "Content-Type": "application/json",
@@ -1579,10 +1556,14 @@ function PlaceHolderSign() {
               sessionToken: localStorage.getItem("accesstoken")
             }
           }
-        );
+        )
-      } catch (err) {
+        .then(() => {
-        console.log("axois err ", err);
+          // const json = Listdata.data;
-      }
+          // const res = json.results;
+        })
+        .catch((err) => {
+          console.log("axois err ", err);
+        });
     }
   };
   const handleRecipientSign = () => {
@@ -1667,15 +1648,8 @@ function PlaceHolderSign() {
   const signerAssignTour = [
     {
       selector: '[data-tut="assignSigner"]',
-      content: t("attach-signer-tour"),
+      content:
-      position: "top",
+        "You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour. ",
-      style: { fontSize: "13px" }
-    }
-  ];
-  const textFieldTour = [
-    {
-      selector: '[data-tut="IsSigned"]',
-      content: t("text-field-tour"),
       position: "top",
       style: { fontSize: "13px" }
     }
@@ -1785,13 +1759,6 @@ function PlaceHolderSign() {
                 rounded={5}
                 closeWithMask={false}
               />
-              <Tour
-                onRequestClose={() => setIsSendAlert({})}
-                steps={textFieldTour}
-                isOpen={isSendAlert.mssg === textWidget}
-                rounded={5}
-                closeWithMask={false}
-              />
               {/* this component used to render all pdf pages in left side */}
               <RenderAllPdfPage
                 signPdfUrl={pdfDetails[0].URL}
@@ -1812,18 +1779,20 @@ function PlaceHolderSign() {
                 <div className=" w-full md:w-[95%] ">
                   {/* this modal is used show alert set placeholder for all signers before send mail */}
                   <ModalUi
-                    isOpen={
+                    isOpen={isSendAlert.alert}
-                      isSendAlert.alert && isSendAlert.mssg !== textWidget
-                    }
                     title={
                       isSendAlert.mssg === "sure" ||
-                      (isSendAlert.mssg === "confirm" && t("send-mail"))
+                      isSendAlert.mssg === textWidget
+                        ? t("fields-required")
+                        : isSendAlert.mssg === "confirm" && t("send-mail")
                     }
                     handleClose={() => handleCloseSendmailModal()}
                   >
                     <div className="max-h-96 overflow-y-scroll scroll-hide p-[20px] text-base-content">
                       {isSendAlert.mssg === "sure" ? (
                         <span>{t("placeholder-alert-1")}</span>
+                      ) : isSendAlert.mssg === textWidget ? (
+                        <p>{t("placeholder-alert-2")}</p>
                       ) : (
                         isSendAlert.mssg === "confirm" && (
                           <>
@@ -1904,11 +1873,9 @@ function PlaceHolderSign() {
                   <ModalUi
                     isOpen={isSend}
                     title={
-                      mailStatus === "success"
+                      mailStatus === "quotareached"
-                        ? t("mails-sent")
+                        ? t("quota-mail-head")
-                        : mailStatus === "quotareached"
+                        : t("Mails Sent")
-                          ? t("quota-mail-head")
-                          : t("mail-not-delivered")
                     }
                     handleClose={() => {
                       setIsSend(false);
@@ -1935,12 +1902,7 @@ function PlaceHolderSign() {
                           <div className="my-3">{handleShareList()}</div>
                         </div>
                       ) : (
-                        <div className="mb-[10px]">
+                        <p>{t("placeholder-alert-6")}</p>
-                          <p>{t("placeholder-alert-6")}</p>
-                          {isCurrUser && (
-                            <p className="mt-1">{t("placeholder-alert-5")}</p>
-                          )}
-                        </div>
                       )}
                       {!mailStatus && (
                         <div className="w-full h-[1px] bg-[#9f9f9f] my-[15px]"></div>
@@ -2056,7 +2018,6 @@ function PlaceHolderSign() {
 
                   {/* pdf header which contain funish back button */}
                   <Header
-                    completeBtnTitle={t("next")}
                     isPlaceholder={true}
                     pageNumber={pageNumber}
                     allPages={allPages}
@@ -2097,7 +2058,6 @@ function PlaceHolderSign() {
                         setSignerPos={setSignerPos}
                         containerWH={containerWH}
                         setIsResize={setIsResize}
-                        isResize={isResize}
                         setZIndex={setZIndex}
                         setIsPageCopy={setIsPageCopy}
                         signersdata={signersdata}
@@ -2124,7 +2084,6 @@ function PlaceHolderSign() {
                         setFontSize={setFontSize}
                         fontColor={fontColor}
                         setFontColor={setFontColor}
-                        unSignedWidgetId={unSignedWidgetId}
                       />
                     )}
                   </div>
@@ -2249,7 +2208,6 @@ function PlaceHolderSign() {
           signersData={signersdata}
         />
         <WidgetNameModal
-          signatureType={signatureType}
           widgetName={widgetName}
           defaultdata={currWidgetsDetails}
           isOpen={isNameModal}

apps/OpenSign/src/pages/Preferences.js

@@ -1,218 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Title from "../components/Title";
-import Alert from "../primitives/Alert";
-import { useTranslation } from "react-i18next";
-import Loader from "../primitives/Loader";
-import Tooltip from "../primitives/Tooltip";
-import {
-  getTenantDetails,
-  handleSignatureType,
-  signatureTypes
-} from "../constant/Utils";
-import Parse from "parse";
-import { Tooltip as ReactTooltip } from "react-tooltip";
-const Preferences = () => {
-  const { t } = useTranslation();
-  const [isalert, setIsAlert] = useState({ type: "success", msg: "" });
-  const [isTopLoader, setIsTopLoader] = useState(false);
-  const [isLoader, setIsLoader] = useState(false);
-  const [signatureType, setSignatureType] = useState([]);
-  const [errMsg, setErrMsg] = useState("");
-  useEffect(() => {
-    fetchSignType();
-  }, []);
-
-  const fetchSignType = async () => {
-    setIsTopLoader(true);
-    try {
-      const user = JSON.parse(
-        localStorage.getItem(
-          `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-        )
-      );
-      const tenantDetails = await getTenantDetails(user?.objectId);
-      const signatureType = tenantDetails?.SignatureType || [];
-      const tenantSignTypes = signatureType?.filter((x) => x.enabled === true);
-      const getUser = await Parse.Cloud.run("getUserDetails");
-      if (getUser) {
-        const _getUser = JSON.parse(JSON.stringify(getUser));
-        if (tenantSignTypes?.length > 0) {
-          const signatureType = _getUser?.SignatureType || signatureTypes;
-          const updatedSignatureType = await handleSignatureType(
-            tenantSignTypes,
-            signatureType
-          );
-          setSignatureType(updatedSignatureType);
-        } else {
-          const SignatureType = _getUser?.SignatureType || signatureTypes;
-          setSignatureType(SignatureType);
-        }
-      }
-    } catch (err) {
-      console.log("err while getting user details", err);
-      setErrMsg("Something went wrong");
-    } finally {
-      setIsTopLoader(false);
-    }
-  };
-
-  // `handleCheckboxChange` is trigger when user enable/disable checkbox of respective type
-  const handleCheckboxChange = (index) => {
-    // Create a copy of the signatureType array
-    const updatedSignatureType = [...signatureType];
-    // Toggle the enabled value for the clicked item
-    updatedSignatureType[index].enabled = !updatedSignatureType[index].enabled;
-    // Update the state with the modified array
-    setSignatureType(updatedSignatureType);
-  };
-
-  // `handleSave` is used save updated value signature type
-  const handleSave = async () => {
-    setIsLoader(true);
-    const enabledSignTypes = signatureType?.filter((x) => x.enabled);
-    const isDefaultSignTypeOnly =
-      enabledSignTypes?.length === 1 && enabledSignTypes[0]?.name === "default";
-    if (enabledSignTypes.length === 0) {
-      setIsAlert({
-        type: "danger",
-        msg: t("at-least-one-signature-type")
-      });
-    } else if (isDefaultSignTypeOnly) {
-      setIsAlert({
-        type: "danger",
-        msg: t("expect-default-one-more-signature-type")
-      });
-    } else {
-      try {
-        const updateRes = await Parse.Cloud.run("updatesignaturetype", {
-          SignatureType: signatureType
-        });
-        if (updateRes) {
-          setIsAlert({ type: "success", msg: "Saved successfully." });
-        }
-      } catch (err) {
-        console.log("Error updating signature type", err);
-        setIsAlert({ type: "danger", msg: err.message });
-      }
-    }
-    setTimeout(() => setIsAlert({ type: "success", msg: "" }), 1500);
-    setIsLoader(false);
-  };
-
-  return (
-    <React.Fragment>
-      <Title title={"API Token"} />
-      {isalert.msg && <Alert type={isalert.type}>{isalert.msg}</Alert>}
-      {isTopLoader ? (
-        <div className="flex justify-center items-center h-screen">
-          <Loader />
-        </div>
-      ) : (
-        <>
-          {errMsg ? (
-            <div className="flex justify-center items-center h-screen">
-              {errMsg}
-            </div>
-          ) : (
-            <div className="relative bg-base-100 text-base-content flex flex-col justify-center shadow-md rounded-box mb-3">
-              {isLoader && (
-                <div className="flex justify-center items-center absolute w-full h-full rounded-box bg-black/30">
-                  <Loader />
-                </div>
-              )}
-              <h1 className="ml-4 mt-3 mb-2 font-semibold">
-                OpenSign™ {t("Preferences")}{" "}
-                <span>
-                  <Tooltip
-                    message={`OpenSign™ ${t("Preferences")}`}
-                    isSubscribe={true}
-                  />
-                </span>
-              </h1>
-              <div className="ml-4 mt-1 mb-2 flex flex-col">
-                <div className="mb-[0.75rem]">
-                  <label
-                    htmlFor="signaturetype"
-                    className="text-[14px] mb-[0.7rem] font-medium"
-                  >
-                    {t("allowed-signature-types")}
-                    <a data-tooltip-id="signtypes-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>
-                    <ReactTooltip id="signtypes-tooltip" className="z-[999]">
-                      <div className="max-w-[200px] md:max-w-[450px] text-[11px]">
-                        <p className="font-bold">
-                          {t("allowed-signature-types")}
-                        </p>
-                        <p>{t("allowed-signature-types-help.p1")}</p>
-                        <p className="p-[5px] ml-2">
-                          <ol className="list-disc">
-                            <li>
-                              <span className="font-bold">Draw: </span>
-                              <span>
-                                {t("allowed-signature-types-help.l1")}
-                              </span>
-                            </li>
-                            <li>
-                              <span className="font-bold">Typed: </span>
-                              <span>
-                                {t("allowed-signature-types-help.l2")}
-                              </span>
-                            </li>
-                            <li>
-                              <span className="font-bold">Upload: </span>
-                              <span>
-                                {t("allowed-signature-types-help.l3")}
-                              </span>
-                            </li>
-                            <li>
-                              <span className="font-bold">Default: </span>
-                              <span>
-                                {t("allowed-signature-types-help.l4")}
-                              </span>
-                            </li>
-                          </ol>
-                        </p>
-                      </div>
-                    </ReactTooltip>
-                  </label>
-                  <div className=" ml-[7px] flex flex-col md:flex-row gap-[10px] mb-[0.7rem]">
-                    {signatureType.map((type, i) => (
-                      <div
-                        key={i}
-                        className="flex flex-row gap-[5px] items-center"
-                      >
-                        <input
-                          className="mr-[2px] op-checkbox op-checkbox-xs"
-                          type="checkbox"
-                          name="signaturetype"
-                          onChange={() => handleCheckboxChange(i)}
-                          checked={type.enabled}
-                        />
-                        <div
-                          className="text-[13px] font-medium hover:underline underline-offset-2 cursor-default capitalize"
-                          title={`Enabling this allow signers to ${type.name} signature`}
-                        >
-                          {type.name}
-                        </div>
-                      </div>
-                    ))}
-                  </div>
-                  <button
-                    className="op-btn op-btn-primary"
-                    onClick={handleSave}
-                  >
-                    Save
-                  </button>
-                </div>
-              </div>
-            </div>
-          )}
-        </>
-      )}
-    </React.Fragment>
-  );
-};
-export default Preferences;

apps/OpenSign/src/pages/Signup.js

@@ -10,7 +10,7 @@ import { appInfo } from "../constant/appinfo";
 import { useDispatch } from "react-redux";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
 import { showTenant } from "../redux/reducers/ShowTenant";
-import { emailRegex, isEnableSubscription } from "../constant/const";
+import { isEnableSubscription } from "../constant/const";
 import {
   getAppLogo,
   openInNewTab,
@@ -83,96 +83,92 @@ const Signup = () => {
   };
   const handleSubmit = (event) => {
     event.preventDefault();
-    if (!emailRegex.test(email)) {
+    if (lengthValid && caseDigitValid && specialCharValid) {
-      alert("Please enter a valid email address.");
+      clearStorage();
-    } else {
+      setState({ loading: true });
-      if (lengthValid && caseDigitValid && specialCharValid) {
+      const userDetails = {
-        clearStorage();
+        name: name,
-        setState({ loading: true });
+        email: email,
-        const userDetails = {
+        phone: phone,
-          name: name,
+        company: company,
-          email: email,
+        jobTitle: jobTitle
-          phone: phone,
+      };
-          company: company,
+      localStorage.setItem("userDetails", JSON.stringify(userDetails));
-          jobTitle: jobTitle
+      try {
-        };
+        event.preventDefault();
-        localStorage.setItem("userDetails", JSON.stringify(userDetails));
+        var user = new Parse.User();
-        try {
+        user.set("name", name);
-          event.preventDefault();
+        user.set("email", email);
-          var user = new Parse.User();
+        user.set("password", password);
-          user.set("name", name);
+        user.set("phone", phone);
-          user.set("email", email);
+        user.set("username", email);
-          user.set("password", password);
+        let res = user.save();
-          user.set("phone", phone);
+        res
-          user.set("username", email);
+          .then(async (r) => {
-          let res = user.save();
+            if (r) {
-          res
+              let roleData = appInfo.settings;
-            .then(async (r) => {
+              if (roleData && roleData.length > 0) {
-              if (r) {
+                const params = {
-                let roleData = appInfo.settings;
+                  userDetails: {
-                if (roleData && roleData.length > 0) {
+                    jobTitle: jobTitle,
-                  const params = {
+                    company: company,
-                    userDetails: {
+                    name: name,
-                      jobTitle: jobTitle,
+                    email: email,
-                      company: company,
+                    phone: phone,
-                      name: name,
+                    role: appInfo.defaultRole
-                      email: email,
-                      phone: phone,
-                      role: appInfo.defaultRole
-                    }
-                  };
-                  try {
-                    const usersignup = await Parse.Cloud.run(
-                      "usersignup",
-                      params
-                    );
-                    if (usersignup) {
-                      const param = new URLSearchParams(location.search);
-                      const isFreeplan =
-                        param?.get("subscription") === "freeplan";
-                      if (isFreeplan) {
-                        await handleFreePlan(r.id);
-                      }
-                      handleNavigation(r.getSessionToken(), isFreeplan);
-                    }
-                  } catch (err) {
-                    alert(err.message);
-                    setState({ loading: false });
                   }
+                };
+                try {
+                  const usersignup = await Parse.Cloud.run(
+                    "usersignup",
+                    params
+                  );
+                  if (usersignup) {
+                    const param = new URLSearchParams(location.search);
+                    const isFreeplan =
+                      param?.get("subscription") === "freeplan";
+                    if (isFreeplan) {
+                      await handleFreePlan(r.id);
+                    }
+                    handleNavigation(r.getSessionToken(), isFreeplan);
+                  }
+                } catch (err) {
+                  alert(err.message);
+                  setState({ loading: false });
                 }
               }
-            })
+            }
-            .catch(async (err) => {
+          })
-              if (err.code === 202) {
+          .catch(async (err) => {
-                const params = { email: email };
+            if (err.code === 202) {
-                const res = await Parse.Cloud.run("getUserDetails", params);
+              const params = { email: email };
-                // console.log("Res ", res);
+              const res = await Parse.Cloud.run("getUserDetails", params);
-                if (res) {
+              // console.log("Res ", res);
-                  alert(t("user-already-exist-name"));
+              if (res) {
-                  setState({ loading: false });
+                alert(t("user-already-exist-name"));
-                } else {
+                setState({ loading: false });
-                  // console.log("state.email ", email);
-                  try {
-                    await Parse.User.requestPasswordReset(email).then(
-                      async function (res1) {
-                        if (res1.data === undefined) {
-                          alert(t("verification-code-sent"));
-                        }
-                      }
-                    );
-                  } catch (err) {
-                    console.log(err);
-                  }
-                  setState({ loading: false });
-                }
               } else {
-                alert(err.message);
+                // console.log("state.email ", email);
+                try {
+                  await Parse.User.requestPasswordReset(email).then(
+                    async function (res1) {
+                      if (res1.data === undefined) {
+                        alert(t("verification-code-sent"));
+                      }
+                    }
+                  );
+                } catch (err) {
+                  console.log(err);
+                }
                 setState({ loading: false });
               }
-            });
+            } else {
-        } catch (error) {
+              alert(err.message);
-          console.log("err ", error);
+              setState({ loading: false });
-        }
+            }
+          });
+      } catch (error) {
+        console.log("err ", error);
       }
     }
   };

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -36,8 +36,7 @@ import {
   getDefaultSignature,
   onClickZoomIn,
   onClickZoomOut,
-  rotatePdfPage,
+  rotatePdfPage
-  signatureTypes
 } from "../constant/Utils";
 import { useParams } from "react-router-dom";
 import Tour from "reactour";
@@ -133,7 +132,6 @@ function SignYourSelf() {
   const [isRotate, setIsRotate] = useState({ status: false, degree: 0 });
   const [isSubscribe, setIsSubscribe] = useState({ plan: "", isValid: true });
   const [isDownloadModal, setIsDownloadModal] = useState(false);
-  const [isResize, setIsResize] = useState(false);
   const divRef = useRef(null);
   const nodeRef = useRef(null);
   const [, drop] = useDrop({
@@ -425,7 +423,9 @@ function SignYourSelf() {
       const getWidth = widgetTypeExist
         ? calculateInitialWidthHeight(dragTypeValue, widgetValue).getWidth
         : defaultWidthHeight(dragTypeValue).width;
-      const getHeight = defaultWidthHeight(dragTypeValue).height;
+      const getHeight = widgetTypeExist
+        ? calculateInitialWidthHeight(dragTypeValue, widgetValue).getHeight
+        : defaultWidthHeight(dragTypeValue).height;
 
       dropObj = {
         xPosition: getWidth / 2 + containerWH.width / 2,
@@ -456,7 +456,9 @@ function SignYourSelf() {
       const getWidth = widgetTypeExist
         ? calculateInitialWidthHeight(widgetValue).getWidth
         : defaultWidthHeight(dragTypeValue).width;
-      const getHeight = defaultWidthHeight(dragTypeValue).height;
+      const getHeight = widgetTypeExist
+        ? calculateInitialWidthHeight(widgetValue).getHeight
+        : defaultWidthHeight(dragTypeValue).height;
       dropObj = {
         xPosition: getXPosition / (containerScale * scale),
         yPosition: getYPosition / (containerScale * scale),
@@ -556,7 +558,7 @@ function SignYourSelf() {
   };
   useEffect(() => {
     const timer = setTimeout(() => {
-      if (xyPostion?.length > 0 && !pdfDetails?.[0]?.IsCompleted) {
+      if (xyPostion?.length > 0) {
         autosavedetails();
       }
     }, 2000);
@@ -615,8 +617,12 @@ function SignYourSelf() {
                 const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
                 let checkDefaultSigned =
                   requiredWidgets[i]?.options?.defaultValue;
-                if (!checkSignUrl && !checkDefaultSigned && !showAlert) {
+                if (!checkSignUrl) {
-                  showAlert = true;
+                  if (!checkDefaultSigned) {
+                    if (!showAlert) {
+                      showAlert = true;
+                    }
+                  }
                 }
               }
             }
@@ -643,9 +649,10 @@ function SignYourSelf() {
           return;
         } else {
           setIsUiLoading(true);
+          const existingPdfBytes = pdfArrayBuffer;
           // Load a PDFDocument from the existing PDF bytes
           try {
-            const pdfDoc = await PDFDocument.load(pdfArrayBuffer);
+            const pdfDoc = await PDFDocument.load(existingPdfBytes);
             const isSignYourSelfFlow = true;
             const extUserPtr = pdfDetails[0].ExtUserPtr;
             const HeaderDocId = extUserPtr?.HeaderDocId;
@@ -658,19 +665,14 @@ function SignYourSelf() {
               xyPostion,
               pdfDoc,
               isSignYourSelfFlow,
-              scale
+              scale,
+              pdfOriginalWH,
+              containerWH
             );
             // console.log("pdf", pdfBytes);
             //function for call to embed signature in pdf and get digital signature pdf
-            if (!pdfBytes?.error) {
+            if (pdfBytes) {
               await signPdfFun(pdfBytes, documentId);
-            } else {
-              setIsUiLoading(false);
-              setIsAlert({
-                header: t("error"),
-                isShow: true,
-                alertMessage: t("pdf-uncompatible")
-              });
             }
           } catch (err) {
             setIsUiLoading(false);
@@ -682,7 +684,10 @@ function SignYourSelf() {
               });
             } else {
               console.log("err in signing", err.message);
-              if (err?.message?.includes("password")) {
+              if (
+                err.message ===
+                "PKCS#12 MAC could not be verified. Invalid password?"
+              ) {
                 setIsAlert({
                   header: t("error"),
                   isShow: true,
@@ -749,10 +754,10 @@ function SignYourSelf() {
         alert(t("something-went-wrong-mssg"));
       }
     }
-    //change image width and height to 300/120 in png base64
+    //change image width and height to 100/40 in png base64
-    const imagebase64 = await changeImageWH(base64Sign);
+    const getNewse64 = await changeImageWH(base64Sign);
-    //remove suffiix of base64 (without type)
+    //remove suffiix of base64
-    const suffixbase64 = imagebase64 && imagebase64.split(",").pop();
+    const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
     const params = {
       pdfFile: base64Url,
       docId: documentId,
@@ -778,7 +783,7 @@ function SignYourSelf() {
   const handleStop = (event, dragElement) => {
     setFontSize();
     setFontColor();
-    if (!isResize && isDragging && dragElement) {
+    if (isDragging && dragElement) {
       event.preventDefault();
       const containerScale = getContainerScale(
         pdfOriginalWH,
@@ -1023,6 +1028,7 @@ function SignYourSelf() {
     const getPageNumer = xyPostion.filter(
       (data) => data.pageNumber === pageNumber
     );
+
     if (getPageNumer.length > 0) {
       const getXYdata = getPageNumer[0].pos;
       const getPosData = getXYdata;
@@ -1052,7 +1058,7 @@ function SignYourSelf() {
                 isReadOnly: isReadOnly,
                 isHideLabel: isHideLabel || false,
                 fontSize:
-                  fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                  fontSize || currWidgetsDetails?.options?.fontSize || "12",
                 fontColor:
                   fontColor || currWidgetsDetails?.options?.fontColor || "black"
               }
@@ -1086,6 +1092,7 @@ function SignYourSelf() {
     const getPageNumer = xyPostion.filter(
       (data) => data.pageNumber === pageNumber
     );
+
     if (getPageNumer.length > 0) {
       const getXYdata = getPageNumer[0].pos;
       const getPosData = getXYdata;
@@ -1095,7 +1102,8 @@ function SignYourSelf() {
             ...position,
             options: {
               ...position.options,
-              fontSize: fontSize || currWidgetsDetails?.options?.fontSize || 12,
+              fontSize:
+                fontSize || currWidgetsDetails?.options?.fontSize || "12",
               fontColor:
                 fontColor || currWidgetsDetails?.options?.fontColor || "black"
             }
@@ -1294,7 +1302,6 @@ function SignYourSelf() {
                 />
                 {/* this is modal of signature pad */}
                 <SignPad
-                  signatureTypes={signatureTypes}
                   isSignPad={isSignPad}
                   isStamp={isStamp}
                   setIsImageSelect={setIsImageSelect}
@@ -1393,8 +1400,6 @@ function SignYourSelf() {
                       setFontSize={setFontSize}
                       fontColor={fontColor}
                       setFontColor={setFontColor}
-                      isResize={isResize}
-                      setIsResize={setIsResize}
                     />
                   )}
                 </div>

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -29,11 +29,7 @@ import {
   onClickZoomOut,
   onClickZoomIn,
   handleRemoveWidgets,
-  handleRotateWarning,
+  handleRotateWarning
-  color,
-  signatureTypes,
-  getTenantDetails,
-  handleSignatureType
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import "../styles/AddUser.css";
@@ -72,7 +68,10 @@ const TemplatePlaceholder = () => {
   const [isSendAlert, setIsSendAlert] = useState(false);
   const [isCreateDocModal, setIsCreateDocModal] = useState(false);
   const [isSubscribe, setIsSubscribe] = useState(false);
-  const [isRotate, setIsRotate] = useState({ status: false, degree: 0 });
+  const [isRotate, setIsRotate] = useState({
+    status: false,
+    degree: 0
+  });
   const [isLoading, setIsLoading] = useState({
     isLoad: true,
     message: t("loading-mssg")
@@ -103,21 +102,50 @@ const TemplatePlaceholder = () => {
   const [isTextSetting, setIsTextSetting] = useState(false);
   const [pdfLoad, setPdfLoad] = useState(false);
   const [pdfRotateBase64, setPdfRotatese64] = useState("");
+  const color = [
+    "#93a3db",
+    "#e6c3db",
+    "#c0e3bc",
+    "#bce3db",
+    "#b8ccdb",
+    "#ceb8db",
+    "#ffccff",
+    "#99ffcc",
+    "#cc99ff",
+    "#ffcc99",
+    "#66ccff",
+    "#ffffcc"
+  ];
   const isMobile = window.innerWidth < 767;
   const [, drop] = useDrop({
     accept: "BOX",
     drop: (item, monitor) => addPositionOfSignature(item, monitor),
-    collect: (monitor) => ({ isOver: !!monitor.isOver() })
+    collect: (monitor) => ({
+      isOver: !!monitor.isOver()
+    })
   });
   const [{ isDragSign }, dragSignature] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 1, text: "signature" },
+    item: {
-    collect: (monitor) => ({ isDragSign: !!monitor.isDragging() })
+      type: "BOX",
+      id: 1,
+      text: "signature"
+    },
+    collect: (monitor) => ({
+      isDragSign: !!monitor.isDragging()
+    })
   });
   const [{ isDragStamp }, dragStamp] = useDrag({
     type: "BOX",
-    item: { type: "BOX", id: 2, text: "stamp" },
+
-    collect: (monitor) => ({ isDragStamp: !!monitor.isDragging() })
+    item: {
+      type: "BOX",
+      id: 2,
+      text: "stamp"
+    },
+    collect: (monitor) => ({
+      isDragStamp: !!monitor.isDragging()
+    })
   });
   const [uniqueId, setUniqueId] = useState("");
   const [isModalRole, setIsModalRole] = useState(false);
@@ -138,7 +166,6 @@ const TemplatePlaceholder = () => {
   const [fontColor, setFontColor] = useState();
   const [zoomPercent, setZoomPercent] = useState(0);
   const [scale, setScale] = useState(1);
-  const [signatureType, setSignatureType] = useState([]);
 
   useEffect(() => {
     fetchTemplate();
@@ -186,38 +213,9 @@ const TemplatePlaceholder = () => {
       handleNavigation(plan);
     }
   }
-
-  //function to fetch tenant Details
-  const fetchTenantDetails = async () => {
-    const user = JSON.parse(
-      localStorage.getItem(
-        `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-      )
-    );
-    if (user) {
-      try {
-        const tenantDetails = await getTenantDetails(user?.objectId);
-        if (tenantDetails && tenantDetails === "user does not exist!") {
-          alert(t("user-not-exist"));
-        } else if (tenantDetails) {
-          const signatureType = tenantDetails?.SignatureType || [];
-          const filterSignTypes = signatureType?.filter(
-            (x) => x.enabled === true
-          );
-          return filterSignTypes;
-        }
-      } catch (e) {
-        alert(t("user-not-exist"));
-      }
-    } else {
-      alert(t("user-not-exist"));
-    }
-  };
-
   // `fetchTemplate` function in used to get Template from server and setPlaceholder ,setSigner if present
   const fetchTemplate = async () => {
     try {
-      const tenantSignTypes = await fetchTenantDetails();
       const params = { templateId: templateId };
       const templateDeatils = await axios.post(
         `${localStorage.getItem("baseUrl")}functions/getTemplate`,
@@ -239,18 +237,7 @@ const TemplatePlaceholder = () => {
         if (isEnableSubscription) {
           checkIsSubscribed(documentData[0]?.ExtUserPtr?.Email);
         }
-        const userSignatureType =
+        setPdfDetails(documentData);
-          documentData[0]?.ExtUserPtr?.SignatureType || signatureTypes;
-        const docSignTypes =
-          documentData?.[0]?.SignatureType || userSignatureType;
-        const updatedSignatureType = await handleSignatureType(
-          tenantSignTypes,
-          docSignTypes
-        );
-        setSignatureType(updatedSignatureType);
-        const updatedPdfDetails = [...documentData];
-        updatedPdfDetails[0].SignatureType = updatedSignatureType;
-        setPdfDetails(updatedPdfDetails);
         setIsSigners(true);
         if (documentData[0].Signers && documentData[0].Signers.length > 0) {
           setIsSelectId(0);
@@ -273,7 +260,11 @@ const TemplatePlaceholder = () => {
                   blockColor: x.blockColor
                 };
               } else {
-                return { Role: x.Role, Id: x.Id, blockColor: x.blockColor };
+                return {
+                  Role: x.Role,
+                  Id: x.Id,
+                  blockColor: x.blockColor
+                };
               }
             });
             setSignersData(updatedSigners);
@@ -296,7 +287,11 @@ const TemplatePlaceholder = () => {
             documentData[0].Placeholders.length > 0
           ) {
             let updatedSigners = documentData[0].Placeholders.map((x) => {
-              return { Role: x.Role, Id: x.Id, blockColor: x.blockColor };
+              return {
+                Role: x.Role,
+                Id: x.Id,
+                blockColor: x.blockColor
+              };
             });
             setSignerPos(documentData[0].Placeholders);
             setUniqueId(updatedSigners[0].Id);
@@ -309,33 +304,17 @@ const TemplatePlaceholder = () => {
         documentData === "Error: Something went wrong!" ||
         (documentData.result && documentData.result.error)
       ) {
+        const loadObj = {
+          isLoad: false
+        };
         setHandleError(t("something-went-wrong-mssg"));
-        setIsLoading({ isLoad: false });
+        setIsLoading(loadObj);
       } else {
         setHandleError(t("no-data-avaliable"));
-        setIsLoading({ isLoad: false });
+        const loadObj = {
-      }
+          isLoad: false
-      const res = await contractUsers();
+        };
-      if (res[0] && res.length) {
+        setIsLoading(loadObj);
-        setSignerUserId(res[0].objectId);
-        setCurrentEmail(res[0].Email);
-        const tourstatus = res[0].TourStatus && res[0].TourStatus;
-        if (tourstatus && tourstatus.length > 0) {
-          setTourStatus(tourstatus);
-          const checkTourRecipients = tourstatus.filter(
-            (data) => data.templateTour
-          );
-          if (checkTourRecipients && checkTourRecipients.length > 0) {
-            setCheckTourStatus(checkTourRecipients[0].templateTour);
-          }
-        }
-        setIsLoading({ isLoad: false });
-      } else if (res === "Error: Something went wrong!") {
-        setHandleError(t("something-went-wrong-mssg"));
-        setIsLoading({ isLoad: false });
-      } else if (res.length === 0) {
-        setHandleError(t("no-data-avaliable"));
-        setIsLoading({ isLoad: false });
       }
     } catch (err) {
       console.log("err ", err);
@@ -345,6 +324,37 @@ const TemplatePlaceholder = () => {
         setHandleError(t("something-went-wrong-mssg"));
       }
     }
+    const res = await contractUsers();
+    if (res[0] && res.length) {
+      setSignerUserId(res[0].objectId);
+      setCurrentEmail(res[0].Email);
+      const tourstatus = res[0].TourStatus && res[0].TourStatus;
+      if (tourstatus && tourstatus.length > 0) {
+        setTourStatus(tourstatus);
+        const checkTourRecipients = tourstatus.filter(
+          (data) => data.templateTour
+        );
+        if (checkTourRecipients && checkTourRecipients.length > 0) {
+          setCheckTourStatus(checkTourRecipients[0].templateTour);
+        }
+      }
+      const loadObj = {
+        isLoad: false
+      };
+      setIsLoading(loadObj);
+    } else if (res === "Error: Something went wrong!") {
+      const loadObj = {
+        isLoad: false
+      };
+      setHandleError(t("something-went-wrong-mssg"));
+      setIsLoading(loadObj);
+    } else if (res.length === 0) {
+      setHandleError(t("no-data-avaliable"));
+      const loadObj = {
+        isLoad: false
+      };
+      setIsLoading(loadObj);
+    }
   };
 
   //function for setting position after drop signature button over pdf
@@ -369,10 +379,8 @@ const TemplatePlaceholder = () => {
         );
         const key = randomId();
         const dragTypeValue = item?.text ? item.text : monitor.type;
-        const widgetWidth =
+        const widgetWidth = defaultWidthHeight(dragTypeValue).width;
-          defaultWidthHeight(dragTypeValue).width * containerScale;
+        const widgetHeight = defaultWidthHeight(dragTypeValue).height;
-        const widgetHeight =
-          defaultWidthHeight(dragTypeValue).height * containerScale;
         let dropData = [],
           currentPagePosition;
         let placeHolder;
@@ -394,7 +402,10 @@ const TemplatePlaceholder = () => {
             Height: widgetHeight / (containerScale * scale)
           };
           dropData.push(dropObj);
-          placeHolder = { pageNumber: pageNumber, pos: dropData };
+          placeHolder = {
+            pageNumber: pageNumber,
+            pos: dropData
+          };
         } else {
           const offset = monitor.getClientOffset();
           //adding and updating drop position in array when user drop signature button in div
@@ -425,7 +436,10 @@ const TemplatePlaceholder = () => {
           };
 
           dropData.push(dropObj);
-          placeHolder = { pageNumber: pageNumber, pos: dropData };
+          placeHolder = {
+            pageNumber: pageNumber,
+            pos: dropData
+          };
         }
         let filterSignerPos = signerPos.find((data) => data.Id === uniqueId);
         const getPlaceHolder = filterSignerPos?.placeHolder;
@@ -442,7 +456,10 @@ const TemplatePlaceholder = () => {
           );
           const getPos = currentPagePosition?.pos;
           const newSignPos = getPos.concat(dropData);
-          let xyPos = { pageNumber: pageNumber, pos: newSignPos };
+          let xyPos = {
+            pageNumber: pageNumber,
+            pos: newSignPos
+          };
           updatePlace.push(xyPos);
           const updatesignerPos = signerPos.map((x) =>
             x.Id === uniqueId ? { ...x, placeHolder: updatePlace } : x
@@ -478,6 +495,7 @@ const TemplatePlaceholder = () => {
         setWidgetType(dragTypeValue);
         setSignKey(key);
         setSelectWidgetId(key);
+
         setIsMailSend(false);
       } else {
         setIsReceipent(false);
@@ -490,7 +508,7 @@ const TemplatePlaceholder = () => {
   const tourAddRole = [
     {
       selector: '[data-tut="reactourAddbtn"]',
-      content: t("add-user-template"),
+      content: "You need to add a role before you can add fields for it. ",
       position: "top",
       style: { fontSize: "13px" }
     }
@@ -576,7 +594,9 @@ const TemplatePlaceholder = () => {
       }
     }
     setIsMailSend(false);
-    setTimeout(() => setIsDragging(false), 200);
+    setTimeout(() => {
+      setIsDragging(false);
+    }, 200);
   };
   //function for delete signature block
   const handleDeleteSign = (key, Id) => {
@@ -692,7 +712,7 @@ const TemplatePlaceholder = () => {
     }, 2000);
     return () => clearTimeout(timer);
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [signerPos, signatureType]);
+  }, [signerPos]);
 
   // `autosavedetails` is used to save template details after every 2 sec when changes are happern in placeholder like drag-drop widgets, remove signers
   const autosavedetails = async () => {
@@ -714,7 +734,6 @@ const TemplatePlaceholder = () => {
       templateCls.id = templateId;
       templateCls.set("Placeholders", signerPos);
       templateCls.set("Signers", signers);
-      templateCls.set("SignatureType", signatureType);
       await templateCls.save();
     } catch (err) {
       console.log("error in autosave template", err);
@@ -723,7 +742,8 @@ const TemplatePlaceholder = () => {
 
   const handleSaveTemplate = async () => {
     if (signersdata?.length) {
-      setIsLoading({ isLoad: true, message: t("loading-mssg") });
+      const loadObj = { isLoad: true, message: t("loading-mssg") };
+      setIsLoading(loadObj);
       setIsSendAlert(false);
       let signers = [];
       if (signersdata?.length > 0) {
@@ -761,9 +781,7 @@ const TemplatePlaceholder = () => {
           RemindOnceInEvery: parseInt(pdfDetails[0]?.RemindOnceInEvery),
           NextReminderDate: pdfDetails[0]?.NextReminderDate,
           IsEnableOTP: pdfDetails[0]?.IsEnableOTP === true ? true : false,
-          IsTourEnabled: pdfDetails[0]?.IsTourEnabled === true ? true : false,
+          URL: pdfUrl
-          URL: pdfUrl,
-          SignatureType: signatureType
         };
         const updateTemplate = new Parse.Object("contracts_Template");
         updateTemplate.id = templateId;
@@ -872,7 +890,9 @@ const TemplatePlaceholder = () => {
           `${localStorage.getItem(
             "baseUrl"
           )}classes/contracts_Users/${signerUserId}`,
-          { TourStatus: updatedTourStatus },
+          {
+            TourStatus: updatedTourStatus
+          },
           {
             headers: {
               "Content-Type": "application/json",
@@ -1115,7 +1135,7 @@ const TemplatePlaceholder = () => {
                     isReadOnly: isReadOnly || false,
                     isHideLabel: isHideLabel || false,
                     fontSize:
-                      fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                      fontSize || currWidgetsDetails?.options?.fontSize || "12",
                     fontColor:
                       fontColor ||
                       currWidgetsDetails?.options?.fontColor ||
@@ -1153,7 +1173,7 @@ const TemplatePlaceholder = () => {
                     defaultValue: defaultValue,
                     isHideLabel: isHideLabel || false,
                     fontSize:
-                      fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                      fontSize || currWidgetsDetails?.options?.fontSize || "12",
                     fontColor:
                       fontColor ||
                       currWidgetsDetails?.options?.fontColor ||
@@ -1171,7 +1191,7 @@ const TemplatePlaceholder = () => {
                   values: dropdownOptions,
                   defaultValue: defaultValue,
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1206,15 +1226,7 @@ const TemplatePlaceholder = () => {
     setFontColor();
   };
 
-  const handleWidgetdefaultdata = (defaultdata, isSignWidget) => {
+  const handleWidgetdefaultdata = (defaultdata) => {
-    if (isSignWidget) {
-      const updatedPdfDetails = [...pdfDetails];
-      const signtypes = defaultdata.signatureType || signatureType;
-      updatedPdfDetails[0].SignatureType = signtypes;
-      // Update the SignatureType with the modified array
-      setPdfDetails(updatedPdfDetails);
-      setSignatureType(signtypes);
-    }
     const options = ["email", "number", "text"];
     let inputype;
     if (defaultdata.textvalidate) {
@@ -1254,7 +1266,7 @@ const TemplatePlaceholder = () => {
                         }
                       : {},
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1270,7 +1282,7 @@ const TemplatePlaceholder = () => {
                   status: defaultdata.status,
                   defaultValue: defaultdata.defaultValue,
                   fontSize:
-                    fontSize || currWidgetsDetails?.options?.fontSize || 12,
+                    fontSize || currWidgetsDetails?.options?.fontSize || "12",
                   fontColor:
                     fontColor ||
                     currWidgetsDetails?.options?.fontColor ||
@@ -1587,7 +1599,6 @@ const TemplatePlaceholder = () => {
                         setFontSize={setFontSize}
                         fontColor={fontColor}
                         setFontColor={setFontColor}
-                        isResize={isResize}
                       />
                     )}
                   </div>
@@ -1710,7 +1721,6 @@ const TemplatePlaceholder = () => {
           />
         </ModalUi>
         <WidgetNameModal
-          signatureType={signatureType}
           widgetName={widgetName}
           defaultdata={currWidgetsDetails}
           isOpen={isNameModal}

apps/OpenSign/src/pages/UpdateExistUserAdmin.js

@@ -5,7 +5,6 @@ import { NavLink, useNavigate } from "react-router-dom";
 import Alert from "../primitives/Alert";
 import Title from "../components/Title";
 import { useTranslation } from "react-i18next";
-import { emailRegex } from "../constant/const";
 const UpdateExistUserAdmin = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -16,7 +15,6 @@ const UpdateExistUserAdmin = () => {
   const [isAlert, setIsAlert] = useState({ type: "danger", msg: "" });
   useEffect(() => {
     checkIsAdminExist();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const checkIsAdminExist = async () => {
@@ -24,7 +22,7 @@ const UpdateExistUserAdmin = () => {
       const isAdminExist = await Parse.Cloud.run("checkadminexist");
       if (isAdminExist !== "not_exist") {
         // console.log("isAdminExist ", isAdminExist);
-        setErrMsg(t("admin-exists"));
+        setErrMsg("Admin already exists.");
       }
     } catch (err) {
       console.log("Err in checkadminexist", err);
@@ -36,37 +34,33 @@ const UpdateExistUserAdmin = () => {
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
-    if (!emailRegex.test(formdata.email)) {
+    setIsSubmitLoading(true);
-      alert("Please enter a valid email address.");
+    try {
-    } else {
+      const updateUserAsAdmin = await Parse.Cloud.run(
-      setIsSubmitLoading(true);
+        "updateuserasadmin",
-      try {
+        formdata
-        const updateUserAsAdmin = await Parse.Cloud.run(
+      );
-          "updateuserasadmin",
+      // console.log("updateUserAsAdmin ", updateUserAsAdmin);
-          formdata
+      if (updateUserAsAdmin === "admin_created") {
-        );
+        setIsAlert({ type: "success", msg: t("admin-created") });
-        // console.log("updateUserAsAdmin ", updateUserAsAdmin);
+        navigate("/");
-        if (updateUserAsAdmin === "admin_created") {
-          setIsAlert({ type: "success", msg: t("admin-created") });
-          navigate("/");
-        }
-      } catch (err) {
-        console.log("err in updateuserasadmin", err.code);
-        if (err.code === 404) {
-          setIsAlert((prev) => ({ ...prev, msg: t("invalid-masterkey") }));
-        } else if (err.code === 101) {
-          setIsAlert((prev) => ({ ...prev, msg: t("user-not-found") }));
-        } else if (err.code === 137) {
-          setIsAlert((prev) => ({ ...prev, msg: t("admin-exists") }));
-        } else {
-          setErrMsg(t("something-went-wrong-mssg"));
-        }
-      } finally {
-        setIsSubmitLoading(false);
-        setTimeout(() => {
-          setIsAlert(() => ({ type: "danger", msg: "" }));
-        }, 2000);
       }
+    } catch (err) {
+      console.log("err in updateuserasadmin", err.code);
+      if (err.code === 404) {
+        setIsAlert((prev) => ({ ...prev, msg: t("invalid-masterkey") }));
+      } else if (err.code === 101) {
+        setIsAlert((prev) => ({ ...prev, msg: t("user-not-found") }));
+      } else if (err.code === 137) {
+        setIsAlert((prev) => ({ ...prev, msg: t("admin-already-exist") }));
+      } else {
+        setErrMsg(t("something-went-wrong-mssg"));
+      }
+    } finally {
+      setIsSubmitLoading(false);
+      setTimeout(() => {
+        setIsAlert(() => ({ type: "danger", msg: "" }));
+      }, 2000);
     }
   };
   return (

apps/OpenSign/src/pages/UserProfile.js

@@ -611,7 +611,7 @@ function UserProfile() {
                     <div className="flex flex-row md:items-center gap-1">
                       {editmode || !extendUser?.[0]?.Tagline ? (
                         <input
-                          maxLength={100}
+                          maxLength={40}
                           onChange={handleOnchangeTagLine}
                           value={tagLine}
                           disabled={!editmode}

apps/OpenSign/src/primitives/AddContact.js

@@ -1,9 +1,7 @@
 import React, { useState, useEffect } from "react";
+import Parse from "parse";
 import Loader from "./Loader";
 import { useTranslation } from "react-i18next";
-import axios from "axios";
-import { getTenantDetails } from "../constant/Utils";
-import { emailRegex } from "../constant/const";
 const AddContact = (props) => {
   const { t } = useTranslation();
   const [name, setName] = useState("");
@@ -14,7 +12,6 @@ const AddContact = (props) => {
   const [isUserExist, setIsUserExist] = useState(false);
   useEffect(() => {
     checkUserExist();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   // Load user details from localStorage when the component mounts
   useEffect(() => {
@@ -29,61 +26,127 @@ const AddContact = (props) => {
   }, [addYourself]);
 
   const checkUserExist = async () => {
+    const user = Parse.User.current();
     try {
-      const baseURL = localStorage.getItem("baseUrl");
+      const query = new Parse.Query("contracts_Contactbook");
-      const url = `${baseURL}functions/isuserincontactbook`;
+      query.equalTo("CreatedBy", user);
-      const token = props?.jwttoken
+      query.notEqualTo("IsDeleted", true);
-        ? { jwttoken: props?.jwttoken }
+      query.equalTo("Email", user.getEmail());
-        : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
+      const res = await query.first();
-      const headers = {
+      // console.log(res);
-        "Content-Type": "application/json",
+      if (!res) {
-        "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-        ...token
-      };
-      const axiosRes = await axios.post(url, {}, { headers });
-      const contactRes = axiosRes?.data?.result || {};
-      if (!contactRes?.objectId) {
         setIsUserExist(true);
       }
     } catch (err) {
-      console.log("err ", err);
+      console.log("err", err);
     }
   };
   // Define a function to handle form submission
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
-    if (!emailRegex.test(email)) {
+    setIsLoader(true);
-      alert("Please enter a valid email address.");
+    if (localStorage.getItem("TenantId")) {
-    } else {
+      try {
-      setIsLoader(true);
+        const user = Parse.User.current();
-      const user = JSON.parse(
+        const query = new Parse.Query("contracts_Contactbook");
-        localStorage.getItem(
+        query.equalTo("CreatedBy", user);
-          `Parse/${localStorage.getItem("parseAppId")}/currentUser`
+        query.notEqualTo("IsDeleted", true);
-        )
+        query.equalTo("Email", email);
-      );
+        const res = await query.first();
-      const userId = user?.objectId || "";
+        if (!res) {
-      const tenantDetails = await getTenantDetails(userId, props.jwttoken);
+          const contactQuery = new Parse.Object("contracts_Contactbook");
-      const tenantId = tenantDetails?.objectId || "";
+          contactQuery.set("Name", name);
-      if (tenantId) {
+          if (phone) {
-        try {
+            contactQuery.set("Phone", phone);
-          const baseURL = localStorage.getItem("baseUrl");
+          }
-          const url = `${baseURL}functions/savecontact`;
+          contactQuery.set("Email", email);
-          const token = props?.jwttoken
+          contactQuery.set("UserRole", "contracts_Guest");
-            ? { jwttoken: props?.jwttoken }
+
-            : { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
+          if (localStorage.getItem("TenantId")) {
-          const data = { name, email, phone, tenantId };
+            contactQuery.set("TenantId", {
-          const headers = {
+              __type: "Pointer",
-            "Content-Type": "application/json",
+              className: "partners_Tenant",
-            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+              objectId: localStorage.getItem("TenantId")
-            ...token
+            });
-          };
+          }
-          const axiosRes = await axios.post(url, data, { headers });
+
-          const contactRes = axiosRes?.data?.result || {};
+          try {
-          if (contactRes?.objectId) {
+            const _users = Parse.Object.extend("User");
-            props.details(contactRes);
+            const _user = new _users();
-            if (props.closePopup) {
+            _user.set("name", name);
-              props.closePopup();
+            _user.set("username", email);
+            _user.set("email", email);
+            _user.set("password", email);
+            if (phone) {
+              _user.set("phone", phone);
+            }
+
+            const user = await _user.save();
+            if (user) {
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", user);
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              props.details(parseData);
+              if (props.closePopup) {
+                props.closePopup();
+              }
+
+              setIsLoader(false);
+              // Reset the form fields
+              setAddYourself(false);
+              setName("");
+              setPhone("");
+              setEmail("");
+            }
+          } catch (err) {
+            console.log("err ", err);
+            if (err.code === 202) {
+              const params = { email: email };
+              const userRes = await Parse.Cloud.run("getUserId", params);
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", {
+                __type: "Pointer",
+                className: "_User",
+                objectId: userRes.id
+              });
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              if (props.details) {
+                props.details(parseData);
+              }
+
+              if (props.closePopup) {
+                props.closePopup();
+              }
               setIsLoader(false);
               // Reset the form fields
               setAddYourself(false);
@@ -92,19 +155,18 @@ const AddContact = (props) => {
               setEmail("");
             }
           }
-        } catch (err) {
+        } else {
-          console.log("Err", err);
+          alert(t("add-signer-alert"));
           setIsLoader(false);
-          if (err?.response?.data?.error?.includes("already exists")) {
-            alert(t("add-signer-alert"));
-          } else {
-            alert(t("something-went-wrong-mssg"));
-          }
         }
-      } else {
+      } catch (err) {
+        // console.log("err", err);
         setIsLoader(false);
         alert(t("something-went-wrong-mssg"));
       }
+    } else {
+      setIsLoader(false);
+      alert(t("something-went-wrong-mssg"));
     }
   };
 

apps/OpenSign/src/primitives/Agreement.js

@@ -0,0 +1,43 @@
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+function Agreement(props) {
+  const { t } = useTranslation();
+  const [isChecked, setIsChecked] = useState(false);
+  return (
+    <div className="flex justify-between  mx-2 mb-2 pt-1" data-tut="IsAgree">
+      <div className="flex items-center">
+        <input
+          className="mr-3 op-checkbox op-checkbox-m"
+          type="checkbox"
+          value={isChecked}
+          onChange={(e) => {
+            setIsChecked(e.target.checked);
+            if (e.target.checked) {
+              props.setIsAgreeTour(false);
+            }
+          }}
+        />
+        I confirm that I have read and understood the &apos;Electronic Record
+        and Signature Disclosure&apos; and consent to use electronic records and
+        signatures.
+      </div>
+
+      <div className="flex">
+        <button
+          onClick={() => {
+            if (isChecked) {
+              props.setIsAgreeTour(false);
+              props.setIsAgree(true);
+            }
+          }}
+          className="op-btn op-btn-primary op-btn-sm"
+        >
+          Agree & Continue
+        </button>
+      </div>
+    </div>
+  );
+}
+
+export default Agreement;

apps/OpenSign/src/primitives/DownloadPdfZip.js

@@ -34,13 +34,11 @@ function DownloadPdfZip(props) {
 
       try {
         // Fetch the first PDF (Signed Document)
-        const docId = pdfDetails?.[0]?.objectId || "";
+        const docId =
-        const fileAdapterId = pdfDetails?.[0]?.FileAdapterId
+          props.isDocId && !pdfDetails?.[0]?.IsEnableOTP
-          ? pdfDetails?.[0]?.FileAdapterId
+            ? pdfDetails?.[0]?.objectId
-          : "";
+            : "";
-        console.log("pdfDetails?.[0] ", pdfDetails?.[0]);
+        const signedUrl = await getSignedUrl(pdfUrl, docId);
-        const signedUrl = await getSignedUrl(pdfUrl, docId, fileAdapterId);
-        console.log("signedUrl ", signedUrl);
         const pdf1Response = await fetch(signedUrl);
         if (!pdf1Response.ok) {
           throw new Error(`Failed to fetch PDF: ${signedUrl}`);

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -15,10 +15,7 @@ import {
   copytoData,
   fetchUrl,
   getSignedUrl,
-  getTenantDetails,
+  replaceMailVaribles
-  handleSignatureType,
-  replaceMailVaribles,
-  signatureTypes
 } from "../constant/Utils";
 import Confetti from "react-confetti";
 import EditorToolbar, {
@@ -79,8 +76,6 @@ const ReportTable = (props) => {
   const [reason, setReason] = useState("");
   const [isDownloadModal, setIsDownloadModal] = useState(false);
   const [isEmbed, setIsEmbed] = useState(false);
-  const [isPublicTour, setIsPublicTour] = useState();
-  const [signatureType, setSignatureType] = useState([]);
   const Extand_Class = localStorage.getItem("Extand_Class");
   const extClass = Extand_Class && JSON.parse(Extand_Class);
   const startIndex = (currentPage - 1) * props.docPerPage;
@@ -199,33 +194,6 @@ const ReportTable = (props) => {
     }
   }, [isMoreDocs, pageNumbers, currentPage, setIsNextRecord]);
 
-  //function to fetch tenant Details
-  const fetchTenantDetails = async () => {
-    const user = JSON.parse(
-      localStorage.getItem(
-        `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-      )
-    );
-    if (user) {
-      try {
-        const tenantDetails = await getTenantDetails(user?.objectId);
-        if (tenantDetails && tenantDetails === "user does not exist!") {
-          alert(t("user-not-exist"));
-        } else if (tenantDetails) {
-          const signatureType = tenantDetails?.SignatureType || [];
-          const filterSignTypes = signatureType?.filter(
-            (x) => x.enabled === true
-          );
-          return filterSignTypes;
-        }
-      } catch (e) {
-        alert(t("user-not-exist"));
-      }
-    } else {
-      alert(t("user-not-exist"));
-    }
-  };
-
   // `handleURL` is used to open microapp
   const handleURL = async (item, act) => {
     if (props.ReportName === "Templates") {
@@ -234,7 +202,9 @@ const ReportTable = (props) => {
       } else {
         setActLoader({ [`${item.objectId}_${act.btnId}`]: true });
         try {
-          const params = { templateId: item.objectId };
+          const params = {
+            templateId: item.objectId
+          };
           const templateDeatils = await axios.post(
             `${localStorage.getItem("baseUrl")}functions/getTemplate`,
             params,
@@ -278,16 +248,6 @@ const ReportTable = (props) => {
                 }
               }
             }
-            const tenantSignTypes = await fetchTenantDetails();
-            const docSignTypes = Doc?.SignatureType || signatureTypes;
-            const updatedSignatureType = await handleSignatureType(
-              tenantSignTypes,
-              docSignTypes
-            );
-            const SignatureType =
-              updatedSignatureType.length > 0
-                ? { SignatureType: updatedSignatureType }
-                : {};
             let placeholdersArr = [];
             if (Doc.Placeholders?.length > 0) {
               placeholdersArr = Doc.Placeholders;
@@ -313,9 +273,7 @@ const ReportTable = (props) => {
                 SendinOrder: Doc?.SendinOrder || false,
                 AutomaticReminders: Doc?.AutomaticReminders || false,
                 RemindOnceInEvery: Doc?.RemindOnceInEvery || 5,
-                IsEnableOTP: Doc?.IsEnableOTP || false,
+                IsEnableOTP: Doc?.IsEnableOTP || false
-                FileAdapterId: Doc?.FileAdapterId || "",
-                ...SignatureType
               };
               try {
                 const res = await axios.post(
@@ -415,19 +373,6 @@ const ReportTable = (props) => {
       handleEmbedFunction(item);
     } else if (act.action === "CopyTemplateId") {
       copyTemplateId(item.objectId);
-    } else if (act.action === "CopyPublicURL") {
-      const isPublic = item?.IsPublic;
-      if (isPublic) {
-        let publicUrl = "";
-        if (isStaging) {
-          publicUrl = `https://staging.opensign.me/publicsign?templateid=${item.objectId}`;
-        } else {
-          publicUrl = `https://opensign.me/publicsign?templateid=${item.objectId}`;
-        }
-        copyTemplateId(publicUrl);
-      } else {
-        setIsPublicTour({ [item.objectId]: true });
-      }
     }
   };
   // Get current list
@@ -643,15 +588,25 @@ const ReportTable = (props) => {
 
   async function checkTourStatus() {
     const cloudRes = await Parse.Cloud.run("getUserDetails");
-    if (cloudRes) {
+    const res = { data: cloudRes.toJSON() };
-      const extUser = JSON.parse(JSON.stringify(cloudRes));
+    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = res.data.TourStatus;
-      const tourStatus = extUser?.TourStatus || [];
+      // console.log("res ", res.data.TourStatus);
       setTourStatusArr(tourStatus);
-      const templateTour = tourStatus.find(
+      const filteredtourStatus = tourStatus.filter(
-        (obj) => obj.templateTour
+        (obj) => obj["templateTour"]
-      )?.templateTour;
+      );
-      setIsTour(!templateTour);
+      if (filteredtourStatus.length > 0) {
+        const templateTour = filteredtourStatus[0]["templateTour"];
+
+        if (templateTour) {
+          setIsTour(false);
+        } else {
+          setIsTour(true);
+        }
+      } else {
+        setIsTour(true);
+      }
     } else {
       setIsTour(true);
     }
@@ -702,21 +657,12 @@ const ReportTable = (props) => {
     const url = item?.SignedUrl || item?.URL || "";
     const pdfName = item?.Name || "exported_file";
     const isCompleted = item?.IsCompleted || false;
-    const templateId = props?.ReportName === "Templates" && item.objectId;
-    const docId = props?.ReportName !== "Templates" && item.objectId;
-    const fileAdapterId = item?.FileAdapterId ? item?.FileAdapterId : "";
-
     if (url) {
       try {
         if (isCompleted) {
           setIsDownloadModal({ [item.objectId]: true });
         } else {
-          const signedUrl = await getSignedUrl(
+          const signedUrl = await getSignedUrl(url);
-            url,
-            docId,
-            fileAdapterId,
-            templateId
-          );
           await fetchUrl(signedUrl, pdfName);
         }
         setActLoader({});
@@ -751,7 +697,7 @@ const ReportTable = (props) => {
       receiver_phone: userDetails?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: `<a href=${signPdf}>Sign here</a>`
     };
     const res = replaceMailVaribles(subject, "", variables);
 
@@ -780,7 +726,7 @@ const ReportTable = (props) => {
       receiver_phone: userDetails?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc.ExtUserPtr.Company,
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: `<a href=${signPdf}>Sign here</a>`
     };
     const res = replaceMailVaribles("", body, variables);
 
@@ -821,7 +767,7 @@ const ReportTable = (props) => {
       receiver_phone: user?.signerPtr?.Phone || "",
       expiry_date: localExpireDate,
       company_name: doc?.ExtUserPtr?.Company || "",
-      signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+      signing_url: `<a href=${signPdf}>Sign here</a>`
     };
 
     const subject =
@@ -950,13 +896,6 @@ const ReportTable = (props) => {
         }
       );
       const templateRes = axiosRes.data && axiosRes.data.result;
-      const tenantSignTypes = await fetchTenantDetails();
-      const docSignTypes = templateRes?.SignatureType || signatureTypes;
-      const updatedSignatureType = await handleSignatureType(
-        tenantSignTypes,
-        docSignTypes
-      );
-      setSignatureType(updatedSignatureType);
       setPlaceholders(templateRes?.Placeholders);
       setTemplateDetails(templateRes);
       setIsLoader({});
@@ -1194,17 +1133,6 @@ const ReportTable = (props) => {
     setIsPublicUserName(extendUser[0]?.UserName || "");
   };
 
-  const publicTourConfig = [
-    {
-      selector: '[data-tut="IsPublic"]',
-      content: t("public-tour-message"),
-      position: "top",
-      style: { fontSize: "13px" }
-    }
-  ];
-  const closePublicTour = () => {
-    setIsPublicTour();
-  };
   return (
     <div className="relative">
       {Object.keys(actLoader)?.length > 0 && (
@@ -1212,7 +1140,7 @@ const ReportTable = (props) => {
           <Loader />
         </div>
       )}
-      <div className="p-2 w-full bg-base-100 text-base-content op-card shadow-lg">
+      <div className="p-2 w-full overflow-hidden bg-base-100 text-base-content op-card shadow-lg">
         {isCelebration && (
           <div className="relative z-[1000]">
             <Confetti
@@ -1225,27 +1153,13 @@ const ReportTable = (props) => {
         )}
         {isAlert && <Alert type={alertMsg.type}>{alertMsg.message}</Alert>}
         {props.tourData && props.ReportName === "Templates" && (
-          <>
+          <Tour
-            <Tour
+            onRequestClose={closeTour}
-              onRequestClose={closeTour}
+            steps={props.tourData}
-              steps={props.tourData}
+            isOpen={isTour}
-              isOpen={isTour}
+            // rounded={5}
-              // rounded={5}
+            closeWithMask={false}
-              closeWithMask={false}
+          />
-            />
-            {isPublicTour && (
-              <Tour
-                showNumber={false}
-                showNavigation={false}
-                showNavigationNumber={false}
-                onRequestClose={closePublicTour}
-                steps={publicTourConfig}
-                isOpen={true}
-                rounded={5}
-                closeWithMask={false}
-              />
-            )}
-          </>
         )}
         <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
           <div className="font-light">
@@ -1273,17 +1187,11 @@ const ReportTable = (props) => {
           )}
         </div>
         <div
-          className={`overflow-auto w-full border-b ${
+          className={`${
-            props.List?.length > 0
+            isDashboard && props.List?.length > 0 ? "min-h-[317px]" : "h-full"
-              ? isDashboard
+          } overflow-auto w-full`}
-                ? "min-h-[317px]"
-                : currentList?.length === props.docPerPage
-                  ? "h-fit"
-                  : "h-screen"
-              : ""
-          }`}
         >
-          <table className="op-table border-collapse w-full mb-4">
+          <table className="op-table border-collapse w-full ">
             <thead className="text-[14px]">
               <tr className="border-y-[1px]">
                 {props.heading?.map((item, index) => (
@@ -1364,14 +1272,7 @@ const ReportTable = (props) => {
                         </td>
                       </tr>
                     ) : (
-                      <tr
+                      <tr className="border-y-[1px]" key={index}>
-                        className={`${
-                          currentList?.length === props.docPerPage
-                            ? "last:border-none"
-                            : ""
-                        } border-y-[1px] `}
-                        key={index}
-                      >
                         {props.heading.includes("Sr.No") && (
                           <th className="px-4 py-2">
                             {startIndex + index + 1}
@@ -1474,17 +1375,13 @@ const ReportTable = (props) => {
                           isEnableSubscription && (
                             <td className=" pl-[20px] py-2">
                               {props.ReportName === "Templates" && (
-                                <div
+                                <div className="flex flex-row">
-                                  className="flex flex-row "
-                                  data-tut="IsPublic"
-                                >
                                   <label className="cursor-pointer relative inline-flex items-center mb-0">
                                     <input
                                       checked={props.isPublic?.[item.objectId]}
-                                      onChange={(e) => {
+                                      onChange={(e) =>
-                                        setIsPublicTour();
+                                        handlePublicChange(e, item)
-                                        handlePublicChange(e, item);
+                                      }
-                                      }}
                                       type="checkbox"
                                       value=""
                                       className="sr-only peer"
@@ -1539,13 +1436,13 @@ const ReportTable = (props) => {
                                         }
                                         className="op-btn op-btn-primary"
                                       >
-                                        {t("yes")}
+                                        {t("submit")}
                                       </button>
                                       <button
                                         onClick={() => handleClose(item)}
                                         className="op-btn op-btn-secondary"
                                       >
-                                        {t("no")}
+                                        {t("cancel")}
                                       </button>
                                     </div>
                                   </div>
@@ -1571,14 +1468,14 @@ const ReportTable = (props) => {
                                         <span>{t("public-url-copy")}</span>
                                         <div className=" flex items-center justify-between gap-3 p-[2px] ">
                                           <div className="w-[280px] whitespace-nowrap overflow-hidden text-ellipsis">
-                                            <a
+                                            <span
-                                              rel="noreferrer"
+                                              onClick={() =>
-                                              target="_blank"
+                                                copytoProfileLink()
-                                              href={publicUrl()}
+                                              }
                                               className="ml-[2px] underline underline-offset-2 cursor-pointer text-blue-800"
                                             >
                                               {publicUrl()}
-                                            </a>
+                                            </span>
                                           </div>
                                           <div className="flex items-center gap-2">
                                             <RWebShare
@@ -1595,7 +1492,7 @@ const ReportTable = (props) => {
                                               </button>
                                             </RWebShare>
                                             <button
-                                              className="op-btn op-btn-primary op-btn-outline op-btn-xs md:op-btn-sm md:w-[100px]"
+                                              className="op-btn op-btn-primary op-btn-outline op-btn-xs md:op-btn-sm"
                                               onClick={() =>
                                                 copytoProfileLink()
                                               }
@@ -1621,7 +1518,7 @@ const ReportTable = (props) => {
                                           className="mt-3 op-btn op-btn-primary"
                                           onClick={() => navigate("/profile")}
                                         >
-                                          {t("Proceed")}
+                                          {t("add")}
                                         </button>
                                       </div>
                                     )}
@@ -1650,7 +1547,9 @@ const ReportTable = (props) => {
                                         className={
                                           act.action !== "option"
                                             ? `${
-                                                act?.btnColor || ""
+                                                act?.btnColor
+                                                  ? act.btnColor
+                                                  : ""
                                               } op-btn op-btn-sm mr-1`
                                             : "text-base-content focus:outline-none text-lg mr-2 relative"
                                         }
@@ -1667,10 +1566,9 @@ const ReportTable = (props) => {
                                                 )}`}
                                           </span>
                                         )}
-                                        {/* template report */}
                                         {isOption[item.objectId] &&
                                           act.action === "option" && (
-                                            <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
+                                            <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow bg-base-100 text-base-content rounded-box">
                                               {act.subaction?.map((subact) => (
                                                 <li
                                                   key={subact.btnId}
@@ -1724,10 +1622,9 @@ const ReportTable = (props) => {
                                         {t(`btnLabel.${act.btnLabel}`)}
                                       </span>
                                     )}
-                                    {/* doc report */}
                                     {isOption[item.objectId] &&
                                       act.action === "option" && (
-                                        <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow-black/20 shadow bg-base-100 text-base-content rounded-box">
+                                        <ul className="absolute -right-1 top-auto z-[70] w-max op-dropdown-content op-menu shadow bg-base-100 text-base-content rounded-box">
                                           {act.subaction?.map((subact) => (
                                             <li
                                               key={subact.btnId}
@@ -1980,7 +1877,6 @@ const ReportTable = (props) => {
                                   Placeholders={placeholders}
                                   item={templateDeatils}
                                   handleClose={handleQuickSendClose}
-                                  signatureType={signatureType}
                                 />
                               )}
                             </ModalUi>
@@ -2190,24 +2086,6 @@ const ReportTable = (props) => {
               )}
             </tbody>
           </table>
-          {props.List?.length <= 0 && (
-            <div
-              className={`${
-                isDashboard ? "h-[317px]" : ""
-              } flex flex-col items-center justify-center w-ful bg-base-100 text-base-content rounded-xl py-4`}
-            >
-              <div className="w-[60px] h-[60px] overflow-hidden">
-                <img
-                  className="w-full h-full object-contain"
-                  src={pad}
-                  alt="img"
-                />
-              </div>
-              <div className="text-sm font-semibold">
-                {t("no-data-avaliable")}
-              </div>
-            </div>
-          )}
         </div>
         <div className="op-join flex flex-wrap items-center p-2">
           {props.List.length > props.docPerPage && (
@@ -2239,6 +2117,24 @@ const ReportTable = (props) => {
             </button>
           )}
         </div>
+        {props.List?.length <= 0 && (
+          <div
+            className={`${
+              isDashboard ? "h-[317px]" : ""
+            } flex flex-col items-center justify-center w-ful bg-base-100 text-base-content rounded-xl py-4`}
+          >
+            <div className="w-[60px] h-[60px] overflow-hidden">
+              <img
+                className="w-full h-full object-contain"
+                src={pad}
+                alt="img"
+              />
+            </div>
+            <div className="text-sm font-semibold">
+              {t("no-data-avaliable")}
+            </div>
+          </div>
+        )}
         <ModalUi
           title={t("add-contact")}
           isOpen={isContactform}

apps/OpenSign/src/primitives/LinkUserModal.js

@@ -19,16 +19,11 @@ const LinkUserModal = (props) => {
         details={props.handleAddUser}
         closePopup={props.closePopup}
         signersData={props?.signersData}
-        jwttoken={props?.jwttoken}
       />
       <div className="op-divider text-base-content mx-[25%] my-1">
         {t("or")}
       </div>
-      <AddContact
+      <AddContact details={props.handleAddUser} closePopup={props.closePopup} />
-        details={props.handleAddUser}
-        closePopup={props.closePopup}
-        jwttoken={props?.jwttoken}
-      />
     </ModalUi>
   );
 };

apps/OpenSign/src/script/i18n.js

@@ -2,7 +2,6 @@ import i18n from "i18next";
 import { initReactI18next } from "react-i18next";
 import LanguageDetector from "i18next-browser-languagedetector";
 import en from "./locales/en/translation.json";
-import es from "./locales/es/translation.json";
 import fr from "./locales/fr/translation.json";
 
 i18n
@@ -13,9 +12,6 @@ i18n
       en: {
         translation: en
       },
-      es: {
-        translation: es
-      },
       fr: {
         translation: fr
       }
@@ -31,7 +27,7 @@ i18n
     interpolation: {
       escapeValue: false // React already does escaping
     },
-    whitelist: ["en", "es", "fr"] // List of allowed languages
+    whitelist: ["en", "fr"] // List of allowed languages
   });
 
 export default i18n;

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

@@ -41,7 +41,7 @@
   "upgrade-now": "Upgrade now",
   "upgrade-to": "Upgrade to",
   "plan": "Plan",
-  "subscribe-card-teamplan": "Unlock the full power of collaboration! Create unlimited organizations, teams, and hierarchies. Share templates seamlessly across teams and assign custom user roles. Elevate your workflow today!",
+  "subscribe-card-teamplan":"Unlock the full power of collaboration! Create unlimited organizations, teams, and hierarchies. Share templates seamlessly across teams and assign custom user roles. Elevate your workflow today!",
   "subscribe-card-plan": "Unlock premium features starting at just {{premiumPrice}}/month. Enjoy enhanced performance and only {{addonPrice}} per additional credit after your included premium credits.",
   "user-name-limit-char": "To have a username less than 8 character please subscribe",
   "tour-content": "Don't show this again",
@@ -94,7 +94,6 @@
       "My Signature": "My Signature",
       "API Token": "API Token",
       "Webhook": "Webhook",
-      "Preferences": "Preferences",
       "Teams": "Teams",
       "Team-update-successfully": "Team Updated successfully.",
       "Users": "Users"
@@ -133,8 +132,7 @@
     "View": "View",
     "option": "Option",
     "Embed": "Embed",
-    "Copy TemplateId": "Copy TemplateId",
+    "Copy TemplateId":"Copy TemplateId"
-    "Copy Public URL": "Copy Public URL"
   },
   "report-heading": {
     "Sr.No": "Sr.No",
@@ -266,10 +264,10 @@
   "make-template-public-alert": "Are you sure you want to make this template public?",
   "make-template-private-alert": "Are you sure you want to make this template private? This will remove it from your public profile.",
   "public-role": "Public role",
-  "public-url": "Public profile needed",
+  "public-url": "Public URL",
   "public-url-copy": "Here’s your public URL: ",
-  "public-url-copy-mssg": "Copy it or share it with the signer, and you will be able to see all your publicly set templates.",
+  "public-url-copy-mssg":"Copy it or share it with the signer, and you will be able to see all your publicly set templates.",
-  "add-public-url-alert": "Please complete your OpenSign public profile setup. Once done, you’ll be able to make templates public. This process only needs to be completed once.",
+  "add-public-url-alert": "Please add your public URL, and you will be able to make a public template.",
   "share-with-alert": "You cannot share a template if any roles already have contacts assigned. Please remove all contact assignments from the roles before sharing the template.",
   "share-with": "Share with",
   "team-not-found": "Team not found",
@@ -292,7 +290,7 @@
   "subject": "Subject",
   "body": "Body",
   "add-contact": "Add Contact",
-  "add-signer-alert": "Contact already exist! Please select it from ‘Signers’ dropdown",
+  "add-signer-alert": "Contact already exist!",
   "record-delete-alert": "Record deleted successfully!",
   "record-revoke-alert": "Record revoked successfully!",
   "mail-sent-alert": "Mail sent successfully.",
@@ -446,8 +444,7 @@
   "cutomize-email": "Cutomize Email",
   "upgrade-to-customize-email": "Upgrade to customize Email",
   "sign-url": "Sign url",
-  "mails-sent": "Mails Sent",
+  "Mails Sent": "Mails Sent",
-  "mail-not-delivered": "Mail not delivered",
   "document-alert": "Document Alert",
   "owner-subscription-expired": "Owner's subscription has expired.",
   "subscription-expired": "Subscription Expired",
@@ -600,7 +597,7 @@
     "Recently sent for signatures": "This is a list of documents you've sent to other parties for signature.",
     "Drafts": "This are documents you have started but have not finalized for sending.",
     "public-template": "This video demonstrates how to set up your personalized public profile, such as ‘https://opensign.me/your-username’. You’ll also learn how to customize your tagline and make your templates available for public signing."
-  },
+   },
   "enter-email-plaholder": "Add an email address and hit enter",
   "success-email-alert": "Email sent successfully!",
   "expired-doc-title": "Expired Document",
@@ -621,44 +618,44 @@
   "select-date-format": "Select a date format",
   "quantity-of-credits": "Quantity of premium credits",
   "remaining-credits": "Premium credits available:",
-  "remaining-credits-help": "Use premium credits for API document signing, bulk sending, or embedding OpenSign integration on your website. You have {{allowedcredits}} included credits and {{addoncredits}} additional purchased credits remaining.",
+  "remaining-credits-help":"Use premium credits for API document signing, bulk sending, or embedding OpenSign integration on your website. You have {{allowedcredits}} included credits and {{addoncredits}} additional purchased credits remaining.",
   "additional-credits": "Please purchase premium credits",
   "quota-err-quicksend": "Quota Reached, You don't have enough credits.",
   "buy-credits": "Buy Premium Credits",
-  "rotate-right": "Rotate right",
+  "rotate-right":"Rotate right",
-  "rotate-left": "Rotate left",
+  "rotate-left":"Rotate left",
-  "rotate-alert-mssg": "All widgets on this page will be lost. Are you sure you want to proceed?",
+  "rotate-alert-mssg":"All widgets on this page will be lost. Are you sure you want to proceed?",
-  "templateid": "Template-Id",
+  "templateid":"Template-Id",
-  "bulk-send-subcription-alert": "Please upgrade to Professional or Team plan to use bulk send.",
+  "bulk-send-subcription-alert":"Please upgrade to Professional or Team plan to use bulk send.",
-  "generate-test-token": "Generate Test Token",
+  "generate-test-token":"Generate Test Token",
-  "regenerate-test-token": "Regenerate Test Token",
+  "regenerate-test-token":"Regenerate Test Token",
-  "help-test-token": "This token can be used to test the APIs at the https://sandbox.opensignlabs.com/api/v1 endpoint, allowing you to conduct unlimited document signatures. Please note that the sandbox API will sign your documents with self-signed certificates, which may not be recognized as valid by Adobe. Once you’ve completed your testing, you can upgrade to one of our paid plans to generate a production token.",
+  "help-test-token":"This token can be used to test the APIs at the https://sandbox.opensignlabs.com/api/v1 endpoint, allowing you to conduct unlimited document signatures. Please note that the sandbox API will sign your documents with self-signed certificates, which may not be recognized as valid by Adobe. Once you’ve completed your testing, you can upgrade to one of our paid plans to generate a production token.",
-  "help-api-token": "This token can be used to access the production APIs at the {{origin}}/api/v1 endpoint. It can only be generated on one of our paid plans.",
+  "help-api-token":"This token can be used to access the production APIs at the {{origin}}/api/v1 endpoint. It can only be generated on one of our paid plans.",
-  "reason": "Reason",
+  "reason":"Reason",
-  "decline-by": "Declined/revoked by",
+  "decline-by":"Declined/revoked by",
   "document-declined": "Document declined",
-  "public-template-mssg-1": "To integrate OpenSign into your React or Next.js project, simply run the following command:",
+  "public-template-mssg-1":"To integrate OpenSign into your React or Next.js project, simply run the following command:",
-  "public-template-mssg-2": "Ensure you have npm or yarn set up in your project. If you’re using Yarn, you can replace npm install with yarn add @opensign/react.",
+  "public-template-mssg-2" :"Ensure you have npm or yarn set up in your project. If you’re using Yarn, you can replace npm install with yarn add @opensign/react.",
-  "public-template-mssg-3": "Need more details or examples?",
+  "public-template-mssg-3"  :"Need more details or examples?",
   "public-template-mssg-4": "Visit the",
   "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
-  "public-template-mssg-6": "Before you can use this code snippet, you must make this template public.",
+  "public-template-mssg-6" :"You need to set this template as public before you can utilize this code snippet.",
-  "copy-code": "COPY",
+  "copy-code":"COPY",
-  "copied-code": "COPIED",
+  "copied-code":"COPIED",
-  "Installation": "Installation",
+  "Installation":"Installation",
-  "Usage": "Usage",
+  "Usage" :"Usage",
-  "insufficient-credits": "Insufficient Signing Credits",
+  "insufficient-credits":"Insufficient Signing Credits",
-  "insufficient-credits-mssg": "The owner of this document currently lacks the necessary OpenSign credits for you to sign. Please reach out to the owner if you require further details.",
+  "insufficient-credits-mssg":"The owner of this document currently lacks the necessary OpenSign credits for you to sign. Please reach out to the owner if you require further details.",
   "angular-npm-mssg-1": "To integrate OpenSign into your Angular project, simply run the following command:",
-  "quota-mail-info-head": "Monthly request signatures email limit",
+  "quota-mail-info-head":"Monthly request signatures email limit",
   "quota-mail-info": "You can send upto 15 signature request emails every month. Upgrade now to send unlimited signing requests directly.",
   "quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.",
-  "quota-mail-tip": "Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
+  "quota-mail-tip":"Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
-  "quota-mail-head": "Quota Reached",
+  "quota-mail-head":"Quota Reached",
-  "unauthorized-modal": "You don't have permission to perform this action, please contact {{adminEmail}}.",
+  "unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.",
-  "sent-this-month": "Sent this month",
+  "sent-this-month":"Sent this month",
-  "available-seats": "Available seats",
+  "available-seats":"Available seats",
-  "buy-users": "Buy more users",
+  "buy-users":"Buy more users",
   "isenable-otp": "Enable OTP verification",
   "isenable-otp-help": {
     "p1": "Would you like to enable the verification process using a one-time password (OTP)?",
@@ -666,36 +663,10 @@
     "p3": "Selecting this option will disable OTP verification, allowing users to sign the document directly without additional steps.",
     "p4": "Please choose the option that best suits your document signing requirements."
   },
-  "advanced-options": "Advanced options",
+  "advanced-options":"Advanced options",
-  "hide-advanced-options": "Hide Advanced options",
+  "hide-advanced-options":"Hide Advanced options",
-  "download-files": "Download files",
+  "download-files":"Download files",
-  "download-pdf": "Download Pdf",
+  "download-pdf":"Download Pdf",
-  "pdf-certificate": "Download Pdf + Certificate",
+  "pdf-certificate":"Download Pdf + Certificate",
-  "document-logs": "Document logs",
+  "document-logs":"Document logs"
-  "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
-  "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
-  "enable-tour": "Enable Tour",
-  "istourenabled-help": {
-    "p1": "This will enable a guided tour for signers, providing instructions during the signing process.",
-    "p2": "This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
-    "p3": "Tip: If your signers are familiar with OpenSign and frequently use it, you may want to disable the guided tour for a more seamless experience. Choose the option that best fits your document signing needs."
-  },
-  "form-title-1": "Document Flow Setting",
-  "form-title-2": "Security Settings",
-  "public-tour-message": "The template needs to be public before you can generate a shareable link.",
-  "add-user-template": "You need to add a role before you can add fields for it.",
-  "pdf-uncompatible": "This pdf is not compatible with opensign, please contact <support@opensignlabs.com>",
-  "text-field-tour": "Fields of type 'Text' must be filled in advance before the document is sent. If you need the signers to provide input, use the 'Text Input' field instead.",
-  "attach-signer-tour": "You need to attach a Signer to every role. You can do that by clicking this icon. Once you select a Signer it will be attached to all the fields associated with that role which appear in the same colour.",
-  "allowed-signature-types": "Allowed signature types",
-  "at-least-one-signature-type": "At least one signature type should be enabled.",
-  "expect-default-one-signature-type": "Please enable one additional signature type apart from the default.",
-  "add-signer-note": "Note - This contact will be added to your contact list",
-  "allowed-signature-types-help": {
-    "p1": "This signature preference controls which signing options are available to your signers. Only the signature types you select will appear in the signature widget when a document is signed. For example, if you choose only the 'Draw' option in preferences, your signer will see only the 'Draw' option in the signature widget, while the other three options will not be available.",
-    "l1": "Create a handwritten signature directly on the screen using your finger or a stylus.",
-    "l2": "Enter your name and choose from various font styles to create a signature.",
-    "l3": "Upload an existing digital version of your signature.",
-    "l4": "Use a pre-set signature style saved under 'My Signature' in your settings."
-  }
 }

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

@@ -1,701 +0,0 @@
-{
-  "header-news": "Nueva funcionalidad: ¡Los perfiles públicos ahora están disponibles! Crea y comparte plantillas públicas fácilmente",
-  "header-news-btn": "Configurar ahora",
-  "create-account": "Crear cuenta",
-  "login": "Iniciar sesión",
-  "language": "Idioma",
-  "name": "Nombre",
-  "phone": "Teléfono",
-  "phone-optional": "opcional",
-  "email": "Correo",
-  "company": "Compañía",
-  "job-title": "Título del puesto",
-  "profile": "Perfil",
-  "log-out": "Cerrar sesión",
-  "is-email-verified": "El correo está verificado",
-  "public-profile": "Perfil público",
-  "tagline": "Eslogan ",
-  "has-requested-you-to-sign": "ha solicitado que firmes",
-  "has-requested-you-to-review-and-sign": " ha solicitado que revises y firmes",
-  "input-required": "Por favor, rellena este campo.",
-  "sort-order": {
-    "Ascending": "Ascendente",
-    "Descending": "Descendente",
-    "Name": "Nombre",
-    "Date": "Fecha"
-  },
-  "context-menu": {
-    "Download": "Descargar",
-    "Rename": "Renombrar",
-    "Move": "Mover",
-    "Delete": "Eliminar"
-  },
-  "action": "Acción",
-  "add": "Agregar",
-  "add-new-folder": "Agregar nueva carpeta",
-  "disable-documentId": "Desactivar ID de documento",
-  "edit": "Editar",
-  "change-password": "Cambiar contraseña",
-  "save": "Guardar",
-  "cancel": "Cancelar",
-  "upgrade-now": "Mejorar ahora",
-  "upgrade-to": "Mejorar a",
-  "plan": "Plan",
-  "subscribe-card-teamplan": "¡Libera todo el poder de la colaboración! Crea organizaciones, equipos y jerarquías ilimitadas. Comparte plantillas sin problemas entre equipos y asigna funciones de usuario personalizadas. ¡Mejora tu flujo de trabajo hoy mismo!",
-  "subscribe-card-plan": "Desbloquea funciones premium desde solo {{premiumPrice}}/mes. Disfruta de un rendimiento mejorado y solo {{addonPrice}} por crédito adicional después de tus créditos premium incluidos.",
-  "user-name-limit-char": "Para tener un nombre de usuario menor a 8 caracteres por favor suscríbete",
-  "tour-content": "No mostrar esto otra vez",
-  "pro": "PRO",
-  "team": "EQUIPO",
-  "user": "Usuario",
-  "docs": "Documentación",
-  "session-expired": "Tu sesión ha expirado.",
-  "public-profile-help": "Esta es tu URL pública. Cópiala o compártela con el firmante, y podrás ver todas tus plantillas públicas.",
-  "tagline-help": "Este eslogan aparecerá en tu perfil público de OpenSign, por ejem. https://opensign.me/alex",
-  "welcome": "¡Bienvenido de nuevo!",
-  "Login-to-your-account": "Ingresa a tu cuenta",
-  "password": "Contraseña",
-  "forgot-password": "¿Olvidaste la contraseña?",
-  "loading": "Cargando...",
-  "of": "de",
-  "sign-SSO": "Ingresar con SSO",
-  "login-page": "Página de inicio de sesión",
-  "or": "O",
-  "signup-page": "Página de registro",
-  "password-length": "La contraseña debe tener 8 caracteres",
-  "password-case": "La contraseña debe incluir mayúsculas, minúsculas y números",
-  "password-special-char": " La contraseña debe incluir caracteres especiales",
-  "agreee": "Estoy de acuerdo con los",
-  "term": "Términos de Servicio",
-  "subscribe-to-opensign": "Suscribirse al boletín de OpenSign",
-  "register": "Registrarse",
-  "sidebar": {
-    "Dashboard": "Panel",
-    "Sign yourself": "Firma tu mismo",
-    "Request signatures": "Solicitar firmas",
-    "Templates": "Plantillas",
-    "Templates-Children": {
-      "Create template": "Crear plantilla",
-      "Manage templates": "Administrar plantillas"
-    },
-    "OpenSign™ Drive": "OpenSign™ Drive",
-    "Reports": "Reportes",
-    "Reports-Children": {
-      "Need your sign": "Necesitan tu firma",
-      "In Progress": "En progreso",
-      "Completed": "Completado",
-      "Drafts": "Borradores",
-      "Declined": "Rechazados",
-      "Expired": "Expirados",
-      "Contactbook": "Agenda de contactos"
-    },
-    "Settings": "Ajustes",
-    "Settings-Children": {
-      "My Signature": "Mi firma",
-      "API Token": "Token API",
-      "Webhook": "Webhook",
-      "Preferences": "Preferencias",
-      "Teams": "Equipos",
-      "Team-update-successfully": "Equipo actualizado correctamente.",
-      "Users": "Usuarios"
-    }
-  },
-  "dashboard-card": {
-    "Need your Signature": "Necesitan tu firma",
-    "Out for signatures": "En espera de ser firmados"
-  },
-  "report-name": {
-    "Draft Documents": "Documentos borradores",
-    "Need your sign": "Necesitan tu firma",
-    "In-progress documents": "Documentos en progreso",
-    "Completed Documents": "Documentos completados",
-    "Declined Documents": "Documentos rechazados",
-    "Expired Documents": "Documentos expirados",
-    "Recently sent for signatures": "Recientemente enviados para ser firmados",
-    "Recent signature requests": "Solicitudes de firma recientes",
-    "Drafts": "Borradores",
-    "Contactbook": "Agenda de contactos",
-    "Templates": "Plantillas",
-    "Teams": "Equipos",
-    "Users": "Usuarios"
-  },
-  "btnLabel": {
-    "sign": "firmar",
-    "Sign": "FIRMAR",
-    "Resend": "Reenviar",
-    "Revoke": "Revocar",
-    "Delete": "Eliminar",
-    "Use": "Usar",
-    "Quick send": "Envío rápido",
-    "Edit": "Editar",
-    "Share with team": "Compartir con el equipo",
-    "Share": "Compartir",
-    "View": "Ver",
-    "option": "Opción",
-    "Embed": "Incrustar",
-    "Copy TemplateId": "Copiar ID de plantilla",
-    "Copy Public URL": "Copiar URL pública"
-  },
-  "report-heading": {
-    "Sr.No": "Nº",
-    "Title": "Título",
-    "Email": "Correo",
-    "Phone": "Teléfono",
-    "File": "Archivo",
-    "Owner": "Propietario",
-    "Signers": "Firmantes",
-    "Note": "Nota",
-    "Folder": "Carpeta",
-    "Reason": "Razón",
-    "Parent Team": "Equipo padre",
-    "Active": "Activo",
-    "Role": "Rol",
-    "Team": "Equipo",
-    "Name": "Nombre",
-    "Status": "Estado",
-    "created-date": "Fecha de creación",
-    "Type": "Tipo",
-    "Logs": "Registros"
-  },
-  "report-help": {
-    "Draft Documents": "Estos son documentos que has iniciado pero no has finalizado para su envío.",
-    "Need your sign": "Esta es una lista de documentos que esperan tu firma.",
-    "In-progress documents": "Esta es una lista de documentos que has enviado a otras partes para su firma.",
-    "Completed Documents": "Esta es una lista de documentos en los que todas las partes han firmado.",
-    "Declined Documents": "Esta es una lista de documentos que han sido rechazados por uno de los firmantes.",
-    "Expired Documents": "Esta es una lista de documentos que han alcanzado su fecha de caducidad.",
-    "Contactbook": "Esta es una lista de contactos/firmantes añadidos por ti. Aparecerán como sugerencias cuando intentes añadir firmantes a un nuevo documento.",
-    "Templates": "Esta es una lista de plantillas que están a tu disposición para crear documentos. Puedes hacer clic en el botón «usar» para crear un nuevo documento utilizando una plantilla, modifica el documento y añade firmantes en el siguiente paso."
-  },
-  "form-name": {
-    "Sign Yourself": "Firmar",
-    "Request Signatures": "Solicitar firmas",
-    "New Template": "Nueva plantilla"
-  },
-  "file-type": "pdf, png, jpg, jpeg",
-  "docx": "docx",
-  "file-selected": "archivo seleccionado",
-  "template-title": "Título de la plantilla",
-  "document-title": "Título del documento",
-  "description": "Descripción",
-  "time-to-complete": "Plazo de finalización (días)",
-  "send-in-order": "Enviar en orden",
-  "send-in-order-help": {
-    "p1": "Elige cómo quieres que se envíen las solicitudes de firma a los firmantes del documento:",
-    "p2": "Seleccionando esta opción se enviará inicialmente la solicitud de firma al primer firmante. Una vez que el primer firmante complete su parte, el siguiente firmante en la secuencia recibirá la solicitud. Este proceso continúa hasta que todos los firmantes hayan firmado el documento. Este método garantiza que el documento se firme en un orden específico.",
-    "p3": "Seleccionando esta opción se enviarán los enlaces para la firma a todos los firmantes simultáneamente. Cada firmante puede firmar el documento cuando le convenga, independientemente de si otros firmantes han completado sus firmas. Este método es más rápido, pero no impone ningún orden de firma entre los participantes.",
-    "p4": "Selecciona la opción que mejor se adapte a las necesidades de tu tramitación de documentos."
-  },
-  "no": "No",
-  "auto-reminder": "Recordatorio automático",
-  "remind-once": " Recordar una vez cada (Días)",
-  "next": "Siguiente",
-  "select-folder": "Seleccionar carpeta",
-  "OpenSign-drive": "OpenSign™ Drive",
-  "drive-document-status": {
-    "Completed": "Completado",
-    "Declined": "Rechazado",
-    "Draft": "Borrador",
-    "Expired": "Expirado",
-    "In Progress": "En progreso"
-  },
-  "select-folder-help": "Si no seleccionas una carpeta, tu documento firmado se guardará en la carpeta principal de OpenSign Drive.",
-  "no-data": "No se encontraron datos",
-  "save-here": "Guardar aquí",
-  "back": "Atrás",
-  "add-folder": "Añadir carpeta",
-  "create-folder": "Crear carpeta",
-  "parent-folder": "Carpeta superior",
-  "create": "Crear",
-  "signers": "Firmantes",
-  "signers-help": "Empieza a escribir el nombre de un contacto para ver los firmantes sugeridos entre tus contactos guardados o añade otros nuevos. Organiza el orden de firma añadiendo firmantes en la secuencia deseada. Utiliza el botón «+» para añadir nuevos firmantes y la «X» para quitar todos. Cada firmante recibirá una solicitud por correo electrónico para que firme el documento según el orden indicado.",
-  "add-signer": "Añadir firmante",
-  "contact-not-found": "Contacto no encontrado",
-  "add-yourself": "Añadirte a ti mismo",
-  "submit": "Enviar",
-  "reset": "Volver a empezar",
-  "my-signature": "Mi firma",
-  "signature": "Firma",
-  "upload-image": " Subir imagen",
-  "clear": "Limpiar",
-  "upload-signature/Image": "Por favor, sube la firma/imagen",
-  "initials": "Iniciales",
-  "API": "API",
-  "api-token": "Token API",
-  "regenerate-token": "Regenerar token activo",
-  "generate-token": "Generar token activo",
-  "view-docs": "Ver documentación",
-  "generate-token-alert": "¿En definitiva quieres regenerar el token? Esto expirará el token antiguo.",
-  "yes": "Sí",
-  "copied": "Copiado",
-  "something-went-wrong-mssg": "Algo salió mal, por favor, intenta de nuevo más tarde.",
-  "token-generated": "Token generado exitosamente.",
-  "webhook": "Webhook",
-  "update-webhook": "Actualizar webhook",
-  "add-webhook": "Agregar webhook",
-  "webhook-added": "Webhook agregado exitosamente.",
-  "team-disabled": "Equipo deshabilitado",
-  "Team enabled": "Equipo habilitado",
-  "are-you-sure": "¿En definitiva quieres ",
-  "disable": "deshabilitar",
-  "enable": "habilitar",
-  "this-team": " este equipo?",
-  "edit-team": "Editar equipo",
-  "name-of-team": "Nombre del equipo",
-  "prev": "Anterior",
-  "no-data-avaliable": "No hay datos disponibles",
-  "add-team": "Agregar equipo",
-  "page-not-found": "Página no encontrada",
-  "users-from-teams": "usuarios de equipos",
-  "user-status": "Estado del usuario",
-  "activate": "activar",
-  "deactivate": "desactivar",
-  "this-user": " este usuario",
-  "delete-user": "Eliminar usuario",
-  "delete": "eliminar",
-  "add-user": "Agregar usuario",
-  "password-generateed": "La contraseña solo será generada una vez; asegúrate de copiarla.",
-  "Team status": "Estado del equipo",
-  "user-deactivated": "Usuario desactivado.",
-  "user-activated": "Usuario activado.",
-  "public": "Público",
-  "download": "Descargar",
-  "view": "Ver",
-  "make-template-public": "Convertir la plantilla en pública",
-  "make-template-private": "Convertir la plantilla en privada",
-  "make-template-public-alert": "¿En definitiva quieres convertir esta plantilla en pública?",
-  "make-template-private-alert": "¿En definitiva quieres convertir esta plantilla en privada? Esto lo removerá de tu perfil público.",
-  "public-role": "Rol público",
-  "public-url": "Se requiere perfil público",
-  "public-url-copy": "Aquí está tu URL pública: ",
-  "public-url-copy-mssg": "Cópiala o compártela con el firmante y podrás ver todas tus plantillas públicas.",
-  "add-public-url-alert": "Por favor, completa la configuración de tu perfil público OpenSign. Una vez terminado, podrás crear plantillas públicas. Este proceso solo necesita ser completado una vez.",
-  "share-with-alert": "No puedes compartir una plantilla si alguno de los roles ya tiene contactos asignados. Elimina todas las asignaciones de contactos de los roles antes de compartir la plantilla.",
-  "share-with": "Compartir con",
-  "team-not-found": "Equipo no encontrado",
-  "roles": "Roles",
-  "delete-document": "Eliminar documento",
-  "delete-document-alert": "¿En definitiva quieres eliminar este documento?",
-  "quick-send": "Envío rápido",
-  "add-new": "Agregar nuevo",
-  "send": "Enviar",
-  "quick-send-alert-1": "Todos los roles de este documento están actualmente vinculados a contactos. Para enviar rápidamente copias de esta plantilla a varios firmantes, por favor, asegúrate de que al menos un rol no esté vinculado a ningún contacto.",
-  "quick-send-alert-2": "Por favor, asegúrate de que hay al menos un widget de firma añadido para cada destinatario.",
-  "quick-send-alert-3": "Por favor, añade al menos un rol a esta plantilla para poder hacer un «envío rápido» de copias a varios firmantes.",
-  "quick-send-alert-4": "El envío rápido ha alcanzado el límite.",
-  "copy-link": "Copiar enlace",
-  "copy": "Copiar",
-  "revoke-document": "Revocar documento",
-  "revoke-document-alert": "¿En definitiva quieres revocar este documento?",
-  "resend-mail": "Reenviar correo",
-  "resend-mail-help": "Puedes usar las siguientes variables que serán reemplazadas por sus valores reales:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}.",
-  "subject": "Asunto",
-  "body": "Cuerpo",
-  "add-contact": "Agregar contacto",
-  "add-signer-alert": "¡El contacto ya existe! Selecciónelo en el menú desplegable 'Firmantes'",
-  "record-delete-alert": "¡Entrada eliminada exitosamente!",
-  "record-revoke-alert": "¡Entrada revocada exitosamente!",
-  "mail-sent-alert": "Correo enviado exitosamente.",
-  "document-sent-alert": "¡Documento enviado exitosamente!",
-  "template-share-alert": "Plantilla compartida exitosamente.",
-  "template-public-alert-1": "Has convertido exitosamente la plantilla en pública.",
-  "template-public-alert-2": "Has convertido exitosamente la plantilla en privada.",
-  "template-public-alert-3": "Tienes que seleccionar un rol para los firmantes públicos.",
-  "template-public-alert-4": "Por favor, asegúrate de que has añadido al menos un widget de firma para cada firmante.",
-  "template-public-alert-5": "Dado que esta plantilla tiene «enviar en orden» habilitado, el rol público debe estar posicionado arriba al inicio.",
-  "template-public-alert-6": "Por favor, enlaza firmantes a todos los roles excepto al usuario de rol público.",
-  "template-public-alert-7": "Por favor, asigna al menos un rol público para convertir está plantilla en pública.",
-  "loader": " Esto podría llevar algún tiempo",
-  "pages": "Páginas",
-  "document-signed": "Documento firmado",
-  "close": "Cerrar",
-  "validation-alert": "Alerta de validación",
-  "validate-alert-mssg": " Los datos ingresados no cumplen con los criterios establecidos por la expresión regular.",
-  "otp-verification": "Verificación OTP",
-  "enter-otp": "Ingresar OTP",
-  "verify": "Verificar",
-  "verify-email-1": "Verificar correo",
-  "resend": "Reenviar",
-  "contact-details": "Detalles del contacto",
-  "verify-email": "¡Por favor, verifica tu correo!",
-  "send-otp": " Enviar OTP",
-  "otp-placeholder": "Ingresa el código de verificación enviado por correo",
-  "loading-doc": "Cargando documento...",
-  "widgets-name": {
-    "signature": "firma",
-    "stamp": "sello",
-    "initials": "iniciales",
-    "name": "nombre",
-    "job title": "título del puesto",
-    "company": "compañía",
-    "date": "fecha",
-    "text": "texto",
-    "text input": "entrada de texto",
-    "checkbox": "casilla",
-    "dropdown": "desplegable",
-    "radio button": "botón de radio",
-    "image": "imagen",
-    "email": "correo"
-  },
-  "fields": "Campos",
-  "recipients": "Destinatarios",
-  "please-add": "Por favor, agrega un",
-  "signed-by": "Firmado por",
-  "more": "más",
-  "sent": "enviado",
-  "print": "Imprimir",
-  "certificate": "Certificado",
-  "decline": "Rechazar",
-  "finish": "Finalizar",
-  "mail": "Correo",
-  "sign-now": "Firmar ahora",
-  "successfully-signed": "¡Firmado exitosamente!",
-  "email-mssg": " Los destinatarios agregados aquí recibirán una copia del documento firmado.",
-  "email-error-1": " por favor, proporciona una dirección de correo correcta",
-  "email-error-2": "Solo puedes enviar hasta a 10 destinatarios a la vez.",
-  "Email-verified-alert-1": "El correo está verificado.",
-  "Email-verified-alert-2": "El correo ya ha sido verificado.",
-  "upload-stamp-image": "Subir imagen del sello",
-  "draw": "Dibujar",
-  "type": "Escribir",
-  "color-type": {
-    "red": "rojo",
-    "blue": "azul",
-    "black": "negro",
-    "yellow": "amarillo"
-  },
-  "my-initials": "Mis iniciales",
-  "upload": "Subir",
-  "initial-teb": "Iniciales",
-  "signature-tab": "Firma",
-  "your-signature": "Tu firma",
-  "copy-title": "Copiar widget a",
-  "contact-delete-alert": "¿En definitiva quieres eliminar este contacto?",
-  "reset-password-alert-1": "El enlace para restablecer la contraseña ha sido enviado a tu correo electrónico",
-  "reset-password-alert-2": "Por favor, configura un adaptador de correo ",
-  "reset-password-alert-3": "Restablece tu contraseña",
-  "faild-animation": "Error al cargar la animación",
-  "apply": "Aplicar",
-  "copy-type": {
-    "All pages": "Todas las páginas",
-    "All pages but last": "Todas las páginas menos la última",
-    "All pages but first": "Todas las páginas menos la primera",
-    "Next to current widget": "Junto al widget actual"
-  },
-  "options": "Opciones",
-  "minimun-check": "Chequeo mínimo",
-  "maximum-check": "Chequeo máximo",
-  "default-value": "Valor por defecto",
-  "select": "Seleccionar",
-  "read-only": "Es de solo lectura",
-  "hide-labels": "Esconder etiquetas",
-  "checkbox": "Casilla",
-  "alert": "Alerta",
-  "zoom-in": "Acercar",
-  "zoom-out": "Alejar",
-  "document-signed-alert": "¡Felicitaciones! 🎉 ¡Este documento ha sido firmado por ti exitosamente!",
-  "otp-sent-alert": "OTP enviado a tu correo",
-  "fields-required": "Campos requeridos",
-  "signature-widget-alert-1": "Por favor, asegúrate de que hay al menos un widget de firma agregado",
-  "signature-widget-alert-2": "Por favor, asegúrate de que todos los campos están correctamente rellenados y de que cumplen todos los requisitos.",
-  "encrypted-pdf-alert": "Actualmente los archivos PDF encriptados no están soportados.",
-  "encrypted-pdf-alert-1": "La contraseña del archivo PFX es inválida.",
-  "user-not-exist": "El usuario no existe",
-  "template-signature-field": "Por favor, agrega al menos un campo de firma para todos los roles.",
-  "template-role-alert": "Por favor, primero agrega roles",
-  "create-document": "Crear documento",
-  "template-created-alert": "¿Quieres crear un documento usando la plantilla que acabas de crear?",
-  "signers-alert": "alerta de firmantes",
-  "template-creation-alert-1": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
-  "ok": "OK",
-  "radio-group": "Grupo de radio",
-  "dropdown-options": "Opciones del desplegable",
-  "add-role": "Agregar rol",
-  "role-ex": " por ejem.: Cliente, RRHH, Director, Administrador, Estudiante, etc.",
-  "add/choose-signer": "Agregar/Elegir firmante",
-  "choose-from-contacts": "Elegir desde los contactos",
-  "select-signer": " Por favor, selecciona el firmante",
-  "edit-template": "Editar plantilla",
-  "widget-info": "Información del widget",
-  "validation": "Validación",
-  "invalid-default-value": "valor por defecto inválido",
-  "hint": "Pista",
-  "color": "color",
-  "role-help": {
-    "p1": "¿Qué son los roles de una plantilla?",
-    "p2": "Empieza por especificar cada uno de los roles necesarios para completar el documento. Piensa en las partes implicadas en el proceso de firma y cuáles son sus responsabilidades. Los roles más habituales son RRHH para los documentos internos, Cliente para los contratos o Proveedor para los convenios comerciales.",
-    "p3": "¿Por qué preasignar usuarios a algunos roles?",
-    "p4": "Para los roles que consistentemente involucran al mismo individuo (por ejem., la firma del Gerente en las ofertas de empleo), puedes preasignar un usuario a un rol dentro de una plantilla. Este paso es opcional pero recomendado para la eficiencia y consistencia entre documentos",
-    "p5": "¿Cuando especifico el usuario asignado a cada rol?",
-    "p6": "Cuando crees un documento usando tu plantilla, se te pedirá que asignes usuarios a cada rol definido. Si un rol ya tiene un usuario asignado, este será rellenado con anticipación, pero puedes modificarlo según lo necesites antes de enviar el documento."
-  },
-  "add-recipients": "Agregar destinatarios",
-  "loading-mssg": "Esto podría llevar algún tiempo",
-  "send-mail": "Enviar correo",
-  "placeholder-alert-1": "Por favor, asegúrate de que hay al menos un widget de firma para cada destinatario.",
-  "placeholder-alert-2": "Por favor, confirma que hayas rellenado el campo de texto.",
-  "placeholder-alert-3": " ¿En definitiva quieres enviar este documento para ser firmado?",
-  "placeholder-alert-4": "¡Has enviado exitosamente correos a todos los destinatarios!",
-  "placeholder-alert-5": "¿Quieres firmar documentos ahora mismo?",
-  "placeholder-alert-6": "¡Por favor, configura el adaptador de correo para enviar correos!",
-  "placeholder-alert-7": "¡Por favor, selecciona un firmante para agregar un marcador de posición!",
-  "email-subject": "asunto del correo",
-  "email-body": "cuerpo del correo",
-  "email-placeholder": "agregar cuerpo del correo",
-  "reset-to-default": "Restablecer a por defecto",
-  "cutomize-email": "Personalizar correo",
-  "upgrade-to-customize-email": "Mejora para personalizar el correo",
-  "sign-url": "URL de firma",
-  "mails-sent": "Correos enviados",
-  "mail-not-delivered": "correo no entregado",
-  "document-alert": "Alerta de documento",
-  "owner-subscription-expired": "La suscripción del propietario ha expirado.",
-  "subscription-expired": "Suscripción expirada",
-  "alert-message": "Mensaje de alerta",
-  "document-decline": "Rechazar documento",
-  "decline-alert-1": "¿En definitiva quieres rechazar este documento?",
-  "decline-alert-2": "¡Has rechazado este documento!",
-  "decline-alert-3": "No puedes firmar este documento ya que ha sido rechazado/revocado.",
-  "sign here": "Firma aquí",
-  "guest-email-alert": "el código de verificación ha sido enviado a tu correo",
-  "get-otp-alert": "recibirás un código de verificación por correo",
-  "user-already-exist": "El usuario ya existe.",
-  "server-error": "¡Error interno del servidor!",
-  "fill-required-details!": "¡Por favor, rellena los detalles requeridos!",
-  "sign-up-form": "Formulario de registro",
-  "sign-up": "Registrarse",
-  "folder-already-exist!": "¡la carpeta ya existe!",
-  "please-select-position!": "¡por favor, selecciona una posición!",
-  "default-sign-alert": "¿En definitiva quieres firmar automáticamente en todos los lugares solicitados?",
-  "Your-Signature": "Tu firma",
-  "auto-sign-all": "Firmar todo automáticamente",
-  "generating-certificate": "Generando certificado",
-  "pdf-download": "Descargar PDF",
-  "generate-certificate-alert": " Tu certificado de finalización se está generando. Por favor, espera un momento. Si la descarga no inicia pronto, presiona el botón otra vez.",
-  "folder-already-exist": "¡La carpeta ya existe!",
-  "folder-created-successfully": "¡Carpeta creada exitosamente!",
-  "fill-folder-name": "Por favor, rellena el nombre de la carpeta",
-  "already-exists-this-username": "¡Un usuario con este nombre de usuario ya existe!",
-  "verification-code-sent": "¡El correo de verificación ha sido enviado a tu correo!",
-  "registered-user-successfully": "Usuario registrado exitosamente.",
-  "role-not-found": "Rol no encontrado.",
-  "do-not-access": "No tienes acceso, por favor, contacta al administrador.",
-  "add-admin": "Agregar administrador",
-  "opensign-setup": "Instalación de OpenSign",
-  "join-discord": "Únete a nuestro servidor de Discord",
-  "admin-already-exist": "El administrador ya existe.",
-  "password-update-alert-1": "Contraseña actualizada exitosamente.",
-  "password-update-alert-2": "Tu contraseña actual es incorrecta o falta.",
-  "password-update-alert-3": "Tu contraseña actual es incorrecta o falta.",
-  "password-update-alert-4": "Tu contraseña y su confirmación no son iguales.",
-  "current-password": "Contraseña actual",
-  "new-password": "Contraseña nueva",
-  "confirm-password": "Confirmar contraseña",
-  "file-alert-1": "El tamaño del archivo seleccionado es muy grande. Por favor, selecciona un archivo con un tamaño menor a",
-  "file-alert-2": "Por favor, selecciona un archivo.",
-  "file-alert-3": "Por favor, espera mientras se sube el documento.",
-  "enter-pdf-password": "Ingresa la contraseña del PDF",
-  "correct-password": "Por favor, proporciona la contraseña correcta",
-  "decrypting-pdf": " Desencriptando PDF, por favor, espera...",
-  "invalid-otp": "OTP inválido",
-  "user-not-found": "¡Usuario no encontrado!",
-  "enter-otp-alert": "¡Por favor, ingresa el OTP!",
-  "get-verification-code": "Obtener código de verificación",
-  "get-verification-code-2": "Obtendrás un código de verificación por correo",
-  "enter-verification-code": "Ingresar código de verificación",
-  "provide-your-details": "Proporciona tus detalles",
-  "provide-email": "Por favor, proporciona un correo.",
-  "additional-info": "Información adicional",
-  "signature-saved-alert": "Firma guardada exitosamente.",
-  "fill-field": "Por favor, rellena este campo",
-  "error-template": "Error: ¡Plantilla no encontrada!",
-  "error": "Error",
-  "invalid-document": "Error: ¡Documento inválido!",
-  "document-not-found": "¡Documento no encontrado!",
-  "document-signed-alert-1": "Has firmado el documento exitosamente. Puedes descargar o imprimir una copia del documento parcialmente firmado. Una copia del documento firmado digitalmente será enviada al propietario mediante correo electrónico una vez haya sido firmado por todos los firmantes.",
-  "encrypted-pdf-not-support": "Los archivos PDF encriptados no están soportados actualmente.",
-  "document-signed-alert-4": " ¡Felicitaciones! 🎉 ¡Este documento ha sido firmado exitosamente por todos los participantes!",
-  "document-signed-alert-5": "Este documento ha sido firmado por todos los firmantes.",
-  "document-signed-alert-6": "Este documento ha sido rechazado por uno o más destinatarios.",
-  "document-signed-alert-7": "Este documento ya no está disponible.",
-  "document-signed-alert-8": "Este documento ya ha sido enviado para ser firmado.",
-  "yet-to-sign": "Todavía por firmar",
-  "validation-alert-1": "Los datos ingresados no cumplen con los criterios establecidos por la expresión regular.",
-  "account-already-exists": "¡La cuenta ya existe!",
-  "choose-password": "Elegir contraseña",
-  "enter-password": "Ingresar contraseña",
-  "sure": "claro",
-  "subscribed-alert": "¡Ya te has suscrito al plan!",
-  "monthly": "Mensual",
-  "yearly-upto": "Anual (hasta 66% de descuento)",
-  "billed-yearly": "Facturado anualmente",
-  "billed-monthly": "Facturado mensualmente",
-  "plansubscription-1": "Alójalo por tu cuenta gratuitamente",
-  "visit-github": "Visitar GitHub",
-  "user-already-exist-name": "¡Un usuario con este nombre de usuario ya existe!",
-  "do-not-access-contact-admin": "No tienes acceso, por favor, contacta a un administrador.",
-  "filed-required-correctly": "Por favor, rellena correctamente los detalles requeridos.",
-  "admin-created": "Administrador creado",
-  "invalid-masterkey": "Llave maestra inválida",
-  "opensign-Setup": "Instalación de OpenSign",
-  "master-key": " Llave maestra",
-  "profile-update-alert": "Perfil actualizado exitosamente.",
-  "date": "Fecha",
-  "report-not-found": "Reporte no encontrado",
-  "please-wait": "por favor, espera",
-  "select-foler": "Seleccionar carpeta",
-  "generated-on": "Generado el",
-  "text-field": "Campo de texto",
-  "font-size": "Tamaño de la fuente",
-  "widget-status": {
-    "Required": "Requerido",
-    "Optional": "Opcional"
-  },
-  "all-right": "Todos los derechos reservados",
-  "version": "versión",
-  "social-media": {
-    "github": "GitHub",
-    "linked-in": "LinkedIn",
-    "twitter": "Twitter",
-    "discord": "Discord"
-  },
-  "tour-mssg": {
-    "home-layout-1": "¡Has iniciado sesión exitosamente! Echemos un vistazo.",
-    "home-layout-2": "Para subir documentos para firmar tú mismo o para solicitar la firma de otros, simplemente selecciona los botones correspondientes.",
-    "home-layout-3": "¡Ya puedes empezar a utilizar OpenSign! Si necesitas soporte siéntete libre de contactarnos.",
-    "generate-token": "Mejora ahora para generar un token API de producción.",
-    "opensign-drive-1": "Haz clic en los enlaces para navegar fácilmente por la estructura jerárquica de carpetas y ver los documentos de cada carpeta.",
-    "opensign-drive-2": "Haz clic en el botón «Agregar» para crear una nueva carpeta o documento.",
-    "opensign-drive-3": "Ordena tus documentos por «Fecha» o «Nombre» usando este menú.",
-    "opensign-drive-4": "Haz clic en este menú para mostrar los documentos en vista de lista.",
-    "opensign-drive-5": "La lista de documentos es mostrada de acuerdo a la opción de ordenamiento seleccionada. Los íconos situados junto a cada documento indican su estado actual.",
-    "opensign-drive-6": "Haz clic con el botón derecho en un documento para ver opciones como «Descargar», «Renombrar», «Mover» y «Eliminar». Haz clic en el documento para abrirlo.",
-    "opensign-drive-7": "Haz clic con el botón derecho en cualquier carpeta para ver las opciones. Elige «Renombrar» para cambiar el nombre de la carpeta o haz clic en ella para navegar por su contenido.",
-    "pdf-request-file-1": "Lista de firmantes que todavía tienen que firmar este documento.",
-    "pdf-request-file-2": "Haz clic en cualquiera de los marcadores de posición que aparecen en el documento para firmar. A continuación, verás opciones para dibujar tu firma, escribirla o subir una imagen .",
-    "pdf-request-file-3": "Haz clic en los botones «Atrás», «Rechazar» o «Finalizar» para navegar por el documento. Utiliza el menú de tres puntos para ver otras opciones, como el botón «Descargar».",
-    "pdf-request-file-4": "Lista de firmantes que ya han firmado el documento.",
-    "pdf-request-file-5": "Puedes hacer clic en «Firmar todo automáticamente» para firmar de manera automática en todos los lugares que deban ser firmados por ti. Asegúrate de revisar correctamente el documento antes de hacer clic en ese botón.",
-    "placeholder-sign-1": "Selecciona un destinatario de esta lista para agregar un marcador de posición dónde este destinatario tendrá que firmar. El marcador de posición aparecerá con el mismo color que el nombre del destinatario una vez lo sueltes en el documento.",
-    "placeholder-sign-2": "Hacer clic en el botón «Agregar destinatarios» te permitirá añadir más firmantes.",
-    "placeholder-sign-3": "Haz clic en este botón para agregar más destinatarios/firmantes al documento.",
-    "placeholder-sign-4": "Arrastra o haz clic en un capo para agregarlo al documento.",
-    "placeholder-sign-5": "El área de contenido del PDF ya muestra los marcadores de posición existentes en la plantilla. Para tu comodidad, estos marcadores de posición coincidirán con el color del nombre del destinatario, haciéndolos fácilmente identificables.",
-    "placeholder-sign-6": "Hacer clic en «Enviar» guardará el documento. En el siguiente paso podrás personalizar los correos que serán enviados a los destinatarios o copiar los enlaces para firmar y compartirlos con los destinatarios por tu cuenta.",
-    "report-1": "Haz clic en el botón «Agregar» para crear una nueva plantilla. Las plantillas son documentos reusables diseñados para generar rápidamente nuevos documentos con la misma estructura pero diferentes firmantes. Por ejemplo, una plantilla de RR.HH. para el proceso de incorporación podría tener roles predefinidos como «Director de RR.HH.» y «Nuevo empleado». Cada vez que utilices la plantilla, puedes asignar el rol de «Nuevo empleado» a los distintos miembros del personal que se incorporen, mientras que el rol de « Director de RR.HH.» permanece constante, lo que facilita un proceso de incorporación fluido para cada persona contratada.",
-    "redirect": "Haz clic en el botón «Usar» para crear un nuevo documento desde una plantilla existente.",
-    "bulksend": "Para crear y enviar rápidamente múltiples documentos usando una plantilla existente, haz clic en el botón «Envío rápido».",
-    "option": "Este menú revela más opciones como «Editar» y «Eliminar». Usa el botón «Editar» para agregar roles, modificar campos y actualizar tu plantilla. Los cambios aplicarán para todos los documentos futuros que sean creados usando esta plantilla pero no afectarán a los documentos ya existentes. Con el botón «Eliminar» puedes eliminar la plantilla.",
-    "signyour-self-1": "Para personalizar el documento antes de que sea firmado, selecciona y arrastra al documento los widgets que prefieras. Escoge el espacio perfecto para cada modificación para adaptar el documento a tus necesidades.",
-    "signyour-self-2": "Arrastra y suelta en cualquier lugar de esta área. Después podrás cambiar el tamaño y moverlo.",
-    "template-placeholder-1": "Hacer clic en el botón «Agregar rol» te permitirá agregar varios roles de firmantes. Puedes asociar usuarios a cada rol en los siguientes pasos.",
-    "template-placeholder-2": "Una vez que los roles hayan sido agregados, selecciona un rol de la lista para agregar un marcador de posición donde éste tendrá que firmar. El marcador de posición aparecerá con el mismo color que el nombre del rol una vez lo sueltes en el documento.",
-    "template-placeholder-3": "Arrastra o haz clic en un capo para agregarlo al documento.",
-    "template-placeholder-4": "Arrastra el marcador de posición para un rol a cualquier lugar del documento. Recuerda, aparecerá con el mismo color que el nombre del rol para poder referenciarlo fácilmente.",
-    "template-placeholder-5": "Hacer clic en «Siguiente» guardará la plantilla actual. Luego de guardar, se te consultará si deseas crear un nuevo documento usando esta plantilla.",
-    "webhook-1": "Mejora ahora para configurar un webhook",
-    "Need your Signature": "Hacer clic en esta tarjeta te llevará a la lista de documentos que esperan por tu revisión.",
-    "Out for signatures": "Hacer clic en esta tarjeta te llevará a la lista de documentos que esperan tu firma.",
-    "Recent signature requests": "Esta es una lista de documentos que esperan por tu firma.",
-    "Recently sent for signatures": "Esta es una lista de documentos que has enviado a otras partes para que sea firmado.",
-    "Drafts": "Estos son documentos que has empezado pero que todavía no finalizas para su envío.",
-    "public-template": "Este video muestra cómo puedes configurar tu perfil público personalizado, como «https://opensign.me/tu-nombre-de-usuario». También aprenderás cómo personalizar tu eslogan y cómo hacer tus plantillas disponibles para su firmado público."
-  },
-  "enter-email-plaholder": "Agrega una dirección de correo y presiona «Enter»",
-  "success-email-alert": "¡Correo enviado exitosamente!",
-  "expired-doc-title": "Documento expirado",
-  "expired-on-mssg": "Este documento expiro el {{expiredDate}} y ya no está disponible para ser firmado.",
-  "signature-validate-alert": "Por favor, confirma que has seleccionado al menos {{minRequiredCount}} casillas.",
-  "signature-validate-alert-2": "Asegúrate de que este campo esté correctamente rellenado y que cumpla con todos los requisitos.",
-  "remaing-users": "Usuarios restantes",
-  "Role": "Rol",
-  "additional-users": "Por favor, compra el complemento Usuarios.",
-  "Quantity-of-users": "Cantidad de usuarios",
-  "Price": "Precio",
-  "Total-price-for-next-time": "Precio total para la próxima vez",
-  "Proceed": "Proceder",
-  "Select": "Seleccionar",
-  "Add-seats": "Agregar plazas",
-  "user-name-exist": "el nombre de usuario ya existe",
-  "format": "formato",
-  "select-date-format": "Selecciona un formato de fecha",
-  "quantity-of-credits": "Cantidad de créditos premium",
-  "remaining-credits": "Créditos premium disponibles:",
-  "remaining-credits-help": "Usa créditos premium para la API para la firma de documentos, envío en masa, o para incorporar la integración de OpenSign en tu página web. Te quedan {{allowedcredits}} créditos incluidos y {{addoncredits}} créditos comprados adicionalmente.",
-  "additional-credits": "Por favor, compra créditos premium",
-  "quota-err-quicksend": "Cuota alcanzada, no tienes créditos suficientes.",
-  "buy-credits": "Comprar créditos premium",
-  "rotate-right": "Rotar a la derecha",
-  "rotate-left": "Rotar a la izquierda",
-  "rotate-alert-mssg": "Todos los widgets de esta página se perderán. ¿En definitiva quieres proceder?",
-  "templateid": "ID de plantilla",
-  "bulk-send-subcription-alert": "Por favor, mejora al plan a Professional o Team para usar envío en masa.",
-  "generate-test-token": "Generar token de prueba",
-  "regenerate-test-token": "Regenerar token de prueba",
-  "help-test-token": "Este token puede ser usado para probar las API en el punto de acceso «https://sandbox.opensignlabs.com/api/v1», permitiéndote realizar firmas de documentos ilimitadas. Por favor, ten en cuenta que el API de pruebas firmará tus documentos con certificados autofirmados, que podrían no ser reconocidos por Adobe como válidos. Una vez hayas completado tus pruebas, puedes mejorar a uno de nuestros planes de pago para generar un token de producción.",
-  "help-api-token": "Este token puede ser usado para acceder a las API de producción en el punto de acceso «{{origin}}/api/v1». Solo puede ser generado con uno de nuestros planes de pago.",
-  "reason": "Razón",
-  "decline-by": "Rechazado/revocado por",
-  "document-declined": "Documento rechazado",
-  "public-template-mssg-1": "Para integrar OpenSign a tu proyecto React o Next.js, simplemente ejecuta los siguientes comandos:",
-  "public-template-mssg-2": "Asegúrate de tener «npm» o «yarn» configurado en tu proyecto. Si estás usando «yarn», puedes reemplazar «npm install» con «yarn add @opensign/react».",
-  "public-template-mssg-3": "¿Necesitas más detalles o ejemplos?",
-  "public-template-mssg-4": "Visita la",
-  "public-template-mssg-5": " «npm» para las últimas actualizaciones, documentación detallada e historial de versiones.",
-  "public-template-mssg-6": "Antes de que puedas usar este fragmento de código, debes convertir esta plantilla en pública.",
-  "copy-code": "COPIAR",
-  "copied-code": "COPIADO",
-  "Installation": "Instalación",
-  "Usage": "Uso",
-  "insufficient-credits": "Créditos de firma insuficientes",
-  "insufficient-credits-mssg": "El propietario de este documento actualmente carece de los créditos OpenSign necesarios para que puedas firmarlo. Por favor, contacta al propietario si necesitas más detalles.",
-  "angular-npm-mssg-1": "Para integrar OpenSign a tu proyecto Angular, simplemente ejecuta los siguientes comandos:",
-  "quota-mail-info-head": "Límite mensual de solicitudes de firma por correo",
-  "quota-mail-info": "Puedes enviar hasta 15 solicitudes de firma por correo cada mes. Mejora ahora para enviar solicitudes de firma sin límite.",
-  "quota-mail": "Has alcanzado tu límite de 15 solicitudes de firma por correo para este mes. Mejora ahora para continuar enviando correos.",
-  "quota-mail-tip": "Consejo: Todavía puedes solciitar la firma de <1>documentos ilimitados</1> compartiendo manualmente los enlaces de solicitud de firma.",
-  "quota-mail-head": "Cuota alcanzada",
-  "unauthorized-modal": "No tienes permisos para realizar esta acción, por favor, contacta a {{adminEmail}}.",
-  "sent-this-month": "Enviados este mes",
-  "available-seats": "Plazas disponibles",
-  "buy-users": "Comprar más usuarios",
-  "isenable-otp": "Habilitar verificación con OTP",
-  "isenable-otp-help": {
-    "p1": "¿Te gustaría habilitar el proceso de verificación usando una contraseña de un solo uso (OTP)?",
-    "p2": "Seleccionar esta opción habilitará la verificación con OTP. Los usuarios recibirán un código de verificación por correo, la cual tendrán que ingresar para poder firmar el documento.",
-    "p3": "Seleccionar esta opción deshabilitará la verificación con OTP, lo cual permitirá a los usuarios firmar el documento directamente sin pasos adicionales.",
-    "p4": "Por favor, selecciona la opción que mejor se adapte a tus requisitos para la firma de documentos."
-  },
-  "advanced-options": "Opciones avanzadas",
-  "hide-advanced-options": "Ocultar las opciones avanzadas",
-  "download-files": "Descargar archivos",
-  "download-pdf": "Descargar PDF",
-  "pdf-certificate": "Descargar PDF + Certificado",
-  "document-logs": "Registros de documentos",
-  "server-down": "No se pudo conectar al servidor de OpenSign. Si estás alojando OpenSign por tu cuenta, por favor, asegúrate de que todos los pasos de la documentación han sido seguidos correctamente. Si estás ejecutando OpenSign localmente, puedes estar accediendo a OpenSign por un número de puerto incorrecto.",
-  "admin-exists": "El administrador ya existe. Por favor, inicia sesión en la aplicación usando las credenciales de administrador para poder administrar los usuarios.",
-  "public-tour-message": "Por favor, convierte la plantilla en pública para copiar la URL pública",
-  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos.",
-  "pdf-uncompatible": "Este pdf no es compatible con opensign, comuníquese con <support@opensignlabs.com>",
-  "enable-tour": "Habilitar recorrido",
-  "istourenabled-help": {
-    "p1": "Esto permitirá realizar una visita guiada para los firmantes, brindando instrucciones durante el proceso de firma.",
-    "p2": "Esto desactivará la visita guiada, lo que garantizará una experiencia de firma más rápida e ininterrumpida.",
-    "p3": "Consejo: si sus firmantes están familiarizados con OpenSign y lo utilizan con frecuencia, es posible que desee desactivar la visita guiada para disfrutar de una experiencia más fluida. Elija la opción que mejor se adapte a sus necesidades de firma de documentos"
-  },
-  "form-title-1": "Configuración del flujo de documentos",
-  "form-title-2": "Configuración de seguridad",
-  "text-field-tour": "Los campos de tipo 'Texto' deben completarse con anticipación antes de enviar el documento. Si necesita que los firmantes proporcionen información, utilice el campo 'Entrada de texto'",
-  "attach-signer-tour": "Debe adjuntar un firmante a cada función. Puede hacerlo haciendo clic en este icono. Una vez que seleccione un Firmante, se adjuntará a todos los campos asociados con ese rol que aparecen en el mismo color.",
-  "allowed-signature-types": "Tipos de firma permitidos",
-  "at-least-one-signature-type": "Se debe habilitar al menos un tipo de firma.",
-  "expect-default-one-signature-type": "Habilite un tipo de firma adicional aparte del predeterminado.",
-  "add-signer-note": "Nota - Este contacto se agregará a su lista de contactos",
-  "allowed-signature-types-help": {
-    "p1": "Esta preferencia de firma controla qué opciones de firma están disponibles para sus firmantes. Solo los tipos de firma que seleccione aparecerán en el widget de firma cuando se firme un documento. Por ejemplo, si elige sólo la opción 'Draw' en las preferencias, su firmante verá sólo la opción 'Draw' en el widget de firma, mientras que las otras tres opciones no estarán disponibles.",
-    "l1": "Cree una firma manuscrita directamente en la pantalla usando su dedo o un lápiz.",
-    "l2": "Ingrese su nombre y elija entre varios estilos de fuente para crear una firma.",
-    "l3": "Cargue una versión digital existente de su firma.",
-    "l4": "Utilice un estilo de firma preestablecido guardado en 'Mi firma' en su configuración."
-  }
-}

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

@@ -42,7 +42,7 @@
   "upgrade-to": "Mettre à niveau vers",
   "pro": "PRO",
   "plan": "Offre",
-  "subscribe-card-teamplan": "Libérez toute la puissance de la collaboration ! Créez un nombre illimité d'organisations, d'équipes et de hiérarchies. Partagez des modèles de manière transparente entre les équipes et attribuez des rôles d'utilisateur personnalisés. Améliorez votre flux de travail dès aujourd'hui !",
+  "subscribe-card-teamplan":"Libérez toute la puissance de la collaboration ! Créez un nombre illimité d'organisations, d'équipes et de hiérarchies. Partagez des modèles de manière transparente entre les équipes et attribuez des rôles d'utilisateur personnalisés. Améliorez votre flux de travail dès aujourd'hui !",
   "subscribe-card-plan": "Débloquez des fonctionnalités premium à partir de seulement {{premiumPrice}}/mois. Bénéficiez de performances améliorées et de seulement {{addonPrice}} par crédit supplémentaire après vos crédits premium inclus.",
   "user-name-limit-char": "Pour avoir un nom d'utilisateur de moins de 8 caractères s'il vous plaît s'abonner",
   "tour-content": "Ne plus afficher",
@@ -94,7 +94,6 @@
       "My Signature": "Ma signature",
       "API Token": "Jeton API",
       "Webhook": "Webhook",
-      "Preferences": "Préférences",
       "Teams": "Équipe",
       "Team-update-successfully": "Équipe mise à jour avec succès.",
       "Users": "Utilisateurs"
@@ -153,8 +152,7 @@
     "View": "Voir",
     "option": "Option",
     "Embed": "Intégrer",
-    "Copy TemplateId": "Copier l'ID du modèle",
+    "Copy TemplateId": "Copier l'ID du modèle"
-    "Copy Public URL": "Copier l'URL publique"
   },
   "report-help": {
     "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -265,10 +263,10 @@
   "make-template-public-alert": "Êtes-vous sûr de vouloir rendre ce modèle public ?",
   "make-template-private-alert": "Êtes-vous sûr de vouloir rendre ce modèle privé ? Cela le supprimera de votre profil public.",
   "public-role": "Rôle public",
-  "public-url": "Profil public requis",
+  "public-url": "URL publique",
   "public-url-copy": "Voici votre URL publique : ",
   "public-url-copy-mssg": "copiez-la ou partagez-le avec le signataire et vous pouvoir voir tous vos paramètres publics modèles.",
-  "add-public-url-alert": "Veuillez terminer la configuration de votre profil public OpenSign. Une fois cela fait, vous pourrez rendre les modèles publics. Ce processus ne doit être effectué qu’une seule fois.",
+  "add-public-url-alert": "Veuillez ajouter votre URL publique et vous pourra rendre public modèle.",
   "share-with-alert": "Vous ne pouvez pas partager un modèle si des contacts sont déjà attribués à des rôles. Veuillez supprimer toutes les attributions de contacts des rôles avant de partager le modèle.",
   "share-with": "Partager avec",
   "team-not-found": "Équipe introuvable",
@@ -291,7 +289,7 @@
   "subject": "Sujet",
   "body": "Corps",
   "add-contact": "Ajouter le contact",
-  "add-signer-alert": "Le contact existe déjà ! Veuillez le sélectionner dans la liste déroulante 'Signataires'",
+  "add-signer-alert": "Le contact existe déjà !",
   "record-delete-alert": "Enregistrement supprimé avec succès !",
   "record-revoke-alert": " Enregistrement révoqué avec succès ! ",
   "mail-sent-alert": "Courriel envoyé avec succès.",
@@ -445,8 +443,7 @@
   "cutomize-email": "Personnaliser l'e-mail",
   "upgrade-to-customize-email": "Mise à niveau pour personnaliser l'e-mail",
   "sign-url": "Signer l'URL",
-  "mails-sent": "Mails envoyés avec succès !",
+  "Mails Sent": "Mails envoyés avec succès !",
-  "mail-not-delivered": "Courrier non distribué",
   "document-alert": "Alerte document",
   "owner-subscription-expired": "L'abonnement du propriétaire a expiré.",
   "subscription-expired": "Abonnement expiré",
@@ -618,46 +615,46 @@
   "Add-seats": "Ajouter des sièges",
   "format": "format",
   "select-date-format": "Sélectionnez un format de date",
-  "quantity-of-credits": "Quantité de crédits de prime",
+  "quantity-of-credits":"Quantité de crédits de prime",
-  "remaining-credits": "Crédits premium disponibles :",
+  "remaining-credits":"Crédits premium disponibles :",
-  "additional-credits": "Veuillez acheter des crédits premium",
+  "additional-credits":"Veuillez acheter des crédits premium",
-  "remaining-credits-help": "Utilisez des crédits premium pour la signature de documents API, l'envoi groupé ou l'intégration d'OpenSign sur votre site Web. Il vous reste {{allowedcredits}} crédits inclus et {{addoncredits}} crédits achetés supplémentaires.",
+  "remaining-credits-help":"Utilisez des crédits premium pour la signature de documents API, l'envoi groupé ou l'intégration d'OpenSign sur votre site Web. Il vous reste {{allowedcredits}} crédits inclus et {{addoncredits}} crédits achetés supplémentaires.",
   "quota-err-quicksend": "Quota atteint, vous n'avez pas assez de crédits.",
   "buy-credits": "Acheter des crédits premium",
-  "rotate-right": "Faire pivoter à droite",
+  "rotate-right"  :"Faire pivoter à droite",
-  "rotate-left": "Faire pivoter à gauche",
+  "rotate-left" :"Faire pivoter à gauche",
-  "rotate-alert-mssg": "Tous les widgets de cette page seront perdus. Êtes-vous sûr de vouloir continuer ?",
+  "rotate-alert-mssg" :"Tous les widgets de cette page seront perdus. Êtes-vous sûr de vouloir continuer ?",
-  "templateid": "ID de modèle",
+  "templateid":"ID de modèle",
-  "bulk-send-subcription-alert": "Veuillez passer au forfait Professionnel ou Équipe pour utiliser Quicksend.",
+  "bulk-send-subcription-alert":"Veuillez passer au forfait Professionnel ou Équipe pour utiliser Quicksend.",
   "generate-test-token": "Générer jeton de test",
-  "regenerate-test-token": "Régénérer le jeton de test",
+  "regenerate-test-token":"Régénérer le jeton de test",
-  "help-test-token": "Ce jeton peut être utilisé pour tester les API au niveau du point de terminaison https://sandbox.opensignlabs.com/api/v1, vous permettant ainsi d'effectuer un nombre illimité de signatures de documents. Veuillez noter que l'API sandbox signera vos documents avec des certificats auto-signés, qui peuvent ne pas être reconnus comme valides par Adobe. Une fois vos tests terminés, vous pouvez passer à l’un de nos forfaits payants pour générer un jeton de production.",
+  "help-test-token":"Ce jeton peut être utilisé pour tester les API au niveau du point de terminaison https://sandbox.opensignlabs.com/api/v1, vous permettant ainsi d'effectuer un nombre illimité de signatures de documents. Veuillez noter que l'API sandbox signera vos documents avec des certificats auto-signés, qui peuvent ne pas être reconnus comme valides par Adobe. Une fois vos tests terminés, vous pouvez passer à l’un de nos forfaits payants pour générer un jeton de production.",
-  "help-api-token": "Ce jeton peut être utilisé pour accéder aux API de production au point de terminaison {{origin}}/api/v1. Il ne peut être généré que sur l'un de nos forfaits payants.",
+  "help-api-token":"Ce jeton peut être utilisé pour accéder aux API de production au point de terminaison {{origin}}/api/v1. Il ne peut être généré que sur l'un de nos forfaits payants.",
-  "reason": "Raison",
+  "reason" :"Raison",
-  "decline-by": "Refusé/révoqué par",
+  "decline-by" :"Refusé/révoqué par",
-  "document-declined": "document refusé",
+  "document-declined":"document refusé",
-  "public-template-mssg-1": "Pour intégrer OpenSign dans votre projet React ou Next.js, exécutez simplement la commande suivante :",
+  "public-template-mssg-1" :"Pour intégrer OpenSign dans votre projet React ou Next.js, exécutez simplement la commande suivante :",
-  "public-template-mssg-2": "Assurez-vous que npm ou Yarn est configuré dans votre projet. Si vous utilisez Yarn, vous pouvez remplacer npm install par Yarn Add @opensign/react.",
+  "public-template-mssg-2" :"Assurez-vous que npm ou Yarn est configuré dans votre projet. Si vous utilisez Yarn, vous pouvez remplacer npm install par Yarn Add @opensign/react.",
-  "public-template-mssg-3": "Besoin de plus de détails ou d'exemples ?",
+  "public-template-mssg-3" :"Besoin de plus de détails ou d'exemples ?",
   "public-template-mssg-4": "Visitez le",
-  "public-template-mssg-5": "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
+  "public-template-mssg-5":  "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
-  "public-template-mssg-6": "Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
+  "public-template-mssg-6":"Vous devez définir ce modèle comme public avant de pouvoir utiliser cet extrait de code.",
-  "copy-code": "COPIE",
+  "copy-code":"COPIE",
-  "copied-code": "COPIÉ",
+  "copied-code":"COPIÉ",
-  "Installation": "Installation",
+  "Installation":"Installation",
-  "Usage": "Usage",
+  "Usage" :"Usage",
-  "insufficient-credits": "Crédits de signature insuffisants",
+  "insufficient-credits":"Crédits de signature insuffisants",
-  "insufficient-credits-mssg": "Le propriétaire de ce document ne dispose actuellement pas des crédits OpenSign nécessaires pour que vous puissiez le signer. Veuillez contacter le propriétaire si vous avez besoin de plus de détails.",
+   "insufficient-credits-mssg" :"Le propriétaire de ce document ne dispose actuellement pas des crédits OpenSign nécessaires pour que vous puissiez le signer. Veuillez contacter le propriétaire si vous avez besoin de plus de détails.",
-  "angular-npm-mssg-1": "Pour intégrer OpenSign dans votre projet Angular, exécutez simplement la commande suivante :",
+   "angular-npm-mssg-1" :"Pour intégrer OpenSign dans votre projet Angular, exécutez simplement la commande suivante :",
-  "quota-mail-info-head": "Limite mensuelle d'e-mails de signatures de demandes",
+  "quota-mail-info-head":"Limite mensuelle d'e-mails de signatures de demandes",
   "quota-mail-info": "Vous pouvez envoyer jusqu'à 15 e-mails de demande de signature chaque mois. Mettez à niveau maintenant pour envoyer directement des demandes de signature illimitées.",
   "quota-mail": "Vous avez atteint votre limite de 15 e-mails de demande de signature pour ce mois. Mettez à niveau maintenant pour continuer à envoyer des e-mails directement.",
-  "quota-mail-tip-tip": "Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement les liens de demande de signature.",
+  "quota-mail-tip-tip":"Astuce : Vous pouvez toujours signer un nombre <1>illimité de documents</1> en partageant manuellement les liens de demande de signature.",
-  "quota-mail-head": "Quota atteint",
+  "quota-mail-head":"Quota atteint",
-  "unauthorized-modal": "Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.",
+  "unauthorized-modal":"Vous n'êtes pas autorisé à effectuer cette action, veuillez contacter {{adminEmail}}.",
-  "sent-this-month": "envoyé ce mois-ci",
+  "sent-this-month":"envoyé ce mois-ci",
-  "available-seats": "Disponible sièges",
+  "available-seats":"Disponible sièges",
-  "buy-users": "Acheter plus d'utilisateurs",
+  "buy-users":"Acheter plus d'utilisateurs",
   "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)?",
@@ -665,36 +662,11 @@
     "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.",
     "p4": "Veuillez choisir l'option qui correspond le mieux à vos exigences en matière de signature de documents."
   },
-  "advanced-options": "Options avancées",
+  "advanced-options":"Options avancées",
   "hide-advanced-options": "Masquer les options avancées",
-  "download-files": "Télécharger des fichiers",
+   "download-files" :"Télécharger des fichiers",
-  "download-pdf": "Télécharger le PDF",
+   "download-pdf" :"Télécharger le PDF",
-  "pdf-certificate": "Télécharger Pdf + Certificat",
+  "pdf-certificate"  :"Télécharger Pdf + Certificat",
-  "document-logs": "Journaux de documents",
+  "document-logs":"Journaux de documents"
-  "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.",
+
-  "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.",
-  "enable-tour": "Activer la visite",
-  "istourenabled-otp-help": {
-    "p1": "Cela permettra une visite guidée pour les signataires, fournissant des instructions pendant le processus de signature.",
-    "p2": "Cela désactivera la visite guidée, garantissant ainsi une expérience de signature plus rapide et ininterrompue.",
-    "p3": "Conseil : si vos signataires connaissent OpenSign et l'utilisent fréquemment, vous souhaiterez peut-être désactiver la visite guidée pour une expérience plus fluide. Choisissez l'option qui correspond le mieux à vos besoins en matière de signature de documents."
-  },
-  "form-title-1": "Paramètre du flux de documents",
-  "form-title-2": "Paramètre de sécurité",
-  "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.",
-  "add-user-template": "Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. ",
-  "pdf-uncompatible": "Ce pdf n'est pas compatible avec opensign, veuillez contacter <support@opensignlabs.com>",
-  "text-field-tour": "Les champs de type 'Texte' doivent être remplis à l'avance avant l'envoi du document. Si vous avez besoin que les signataires fournissent des informations, utilisez plutôt le champ 'Saisie de texte'.",
-  "attach-signer-tour": "Vous devez associer un signataire à chaque rôle. Vous pouvez le faire en cliquant sur cette icône. Une fois que vous avez sélectionné un signataire, il sera attaché à tous les champs associés à ce rôle qui apparaissent dans la même couleur.",
-  "allowed-signature-types": "Types de signature autorisés",
-  "at-least-one-signature-type": "Au moins un type de signature doit être activé.",
-  "expect-default-one-signature-type": "Veuillez activer un type de signature supplémentaire en plus de celui par défaut.",
-  "add-signer-note": "Remarque - Ce contact sera ajouté à votre liste de contacts",
-  "allowed-signature-types-help": {
-    "p1": "Cette préférence de signature contrôle les options de signature disponibles pour vos signataires. Seuls les types de signature que vous sélectionnez apparaîtront dans le widget de signature lorsqu'un document est signé. Par exemple, si vous choisissez uniquement l'option 'Draw' dans les préférences, votre signataire ne verra que l'option 'Draw' dans le widget de signature, tandis que les trois autres options ne seront pas disponibles.",
-    "l1": "Créez une signature manuscrite directement sur l'écran à l'aide de votre doigt ou d'un stylet.",
-    "l2": "Entrez votre nom et choisissez parmi différents styles de police pour créer une signature.",
-    "l3": "Téléchargez une version numérique existante de votre signature.",
-    "l4": "Utilisez un style de signature prédéfini enregistré sous 'Ma signature' ​​dans vos paramètres."
-  }
 }

apps/OpenSign/src/styles/managesign.css

@@ -4,6 +4,7 @@
   border: 1px solid black;
   background: white;
   border-radius: 5px;
+  animation: inAnimation 2s ease-in-out;
   z-index: 1;
 }
 

apps/OpenSignServer/Utils.js

@@ -127,15 +127,9 @@ export const updateMailCount = async (extUserId, plan, monthchange) => {
 };
 
 export function formatWidgetOptions(type, options) {
-  const colorsArr = ['red', 'black', 'blue', 'yellow'];
-  const fontSizes = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
   const status = options?.required === true ? 'required' : 'optional' || 'required';
   const defaultValue = options?.default || '';
   const values = options?.values || [];
-  const color = options?.color ? options.color : 'black';
-  const fontColor = colorsArr.includes(color) ? color : 'black';
-  const size = options?.fontsize ? parseInt(options.fontsize) : 12;
-  const fontSize = fontSizes.includes(size) ? size : 12;
   switch (type) {
     case 'signature':
       return { name: 'signature', status: 'required' };
@@ -146,34 +140,13 @@ export function formatWidgetOptions(type, options) {
     case 'image':
       return { status: status, name: options.name || 'image' };
     case 'email':
-      return {
+      return { status: status, name: options.name || 'email', validation: { type: 'email' } };
-        status: status,
-        name: options.name || 'email',
-        validation: { type: 'email' },
-        fontColor: fontColor,
-        fontSize: fontSize,
-      };
     case 'name':
-      return {
+      return { status: status, name: options.name || 'name' };
-        status: status,
-        name: options.name || 'name',
-        fontColor: fontColor,
-        fontSize: fontSize,
-      };
     case 'job title':
-      return {
+      return { status: status, name: options.name || 'job title' };
-        status: status,
-        name: options.name || 'job title',
-        fontColor: fontColor,
-        fontSize: fontSize,
-      };
     case 'company':
-      return {
+      return { status: status, name: options.name || 'company' };
-        status: status,
-        name: options.name || 'company',
-        fontColor: fontColor,
-        fontSize: fontSize,
-      };
     case 'date': {
       let today = new Date();
       let dd = String(today.getDate()).padStart(2, '0');
@@ -187,8 +160,6 @@ export function formatWidgetOptions(type, options) {
         name: options.name || 'date',
         response: defaultValue || today,
         validation: { format: dateFormat || 'dd-MM-yyyy', type: 'date-format' },
-        fontColor: fontColor,
-        fontSize: fontSize,
       };
     }
     case 'textbox':
@@ -198,8 +169,6 @@ export function formatWidgetOptions(type, options) {
         defaultValue: defaultValue,
         hint: options.hint,
         validation: { type: 'regex', pattern: options?.regularexpression || '/^[a-zA-Z0-9s]+$/' },
-        fontColor: fontColor,
-        fontSize: fontSize,
       };
     case 'checkbox': {
       const arr = options?.values;
@@ -219,8 +188,6 @@ export function formatWidgetOptions(type, options) {
           maxRequiredCount: options?.validation?.maxselections || 0,
         },
         defaultValue: selectedvalues || [],
-        fontColor: fontColor,
-        fontSize: fontSize,
       };
     }
     case 'radio button': {
@@ -231,8 +198,6 @@ export function formatWidgetOptions(type, options) {
         isReadOnly: options?.readonly || false,
         isHideLabel: options?.hidelabel || false,
         defaultValue: defaultValue,
-        fontColor: fontColor,
-        fontSize: fontSize,
       };
     }
     case 'dropdown':
@@ -241,8 +206,6 @@ export function formatWidgetOptions(type, options) {
         name: options.name || 'dropdown',
         values: values,
         defaultValue: defaultValue,
-        fontColor: fontColor,
-        fontSize: fontSize,
       };
     default:
       break;
@@ -271,7 +234,3 @@ export const planCredits = {
   'teams-monthly': 100,
   'teams-yearly': 500,
 };
-
-export function parseJwt(token) {
-  return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString());
-}

apps/OpenSignServer/cloud/customRoute/autoReminder.js

@@ -53,7 +53,7 @@ async function sendMail(doc, signer) {
     receiver_phone: signer?.Phone || '',
     expiry_date: localExpireDate,
     company_name: doc?.ExtUserPtr?.Company || '',
-    signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
+    signing_url: `<a href=${signPdf}>Sign here</a>`,
   };
   const mail = replaceMailVaribles(subject, body, variables);
 
@@ -88,7 +88,7 @@ export default async function autoReminder(request, response) {
     docQuery.exists('Signers');
     docQuery.exists('SignedUrl');
     docQuery.descending('createdAt');
-    docQuery.include('Signers,AuditTrail.UserPtr,ExtUserPtr,ExtUserPtr.TenantId');
+    docQuery.include('Signers,AuditTrail.UserPtr,ExtUserPtr');
     docQuery.notEqualTo('IsCompleted', true);
     docQuery.notEqualTo('IsDeclined', true);
     docQuery.notEqualTo('IsArchive', true);

apps/OpenSignServer/cloud/customRoute/v1/apiV1.js

@@ -9,6 +9,8 @@ import getDocument from './routes/getDocument.js';
 import getContact from './routes/getContact.js';
 import deleteContact from './routes/deleteContact.js';
 import getContactList from './routes/getContactList.js';
+import draftDocument from './routes/draftDocument.js';
+import createTemplate from './routes/createTemplate.js';
 import getTemplate from './routes/getTemplate.js';
 import deletedTemplate from './routes/deleteTemplate.js';
 import getTemplatetList from './routes/getTemplateList.js';
@@ -29,7 +31,6 @@ import createFolder from './routes/createFolder.js';
 import updateFolder from './routes/updateFolder.js';
 import getFolderList from './routes/getFolderList.js';
 import deleteFolder from './routes/deleteFolder.js';
-import draftTemplate from './routes/draftTemplate.js';
 dotenv.config();
 const storage = multer.memoryStorage();
 const upload = multer({ storage: storage });
@@ -59,6 +60,9 @@ app.post('/createdocumentwithbinary', upload.array('file', 1), createDocumentwit
 // create Document with co-ordinate
 app.post('/createdocument', createDocumentwithCoordinate);
 
+// create Document with base64 without placeholder
+app.post('/draftdocument', draftDocument);
+
 // create Document with templateId
 app.post('/createdocument/:template_id', createDocumentWithTemplate);
 
@@ -74,12 +78,12 @@ app.delete('/document/:document_id', deleteDocument);
 // get all types of documents on the basis of doctype
 app.get('/documentlist/:doctype', getDocumentList);
 
-// create draft template with file base64
-app.post('/drafttemplate', draftTemplate);
-
 // create Template with co-ordinate
 app.post('/createtemplate', createTemplatewithCoordinate);
 
+// create Template
+app.post('/drafttemplate', createTemplate);
+
 // create Template with binary
 app.post('/createtemplatewithbinary', upload.array('file', 1), createTemplatewithCoordinate);
 

apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js

@@ -49,7 +49,7 @@ export default async function createDocumentWithTemplate(request, response) {
   const send_email = request.body.send_email;
   const email_subject = request.body.email_subject;
   const email_body = request.body.email_body;
-  const sendInOrder = request.body.sendInOrder || true;
+  const sendInOrder = request.body.sendInOrder || false;
   const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
 
   try {
@@ -91,7 +91,6 @@ export default async function createDocumentWithTemplate(request, response) {
         if (totalcredits > 0) {
           const templateQuery = new Parse.Query('contracts_Template');
           templateQuery.include('ExtUserPtr');
-          templateQuery.include('ExtUserPtr.TenantId');
           const templateRes = await templateQuery.get(templateId, { useMasterKey: true });
           if (templateRes) {
             const template = JSON.parse(JSON.stringify(templateRes));
@@ -197,13 +196,8 @@ export default async function createDocumentWithTemplate(request, response) {
                 if (TimeToCompleteDays) {
                   object.set('TimeToCompleteDays', TimeToCompleteDays);
                 }
-                const enableOTP = request.body?.enableOTP;
+                const enableOTP = request.body?.enableOTP === true ? true : false;
-                const IsEnableOTP =
+                const IsEnableOTP = enableOTP || template?.IsEnableOTP || false;
-                  enableOTP !== undefined ? enableOTP : template?.IsEnableOTP || false;
-                const enableTour = request.body?.enableTour;
-                const isTourEnabled =
-                  enableTour !== undefined ? enableTour : template?.IsTourEnabled || false;
-                object.set('IsTourEnabled', isTourEnabled);
                 object.set('IsEnableOTP', IsEnableOTP);
                 object.set('CreatedBy', template.CreatedBy);
                 object.set('ExtUserPtr', {
@@ -214,9 +208,6 @@ export default async function createDocumentWithTemplate(request, response) {
                 if (folderId) {
                   object.set('Folder', folderPtr);
                 }
-                if (template?.FileAdapterId) {
-                  object.set('FileAdapterId', template?.FileAdapterId);
-                }
                 const newACL = new Parse.ACL();
                 newACL.setPublicReadAccess(false);
                 newACL.setPublicWriteAccess(false);
@@ -277,7 +268,7 @@ export default async function createDocumentWithTemplate(request, response) {
                         orgName +
                         "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
                         localExpireDate +
-                        "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+                        "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
                         signPdf +
                         "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
                         sender +

apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js

@@ -8,7 +8,6 @@ import {
   sanitizeFileName,
   cloudServerUrl,
 } from '../../../../Utils.js';
-import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';
 
 // `sendDoctoWebhook` is used to send res data of document on webhook
 async function sendDoctoWebhook(doc, WebhookUrl, userId) {
@@ -62,10 +61,9 @@ export default async function createDocumentwithCoordinate(request, response) {
   const fileData = request.files?.[0] ? request.files[0].buffer : null;
   const email_subject = request.body.email_subject;
   const email_body = request.body.email_body;
-  const sendInOrder = request.body.sendInOrder || true;
+  const sendInOrder = request.body.sendInOrder || false;
   const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
   const IsEnableOTP = request.body?.enableOTP === true ? true : false;
-  const isTourEnabled = request.body?.enableTour || false;
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
   const baseUrl = new URL(process.env.PUBLIC_URL);
@@ -89,7 +87,6 @@ export default async function createDocumentwithCoordinate(request, response) {
       };
       const extUsers = new Parse.Query('contracts_Users');
       extUsers.equalTo('UserId', userPtr);
-      extUsers.include('TenantId');
       const extUser = await extUsers.first({ useMasterKey: true });
 
       const subscription = new Parse.Query('contracts_Subscriptions');
@@ -117,7 +114,6 @@ export default async function createDocumentwithCoordinate(request, response) {
                 .status(400)
                 .json({ error: 'Please add at least one signature widget for all signers' });
             }
-            const parseExtUser = JSON.parse(JSON.stringify(extUser));
             let fileUrl;
             if (request.files?.[0]) {
               const base64 = fileData?.toString('base64');
@@ -130,29 +126,23 @@ export default async function createDocumentwithCoordinate(request, response) {
               saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
             } else {
               const filename = sanitizeFileName(`${name}.pdf`);
-              let adapter = {};
+              const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-              const ActiveFileAdapter = parseExtUser?.TenantId?.ActiveFileAdapter || '';
+              await file.save({ useMasterKey: true });
-              if (ActiveFileAdapter) {
+              fileUrl = file.url();
-                adapter =
-                  parseExtUser?.TenantId?.FileAdapters?.find(x => (x.id = ActiveFileAdapter)) || {};
-              }
-              if (adapter?.id) {
-                const filedata = Buffer.from(base64File, 'base64');
-                // `uploadFileToS3` is used to save document in user's file storage
-                fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);
-              } else {
-                const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-                await file.save({ useMasterKey: true });
-                fileUrl = file.url();
-              }
               const buffer = Buffer.from(base64File, 'base64');
               saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
             }
+            const contractsUser = new Parse.Query('contracts_Users');
+            contractsUser.equalTo('UserId', userPtr);
+            const extUser = await contractsUser.first({ useMasterKey: true });
+            const parseExtUser = JSON.parse(JSON.stringify(extUser));
+
             const extUserPtr = {
               __type: 'Pointer',
               className: 'contracts_Users',
               objectId: extUser.id,
             };
+
             const object = new Parse.Object('contracts_Document');
             object.set('Name', name);
 
@@ -174,11 +164,7 @@ export default async function createDocumentwithCoordinate(request, response) {
               object.set('TimeToCompleteDays', TimeToCompleteDays);
             }
             object.set('IsEnableOTP', IsEnableOTP);
-            object.set('IsTourEnabled', isTourEnabled);
             object.set('IsSendMail', send_email);
-            if (parseExtUser?.TenantId?.ActiveFileAdapter) {
-              object.set('FileAdapterId', parseExtUser?.TenantId?.ActiveFileAdapter);
-            }
             let contact = [];
             if (signers && signers.length > 0) {
               let parseSigners;
@@ -339,7 +325,7 @@ export default async function createDocumentwithCoordinate(request, response) {
                     orgName +
                     "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
                     localExpireDate +
-                    "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+                    "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
                     signPdf +
                     "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
                     sender +

apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js

@@ -0,0 +1,140 @@
+import { saveFileUsage } from '../../../../Utils.js';
+export default async function createTemplate(request, response) {
+  const name = request.body?.title;
+  const note = request.body?.note;
+  const description = request.body?.description;
+  const signers = request.body?.signers;
+  const folderId = request.body?.folderId;
+  const base64File = request.body.file;
+  const SendinOrder = request.body.sendInOrder || false;
+  const fileData = request.files?.[0] ? request.files[0].buffer : null;
+  const baseUrl = new URL(process.env.PUBLIC_URL);
+  const isEnableOTP = request.body?.enableOTP === true ? true : false;
+
+  try {
+    const reqToken = request.headers['x-api-token'];
+    if (!reqToken) {
+      return response.status(400).json({ error: 'Please Provide API Token' });
+    }
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', reqToken);
+    tokenQuery.include('userId');
+    const token = await tokenQuery.first({ useMasterKey: true });
+    if (token !== undefined) {
+      // Valid Token then proceed request
+      const parseUser = JSON.parse(JSON.stringify(token));
+      const userPtr = {
+        __type: 'Pointer',
+        className: '_User',
+        objectId: parseUser.userId.objectId,
+      };
+      let fileUrl;
+      if (base64File) {
+        const file = new Parse.File(`${name}.pdf`, {
+          base64: base64File,
+        });
+        await file.save({ useMasterKey: true });
+        fileUrl = file.url();
+        const buffer = Buffer.from(base64File, 'base64');
+        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
+      } else {
+        const base64 = fileData?.toString('base64');
+        const file = new Parse.File(request.files?.[0]?.originalname, {
+          base64: base64,
+        });
+        await file.save({ useMasterKey: true });
+        fileUrl = file.url();
+        const buffer = Buffer.from(base64, 'base64');
+        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
+      }
+
+      const contractsUser = new Parse.Query('contracts_Users');
+      contractsUser.equalTo('UserId', userPtr);
+      const extUser = await contractsUser.first({ useMasterKey: true });
+      const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };
+
+      const folderPtr = { __type: 'Pointer', className: 'contracts_Template', objectId: folderId };
+
+      const object = new Parse.Object('contracts_Template');
+      object.set('Name', name);
+      if (note) {
+        object.set('Note', note);
+      }
+      if (description) {
+        object.set('Description', description);
+      }
+      object.set('URL', fileUrl);
+      object.set('CreatedBy', userPtr);
+      object.set('ExtUserPtr', extUserPtr);
+      object.set('IsEnableOTP', isEnableOTP);
+      if (SendinOrder) {
+        object.set('SendinOrder', SendinOrder);
+      }
+      if (signers && signers.length > 0) {
+        let parseSigners;
+        if (base64File) {
+          parseSigners = signers;
+        } else {
+          parseSigners = JSON.parse(signers);
+        }
+        let createContactUrl = protocol + '/v1/createcontact';
+
+        let contact = [];
+        for (const obj of parseSigners) {
+          const body = {
+            name: obj?.name || '',
+            email: obj?.email || '',
+            phone: obj?.phone || '',
+          };
+          try {
+            const res = await axios.post(createContactUrl, body, {
+              headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
+            });
+            // console.log('res ', res.data);
+            contact.push({
+              __type: 'Pointer',
+              className: 'contracts_Contactbook',
+              objectId: res.data?.objectId,
+            });
+          } catch (err) {
+            // console.log('err ', err.response);
+            if (err?.response?.data?.objectId) {
+              contact.push({
+                __type: 'Pointer',
+                className: 'contracts_Contactbook',
+                objectId: err.response.data?.objectId,
+              });
+            }
+          }
+        }
+        object.set('Signers', contact);
+      }
+      if (folderId) {
+        object.set('Folder', folderPtr);
+      }
+      const newACL = new Parse.ACL();
+      newACL.setPublicReadAccess(false);
+      newACL.setPublicWriteAccess(false);
+      newACL.setReadAccess(userPtr.objectId, true);
+      newACL.setWriteAccess(userPtr.objectId, true);
+      object.setACL(newACL);
+      const res = await object.save(null, { useMasterKey: true });
+      if (request.posthog) {
+        request.posthog?.capture({
+          distinctId: parseUser.userId.email,
+          event: 'api_draft_template',
+          properties: { response_code: 200 },
+        });
+      }
+      return response.json({
+        objectId: res.id,
+        url: baseUrl.origin + '/template/' + res.id,
+      });
+    } else {
+      return response.status(405).json({ error: 'Invalid API Token!' });
+    }
+  } catch (err) {
+    console.log('err ', err);
+    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
+  }
+}

apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js

@@ -6,7 +6,6 @@ import {
   formatWidgetOptions,
   sanitizeFileName,
 } from '../../../../Utils.js';
-import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';
 
 const randomId = () => Math.floor(1000 + Math.random() * 9000);
 export default async function createTemplatewithCoordinate(request, response) {
@@ -17,9 +16,8 @@ export default async function createTemplatewithCoordinate(request, response) {
   const folderId = request.body.folderId;
   const base64File = request.body.file;
   const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const SendinOrder = request.body.sendInOrder || true;
+  const SendinOrder = request.body.sendInOrder || false;
   const isEnableOTP = request.body?.enableOTP === true ? true : false;
-  const isTourEnabled = request.body?.enableTour || false;
 
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
@@ -42,11 +40,6 @@ export default async function createTemplatewithCoordinate(request, response) {
         objectId: parseUser.userId.objectId,
       };
       if (signers && signers.length > 0) {
-        const contractsUser = new Parse.Query('contracts_Users');
-        contractsUser.equalTo('UserId', userPtr);
-        contractsUser.include('TenantId');
-        const extUser = await contractsUser.first({ useMasterKey: true });
-        const parseExtUser = JSON.parse(JSON.stringify(extUser));
         let fileUrl;
         if (request.files?.[0]) {
           const base64 = fileData?.toString('base64');
@@ -59,31 +52,24 @@ export default async function createTemplatewithCoordinate(request, response) {
           saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
         } else {
           const filename = sanitizeFileName(`${name}.pdf`);
-          let adapter = {};
+          const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-          const ActiveFileAdapter = parseExtUser?.TenantId?.ActiveFileAdapter || '';
+          await file.save({ useMasterKey: true });
-          if (ActiveFileAdapter) {
+          fileUrl = file.url();
-            adapter =
-              parseExtUser?.TenantId?.FileAdapters?.find(x => (x.id = ActiveFileAdapter)) || {};
-          }
-          if (adapter?.id) {
-            const filedata = Buffer.from(base64File, 'base64');
-            // `uploadFileToS3` is used to save document in user's file storage
-            fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);
-          } else {
-            const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-            await file.save({ useMasterKey: true });
-            fileUrl = file.url();
-          }
           const buffer = Buffer.from(base64File, 'base64');
           saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
         }
+        const contractsUser = new Parse.Query('contracts_Users');
+        contractsUser.equalTo('UserId', userPtr);
+        const extUser = await contractsUser.first({ useMasterKey: true });
         const extUserPtr = {
           __type: 'Pointer',
           className: 'contracts_Users',
           objectId: extUser.id,
         };
+
         const object = new Parse.Object('contracts_Template');
         object.set('Name', name);
+
         if (note) {
           object.set('Note', note);
         }
@@ -97,7 +83,6 @@ export default async function createTemplatewithCoordinate(request, response) {
         object.set('CreatedBy', userPtr);
         object.set('ExtUserPtr', extUserPtr);
         object.set('IsEnableOTP', isEnableOTP);
-        object.set('IsTourEnabled', isTourEnabled);
         let contact = [];
         if (signers && signers.length > 0) {
           let parseSigners;
@@ -201,9 +186,6 @@ export default async function createTemplatewithCoordinate(request, response) {
             objectId: folderId,
           });
         }
-        if (parseExtUser?.TenantId?.ActiveFileAdapter) {
-          object.set('FileAdapterId', parseExtUser?.TenantId?.ActiveFileAdapter);
-        }
         const newACL = new Parse.ACL();
         newACL.setPublicReadAccess(false);
         newACL.setPublicWriteAccess(false);

apps/OpenSignServer/cloud/customRoute/v1/routes/deleteDocument.js

@@ -20,7 +20,6 @@ export default async function deleteDocument(request, response) {
       const Document = new Parse.Query('contracts_Document');
       Document.equalTo('objectId', request.params.document_id);
       Document.equalTo('CreatedBy', userPtr);
-      Document.include('ExtUserPtr.TenantId');
       const res = await Document.first({ useMasterKey: true });
       if (res) {
         const isArchive = res.get('IsArchive');

apps/OpenSignServer/cloud/customRoute/v1/routes/deleteFolder.js

@@ -22,7 +22,6 @@ export default async function deleteFolder(request, response) {
       obj.equalTo('objectId', folderId);
       obj.equalTo('IsArchive', true);
       obj.equalTo('CreatedBy', userPtr);
-      obj.include('ExtUserPtr.TenantId');
       const isFolderDeleted = await obj.first({ useMasterKey: true });
       if (!isFolderDeleted) {
         const folder = new Parse.Query('contracts_Document');
@@ -35,7 +34,6 @@ export default async function deleteFolder(request, response) {
         folder.notEqualTo('IsArchive', true);
         folder.equalTo('CreatedBy', userPtr);
         folder.equalTo('Type', 'Folder');
-        folder.include('ExtUserPtr.TenantId');
         const isSubItems = await folder.first({ useMasterKey: true });
         // console.log('isSubItems ', isSubItems);
         if (isSubItems) {

apps/OpenSignServer/cloud/customRoute/v1/routes/deleteTemplate.js

@@ -19,7 +19,6 @@ export default async function deletedTemplate(request, response) {
       const template = new Parse.Query('contracts_Template');
       template.equalTo('objectId', request.params.template_id);
       template.equalTo('CreatedBy', userPtr);
-      template.include('ExtUserPtr.TenantId');
       const res = await template.first({ useMasterKey: true });
       if (res) {
         const isArchive = res.get('IsArchive');

apps/OpenSignServer/cloud/customRoute/v1/routes/draftDocument.js

@@ -0,0 +1,166 @@
+import axios from 'axios';
+import { customAPIurl, saveFileUsage } from '../../../../Utils.js';
+
+// const randomId = () => Math.floor(1000 + Math.random() * 9000);
+export default async function draftDocument(request, response) {
+  const name = request.body.title;
+  const note = request.body.note;
+  const description = request.body.description;
+  const signers = request.body.signers;
+  const folderId = request.body.folderId;
+  const base64File = request.body.file;
+  const send_email = request.body.send_email || true;
+  const fileData = request.files?.[0] ? request.files[0].buffer : null;
+  const SendinOrder = request.body.sendInOrder || false;
+  const isEnableOTP = request.body?.enableOTP === true ? true : false;
+
+  // console.log('fileData ', fileData);
+  const protocol = customAPIurl();
+  const baseUrl = new URL(process.env.PUBLIC_URL);
+
+  try {
+    const reqToken = request.headers['x-api-token'];
+    if (!reqToken) {
+      return response.status(400).json({ error: 'Please Provide API Token' });
+    }
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', reqToken);
+    tokenQuery.include('userId');
+    const token = await tokenQuery.first({ useMasterKey: true });
+    if (token !== undefined) {
+      const parseUser = JSON.parse(JSON.stringify(token));
+      const userPtr = {
+        __type: 'Pointer',
+        className: '_User',
+        objectId: parseUser.userId.objectId,
+      };
+      // Valid Token then proceed request
+      if (signers && signers.length > 0) {
+        let fileUrl;
+        if (request.files?.[0]) {
+          const base64 = fileData?.toString('base64');
+          const file = new Parse.File(request.files?.[0]?.originalname, {
+            base64: base64,
+          });
+          await file.save({ useMasterKey: true });
+          fileUrl = file.url();
+          const buffer = Buffer.from(base64, 'base64');
+          saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
+        } else {
+          const file = new Parse.File(`${name}.pdf`, {
+            base64: base64File,
+          });
+          await file.save({ useMasterKey: true });
+          fileUrl = file.url();
+          const buffer = Buffer.from(base64File, 'base64');
+          saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
+        }
+        const contractsUser = new Parse.Query('contracts_Users');
+        contractsUser.equalTo('UserId', userPtr);
+        const extUser = await contractsUser.first({ useMasterKey: true });
+        const extUserPtr = {
+          __type: 'Pointer',
+          className: 'contracts_Users',
+          objectId: extUser.id,
+        };
+
+        const folderPtr = {
+          __type: 'Pointer',
+          className: 'contracts_Document',
+          objectId: folderId,
+        };
+
+        const object = new Parse.Object('contracts_Document');
+        object.set('Name', name);
+        if (note) {
+          object.set('Note', note);
+        }
+        if (description) {
+          object.set('Description', description);
+        }
+        if (SendinOrder) {
+          object.set('SendinOrder', SendinOrder);
+        }
+        object.set('URL', fileUrl);
+        object.set('CreatedBy', userPtr);
+        object.set('ExtUserPtr', extUserPtr);
+        object.set('IsSendMail', send_email);
+        object.set('IsEnableOTP', isEnableOTP);
+        if (signers && signers.length > 0) {
+          let parseSigners;
+          if (base64File) {
+            parseSigners = signers;
+          } else {
+            parseSigners = JSON.parse(signers);
+          }
+          let createContactUrl = protocol + '/v1/createcontact';
+
+          let contact = [];
+          for (const obj of parseSigners) {
+            const body = {
+              name: obj?.name || '',
+              email: obj?.email || '',
+              phone: obj?.phone || '',
+            };
+            try {
+              const res = await axios.post(createContactUrl, body, {
+                headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
+              });
+              // console.log('res ', res.data);
+              contact.push({
+                __type: 'Pointer',
+                className: 'contracts_Contactbook',
+                objectId: res.data?.objectId,
+              });
+            } catch (err) {
+              // console.log('err ', err.response);
+              if (err?.response?.data?.objectId) {
+                contact.push({
+                  __type: 'Pointer',
+                  className: 'contracts_Contactbook',
+                  objectId: err.response.data?.objectId,
+                });
+              }
+            }
+          }
+          object.set('Signers', contact);
+        }
+        if (folderId) {
+          object.set('Folder', folderPtr);
+        }
+        const newACL = new Parse.ACL();
+        newACL.setPublicReadAccess(false);
+        newACL.setPublicWriteAccess(false);
+        newACL.setReadAccess(userPtr.objectId, true);
+        newACL.setWriteAccess(userPtr.objectId, true);
+        object.setACL(newACL);
+        const res = await object.save(null, { useMasterKey: true });
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_draft_document',
+            properties: { response_code: 200 },
+          });
+        }
+        return response.json({
+          objectId: res.id,
+          url: `${baseUrl.origin}/placeholdersign/${res.id}`,
+        });
+      } else {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_draft_document',
+            properties: { response_code: 400 },
+          });
+        }
+        return response.status(400).json({ error: 'Please provide signers!' });
+      }
+    } else {
+      return response.status(405).json({ error: 'Invalid API Token!' });
+    }
+  } catch (err) {
+    console.log('err ', err);
+    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
+  }
+}

apps/OpenSignServer/cloud/customRoute/v1/routes/draftTemplate.js

@@ -1,238 +0,0 @@
-import axios from 'axios';
-import {
-  color,
-  customAPIurl,
-  saveFileUsage,
-  formatWidgetOptions,
-  sanitizeFileName,
-} from '../../../../Utils.js';
-import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';
-import jwt from 'jsonwebtoken';
-
-const randomId = () => Math.floor(1000 + Math.random() * 9000);
-export default async function draftTemplate(request, response) {
-  const name = request.body.title;
-  const note = request.body.note;
-  const description = request.body.description;
-  const signers = request.body.signers;
-  const folderId = request.body.folderId;
-  const base64File = request.body.file;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const SendinOrder = request.body.sendInOrder || true;
-  const isEnableOTP = request.body?.enableOTP === true ? true : false;
-  const isTourEnabled = request.body?.enableTour || false;
-  const isPublic = request.body?.isPublic;
-  const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.PUBLIC_URL).origin;
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      const contractsUser = new Parse.Query('contracts_Users');
-      contractsUser.equalTo('UserId', userPtr);
-      contractsUser.include('TenantId');
-      const extUser = await contractsUser.first({ useMasterKey: true });
-      const parseExtUser = JSON.parse(JSON.stringify(extUser));
-      let fileUrl;
-      if (request.files?.[0]) {
-        const base64 = fileData?.toString('base64');
-        const file = new Parse.File(request.files?.[0]?.originalname, {
-          base64: base64,
-        });
-        await file.save({ useMasterKey: true });
-        fileUrl = file.url();
-        const buffer = Buffer.from(base64, 'base64');
-        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
-      } else {
-        const filename = sanitizeFileName(`${name}.pdf`);
-        let adapter = {};
-        const ActiveFileAdapter = parseExtUser?.TenantId?.ActiveFileAdapter || '';
-        if (ActiveFileAdapter) {
-          adapter =
-            parseExtUser?.TenantId?.FileAdapters?.find(x => (x.id = ActiveFileAdapter)) || {};
-        }
-        if (adapter?.id) {
-          const filedata = Buffer.from(base64File, 'base64');
-          // `uploadFileToS3` is used to save document in user's file storage
-          fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);
-        } else {
-          const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
-        }
-        const buffer = Buffer.from(base64File, 'base64');
-        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
-      }
-      const extUserPtr = {
-        __type: 'Pointer',
-        className: 'contracts_Users',
-        objectId: extUser.id,
-      };
-      const object = new Parse.Object('contracts_Template');
-      object.set('Name', name);
-      if (note) {
-        object.set('Note', note);
-      }
-      if (description) {
-        object.set('Description', description);
-      }
-      if (SendinOrder) {
-        object.set('SendinOrder', SendinOrder);
-      }
-      object.set('URL', fileUrl);
-      object.set('CreatedBy', userPtr);
-      object.set('ExtUserPtr', extUserPtr);
-      object.set('IsEnableOTP', isEnableOTP);
-      object.set('IsTourEnabled', isTourEnabled);
-      const Public = isPublic !== undefined ? isPublic : false;
-      if (isPublic !== undefined) {
-        object.set('IsPublic', Public);
-      }
-      let contact = [];
-      if (signers && signers.length > 0) {
-        let parseSigners;
-        if (base64File) {
-          parseSigners = signers;
-        } else {
-          parseSigners = JSON.parse(signers);
-        }
-        let createContactUrl = protocol + '/v1/createcontact';
-
-        for (const [index, element] of parseSigners.entries()) {
-          if (element?.name && element?.email) {
-            const body = {
-              name: element?.name,
-              email: element?.email,
-              phone: element?.phone || '',
-            };
-            try {
-              const res = await axios.post(createContactUrl, body, {
-                headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-              });
-              // console.log('res ', res.data);
-              const contactPtr = {
-                __type: 'Pointer',
-                className: 'contracts_Contactbook',
-                objectId: res.data?.objectId,
-              };
-              const newObj = { ...element, contactPtr: contactPtr, index: index };
-              contact.push(newObj);
-            } catch (err) {
-              // console.log('err ', err.response);
-              if (err?.response?.data?.objectId) {
-                const contactPtr = {
-                  __type: 'Pointer',
-                  className: 'contracts_Contactbook',
-                  objectId: err.response.data?.objectId,
-                };
-                const newObj = { ...element, contactPtr: contactPtr, index: index };
-                contact.push(newObj);
-              }
-            }
-          } else {
-            const newObj = { ...element, contactPtr: {}, index: index };
-            contact.push(newObj);
-          }
-        }
-        const updatedSigners = contact?.filter(x => x.contactPtr && x.contactPtr.objectId);
-        if (updatedSigners && updatedSigners.length > 0) {
-          object.set(
-            'Signers',
-            updatedSigners?.map(x => x.contactPtr)
-          );
-        }
-        let updatePlaceholders = [];
-        for (const signer of contact) {
-          const placeHolder = [];
-          if (signer.widgets?.length > 0) {
-            for (const widget of signer.widgets) {
-              const pageNumber = widget.page;
-              const page = placeHolder.find(page => page.pageNumber === pageNumber);
-              const options = formatWidgetOptions(widget.type, widget.options);
-              const widgetData = {
-                isStamp: widget.type === 'stamp' || widget.type === 'image',
-                key: randomId(),
-                isDrag: false,
-                scale: 1,
-                isMobile: false,
-                zIndex: 1,
-                type: widget.type === 'textbox' ? 'text input' : widget.type,
-                options: options,
-                Width: widget.w,
-                Height: widget.h,
-                xPosition: widget.x,
-                yPosition: widget.y,
-              };
-
-              if (page) {
-                page.pos.push(widgetData);
-              } else {
-                placeHolder.push({ pageNumber, pos: [widgetData] });
-              }
-            }
-          }
-          updatePlaceholders.push({
-            signerObjId: signer?.contactPtr?.objectId || '',
-            signerPtr: signer?.contactPtr,
-            Role: signer.role,
-            Id: randomId(),
-            blockColor: color[signer?.index],
-            placeHolder,
-          });
-        }
-        if (updatePlaceholders?.length > 0) {
-          object.set('Placeholders', updatePlaceholders);
-        }
-      }
-      if (folderId) {
-        object.set('Folder', {
-          __type: 'Pointer',
-          className: 'contracts_Template',
-          objectId: folderId,
-        });
-      }
-      if (parseExtUser?.TenantId?.ActiveFileAdapter) {
-        object.set('FileAdapterId', parseExtUser?.TenantId?.ActiveFileAdapter);
-      }
-      const newACL = new Parse.ACL();
-      newACL.setPublicReadAccess(false);
-      newACL.setPublicWriteAccess(false);
-      newACL.setReadAccess(userPtr.objectId, true);
-      newACL.setWriteAccess(userPtr.objectId, true);
-      object.setACL(newACL);
-      const res = await object.save(null, { useMasterKey: true });
-      if (request.posthog) {
-        request.posthog?.capture({
-          distinctId: parseUser.userId.email,
-          event: 'api_draft_template',
-          properties: { response_code: 200 },
-        });
-      }
-      const JwtToken = jwt.sign(
-        { user_email: parseUser.userId.email, template_id: res.id },
-        reqToken
-      );
-
-      return response.json({ objectId: res.id, url: `${baseUrl}/drafttemplate/${JwtToken}` });
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}

apps/OpenSignServer/cloud/customRoute/v1/routes/getDocument.js

@@ -24,7 +24,6 @@ export default async function getDocument(request, response) {
       Document.include('Folder');
       Document.include('ExtUserPtr');
       Document.include('Placeholders.signerPtr');
-      Document.include('ExtUserPtr.TenantId');
       const res = await Document.first({ useMasterKey: true });
       if (res) {
         const document = JSON.parse(JSON.stringify(res));
@@ -66,7 +65,6 @@ export default async function getDocument(request, response) {
           enableOTP: document?.IsEnableOTP || false,
           createdAt: document.createdAt,
           updatedAt: document.updatedAt,
-          enableTour: document?.IsTourEnabled || false,
         });
       } else {
         if (request.posthog) {

apps/OpenSignServer/cloud/customRoute/v1/routes/getDocumentList.js

@@ -62,7 +62,7 @@ export default async function getDocumentList(request, response) {
           'X-Parse-Application-Id': appId,
           'X-Parse-Master-Key': process.env.MASTER_KEY,
         };
-        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys},Placeholders&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr,ExtUserPtr.TenantId`;
+        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys},Placeholders&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
         try {
           const res = await axios.get(url, { headers: headers });
           if (res.data && res.data.results.length > 0) {
@@ -103,7 +103,6 @@ export default async function getDocumentList(request, response) {
               enableOTP: x?.IsEnableOTP || false,
               createdAt: x.createdAt,
               updatedAt: x.updatedAt,
-              enableTour: x?.IsTourEnabled || false,
             }));
             return response.json({ result: updateRes });
           } else {

apps/OpenSignServer/cloud/customRoute/v1/routes/getFolder.js

@@ -25,7 +25,7 @@ export default async function getFolder(request, response) {
       folderCls.notEqualTo('IsArchive', true);
       folderCls.descending('createdAt');
       folderCls.include('Folder');
-      folderCls.include('ExtUserPtr.TenantId');
+
       const res = await folderCls.first({ useMasterKey: true });
       if (res) {
         const parseRes = JSON.parse(JSON.stringify(res));

apps/OpenSignServer/cloud/customRoute/v1/routes/getFolderList.js

@@ -35,7 +35,6 @@ export default async function getFolderList(request, response) {
         folderCls.doesNotExist('Folder');
       }
       folderCls.descending('createdAt');
-      folderCls.include('ExtUserPtr.TenantId');
       folderCls.limit(limit);
       folderCls.skip(skip);
       const res = await folderCls.find({ useMasterKey: true });

apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplate.js

@@ -25,7 +25,6 @@ export default async function getTemplate(request, response) {
       Template.include('Folder');
       Template.include('ExtUserPtr');
       Template.include('Placeholders.signerPtr');
-      Template.include('ExtUserPtr.TenantId');
       const res = await Template.first({ useMasterKey: true });
       if (res) {
         const template = JSON.parse(JSON.stringify(res));
@@ -65,7 +64,6 @@ export default async function getTemplate(request, response) {
           enableOTP: template?.IsEnableOTP || false,
           createdAt: template.createdAt,
           updatedAt: template.updatedAt,
-          enableTour: template?.IsTourEnabled || false,
         });
       } else {
         if (request.posthog) {

apps/OpenSignServer/cloud/customRoute/v1/routes/getTemplateList.js

@@ -53,7 +53,7 @@ export default async function getTemplatetList(request, response) {
         'X-Parse-Application-Id': appId,
         'X-Parse-Master-Key': process.env.MASTER_KEY,
       };
-      const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr,ExtUserPtr.TenantId`;
+      const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
       const res = await axios.get(url, { headers: headers });
       if (res.data && res.data.results.length > 0) {
         if (request.posthog) {
@@ -91,7 +91,6 @@ export default async function getTemplatetList(request, response) {
           enableOTP: template?.IsEnableOTP || false,
           createdAt: template.createdAt,
           updatedAt: template.updatedAt,
-          enableTour: template?.IsTourEnabled || false,
         }));
 
         return response.json({ result: updateRes });

apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js

@@ -35,7 +35,7 @@ export default async function resendMail(request, response) {
       docQuery.notEqualTo('IsArchive', true);
       docQuery.greaterThanOrEqualTo('ExpiryDate', new Date());
       docQuery.exists('SignedUrl');
-      docQuery.include('ExtUserPtr.TenantId');
+
       const resDoc = await docQuery.first({ useMasterKey: true });
       // console.log("resDoc ",resDoc)
       if (resDoc) {
@@ -86,7 +86,7 @@ export default async function resendMail(request, response) {
               orgName +
               "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
               localExpireDate +
-              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
               signPdf +
               "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
               sender +

apps/OpenSignServer/cloud/customRoute/v1/routes/updateDocument.js

@@ -10,7 +10,7 @@ export default async function updateDocument(request, response) {
     const token = await tokenQuery.first({ useMasterKey: true });
     if (token !== undefined) {
       // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP', 'enableTour'];
+      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP'];
       const objectKeys = Object.keys(request.body);
       const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
       const parseUser = JSON.parse(JSON.stringify(token));
@@ -23,7 +23,6 @@ export default async function updateDocument(request, response) {
         const document = new Parse.Query('contracts_Document');
         document.equalTo('objectId', request.params.document_id);
         document.equalTo('CreatedBy', userPtr);
-        document.include('ExtUserPtr.TenantId');
         const res = await document.first({ useMasterKey: true });
         if (res) {
           const isArchive = res.get('IsArchive');
@@ -49,12 +48,10 @@ export default async function updateDocument(request, response) {
                 objectId: request?.body?.folderId,
               });
             }
-            if (request.body?.enableOTP !== undefined) {
+
+            if (request.body?.enableOTP) {
               updateQuery.set('IsEnableOTP', request.body?.enableOTP);
             }
-            if (request.body?.enableTour !== undefined) {
-              updateQuery.set('IsTourEnabled', request.body?.enableTour);
-            }
             const updatedRes = await updateQuery.save(null, { useMasterKey: true });
             if (updatedRes) {
               if (request.posthog) {

apps/OpenSignServer/cloud/customRoute/v1/routes/updateFolder.js

@@ -25,7 +25,7 @@ export default async function updateFolder(request, response) {
       folderCls.equalTo('objectId', folderId);
       folderCls.equalTo('Type', 'Folder');
       folderCls.notEqualTo('IsArchive', true);
-      folderCls.include('ExtUserPtr.TenantId');
+
       const res = await folderCls.first({ useMasterKey: true });
       if (res) {
         const updateFolder = new Parse.Object('contracts_Document');

apps/OpenSignServer/cloud/customRoute/v1/routes/updateTemplate.js

@@ -10,7 +10,7 @@ export default async function updateTemplate(request, response) {
     const token = await tokenQuery.first({ useMasterKey: true });
     if (token !== undefined) {
       // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP', 'enableTour'];
+      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP'];
       const objectKeys = Object.keys(request.body);
       const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
       const parseUser = JSON.parse(JSON.stringify(token));
@@ -23,7 +23,6 @@ export default async function updateTemplate(request, response) {
         const template = new Parse.Query('contracts_Template');
         template.equalTo('objectId', request.params.template_id);
         template.equalTo('CreatedBy', userPtr);
-        template.include('ExtUserPtr.TenantId');
         const res = await template.first({ useMasterKey: true });
         if (res) {
           const isArchive = res.get('IsArchive');
@@ -49,12 +48,9 @@ export default async function updateTemplate(request, response) {
                 objectId: request?.body?.folderId,
               });
             }
-            if (request.body?.enableOTP !== undefined) {
+            if (request.body?.enableOTP) {
               updateQuery.set('IsEnableOTP', request.body?.enableOTP);
             }
-            if (request.body?.enableTour !== undefined) {
-              updateQuery.set('IsTourEnabled', request.body?.enableTour);
-            }
             const updatedRes = await updateQuery.save(null, { useMasterKey: true });
             if (updatedRes) {
               if (request.posthog) {

apps/OpenSignServer/cloud/main.js

@@ -70,20 +70,6 @@ import updateContactTour from './parsefunction/updateContactTour.js';
 import declinedocument from './parsefunction/declinedocument.js';
 import addcustomsmtp from './parsefunction/addcustomsmtp.js';
 import deactivateMailAdapter from './parsefunction/deactivateMailAdapter.js';
-import addFileAdapter from './parsefunction/addFileAdapter.js';
-import saveToFileAdapter from './parsefunction/saveToFileAdapter.js';
-import getFileAdapter from './parsefunction/getFileAdapter.js';
-import addPfxFile from './parsefunction/addPfxFile.js';
-import getPfxFile from './parsefunction/getPfxFile.js';
-import getTenant from './parsefunction/getTenant.js';
-import getSigners from './parsefunction/getSigners.js';
-import saveFile from './parsefunction/saveFile.js';
-import savecontact from './parsefunction/savecontact.js';
-import isUserInContactBook from './parsefunction/isUserInContactBook.js';
-import updateTourStatus from './parsefunction/updateTourStatus.js';
-import saveTemplate from './parsefunction/saveTemplate.js';
-import updateToPublicTemplate from './parsefunction/updateToPublicTemplate.js';
-import updateSignatureType from './parsefunction/updatesignaturetype.js';
 
 // This afterSave function triggers after an object is added or updated in the specified class, allowing for post-processing logic.
 Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
@@ -166,17 +152,3 @@ Parse.Cloud.define('updatecontacttour', updateContactTour);
 Parse.Cloud.define('declinedoc', declinedocument);
 Parse.Cloud.define('addsmtp', addcustomsmtp);
 Parse.Cloud.define('deactivatemailadapter', deactivateMailAdapter);
-Parse.Cloud.define('savetofileadapter', saveToFileAdapter);
-Parse.Cloud.define('addfileadapter', addFileAdapter);
-Parse.Cloud.define('getfileadapter', getFileAdapter);
-Parse.Cloud.define('addpfx', addPfxFile);
-Parse.Cloud.define('getpfx', getPfxFile);
-Parse.Cloud.define('gettenant', getTenant);
-Parse.Cloud.define('getsigners', getSigners);
-Parse.Cloud.define('savetemplate', saveTemplate);
-Parse.Cloud.define('savefile', saveFile);
-Parse.Cloud.define('savecontact', savecontact);
-Parse.Cloud.define('isuserincontactbook', isUserInContactBook);
-Parse.Cloud.define('updatetourstatus', updateTourStatus);
-Parse.Cloud.define('updatetopublictemplate', updateToPublicTemplate);
-Parse.Cloud.define('updatesignaturetype', updateSignatureType);

apps/OpenSignServer/cloud/parsefunction/AllowedCredits.js

@@ -1,64 +1,33 @@
-import { parseJwt } from '../../Utils.js';
-import jwt from 'jsonwebtoken';
-async function checkCredits(userId) {
-  const extUser = new Parse.Query('contracts_Users');
-  extUser.equalTo('UserId', {
-    __type: 'Pointer',
-    className: '_User',
-    objectId: userId,
-  });
-  const resExtUser = await extUser.first({ useMasterKey: true });
-  if (resExtUser) {
-    const _resExtUser = JSON.parse(JSON.stringify(resExtUser));
-    const subscription = new Parse.Query('contracts_Subscriptions');
-    subscription.equalTo('TenantId', {
-      __type: 'Pointer',
-      className: 'partners_Tenant',
-      objectId: _resExtUser.TenantId.objectId,
-    });
-    subscription.include('ExtUserPtr');
-    const resSub = await subscription.first({ useMasterKey: true });
-    if (resSub) {
-      const _resSub = JSON.parse(JSON.stringify(resSub));
-      const AllowedCredits = _resSub?.AllowedCredits || 0;
-      const AddonCredits = _resSub?.AddonCredits || 0;
-      return { allowedcredits: AllowedCredits, addoncredits: AddonCredits };
-    }
-  } else {
-    throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
-  }
-}
 export default async function AllowedCredits(request) {
-  const jwttoken = request?.headers?.jwttoken || '';
+  if (!request?.user) {
-
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  }
   try {
-    if (request?.user) {
+    const extUser = new Parse.Query('contracts_Users');
-      return await checkCredits(request.user.id);
+    extUser.equalTo('UserId', {
-    } else if (jwttoken) {
+      __type: 'Pointer',
-      const jwtDecode = parseJwt(jwttoken);
+      className: '_User',
-      if (jwtDecode?.user_email) {
+      objectId: request.user.id,
-        const userCls = new Parse.Query(Parse.User);
+    });
-        userCls.equalTo('email', jwtDecode?.user_email);
+    const resExtUser = await extUser.first({ useMasterKey: true });
-        const userRes = await userCls.first({ useMasterKey: true });
+    if (resExtUser) {
-        const userId = userRes?.id;
+      const _resExtUser = JSON.parse(JSON.stringify(resExtUser));
-        const tokenQuery = new Parse.Query('appToken');
+      const subscription = new Parse.Query('contracts_Subscriptions');
-        tokenQuery.equalTo('userId', {
+      subscription.equalTo('TenantId', {
-          __type: 'Pointer',
+        __type: 'Pointer',
-          className: '_User',
+        className: 'partners_Tenant',
-          objectId: userId,
+        objectId: _resExtUser.TenantId.objectId,
-        });
+      });
-        const appRes = await tokenQuery.first({ useMasterKey: true });
+      subscription.include('ExtUserPtr');
-        const decoded = jwt.verify(jwttoken, appRes?.get('token'));
+      const resSub = await subscription.first({ useMasterKey: true });
-        if (decoded?.user_email) {
+      if (resSub) {
-          return await checkCredits(userId);
+        const _resSub = JSON.parse(JSON.stringify(resSub));
-        } else {
+        const AllowedCredits = _resSub?.AllowedCredits || 0;
-          throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid token.');
+        const AddonCredits = _resSub?.AddonCredits || 0;
-        }
+        return { allowedcredits: AllowedCredits, addoncredits: AddonCredits };
-      } else {
-        throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid token.');
       }
     } else {
-      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
     }
   } catch (err) {
     console.log('err in allowedCredits', err);

apps/OpenSignServer/cloud/parsefunction/DocumentAfterFind.js

@@ -2,30 +2,21 @@ import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function DocumentAfterFind(request) {
-  if (request.objects.length === 1) {
+  if (useLocal !== 'true') {
-    if (request.objects) {
+    if (request.objects.length === 1) {
-      const obj = request.objects[0];
+      if (request.objects) {
-      const FileAdapterId = obj?.get('FileAdapterId') || '';
+        const obj = request.objects[0];
-      if (FileAdapterId || useLocal !== 'true') {
         const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
         const Url = obj?.get('URL') && obj?.get('URL');
         const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
-        let fileAdapter = {};
-        if (FileAdapterId) {
-          const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
-          if (tenantId) {
-            const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
-            fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
-          }
-        }
         if (SignedUrl) {
-          obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
         }
         if (Url) {
-          obj.set('URL', getPresignedUrl(Url, fileAdapter));
+          obj.set('URL', getPresignedUrl(Url));
         }
         if (certificateUrl) {
-          obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
         }
         return [obj];
       }

apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js

@@ -12,7 +12,6 @@ async function DocumentAftersave(request) {
         const ExpiryDate = new Date(createdAt);
         ExpiryDate.setDate(ExpiryDate.getDate() + TimeToCompleteDays);
         const documentQuery = new Parse.Query('contracts_Document');
-        documentQuery.include('ExtUserPtr.TenantId');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
         if (!originIp) {
@@ -31,7 +30,6 @@ async function DocumentAftersave(request) {
         const ExpiryDate = new Date(createdAt);
         ExpiryDate.setDate(ExpiryDate.getDate() + TimeToCompleteDays);
         const documentQuery = new Parse.Query('contracts_Document');
-        documentQuery.include('ExtUserPtr.TenantId');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
         if (!originIp) {
@@ -78,7 +76,6 @@ async function DocumentAftersave(request) {
     // console.log(objId)
     const Query = new Parse.Query('contracts_Document');
     Query.include('Signers');
-    Query.include('ExtUserPtr.TenantId');
     Query.include('CreatedBy');
     const updateACL = await Query.get(objId, { useMasterKey: true });
     const res = JSON.parse(JSON.stringify(updateACL));
@@ -119,7 +116,6 @@ async function DocumentAftersave(request) {
     // console.log(objId)
     const Query = new Parse.Query('contracts_Document');
     Query.include('CreatedBy');
-    Query.include('ExtUserPtr.TenantId');
     const updateACL = await Query.get(objId, { useMasterKey: true });
     const res = JSON.parse(JSON.stringify(updateACL));
     // console.log("res");

apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js

@@ -20,7 +20,6 @@ async function GetPublicTemplate(request) {
         templatQuery.descending('updatedAt');
         templatQuery.equalTo('IsPublic', true);
         templatQuery.notEqualTo('IsArchive', true);
-        templatQuery.include('ExtUserPtr.TenantId');
         const getTemplate = await templatQuery.find({ useMasterKey: true });
         const extcls = new Parse.Query('contracts_Users');
         extcls.equalTo('Email', user.get('email'));

apps/OpenSignServer/cloud/parsefunction/GetTemplate.js

@@ -1,63 +1,30 @@
 import axios from 'axios';
-import { cloudServerUrl, parseJwt } from '../../Utils.js';
+import { cloudServerUrl } from '../../Utils.js';
-import jwt from 'jsonwebtoken';
 
 export default async function GetTemplate(request) {
   const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const templateId = request.params.templateId;
   const ispublic = request.params.ispublic;
-  const jwttoken = request.headers?.jwttoken;
+
-  const sessiontoken = request.headers?.sessiontoken;
   try {
     if (!ispublic) {
-      let userEmail;
+      const userRes = await axios.get(serverUrl + '/users/me', {
-      if (jwttoken) {
+        headers: {
-        try {
+          'X-Parse-Application-Id': process.env.APP_ID,
-          const jwtDecode = parseJwt(jwttoken);
+          'X-Parse-Session-Token': request.headers['sessiontoken'],
-          if (jwtDecode?.user_email) {
+        },
-            const userCls = new Parse.Query(Parse.User);
+      });
-            userCls.equalTo('email', jwtDecode?.user_email);
+      const userId = userRes.data && userRes.data.objectId;
-            const userRes = await userCls.first({ useMasterKey: true });
+      if (templateId && userId) {
-            const userId = userRes?.id;
-            const tokenQuery = new Parse.Query('appToken');
-            tokenQuery.equalTo('userId', {
-              __type: 'Pointer',
-              className: '_User',
-              objectId: userId,
-            });
-            const appRes = await tokenQuery.first({ useMasterKey: true });
-            const decoded = jwt.verify(jwttoken, appRes?.get('token'));
-            if (decoded?.user_email) {
-              userEmail = decoded?.user_email;
-            } else {
-              return { error: 'Invalid token!' };
-            }
-          } else {
-            return { error: 'Invalid token!' };
-          }
-        } catch (err) {
-          console.log('err in jwt', err);
-          return { error: "You don't have access of this document!" };
-        }
-      } else if (sessiontoken) {
-        const userRes = await axios.get(serverUrl + '/users/me', {
-          headers: {
-            'X-Parse-Application-Id': process.env.APP_ID,
-            'X-Parse-Session-Token': sessiontoken,
-          },
-        });
-        userEmail = userRes.data && userRes.data.email;
-      }
-      if (templateId && userEmail) {
         try {
           let template = new Parse.Query('contracts_Template');
           template.equalTo('objectId', templateId);
           template.include('ExtUserPtr');
           template.include('Signers');
           template.include('CreatedBy');
-          template.include('ExtUserPtr.TenantId');
+
           const extUserQuery = new Parse.Query('contracts_Users');
-          extUserQuery.equalTo('Email', userEmail);
+          extUserQuery.equalTo('Email', userRes.data.email);
           extUserQuery.include('TeamIds');
           const extUser = await extUserQuery.first({ useMasterKey: true });
           if (extUser) {
@@ -81,16 +48,12 @@ export default async function GetTemplate(request) {
               template.include('ExtUserPtr');
               template.include('Signers');
               template.include('CreatedBy');
-              template.include('ExtUserPtr.TenantId');
-              template.include('Placeholders.signerPtr');
             }
           }
           const res = await template.first({ useMasterKey: true });
           if (res) {
-            const templateRes = JSON.parse(JSON.stringify(res));
+            // console.log("res ",res)
-            delete templateRes?.ExtUserPtr?.TenantId?.FileAdapters;
+            return res;
-            delete templateRes?.ExtUserPtr?.TenantId?.PfxFile;
-            return templateRes;
           } else {
             return { error: "You don't have access of this document!" };
           }
@@ -98,8 +61,6 @@ export default async function GetTemplate(request) {
           console.log('err', err);
           return err;
         }
-      } else {
-        return { error: "You don't have access of this document!" };
       }
     } else if (templateId && ispublic) {
       try {
@@ -108,14 +69,10 @@ export default async function GetTemplate(request) {
         template.include('ExtUserPtr');
         template.include('Signers');
         template.include('CreatedBy');
-        template.include('ExtUserPtr.TenantId');
         const res = await template.first({ useMasterKey: true });
         // console.log("res ", res)
         if (res) {
-          const templateRes = JSON.parse(JSON.stringify(res));
+          return res;
-          delete templateRes?.ExtUserPtr?.TenantId?.FileAdapters;
-          delete templateRes?.ExtUserPtr?.TenantId?.PfxFile;
-          return templateRes;
         } else {
           return { error: "You don't have access of this document!" };
         }
@@ -128,7 +85,7 @@ export default async function GetTemplate(request) {
     }
   } catch (err) {
     console.log('err', err);
-    if (err?.response?.data?.code === 209 || err.code == 209) {
+    if (err.code == 209) {
       return { error: 'Invalid session token' };
     } else {
       return { error: "You don't have access of this document!" };

apps/OpenSignServer/cloud/parsefunction/PublicUserLinkContactToDoc.js

@@ -31,13 +31,7 @@ const saveRoleContact = async contact => {
   contactQuery.set('CreatedBy', contact.CreatedBy);
   contactQuery.set('UserId', contact.UserId);
   contactQuery.set('UserRole', 'contracts_Guest');
-  if (contact?.TenantId) {
+  contactQuery.set('TenantId', contact.TenantId);
-    contactQuery.set('TenantId', {
-      __type: 'Pointer',
-      className: 'partners_Tenant',
-      objectId: contact.TenantId,
-    });
-  }
   contactQuery.set('IsDeleted', false);
   const acl = new Parse.ACL();
   acl.setReadAccess(contact.CreatedBy.objectId, true);
@@ -61,7 +55,7 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
       object.set('Description', template?.Description);
       object.set('Note', template?.Note);
       object.set('TimeToCompleteDays', template?.TimeToCompleteDays || 15);
-      object.set('SendinOrder', template?.SendinOrder || false);
+      object.set('SendinOrder', template?.SendinOrder);
       object.set('AutomaticReminders', template?.AutomaticReminders || false);
       object.set('RemindOnceInEvery', template?.RemindOnceInEvery || 5);
       object.set('URL', template?.URL);
@@ -69,11 +63,6 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
       object.set('ExtUserPtr', template?.ExtUserPtr);
       object.set('OriginIp', template?.OriginIp || '');
       object.set('IsEnableOTP', template?.IsEnableOTP || false);
-      object.set('IsTourEnabled', template?.IsTourEnabled || false);
-      object.set('FileAdapterId', template?.FileAdapterId || '');
-      if (template?.SignatureType?.length > 0) {
-        object.set('SignatureType', template?.SignatureType);
-      }
       let signers = template?.Signers || [];
       const signerobj = {
         __type: 'Pointer',
@@ -108,7 +97,7 @@ const sendMailToAllSigners = async docId => {
   try {
     //get document details that recenlty created from public template
     const docQuery = new Parse.Query('contracts_Document');
-    docQuery.include('ExtUserPtr,ExtUserPtr.TenantId');
+    docQuery.include('ExtUserPtr');
     docQuery.include('Signers');
     const docRes = await docQuery.get(docId, { useMasterKey: true });
     const Doc = JSON.parse(JSON.stringify(docRes));
@@ -179,7 +168,7 @@ const sendMailToAllSigners = async docId => {
                   receiver_phone: signerMail[i]?.Phone || '',
                   expiry_date: localExpireDate,
                   company_name: orgName,
-                  signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`,
+                  signing_url: `<a href=${signPdf}>Sign here</a>`,
                 };
                 replaceVar = replaceMailVaribles(requestSubject, htmlReqBody, variables);
               }
@@ -257,7 +246,6 @@ const deductcount = async _resSub => {
 export default async function PublicUserLinkContactToDoc(req) {
   const email = req.params.email;
   const templateid = req.params.templateid;
-  const signatureType = req.params.signatureType;
   const name = req.params.name;
   const phone = req.params.phone;
   const role = req.params.role;
@@ -266,7 +254,6 @@ export default async function PublicUserLinkContactToDoc(req) {
       // Execute the query to get the template with the specified 'templateid'
       const docQuery = new Parse.Query('contracts_Template');
       docQuery.include('ExtUserPtr');
-      docQuery.include('ExtUserPtr.TenantId');
       const tempRes = await docQuery.get(templateid, { useMasterKey: true });
       // Check if the template was found; if not, throw an error indicating the template was not found
       if (!tempRes) {
@@ -305,11 +292,8 @@ export default async function PublicUserLinkContactToDoc(req) {
             const existContact = await contactCls.first({ useMasterKey: true });
             if (existContact) {
               const template_json = JSON.parse(JSON.stringify(tempRes));
-              const _template_json = template_json;
-              _template_json.SignatureType =
-                signatureType?.length > 0 ? signatureType : _template_json?.SignatureType;
               //update contact in placeholder, signers and update ACl in provide document
-              const docRes = await createDocumentFromTemplate(_template_json, existContact, index);
+              const docRes = await createDocumentFromTemplate(template_json, existContact, index);
               if (docRes) {
                 await deductcount(_resSub);
                 //condition will execute only if sendInOrder will be false for send email to all signers at a time.
@@ -331,15 +315,12 @@ export default async function PublicUserLinkContactToDoc(req) {
                   Email: email,
                   Phone: _extUser?.Phone ? _extUser.Phone : '',
                   CreatedBy: _tempRes.CreatedBy,
-                  TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
+                  TenantId: _tempRes.ExtUserPtr.TenantId,
                 };
                 const template_json = JSON.parse(JSON.stringify(tempRes));
-                const _template_json = template_json;
-                _template_json.SignatureType =
-                  signatureType?.length > 0 ? signatureType : _template_json?.SignatureType;
                 // if user present on platform create contact on the basis of extended user details
                 const contactRes = await saveRoleContact(contact);
-                const docRes = await createDocumentFromTemplate(_template_json, contactRes, index);
+                const docRes = await createDocumentFromTemplate(template_json, contactRes, index);
                 if (docRes) {
                   await deductcount(_resSub);
                   //condition will execute only if sendInOrder will be false for send email to all signers at a time.
@@ -361,17 +342,14 @@ export default async function PublicUserLinkContactToDoc(req) {
                       Email: email,
                       Phone: phone,
                       CreatedBy: _tempRes.CreatedBy,
-                      TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
+                      TenantId: _tempRes.ExtUserPtr.TenantId,
                     };
                     const template_json = JSON.parse(JSON.stringify(tempRes));
-                    const _template_json = template_json;
-                    _template_json.SignatureType =
-                      signatureType?.length > 0 ? signatureType : _template_json?.SignatureType;
                     // Create new contract on the basis provided contact details by user and userId from _User class
                     const contactRes = await saveRoleContact(contact);
                     //update contact in placeholder, signers and update ACl in provide document
                     const docRes = await createDocumentFromTemplate(
-                      _template_json,
+                      template_json,
                       contactRes,
                       index
                     );
@@ -401,17 +379,14 @@ export default async function PublicUserLinkContactToDoc(req) {
                       Email: email,
                       Phone: phone,
                       CreatedBy: _tempRes.CreatedBy,
-                      TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
+                      TenantId: _tempRes.ExtUserPtr.TenantId,
                     };
                     const template_json = JSON.parse(JSON.stringify(tempRes));
-                    const _template_json = template_json;
-                    _template_json.SignatureType =
-                      signatureType?.length > 0 ? signatureType : _template_json?.SignatureType;
                     // Create new contract on the basis provided contact details by user and userId from _User class
                     const contactRes = await saveRoleContact(contact);
                     //update contact in placeholder, signers and update ACl in provide document
                     const docRes = await createDocumentFromTemplate(
-                      _template_json,
+                      template_json,
                       contactRes,
                       index
                     );

apps/OpenSignServer/cloud/parsefunction/SendMailOTPv1.js

@@ -7,7 +7,6 @@ async function getDocument(docId) {
     query.include('CreatedBy');
     query.include('Signers');
     query.include('AuditTrail.UserPtr');
-    query.include('ExtUserPtr.TenantId');
     query.include('Placeholders');
     query.notEqualTo('IsArchive', true);
     const res = await query.first({ useMasterKey: true });

apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js

@@ -2,31 +2,23 @@ import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function TemplateAfterFind(request) {
-  if (request.objects.length === 1) {
+  if (useLocal !== 'true') {
-    if (request.objects) {
+    if (request.objects.length === 1) {
-      const obj = request.objects[0];
+      if (request.objects) {
-      const FileAdapterId = obj?.get('FileAdapterId') || '';
+        const obj = request.objects[0];
-      if (FileAdapterId || useLocal !== 'true') {
         const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
         const Url = obj?.get('URL') && obj?.get('URL');
         const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
-        let fileAdapter = {};
-        if (FileAdapterId) {
-          const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
-          if (tenantId) {
-            const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
-            fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
-          }
-        }
         if (SignedUrl) {
-          obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
         }
         if (Url) {
-          obj.set('URL', getPresignedUrl(Url, fileAdapter));
+          obj.set('URL', getPresignedUrl(Url));
         }
         if (certificateUrl) {
-          obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
         }
+
         return [obj];
       }
     }

apps/OpenSignServer/cloud/parsefunction/TemplateAfterSave.js

@@ -44,7 +44,6 @@ export default async function TemplateAfterSave(request) {
     const Query = new Parse.Query('contracts_Template');
     Query.include('Signers');
     Query.include('CreatedBy');
-    Query.include('ExtUserPtr.TenantId');
     const updateACL = await Query.get(objId, { useMasterKey: true });
     const res = JSON.parse(JSON.stringify(updateACL));
     // console.log("res");
@@ -86,7 +85,6 @@ export default async function TemplateAfterSave(request) {
 
     const Query = new Parse.Query('contracts_Template');
     Query.include('CreatedBy');
-    Query.include('ExtUserPtr.TenantId');
     const updateACL = await Query.get(objId, { useMasterKey: true });
     const res = JSON.parse(JSON.stringify(updateACL));
     // console.log("res");

apps/OpenSignServer/cloud/parsefunction/UpdateExistUserAsAdmin.js

@@ -51,10 +51,7 @@ export default async function UpdateExistUserAsAdmin(request) {
     extClsQuery.notEqualTo('IsDisabled', true);
     const extAdminRes = await extClsQuery.find({ useMasterKey: true });
     if (extAdminRes && extAdminRes.length === 1 && extAdminRes?.[0]?.get('OrganizationId')) {
-      throw new Parse.Error(
+      throw new Parse.Error(Parse.Error.DUPLICATE_VALUE, 'Admin already exist.');
-        Parse.Error.DUPLICATE_VALUE,
-        'Admin already exists. Please login to the application using admin credentials in order to manage users.'
-      );
     } else {
       const extCls = new Parse.Query('contracts_Users');
       extCls.equalTo('Email', email);

apps/OpenSignServer/cloud/parsefunction/addFileAdapter.js

@@ -1,142 +0,0 @@
-// `generateId` is used to unique Id for fileAdapter
-function generateId(length) {
-  const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
-  let result = '';
-  const charactersLength = characters.length;
-  for (let i = 0; i < length; i++) {
-    result += characters.charAt(Math.floor(Math.random() * charactersLength));
-  }
-  return result;
-}
-
-// `getExtUser` get ext user details
-async function getExtUser(request) {
-  const extUserCls = new Parse.Query('contracts_Users');
-  extUserCls.equalTo('UserId', request.user);
-  extUserCls.include('TenantId');
-  return await extUserCls.first({ useMasterKey: true });
-}
-
-// `saveTenant` save file adapter details in tenant class
-async function saveTenant(tenantId, fileAdapters, activeAdapter) {
-  const tenantCls = new Parse.Object('partners_Tenant');
-  tenantCls.id = tenantId;
-  if (fileAdapters?.length > 0) {
-    tenantCls.set('FileAdapters', fileAdapters);
-  }
-  if (activeAdapter) {
-    tenantCls.set('ActiveFileAdapter', activeAdapter);
-  } else {
-    tenantCls.unset('ActiveFileAdapter');
-  }
-  return await tenantCls.save(null, { useMasterKey: true });
-}
-
-// `updateTenantSchema` is used add FileAdapter in protected fields
-async function updateTenantSchema() {
-  const tenantSchema = new Parse.Schema('partners_Tenant');
-  const currentSchema = await tenantSchema.get();
-  let clp = currentSchema.classLevelPermissions;
-  // Public permission ("*")
-  const role = '*';
-  if (!clp.protectedFields || Object.keys(clp.protectedFields).length === 0) {
-    // Initialize protectedFields if it doesn't exist
-    clp.protectedFields = { [role]: [] };
-  }
-  // save FileAdapters field is in protectedFields if not exists
-  if (!clp.protectedFields[role]?.includes('FileAdapters')) {
-    clp.protectedFields[role].push('FileAdapters');
-    // Update the class schema with the modified CLP
-    tenantSchema.setCLP(clp);
-    await tenantSchema.update();
-  }
-}
-
-export default async function addFileAdapter(request) {
-  if (!request?.user) {
-    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
-  }
-  const fileAdapterName = request.params.fileAdapterName;
-  const bucketName = request.params.bucketName;
-  const region = request.params.region;
-  const endpoint = request.params.endpoint;
-  const baseUrl = request.params.baseUrl;
-  const accessKeyId = request.params.accessKeyId;
-  const secretAccessKey = request.params.secretAccessKey;
-  const adapter = request.params.fileAdapter;
-
-  if (fileAdapterName && accessKeyId && secretAccessKey && adapter) {
-    try {
-      const extUser = await getExtUser(request);
-      if (extUser) {
-        const _extUser = JSON.parse(JSON.stringify(extUser));
-        const tenantId = extUser?.get('TenantId')?.id;
-        // assign existing file adapters or empty array
-        let fileAdapters = _extUser?.TenantId?.FileAdapters || [];
-        const uniqueId = generateId(10);
-        let id = extUser?.get('TenantId')?.id + '_' + uniqueId;
-        const index = fileAdapters?.findIndex(x => x.fileAdapterName === fileAdapterName);
-        if (index !== -1) {
-          // If an object with the same fileAdapterName exists, update it
-          if (bucketName || region || endpoint || baseUrl) {
-            throw new Parse.Error(
-              Parse.Error.INVALID_QUERY,
-              'Cannot update bucketName, region, endpoint, baseUrl.'
-            );
-          } else {
-            const adapterConfig = { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey };
-            fileAdapters[index] = { ...fileAdapters[index], ...adapterConfig };
-            id = fileAdapters[index].id;
-          }
-        } else {
-          if (bucketName && region && endpoint && baseUrl) {
-            // If the object with the given fileAdapterName doesn't exist, add a new one
-            fileAdapters.push({
-              id: id,
-              fileAdapterName: fileAdapterName,
-              fileAdapter: adapter,
-              bucketName: bucketName,
-              region: region,
-              endpoint: endpoint,
-              baseUrl: baseUrl,
-              accessKeyId: accessKeyId,
-              secretAccessKey: secretAccessKey,
-            });
-          } else {
-            throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide all parameters.');
-          }
-        }
-        const updateTenant = await saveTenant(tenantId, fileAdapters, id);
-        await updateTenantSchema();
-        const ActiveFileAdapter = adapter === 'opensign' ? 'opensign' : id;
-        return { ActiveFileAdapter: ActiveFileAdapter, updateAt: updateTenant.updatedAt };
-      } else {
-        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
-      }
-    } catch (err) {
-      console.log('Err in add custom file adapter', err);
-      const code = err.code || 400;
-      const msg = err.message || 'Something went wrong.';
-      throw new Parse.Error(code, msg);
-    }
-  } else if (adapter === 'opensign') {
-    try {
-      const extUser = await getExtUser(request);
-      if (extUser) {
-        const tenantId = extUser?.get('TenantId')?.id;
-        const updateTenant = await saveTenant(tenantId);
-        await updateTenantSchema();
-        return { ActiveFileAdapter: 'opensign', updateAt: updateTenant.updatedAt };
-      } else {
-        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
-      }
-    } catch (err) {
-      console.log('Err in add custom file adapter', err);
-      const code = err.code || 400;
-      const msg = err.message || 'Something went wrong.';
-      throw new Parse.Error(code, msg);
-    }
-  } else {
-    throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide all parameters.');
-  }
-}

apps/OpenSignServer/cloud/parsefunction/addPfxFile.js

@@ -1,58 +0,0 @@
-// `updateTenantSchema` is used add FileAdapter in protected fields
-async function updateTenantSchema() {
-  const tenantSchema = new Parse.Schema('partners_Tenant');
-  const currentSchema = await tenantSchema.get();
-  let clp = currentSchema.classLevelPermissions;
-  // Public permission ("*")
-  const role = '*';
-  if (!clp.protectedFields || Object.keys(clp.protectedFields).length === 0) {
-    // Initialize protectedFields if it doesn't exist
-    clp.protectedFields = { [role]: [] };
-  }
-  // save PfxFile field is in protectedFields if not exists
-  if (!clp.protectedFields[role]?.includes('PfxFile')) {
-    clp.protectedFields[role].push('PfxFile');
-    // Update the class schema with the modified CLP
-    tenantSchema.setCLP(clp);
-    await tenantSchema.update();
-  }
-}
-
-export default async function addPfxFile(request) {
-  if (!request?.user) {
-    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
-  }
-  const pfxBase64 = request.params.pfxBase64;
-  const title = request.params.title;
-  const password = request.params.password;
-  const provider = request.params.provider;
-  if (provider === 'opensign' || (pfxBase64 && password)) {
-    try {
-      const extUserCls = new Parse.Query('contracts_Users');
-      extUserCls.equalTo('UserId', request.user);
-      extUserCls.include('TenantId');
-      const extUser = await extUserCls.first({ useMasterKey: true });
-      if (extUser) {
-        const tenantCls = new Parse.Object('partners_Tenant');
-        tenantCls.id = extUser?.get('TenantId')?.id;
-        if (provider === 'opensign') {
-          tenantCls.unset('PfxFile');
-        } else {
-          tenantCls.set('PfxFile', { title: title, password: password, base64: pfxBase64 });
-        }
-        const updateTenant = await tenantCls.save(null, { useMasterKey: true });
-        await updateTenantSchema();
-        return { updateAt: updateTenant.updatedAt };
-      } else {
-        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
-      }
-    } catch (err) {
-      console.log('Err in add custom file adapter', err);
-      const code = err.code || 400;
-      const msg = err.message || 'Something went wrong.';
-      throw new Parse.Error(code, msg);
-    }
-  } else {
-    throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide all parameters.');
-  }
-}

apps/OpenSignServer/cloud/parsefunction/callWebhook.js

@@ -9,7 +9,6 @@ export default async function callWebhook(request) {
   const appId = process.env.APP_ID;
   try {
     const docQuery = new Parse.Query('contracts_Document');
-    docQuery.include('ExtUserPtr.TenantId');
     const docRes = await docQuery.get(docId, { useMasterKey: true });
     const isEnableOTP = docRes?.get('IsEnableOTP') || false;
     let userId;

apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
-import { cloudServerUrl, parseJwt } from '../../Utils.js';
+import { cloudServerUrl } from '../../Utils.js';
-import jwt from 'jsonwebtoken';
+
 const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 const licenseKey = process.env.LICENSE_KEY;
@@ -30,8 +30,7 @@ async function deductcount(docsCount, extUserId, subscription) {
     console.log('Err in deduct in quick send', err);
   }
 }
-async function sendMail(document) {
+async function sendMail(document, sessionToken) {
-  //sessionToken
   const baseUrl = new URL(process.env.PUBLIC_URL);
 
   // console.log("pdfDetails", pdfDetails);
@@ -58,7 +57,7 @@ async function sendMail(document) {
       const headers = {
         'Content-Type': 'application/json',
         'X-Parse-Application-Id': appId,
-        // sessionToken: sessionToken,
+        sessionToken: sessionToken,
       };
       const objectId = signerMail[i]?.signerObjId;
       const hostUrl = baseUrl.origin;
@@ -96,7 +95,7 @@ async function sendMail(document) {
           orgName +
           "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
           localExpireDate +
-          "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+          "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
           signPdf +
           "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px;'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
           sender +
@@ -113,232 +112,13 @@ async function sendMail(document) {
     }
   }
 }
-async function callwebhookevent(document) {
-  const Signers = document.Signers;
-  const allSigner = document?.Placeholders?.map(item => {
-    if (item.signerObjId) {
-      const signer = Signers?.find(e => item?.signerPtr?.objectId === e?.objectId);
-      if (signer) {
-        return {
-          role: item?.Role || '',
-          name: signer?.Name || '',
-          email: signer?.Email || '',
-          phone: signer?.Phone || '',
-        };
-      }
-    } else {
-      return { role: item?.Role || '', name: '', email: item?.email || '', phone: '' };
-    }
-  });
-  const params = {
-    event: 'created',
-    body: {
-      objectId: document?.objectId,
-      file: document?.SignedUrl || document?.URL,
-      name: document?.Name,
-      note: document?.Note || '',
-      description: document?.Description || '',
-      signers: allSigner,
-      createdBy: document?.ExtUserPtr.Email,
-      createdAt: document?.createdAt,
-    },
-  };
-  try {
-    await axios
-      .post(document?.ExtUserPtr?.Webhook, params, {
-        headers: { 'Content-Type': 'application/json' },
-      })
-      .then(res => {
-        try {
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', res?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: document.CreatedBy.objectId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err);
-        }
-      })
-      .catch(err => {
-        console.log('Err send data to webhook', err?.message);
-        try {
-          const webhook = new Parse.Object('contracts_Webhook');
-          webhook.set('Log', err?.status);
-          webhook.set('UserId', {
-            __type: 'Pointer',
-            className: '_User',
-            objectId: document.CreatedBy.objectId,
-          });
-          webhook.save(null, { useMasterKey: true });
-        } catch (err) {
-          console.log('err save in contracts_Webhook', err?.message);
-        }
-      });
-  } catch (err) {
-    console.log('Err ', err?.message);
-  }
-}
-async function batchQuery(userId, Documents, Ip, parseConfig) {
-  const extCls = new Parse.Query('contracts_Users');
-  extCls.equalTo('UserId', {
-    __type: 'Pointer',
-    className: '_User',
-    objectId: userId,
-  });
-  const resExt = await extCls.first({ useMasterKey: true });
-  if (resExt) {
-    const _resExt = JSON.parse(JSON.stringify(resExt));
-    try {
-      const requests = Documents.map(x => {
-        const Signers = x.Signers;
-        const allSigner = x?.Placeholders?.map(
-          item => Signers?.find(e => item?.signerPtr?.objectId === e?.objectId) || item?.signerPtr
-        ).filter(signer => Object.keys(signer).length > 0);
-        const date = new Date();
-        const isoDate = date.toISOString();
-        let Acl = { [x.CreatedBy.objectId]: { read: true, write: true } };
-        if (allSigner && allSigner.length > 0) {
-          allSigner.forEach(x => {
-            const obj = { [x.CreatedBy.objectId]: { read: true, write: true } };
-            Acl = { ...Acl, ...obj };
-          });
-        }
-        return {
-          method: 'POST',
-          path: '/app/classes/contracts_Document',
-          body: {
-            Name: x.Name,
-            URL: x.URL,
-            Note: x.Note,
-            Description: x.Description,
-            CreatedBy: x.CreatedBy,
-            SendinOrder: x.SendinOrder || true,
-            ExtUserPtr: {
-              __type: 'Pointer',
-              className: x.ExtUserPtr.className,
-              objectId: x.ExtUserPtr?.objectId,
-            },
-            Placeholders: x.Placeholders.map(y =>
-              y?.signerPtr?.objectId
-                ? {
-                    ...y,
-                    signerPtr: {
-                      __type: 'Pointer',
-                      className: 'contracts_Contactbook',
-                      objectId: y.signerPtr.objectId,
-                    },
-                    signerObjId: y.signerObjId,
-                  }
-                : { ...y, signerPtr: {}, signerObjId: '' }
-            ),
-            SignedUrl: x.URL || x.SignedUrl,
-            SentToOthers: true,
-            Signers: allSigner?.map(y => ({
-              __type: 'Pointer',
-              className: 'contracts_Contactbook',
-              objectId: y.objectId,
-            })),
-            ACL: Acl,
-            SentToOthers: true,
-            RemindOnceInEvery: x.RemindOnceInEvery || 5,
-            AutomaticReminders: x.AutomaticReminders || false,
-            TimeToCompleteDays: x.TimeToCompleteDays || 15,
-            OriginIp: Ip,
-            DocSentAt: { __type: 'Date', iso: isoDate },
-            IsEnableOTP: x?.IsEnableOTP || false,
-            IsTourEnabled: x?.IsTourEnabled || false,
-            FileAdapterId: x?.FileAdapterId || '',
-            ...(x?.SignatureType ? { SignatureType: x?.SignatureType } : {}),
-          },
-        };
-      });
-      // console.log('requests ', requests);
-      if (licenseKey) {
-        const subscription = new Parse.Query('contracts_Subscriptions');
-        subscription.equalTo('TenantId', {
-          __type: 'Pointer',
-          className: 'partners_Tenant',
-          objectId: _resExt.TenantId.objectId,
-        });
-        subscription.include('ExtUserPtr');
-        subscription.greaterThanOrEqualTo('Next_billing_date', new Date());
-        const resSub = await subscription.first({ useMasterKey: true });
-        if (resSub) {
-          const _resSub = JSON.parse(JSON.stringify(resSub));
-          const allowedCredits = _resSub?.AllowedCredits || 0;
-          const addonCredits = _resSub?.AddonCredits || 0;
-          const totalcredits = allowedCredits + addonCredits;
-          if (requests?.length <= totalcredits) {
-            const response = await axios.post('batch', { requests: requests }, parseConfig);
-            // Handle the batch query response
-            // console.log('Batch query response:', response.data);
-            if (response.data && response.data.length > 0) {
-              const updateDocuments = Documents.map((x, i) => ({
-                ...x,
-                objectId: response.data[i]?.success?.objectId,
-                createdAt: response.data[i]?.success?.createdAt,
-              }));
-              deductcount(response.data.length, resExt.id, _resSub);
-              for (let i = 0; i < updateDocuments.length; i++) {
-                sendMail(updateDocuments[i], ''); //sessionToken
-              }
-              callwebhookevent(Documents[0]);
-              return 'success';
-            }
-          } else {
-            throw new Parse.Error(429, 'Quota reached, Please buy credits and try again later.');
-          }
-        } else {
-          throw new Parse.Error(
-            Parse.Error.INVALID_QUERY,
-            'Please purchase or renew your subscription.'
-          );
-        }
-      } else {
-        if (requests?.length > 0) {
-          const newrequests = [requests?.[0]];
-          const response = await axios.post('batch', { requests: newrequests }, parseConfig);
-          // Handle the batch query response
-          // console.log('Batch query response:', response.data);
-          if (response.data && response.data.length > 0) {
-            const document = Documents?.[0];
-            const updateDocuments = {
-              ...document,
-              objectId: response.data[0]?.success?.objectId,
-              createdAt: response.data[0]?.success?.createdAt,
-            };
-            deductcount(response.data.length, resExt.id);
-            sendMail(updateDocuments); //sessionToken
-            callwebhookevent(Documents[0]);
-            return 'success';
-          }
-        }
-      }
-    } catch (error) {
-      const code = error?.response?.data?.code || error?.response?.status || error?.code || 400;
-      const msg =
-        error?.response?.data?.error ||
-        error?.response?.data ||
-        error?.message ||
-        'Something went wrong.';
-      console.log('Error performing batch query:', code, msg);
-      throw new Parse.Error(code, msg);
-    }
-  } else {
-    throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
-  }
-}
 export default async function createBatchDocs(request) {
   const strDocuments = request.params.Documents;
-  const sessionToken = request.headers?.sessiontoken;
+  const sessionToken = request.headers['sessiontoken'];
-  const jwttoken = request.headers?.jwttoken;
   const Documents = JSON.parse(strDocuments);
   const Ip = request?.headers?.['x-real-ip'] || '';
   const parseConfig = {
-    baseURL: serverUrl,
+    baseURL: serverUrl, //localStorage.getItem('baseUrl'),
     headers: {
       'X-Parse-Application-Id': appId,
       'X-Parse-Session-Token': sessionToken,
@@ -346,38 +126,165 @@ export default async function createBatchDocs(request) {
     },
   };
   try {
-    if (request?.user) {
+    const user = await axios.get(serverUrl + '/users/me', {
-      return await batchQuery(request.user.id, Documents, Ip, parseConfig);
+      headers: {
-    } else if (jwttoken) {
+        'X-Parse-Application-Id': appId,
-      const jwtDecode = parseJwt(jwttoken);
+        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      if (jwtDecode?.user_email) {
+      },
-        const userCls = new Parse.Query(Parse.User);
+    });
-        userCls.equalTo('email', jwtDecode?.user_email);
+    if (user.data) {
-        const userRes = await userCls.first({ useMasterKey: true });
+      const extCls = new Parse.Query('contracts_Users');
-        const userId = userRes?.id;
+      extCls.equalTo('UserId', {
-        const tokenQuery = new Parse.Query('appToken');
+        __type: 'Pointer',
-        tokenQuery.equalTo('userId', {
+        className: '_User',
-          __type: 'Pointer',
+        objectId: user.data.objectId,
-          className: '_User',
+      });
-          objectId: userId,
+      const resExt = await extCls.first({ useMasterKey: true });
-        });
+      if (resExt) {
-        const appRes = await tokenQuery.first({ useMasterKey: true });
+        const _resExt = JSON.parse(JSON.stringify(resExt));
-        const decoded = jwt.verify(jwttoken, appRes?.get('token'));
+        try {
-        if (decoded?.user_email) {
+          const requests = Documents.map(x => {
-          return await batchQuery(userId, Documents, Ip, parseConfig);
+            const Signers = x.Signers;
-        } else {
+            const allSigner = x?.Placeholders?.map(
-          throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid token.');
+              item =>
+                Signers?.find(e => item?.signerPtr?.objectId === e?.objectId) || item?.signerPtr
+            ).filter(signer => Object.keys(signer).length > 0);
+            const date = new Date();
+            const isoDate = date.toISOString();
+            let Acl = { [x.CreatedBy.objectId]: { read: true, write: true } };
+            if (allSigner && allSigner.length > 0) {
+              allSigner.forEach(x => {
+                const obj = { [x.CreatedBy.objectId]: { read: true, write: true } };
+                Acl = { ...Acl, ...obj };
+              });
+            }
+            return {
+              method: 'POST',
+              path: '/app/classes/contracts_Document',
+              body: {
+                Name: x.Name,
+                URL: x.URL,
+                Note: x.Note,
+                Description: x.Description,
+                CreatedBy: x.CreatedBy,
+                SendinOrder: x.SendinOrder || true,
+                ExtUserPtr: {
+                  __type: 'Pointer',
+                  className: x.ExtUserPtr.className,
+                  objectId: x.ExtUserPtr.objectId,
+                },
+                Placeholders: x.Placeholders.map(y =>
+                  y?.signerPtr?.objectId
+                    ? {
+                        ...y,
+                        signerPtr: {
+                          __type: 'Pointer',
+                          className: 'contracts_Contactbook',
+                          objectId: y.signerPtr.objectId,
+                        },
+                        signerObjId: y.signerObjId,
+                      }
+                    : { ...y, signerPtr: {}, signerObjId: '' }
+                ),
+                SignedUrl: x.URL || x.SignedUrl,
+                SentToOthers: true,
+                Signers: allSigner?.map(y => ({
+                  __type: 'Pointer',
+                  className: 'contracts_Contactbook',
+                  objectId: y.objectId,
+                })),
+                ACL: Acl,
+                SentToOthers: true,
+                RemindOnceInEvery: x.RemindOnceInEvery || 5,
+                AutomaticReminders: x.AutomaticReminders || false,
+                TimeToCompleteDays: x.TimeToCompleteDays || 15,
+                OriginIp: Ip,
+                DocSentAt: { __type: 'Date', iso: isoDate },
+                IsEnableOTP: x?.IsEnableOTP || false,
+              },
+            };
+          });
+          // console.log('requests ', requests);
+          if (licenseKey) {
+            const subscription = new Parse.Query('contracts_Subscriptions');
+            subscription.equalTo('TenantId', {
+              __type: 'Pointer',
+              className: 'partners_Tenant',
+              objectId: _resExt.TenantId.objectId,
+            });
+            subscription.include('ExtUserPtr');
+            subscription.greaterThanOrEqualTo('Next_billing_date', new Date());
+            const resSub = await subscription.first({ useMasterKey: true });
+            if (resSub) {
+              const _resSub = JSON.parse(JSON.stringify(resSub));
+              const allowedCredits = _resSub?.AllowedCredits || 0;
+              const addonCredits = _resSub?.AddonCredits || 0;
+              const totalcredits = allowedCredits + addonCredits;
+              if (requests?.length <= totalcredits) {
+                const response = await axios.post('batch', { requests: requests }, parseConfig);
+                // // Handle the batch query response
+                // console.log('Batch query response:', response.data);
+                if (response.data && response.data.length > 0) {
+                  const updateDocuments = Documents.map((x, i) => ({
+                    ...x,
+                    objectId: response.data[i]?.success?.objectId,
+                    createdAt: response.data[i]?.success?.createdAt,
+                  }));
+                  deductcount(response.data.length, resExt.id, _resSub);
+                  for (let i = 0; i < updateDocuments.length; i++) {
+                    sendMail(updateDocuments[i], sessionToken);
+                  }
+                  return 'success';
+                }
+              } else {
+                throw new Parse.Error(
+                  429,
+                  'Quota reached, Please buy credits and try again later.'
+                );
+              }
+            } else {
+              throw new Parse.Error(
+                Parse.Error.INVALID_QUERY,
+                'Please purchase or renew your subscription.'
+              );
+            }
+          } else {
+            if (requests?.length > 0) {
+              const newrequests = [requests?.[0]];
+              const response = await axios.post('batch', { requests: newrequests }, parseConfig);
+              // Handle the batch query response
+              // console.log('Batch query response:', response.data);
+              if (response.data && response.data.length > 0) {
+                const document = Documents?.[0];
+                const updateDocuments = {
+                  ...document,
+                  objectId: response.data[0]?.success?.objectId,
+                  createdAt: response.data[0]?.success?.createdAt,
+                };
+                deductcount(response.data.length, resExt.id);
+                sendMail(updateDocuments, sessionToken);
+                return 'success';
+              }
+            }
+          }
+        } catch (error) {
+          const code = error?.response?.data?.code || error?.response?.status || error?.code || 400;
+          const msg =
+            error?.response?.data?.error ||
+            error?.response?.data ||
+            error?.message ||
+            'Something went wrong.';
+          console.log('Error performing batch query:', code, msg);
+          throw new Parse.Error(code, msg);
         }
-      } else {
-        throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'Invalid token.');
       }
     } else {
-      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
     }
   } catch (err) {
     console.log('err in createbatchdoc', err);
     const code = err?.code || 400;
     const msg = err?.message || 'Something went wrong.';
-    throw new Parse.Error(code, msg);
+    new Parse.Error(code, msg);
   }
 }