+
-
{t("yes")}
+
{
- const pdfName = pdfDetails[0]?.Name;
setIsLoading(true);
- let sendMail;
- const docId = pdfDetails?.[0]?.objectId || "";
- let presignedUrl = pdfUrl;
- try {
- const axiosRes = await axios.post(
- `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
- {
- url: pdfUrl,
- docId: docId,
- },
- {
- headers: {
- "content-type": "Application/json",
- "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
- "X-Parse-Session-Token": localStorage.getItem("accesstoken")
- }
- }
- );
- presignedUrl = axiosRes.data.result;
- } catch (err) {
- console.log("err in getsignedurl", err);
- }
- for (let i = 0; i < emailList.length; i++) {
- try {
- 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 logo =
- `
`;
- const opurl =
- ` here`;
-
- let params = {
- extUserId: extUserId,
- pdfName: pdfName,
- url: presignedUrl,
- recipient: emailList[i],
- subject: `${sender.name} has signed the doc - ${pdfName}`,
- replyto:
- pdfDetails?.[0]?.ExtUserPtr?.Email ||
- "",
- from:
- sender.email,
- html:
- ``
- };
- sendMail = await axios.post(url, params, { headers: headers });
- } catch (error) {
- console.log("error", error);
- setIsLoading(false);
- setIsEmail(false);
- setIsAlert({
- isShow: true,
- alertMessage: t("something-went-wrong-mssg")
- });
- }
- }
- if (sendMail?.data?.result?.status === "success") {
+ const params = { docId: pdfDetails?.[0]?.objectId, recipients: emailList };
+ const sendmail = await Parse.Cloud.run("forwarddoc", params);
+ console.log("sendmail ", sendmail);
+ if (sendmail?.status === "success") {
setSuccessEmail(true);
setIsEmail(false);
setTimeout(() => {
diff --git a/apps/OpenSign/src/components/pdf/Placeholder.js b/apps/OpenSign/src/components/pdf/Placeholder.js
index a8da8d33bf..6b5c425176 100644
--- a/apps/OpenSign/src/components/pdf/Placeholder.js
+++ b/apps/OpenSign/src/components/pdf/Placeholder.js
@@ -74,24 +74,23 @@ const changeDateToMomentFormat = (format) => {
return "L";
}
};
+//function to get default format
+const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
-//function to get default date
-const getDefaultdate = (selectedDate, format = "dd-MM-yyyy") => {
+//function to convert formated date to new Date() format
+const getDefaultDate = (dateStr, format) => {
+ //get valid date format for moment to convert formated date to new Date() format
+ const formats = changeDateToMomentFormat(format);
+ const parsedDate = moment(dateStr, formats);
let date;
- if (format && format === "dd-MM-yyyy") {
- const newdate = selectedDate
- ? selectedDate
- : moment(new Date()).format(changeDateToMomentFormat(format));
- const [day, month, year] = newdate.split("-");
- date = new Date(`${year}-${month}-${day}`);
+ if (parsedDate.isValid()) {
+ date = new Date(parsedDate.toISOString());
+ return date;
} else {
- date = new Date(selectedDate);
+ date = new Date();
+ return date;
}
- const value = date;
- return value;
};
-//function to get default format
-const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
function Placeholder(props) {
//'isTouchDevice' is used to detect whether a device has a touchscreen or is mouse-based
@@ -104,28 +103,16 @@ function Placeholder(props) {
const holdTimeout = useRef(null);
const startTime = useRef(null); // Track when the user starts holdings
const [isDisableDragging, setIsDisableDragging] = useState(true);
- const [selectDate, setSelectDate] = useState({
- date:
- props.pos.type === "date"
- ? moment(
- getDefaultdate(
- props?.pos?.options?.response,
- props.pos?.options?.validation?.format
- ).getTime()
- ).format(
- changeDateToMomentFormat(props.pos?.options?.validation?.format)
- )
- : "",
- format:
- props.pos.type === "date"
- ? getDefaultFormat(props.pos?.options?.validation?.format)
- : ""
- });
+ const [selectDate, setSelectDate] = useState({});
const [dateFormat, setDateFormat] = useState([]);
const [clickonWidget, setClickonWidget] = useState({});
const [startDate, setStartDate] = useState(
- props.pos.type === "date" &&
- getDefaultdate(new Date(), props.pos?.options?.validation?.format)
+ props?.pos?.options?.response
+ ? getDefaultDate(
+ props?.pos?.options?.response,
+ props.pos?.options?.validation?.format
+ )
+ : new Date()
);
const [getCheckboxRenderWidth, setGetCheckboxRenderWidth] = useState({
width: null,
@@ -164,7 +151,6 @@ function Placeholder(props) {
return () => clearTimeout(timer);
}, [props.pos]);
-
useEffect(() => {
const onOutsideClick = () => {
if (!isDraggingEnabled) {
@@ -453,7 +439,9 @@ function Placeholder(props) {
//checking widget's type and open widget copy modal for required widgets
if (
- ["signature", textWidget, "stamp", "initials"].includes(props.pos.type)
+ ["signature", textInputWidget, textWidget, "stamp", "initials"].includes(
+ props.pos.type
+ )
) {
props.setIsPageCopy(true);
props.setSignKey(props.pos.key);
@@ -476,7 +464,7 @@ function Placeholder(props) {
const isDateChange = true;
const dateObj = {
date: startDate,
- format: selectDate.format
+ format: getDefaultFormat(props.pos?.options?.validation?.format)
};
handleSaveDate(dateObj, isDateChange); //function to save date and format in local array
}
@@ -485,19 +473,18 @@ function Placeholder(props) {
//function to save date and format on local array onchange date and onclick format
const handleSaveDate = (data, isDateChange) => {
let updateDate = data.date;
- //check if date change by user
- if (isDateChange) {
- //`changeDateToMomentFormat` is used to convert date as per required to moment package
- updateDate = moment(data.date).format(
- changeDateToMomentFormat(data.format)
+ let date;
+ if (data?.format === "dd-MM-yyyy") {
+ date = isDateChange
+ ? moment(updateDate).format(changeDateToMomentFormat(data.format))
+ : updateDate;
+ } else {
+ //using moment package is used to change date as per the format provided in selectDate obj e.g. - MM/dd/yyyy -> 03/12/2024
+ const newDate = new Date(updateDate);
+ date = moment(newDate.getTime()).format(
+ changeDateToMomentFormat(data?.format)
);
}
- //using moment package is used to change date as per the format provided in selectDate obj e.g. - MM/dd/yyyy -> 03/12/2024
- //`getDefaultdate` is used to convert update date in new Date() format
- const date = moment(
- getDefaultdate(updateDate, data?.format).getTime()
- ).format(changeDateToMomentFormat(data?.format));
-
//`onChangeInput` is used to save data related to date in a placeholder field
onChangeInput(
date,
@@ -1100,7 +1087,7 @@ function Placeholder(props) {
isSignYourself={props.isSignYourself}
isSelfSign={props.isSelfSign}
signerObjId={props.signerObjId}
- handleUserName={props.handleUserName}
+ calculateFontsize={props.calculateFontsize}
pdfDetails={props?.pdfDetails && props?.pdfDetails[0]}
isNeedSign={props.isNeedSign}
setSelectDate={setSelectDate}
diff --git a/apps/OpenSign/src/components/pdf/PlaceholderType.js b/apps/OpenSign/src/components/pdf/PlaceholderType.js
index 788c17d527..624b82f6a5 100644
--- a/apps/OpenSign/src/components/pdf/PlaceholderType.js
+++ b/apps/OpenSign/src/components/pdf/PlaceholderType.js
@@ -30,6 +30,7 @@ function PlaceholderType(props) {
const inputRef = useRef(null);
const [textValue, setTextValue] = useState();
const [selectedCheckbox, setSelectedCheckbox] = useState([]);
+ const [hint, setHint] = useState("");
const years = range(1950, getYear(new Date()) + 16, 1);
const fontSize = props.calculateFont(props.pos.options?.fontSize);
const fontColor = props.pos.options?.fontColor || "black";
@@ -150,6 +151,11 @@ function PlaceholderType(props) {
if (defaultData) {
setTextValue(defaultData);
}
+ if (props.pos?.options?.hint) {
+ setHint(props.pos?.options.hint);
+ } else {
+ setHint(props.pos?.type);
+ }
} else if ([textInputWidget].includes(props.pos?.type)) {
const defaultData = props.pos?.options?.defaultValue;
if (defaultData) {
@@ -158,7 +164,6 @@ function PlaceholderType(props) {
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [props.pos?.options?.defaultValue]);
-
const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (
) : (
`;
- const opurl =
- ` here`;
-
- let params = {
- extUserId: extUserId,
- pdfName: pdfName,
- url: presignedUrl,
- recipient: emailList[i],
- subject: `${sender.name} has signed the doc - ${pdfName}`,
- replyto:
- pdfDetails?.[0]?.ExtUserPtr?.Email ||
- "",
- from:
- sender.email,
- html:
- `` +
- `${logo}
Document Copy
` +
- `
A copy of the document ${pdfName} is attached to this email. Kindly download the document from the attachment.
` + - `This is an automated email from ${appName}. For any queries regarding this email, please contact the sender ${sender.email} directly. ` + - `If you think this email is inappropriate or spam, you may file a complaint with ${appName}${opurl}.
- {props?.handleUserName &&
- props?.handleUserName(
- props?.data?.Id,
- props?.data?.Role,
- widgetTypeTraslation,
- props.pos
- )}
+ {props.pos.type && (
+
);
case "stamp":
@@ -346,13 +358,20 @@ function PlaceholderType(props) {
/>
) : (
+ {props.isNeedSign
+ ? props.pos?.options?.hint || widgetTypeTraslation
+ : widgetTypeTraslation}
+
+ )}
- {props?.handleUserName &&
- props?.handleUserName(
- props?.data?.Id,
- props?.data?.Role,
- widgetTypeTraslation,
- props.pos
- )}
+ {props.pos.type && (
+
);
case "checkbox":
@@ -533,13 +552,20 @@ function PlaceholderType(props) {
/>
) : (
+ {props.isNeedSign
+ ? props.pos?.options?.hint || widgetTypeTraslation
+ : widgetTypeTraslation}
+
+ )}
- {props?.handleUserName &&
- props?.handleUserName(
- props?.data?.Id,
- props?.data?.Role,
- widgetTypeTraslation,
- props.pos
- )}
+ {props.pos.type && (
+
);
case "name":
@@ -548,7 +574,7 @@ function PlaceholderType(props) {
(props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
) : (
+ {props.isNeedSign
+ ? props.pos?.options?.hint || widgetTypeTraslation
+ : widgetTypeTraslation}
+
+ )}
- {props?.handleUserName &&
- props?.handleUserName(
- props?.data?.Id,
- props?.data?.Role,
- widgetTypeTraslation,
- props.pos
- )}
+ {props.pos.type && (
+
);
case "email":
@@ -727,7 +760,7 @@ function PlaceholderType(props) {
(props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
+ {props.isNeedSign
+ ? props.pos?.options?.hint || widgetTypeTraslation
+ : widgetTypeTraslation}
+
+ )}