Skip to content

Commit c9909a0

Browse files
raktima-opensignlabsraktima-opensignlabs
committed
Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into raktima-patch-3
2 parents 988fc1b + ced9bbd commit c9909a0

File tree

14 files changed

+156
-82
lines changed

14 files changed

+156
-82
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@
151151
"Name": "Name",
152152
"Status": "Status",
153153
"created-date": "Created Date",
154-
"Type": "Type"
154+
"Type": "Type",
155+
"Logs": "Logs"
155156
},
156157
"report-help": {
157158
"Draft Documents": "These are documents you have started but have not finalized for sending.",
@@ -651,5 +652,7 @@
651652
"hide-advanced-options":"Hide Advanced options",
652653
"download-files":"Download files",
653654
"download-pdf":"Download Pdf",
654-
"pdf-certificate":"Download Pdf + Certificate"
655+
"pdf-certificate":"Download Pdf + Certificate",
656+
"document-logs":"Document logs"
657+
655658
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@
136136
"Name": "Nom",
137137
"Status": "Statut",
138138
"created-date": "Date de création",
139-
"Type": "Saisir"
139+
"Type": "Saisir",
140+
"Logs": "Journaux"
140141
},
141142
"btnLabel": {
142143
"sign": "Signer",
@@ -650,6 +651,7 @@
650651
"hide-advanced-options": "Masquer les options avancées",
651652
"download-files" :"Télécharger des fichiers",
652653
"download-pdf" :"Télécharger le PDF",
653-
"pdf-certificate" :"Télécharger Pdf + Certificat"
654+
"pdf-certificate" :"Télécharger Pdf + Certificat",
655+
"document-logs":"Journaux de documents"
654656

655657
}

