diff --git a/apps/OpenSign/src/routes/Form.js b/apps/OpenSign/src/routes/Form.js
index 032454901..8191b84b4 100644
--- a/apps/OpenSign/src/routes/Form.js
+++ b/apps/OpenSign/src/routes/Form.js
@@ -368,7 +368,7 @@ const Forms = (props) => {
/>
)}
- {props.title === "Request Signature" && (
+ {props.title !== "Sign Yourself" && (
diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
index 1c4b9803f..ebb0dbbe6 100644
--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
@@ -105,8 +105,9 @@ export default async function createDocumentWithTemplate(request, response) {
object.set('IsSendMail', send_email);
if (sendInOrder) {
object.set('SendinOrder', sendInOrder);
+ } else if (template?.SendinOrder && template?.SendinOrder) {
+ object.set('SendinOrder', template?.SendinOrder);
}
-
let templateSigner = template?.Signers ? template?.Signers : [];
let contact = [];
if (signers && signers.length > 0) {
diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js
index a57c20e58..bd9aced27 100644
--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js
+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocument.js
@@ -11,6 +11,7 @@ export default async function createDocument(request, response) {
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;
// console.log('fileData ', fileData);
const protocol = customAPIurl();
@@ -69,6 +70,9 @@ export default async function createDocument(request, response) {
if (description) {
object.set('Description', description);
}
+ if (SendinOrder) {
+ object.set('SendinOrder', SendinOrder);
+ }
object.set('URL', fileUrl);
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js
index 1e835958a..a2b22d90f 100644
--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js
+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js
@@ -8,6 +8,7 @@ export default async function createTemplate(request, response) {
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.SERVER_URL);
@@ -61,6 +62,9 @@ export default async function createTemplate(request, response) {
object.set('URL', fileUrl);
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
+ if (SendinOrder) {
+ object.set('SendinOrder', SendinOrder);
+ }
if (signers && signers.length > 0) {
let parseSigners;
if (base64File) {
diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js
index 40f0a170c..62cab68da 100644
--- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js
+++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplatewithCoordinate.js
@@ -10,6 +10,7 @@ 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 || false;
// console.log('fileData ', fileData);
const protocol = customAPIurl();
@@ -63,6 +64,9 @@ export default async function createTemplatewithCoordinate(request, response) {
if (description) {
object.set('Description', description);
}
+ if (SendinOrder) {
+ object.set('SendinOrder', SendinOrder);
+ }
object.set('URL', fileUrl);
object.set('CreatedBy', userPtr);
object.set('ExtUserPtr', extUserPtr);
diff --git a/microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js b/microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js
index a8c34524d..ed8c54812 100644
--- a/microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js
+++ b/microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js
@@ -668,7 +668,8 @@ const TemplatePlaceholder = () => {
Signers: signers,
Name: pdfDetails[0]?.Name || "",
Note: pdfDetails[0]?.Note || "",
- Description: pdfDetails[0]?.Description || ""
+ Description: pdfDetails[0]?.Description || "",
+ SendinOrder: pdfDetails[0]?.SendinOrder || false
};
await axios
diff --git a/microfrontends/SignDocuments/src/Component/component/EditTemplate.js b/microfrontends/SignDocuments/src/Component/component/EditTemplate.js
index f60091c6d..9290069ad 100644
--- a/microfrontends/SignDocuments/src/Component/component/EditTemplate.js
+++ b/microfrontends/SignDocuments/src/Component/component/EditTemplate.js
@@ -7,7 +7,8 @@ const EditTemplate = ({ template, onSuccess }) => {
const [formData, setFormData] = useState({
Name: template?.Name || "",
Note: template?.Note || "",
- Description: template?.Description || ""
+ Description: template?.Description || "",
+ SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false"
});
const handleStrInput = (e) => {
@@ -22,7 +23,8 @@ const EditTemplate = ({ template, onSuccess }) => {
const handleSubmit = async (e) => {
e.preventDefault();
e.stopPropagation();
- const data = {...formData }
+ const isChecked = formData.SendinOrder === "true" ? true : false;
+ const data = { ...formData, SendinOrder: isChecked };
onSuccess(data);
};
@@ -86,6 +88,45 @@ const EditTemplate = ({ template, onSuccess }) => {
className="addUserInput"
/>
+
{/*
*/}