Skip to content

🔥 The free & Open Source DocuSign alternative

refactor: add date format in label for expiry date

prafull-opensignlabs4fb27f489696
diff --git a/apps/OpenSign/public/locales/en/translation.json b/apps/OpenSign/public/locales/en/translation.json
index e3c02ce5b..c07cdedda 100644
--- a/apps/OpenSign/public/locales/en/translation.json
+++ b/apps/OpenSign/public/locales/en/translation.json
@@ -706,6 +706,7 @@
"p1": "The document creator will receive an email notification whenever a signer signs the document.",
"note": "Note: Notification email will not be sent for the last signer, as the document creator will receive a completion email instead."
},
+ "expiry-date": "Expiry Date",
"expiry-date-updated": "The expiry date has been successfully extended to {{newexpirydate}}",
"expiry-date-error": "Please provide a new expiry date that is later than the current one"
}
diff --git a/apps/OpenSign/public/locales/es/translation.json b/apps/OpenSign/public/locales/es/translation.json
index 5154c87d7..d2cc76701 100644
--- a/apps/OpenSign/public/locales/es/translation.json
+++ b/apps/OpenSign/public/locales/es/translation.json
@@ -706,6 +706,7 @@
"p1": "El creador del documento recibirá una notificación por correo electrónico cada vez que un firmante firme el documento.",
"note": "Nota: No se enviará un correo electrónico de notificación al último firmante, ya que el creador del documento recibirá un correo electrónico de finalización."
},
+ "expiry-date": "Date d'expiration",
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
"expiry-date-error": "Proporcione una nueva fecha de vencimiento que sea posterior a la actual"
}
diff --git a/apps/OpenSign/public/locales/fr/translation.json b/apps/OpenSign/public/locales/fr/translation.json
index 321cf94d2..3aa1ebc05 100644
--- a/apps/OpenSign/public/locales/fr/translation.json
+++ b/apps/OpenSign/public/locales/fr/translation.json
@@ -705,6 +705,7 @@
"p1": "Le créateur du document recevra une notification par e-mail chaque fois qu'un signataire signera le document.",
"note": "Remarque : L'e-mail de notification ne sera pas envoyé pour le dernier signataire, car le créateur du document recevra à la place un e-mail de fin."
},
+ "expiry-date": "Fecha de caducidad",
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
"expiry-date-error": "Veuillez fournir une nouvelle date d'expiration postérieure à la date actuelle"
}
diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js
index 4f3a2f79b..6ef484120 100644
--- a/apps/OpenSign/src/primitives/GetReportDisplay.js
+++ b/apps/OpenSign/src/primitives/GetReportDisplay.js
@@ -1848,7 +1848,9 @@ const ReportTable = (props) => {
className="px-4 py-2 flex flex-col"
onSubmit={(e) => handleUpdateExpiry(e, item)}
>
- <label className="mr-2">Expiry date</label>
+ <label className="mr-2">
+ {t("expiry-date")} {"(dd-mm-yyyy)"}
+ </label>
<input
type="date"
className="rounded-full mb-2 bg-base-300 w-full px-4 py-2 text-black border-2 hover:border-spacing-2"
diff --git a/apps/OpenSign/src/primitives/PdfDeclineModal.js b/apps/OpenSign/src/primitives/PdfDeclineModal.js
index b8dfa8840..836192511 100644
--- a/apps/OpenSign/src/primitives/PdfDeclineModal.js
+++ b/apps/OpenSign/src/primitives/PdfDeclineModal.js
@@ -35,27 +35,31 @@ function CustomModal(props) {
<h3 className="text-base-content font-bold text-lg pt-[15px] px-[20px]">
{props?.headMsg && props?.headMsg}
</h3>
- <div className="p-[10px] px-[20px]">
- <p className="text-[15px]">{props.bodyMssg && props.bodyMssg}</p>
- </div>
- <div className="flex flex-row items-center">
- {isCreator && (
- <button
- className="op-btn op-btn-primary px-6 ml-[20px] mb-3 mt-1"
- onClick={() => handleExtendBtn()}
- >
- Extend
- </button>
- )}
- {props.isDownloadBtn && (
- <button
- className="op-btn op-btn-primary ml-[10px] mb-3 mt-1"
- onClick={() => props.handleDownloadBtn()}
- >
- Download
- </button>
- )}
- </div>
+ {!isExtendExpiry && (
+ <div className="p-[10px] px-[20px]">
+ <p className="text-[15px]">{props.bodyMssg && props.bodyMssg}</p>
+ </div>
+ )}
+ {!isExtendExpiry && (
+ <div className="flex flex-row items-center">
+ {isCreator && (
+ <button
+ className="op-btn op-btn-primary px-6 ml-[20px] mb-3 mt-1"
+ onClick={() => handleExtendBtn()}
+ >
+ Extend
+ </button>
+ )}
+ {props.isDownloadBtn && (
+ <button
+ className="op-btn op-btn-primary ml-[10px] mb-3 mt-1"
+ onClick={() => props.handleDownloadBtn()}
+ >
+ Download
+ </button>
+ )}
+ </div>
+ )}
{props.footerMessage && (
<>
<div className="mx-3">
@@ -93,10 +97,13 @@ function CustomModal(props) {
)}
{isExtendExpiry && (
<form className="mx-3 mb-3" onSubmit={handleUpdateExpiry}>
+ <label className="ml-2 mt-2">
+ {t("expiry-date")} {"(dd-mm-yyyy)"}
+ </label>
<input
type="date"
className="rounded-full bg-base-300 w-full px-4 py-2 text-black border-2 hover:border-spacing-2"
- defaultValue={props?.doc?.ExpiryDate?.iso?.split("T")[0]}
+ defaultValue={props?.doc?.ExpiryDate?.iso?.split("T")?.[0]}
onChange={(e) => setExpiryDate(e.target.value)}
/>
<div className="flex flex-row items-center mt-2">
@@ -111,7 +118,7 @@ function CustomModal(props) {
setIsExtendExpiry(false);
}}
>
- {t("close")}
+ {t("cancel")}
</button>
</div>
</form>
diff --git a/apps/OpenSign/src/script/locales/en/translation.json b/apps/OpenSign/src/script/locales/en/translation.json
index b5dad6262..69ad3caa6 100644
--- a/apps/OpenSign/src/script/locales/en/translation.json
+++ b/apps/OpenSign/src/script/locales/en/translation.json
@@ -706,6 +706,7 @@
"p1": "The document creator will receive an email notification whenever a signer signs the document.",
"note": "Note: Notification email will not be sent for the last signer, as the document creator will receive a completion email instead."
},
+ "expiry-date":"Expiry date",
"expiry-date-updated": "The expiry date has been successfully extended to {{newexpirydate}}",
"expiry-date-error": "Please provide a new expiry date that is later than the current one"
}
diff --git a/apps/OpenSign/src/script/locales/es/translation.json b/apps/OpenSign/src/script/locales/es/translation.json
index cf964b53e..115a038e5 100644
--- a/apps/OpenSign/src/script/locales/es/translation.json
+++ b/apps/OpenSign/src/script/locales/es/translation.json
@@ -706,6 +706,7 @@
"p1": "El creador del documento recibirá una notificación por correo electrónico cada vez que un firmante firme el documento.",
"note": "Nota: No se enviará un correo electrónico de notificación al último firmante, ya que el creador del documento recibirá un correo electrónico de finalización."
},
+ "expiry-date": "Date d'expiration",
"expiry-date-updated": "La fecha de vencimiento se ha extendido con éxito hasta el {{newexpirydate}}",
"expiry-date-error": "Proporcione una nueva fecha de vencimiento que sea posterior a la actual"
}
diff --git a/apps/OpenSign/src/script/locales/fr/translation.json b/apps/OpenSign/src/script/locales/fr/translation.json
index 3611ee6f3..ae5854a8b 100644
--- a/apps/OpenSign/src/script/locales/fr/translation.json
+++ b/apps/OpenSign/src/script/locales/fr/translation.json
@@ -705,6 +705,7 @@
"p1": "Le créateur du document recevra une notification par e-mail chaque fois qu'un signataire signera le document.",
"note": "Remarque : L'e-mail de notification ne sera pas envoyé pour le dernier signataire, car le créateur du document recevra à la place un e-mail de fin."
},
+ "expiry-date": "Fecha de caducidad",
"expiry-date-updated": "La date d'expiration a été prolongée avec succès jusqu'au {{newexpirydate}}",
"expiry-date-error": "Veuillez fournir une nouvelle date d'expiration postérieure à la date actuelle"
}