‎apps/OpenSign/src/json/ReportJson.js‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ export default function reportJson(id) {
1010
"Owner",
1111
"Signers"
1212
];
13+
const iphead = [
14+
"Sr.No",
15+
"Title",
16+
"Note",
17+
"Folder",
18+
"File",
19+
"Logs",
20+
"Signers"
21+
];
1322
const contactbook = ["Sr.No", "Name", "Email", "Phone"];
1423
const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
1524
const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
@@ -63,7 +72,7 @@ export default function reportJson(id) {
6372
case "1MwEuxLEkF":
6473
return {
6574
reportName: "In-progress documents",
66-
heading: head,
75+
heading: iphead,
6776
actions: [
6877
{
6978
btnId: "8901",

‎apps/OpenSign/src/pages/PdfRequestFiles.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,8 @@ function PdfRequestFiles(props) {
16621662
<Confetti
16631663
width={window.innerWidth}
16641664
height={window.innerHeight}
1665+
recycle={false} // Prevents confetti from repeating
1666+
gravity={0.1} // Adjust the gravity to control the speed
16651667
/>
16661668
</div>
16671669
)}

‎apps/OpenSign/src/pages/SignyourselfPdf.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1194,7 +1194,12 @@ function SignYourSelf() {
11941194
)}
11951195
{isCelebration && (
11961196
<div className="relative z-[1000]">
1197-
<Confetti width={window.innerWidth} height={window.innerHeight} />
1197+
<Confetti
1198+
width={window.innerWidth}
1199+
height={window.innerHeight}
1200+
recycle={false} // Prevents confetti from repeating
1201+
gravity={0.1} // Adjust the gravity to control the speed
1202+
/>
11981203
</div>
11991204
)}
12001205
<div className="relative op-card overflow-hidden flex flex-col md:flex-row justify-between bg-base-300">

‎apps/OpenSign/src/primitives/GetReportDisplay.js‎

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ const ReportTable = (props) => {
6969
const [publicUserName, setIsPublicUserName] = useState("");
7070
const [isViewShare, setIsViewShare] = useState({});
7171
const [isSubscribe, setIsSubscribe] = useState(true);
72+
const [isModal, setIsModal] = useState({});
7273
const [reason, setReason] = useState("");
7374
const Extand_Class = localStorage.getItem("Extand_Class");
7475
const extClass = Extand_Class && JSON.parse(Extand_Class);
@@ -1128,7 +1129,12 @@ const ReportTable = (props) => {
11281129
<div className="p-2 w-full overflow-auto bg-base-100 text-base-content op-card shadow-lg">
11291130
{isCelebration && (
11301131
<div className="relative z-[1000]">
1131-
<Confetti width={window.innerWidth} height={window.innerHeight} />
1132+
<Confetti
1133+
width={window.innerWidth}
1134+
height={window.innerHeight}
1135+
recycle={false} // Prevents confetti from repeating
1136+
gravity={0.1} // Adjust the gravity to control the speed
1137+
/>
11321138
</div>
11331139
)}
11341140
{isAlert && <Alert type={alertMsg.type}>{alertMsg.message}</Alert>}
@@ -1288,9 +1294,55 @@ const ReportTable = (props) => {
12881294
{item?.URL ? t("download") : "-"}
12891295
</button>
12901296
</td>
1291-
<td className="px-4 py-2">
1292-
{formatRow(item?.ExtUserPtr)}
1293-
</td>
1297+
{props.ReportName === "In-progress documents" ? (
1298+
<td className="px-4 py-2">
1299+
<button
1300+
onClick={() =>
1301+
item?.AuditTrail?.length > 0 &&
1302+
setIsModal({ [item?.objectId]: true })
1303+
}
1304+
className={`${
1305+
item?.AuditTrail?.length
1306+
? "border-green-400"
1307+
: "cursor-default op-border-primary"
1308+
} focus:outline-none w-[60px] border-[2px] text-[12px] rounded-full md:self-center`}
1309+
>
1310+
{item?.AuditTrail?.length ? "VIEWED" : "SENT"}
1311+
</button>
1312+
{isModal[item.objectId] && (
1313+
<ModalUi
1314+
isOpen
1315+
title={t("document-logs")}
1316+
handleClose={() => setIsModal({})}
1317+
>
1318+
{item?.AuditTrail?.map((x, i) => (
1319+
<div
1320+
key={i}
1321+
className="pl-3 first:mt-2 text-sm font-medium flex flex-col md:flex-row items-start md:gap-4 border-t-[1px] border-gray-600"
1322+
>
1323+
<div className="py-2 break-all font-bold md:text-[12px] md:col-span-2 w-full md:w-[210px]">
1324+
{x?.UserPtr?.Email || "-"}
1325+
</div>
1326+
<button className="px-2 cursor-default border-[2px] text-[12px] border-green-400 rounded-full md:self-center">
1327+
{x?.Activity?.toUpperCase() || "-"}
1328+
</button>
1329+
<div className=" text-[12px] py-2">
1330+
{x?.Activity === "Signed"
1331+
? new Date(x?.SignedOn)?.toUTCString()
1332+
: new Date(
1333+
x?.ViewedOn
1334+
)?.toUTCString() || "-"}
1335+
</div>
1336+
</div>
1337+
))}
1338+
</ModalUi>
1339+
)}
1340+
</td>
1341+
) : (
1342+
<td className="px-4 py-2">
1343+
{formatRow(item?.ExtUserPtr)}
1344+
</td>
1345+
)}
12941346
<td className="px-4 py-2">
12951347
{!item?.IsSignyourself && item?.Placeholders ? (
12961348
<button
@@ -1308,11 +1360,7 @@ const ReportTable = (props) => {
13081360
<td className=" pl-[20px] py-2">
13091361
{props.ReportName === "Templates" && (
13101362
<div className="flex flex-row">
1311-
<label
1312-
className={
1313-
"cursor-pointer relative inline-flex items-center mb-0"
1314-
}
1315-
>
1363+
<label className="cursor-pointer relative inline-flex items-center mb-0">
13161364
<input
13171365
checked={props.isPublic?.[item.objectId]}
13181366
onChange={(e) =>

‎apps/OpenSign/src/primitives/TourContentWithBtn.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default function TourContentWithBtn({ message, isChecked, video }) {
2424
></iframe>
2525
</div>
2626
)}
27-
<label className="flex items-center justify-center mb-0">
27+
<label className="flex items-center justify-center mt-3 mb-0">
2828
<input
2929
type="checkbox"
3030
className="op-checkbox op-checkbox-xs mr-1"

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

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"upgrade-now": "Upgrade now",
4242
"upgrade-to": "Upgrade to",
4343
"plan": "Plan",
44-
"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!",
44+
"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!",
4545
"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.",
4646
"user-name-limit-char": "To have a username less than 8 character please subscribe",
4747
"tour-content": "Don't show this again",
@@ -151,7 +151,8 @@
151151
"Name": "Name",
152152
"Status": "Status",
153153
"created-date": "Created Date",
154-
"Type": "Type"
154+
"Type": "Type",
155+
"Logs": "Logs"
155156
},
156157
"report-help": {
157158
"Draft Documents": "These are documents you have started but have not finalized for sending.",
@@ -594,7 +595,7 @@
594595
"Recently sent for signatures": "This is a list of documents you've sent to other parties for signature.",
595596
"Drafts": "This are documents you have started but have not finalized for sending.",
596597
"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."
597-
},
598+
},
598599
"enter-email-plaholder": "Add an email address and hit enter",
599600
"success-email-alert": "Email sent successfully!",
600601
"expired-doc-title": "Expired Document",
@@ -615,38 +616,42 @@
615616
"select-date-format": "Select a date format",
616617
"quantity-of-credits": "Quantity of premium credits",
617618
"remaining-credits": "Premium credits available:",
618-
"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.",
619+
"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.",
619620
"additional-credits": "Please purchase premium credits",
620621
"quota-err-quicksend": "Quota Reached, You don't have enough credits.",
621622
"buy-credits": "Buy Premium Credits",
622-
"rotate-right":"Rotate right",
623-
"rotate-left":"Rotate left",
624-
"rotate-alert-mssg":"All widgets on this page will be lost. Are you sure you want to proceed?",
625-
"templateid":"Template-Id",
626-
"bulk-send-subcription-alert":"Please upgrade to Professional or Team plan to use bulk send.",
627-
"generate-test-token":"Generate Test Token",
628-
"regenerate-test-token":"Regenerate Test Token",
629-
"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.",
630-
"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.",
631-
"reason":"Reason",
632-
"decline-by":"Declined/revoked by",
623+
"rotate-right": "Rotate right",
624+
"rotate-left": "Rotate left",
625+
"rotate-alert-mssg": "All widgets on this page will be lost. Are you sure you want to proceed?",
626+
"templateid": "Template-Id",
627+
"bulk-send-subcription-alert": "Please upgrade to Professional or Team plan to use bulk send.",
628+
"generate-test-token": "Generate Test Token",
629+
"regenerate-test-token": "Regenerate Test Token",
630+
"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.",
631+
"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.",
632+
"reason": "Reason",
633+
"decline-by": "Declined/revoked by",
633634
"document-declined": "Document declined",
634-
"quota-mail-info-head":"Monthly request signatures email limit",
635+
"quota-mail-info-head": "Monthly request signatures email limit",
635636
"quota-mail-info": "You can send upto 15 signature request emails every month. Upgrade now to send unlimited signing requests directly.",
636637
"quota-mail": "You've reached your limit of 15 signature request emails for this month. Upgrade now to continue sending emails directly.",
637-
"quota-mail-tip":"Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
638-
"quota-mail-head":"Quota Reached",
639-
"unauthorized-modal":"You don't have permission to perform this action, please contact {{adminEmail}}.",
640-
"sent-this-month":"Sent this month",
641-
"available-seats":"Available seats",
642-
"buy-users":"Buy more users",
638+
"quota-mail-tip": "Tip: You can still sign <1>unlimited documents</1> by manually sharing the signing request links.",
639+
"quota-mail-head": "Quota Reached",
640+
"unauthorized-modal": "You don't have permission to perform this action, please contact {{adminEmail}}.",
641+
"sent-this-month": "Sent this month",
642+
"available-seats": "Available seats",
643+
"buy-users": "Buy more users",
643644
"isenable-otp": "Enable OTP verification",
644645
"isenable-otp-help": {
645646
"p1": "Would you like to enable the verification process using a one-time password (OTP)?",
646647
"p2": "Selecting this option will enable OTP verification. Users will receive a verification code via email, which they must enter to sign the document.",
647648
"p3": "Selecting this option will disable OTP verification, allowing users to sign the document directly without additional steps.",
648649
"p4": "Please choose the option that best suits your document signing requirements."
649650
},
650-
"advanced-options":"Advanced options",
651-
"hide-advanced-options":"Hide Advanced options"
651+
"advanced-options": "Advanced options",
652+
"hide-advanced-options": "Hide Advanced options",
653+
"download-files": "Download files",
654+
"download-pdf": "Download Pdf",
655+
"pdf-certificate": "Download Pdf + Certificate",
656+
"document-logs": "Document logs"
652657
}

0 commit comments

Comments
 (0)