Skip to content

Commit 97983c4

Browse files
feat: add send in order in template
1 parent 68050e3 commit 97983c4

File tree

8 files changed

+62
-6
lines changed

8 files changed

+62
-6
lines changed

apps/OpenSign/src/routes/Form.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ const Forms = (props) => {
368368
/>
369369
</div>
370370
)}
371-
{props.title === "Request Signature" && (
371+
{props.title !== "Sign Yourself" && (
372372
<div className="text-xs mt-2">
373373
<label className="block">Send In Order</label>
374374
<div className="flex items-center gap-2 ml-2 mb-1">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ export default async function createDocumentWithTemplate(request, response) {
105105
object.set('IsSendMail', send_email);
106106
if (sendInOrder) {
107107
object.set('SendinOrder', sendInOrder);
108+
} else if (template?.SendinOrder && template?.SendinOrder) {
109+
object.set('SendinOrder', template?.SendinOrder);
108110
}
109-
110111
let templateSigner = template?.Signers ? template?.Signers : [];
111112
let contact = [];
112113
if (signers && signers.length > 0) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export default async function createDocument(request, response) {
1111
const base64File = request.body.file;
1212
const send_email = request.body.send_email || true;
1313
const fileData = request.files?.[0] ? request.files[0].buffer : null;
14+
const SendinOrder = request.body.sendInOrder || false;
1415
// console.log('fileData ', fileData);
1516
const protocol = customAPIurl();
1617

@@ -69,6 +70,9 @@ export default async function createDocument(request, response) {
6970
if (description) {
7071
object.set('Description', description);
7172
}
73+
if (SendinOrder) {
74+
object.set('SendinOrder', SendinOrder);
75+
}
7276
object.set('URL', fileUrl);
7377
object.set('CreatedBy', userPtr);
7478
object.set('ExtUserPtr', extUserPtr);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export default async function createTemplate(request, response) {
88
const signers = request.body?.signers;
99
const folderId = request.body?.folderId;
1010
const base64File = request.body.file;
11+
const SendinOrder = request.body.sendInOrder || false;
1112
const fileData = request.files?.[0] ? request.files[0].buffer : null;
1213
const baseUrl = new URL(process.env.SERVER_URL);
1314

@@ -61,6 +62,9 @@ export default async function createTemplate(request, response) {
6162
object.set('URL', fileUrl);
6263
object.set('CreatedBy', userPtr);
6364
object.set('ExtUserPtr', extUserPtr);
65+
if (SendinOrder) {
66+
object.set('SendinOrder', SendinOrder);
67+
}
6468
if (signers && signers.length > 0) {
6569
let parseSigners;
6670
if (base64File) {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export default async function createTemplatewithCoordinate(request, response) {
1010
const folderId = request.body.folderId;
1111
const base64File = request.body.file;
1212
const fileData = request.files?.[0] ? request.files[0].buffer : null;
13+
const SendinOrder = request.body.sendInOrder || false;
1314
// console.log('fileData ', fileData);
1415
const protocol = customAPIurl();
1516

@@ -63,6 +64,9 @@ export default async function createTemplatewithCoordinate(request, response) {
6364
if (description) {
6465
object.set('Description', description);
6566
}
67+
if (SendinOrder) {
68+
object.set('SendinOrder', SendinOrder);
69+
}
6670
object.set('URL', fileUrl);
6771
object.set('CreatedBy', userPtr);
6872
object.set('ExtUserPtr', extUserPtr);

microfrontends/SignDocuments/src/Component/TemplatePlaceholder.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,8 @@ const TemplatePlaceholder = () => {
668668
Signers: signers,
669669
Name: pdfDetails[0]?.Name || "",
670670
Note: pdfDetails[0]?.Note || "",
671-
Description: pdfDetails[0]?.Description || ""
671+
Description: pdfDetails[0]?.Description || "",
672+
SendinOrder: pdfDetails[0]?.SendinOrder || false
672673
};
673674

674675
await axios

microfrontends/SignDocuments/src/Component/component/EditTemplate.js

Lines changed: 43 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ const EditTemplate = ({ template, onSuccess }) => {
77
const [formData, setFormData] = useState({
88
Name: template?.Name || "",
99
Note: template?.Note || "",
10-
Description: template?.Description || ""
10+
Description: template?.Description || "",
11+
SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false"
1112
});
1213

1314
const handleStrInput = (e) => {
@@ -22,7 +23,8 @@ const EditTemplate = ({ template, onSuccess }) => {
2223
const handleSubmit = async (e) => {
2324
e.preventDefault();
2425
e.stopPropagation();
25-
const data = {...formData }
26+
const isChecked = formData.SendinOrder === "true" ? true : false;
27+
const data = { ...formData, SendinOrder: isChecked };
2628
onSuccess(data);
2729
};
2830

@@ -86,6 +88,45 @@ const EditTemplate = ({ template, onSuccess }) => {
8688
className="addUserInput"
8789
/>
8890
</div>
91+
<div className="form-section">
92+
<label style={{ fontSize: 13 }}>Send In Order</label>
93+
<div
94+
style={{
95+
display: "flex",
96+
alignItems: "center",
97+
gap: 8,
98+
marginLeft: 8,
99+
marginBottom: 5
100+
}}
101+
>
102+
<input
103+
type="radio"
104+
value={"true"}
105+
name="SendinOrder"
106+
checked={formData.SendinOrder === "true"}
107+
onChange={handleStrInput}
108+
/>
109+
<div style={{ fontSize: 12 }}>Yes</div>
110+
</div>
111+
<div
112+
style={{
113+
display: "flex",
114+
alignItems: "center",
115+
gap: 8,
116+
marginLeft: 8,
117+
marginBottom: 5
118+
}}
119+
>
120+
<input
121+
type="radio"
122+
value={"false"}
123+
name="SendinOrder"
124+
checked={formData.SendinOrder === "false"}
125+
onChange={handleStrInput}
126+
/>
127+
<div style={{ fontSize: 12 }}>No</div>
128+
</div>
129+
</div>
89130
{/* <SelectFolder onSuccess={handleFolder} folderCls={"contracts_Template"} /> */}
90131
<div className="buttoncontainer">
91132
<button type="submit" className="submitbutton">

microfrontends/SignDocuments/src/utils/Utils.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,8 @@ export const createDocument = async (template, placeholders, signerData) => {
10021002
className: "_User",
10031003
objectId: Doc.CreatedBy.objectId
10041004
},
1005-
Signers: signers
1005+
Signers: signers,
1006+
SendinOrder: Doc?.SendinOrder || false
10061007
};
10071008

10081009
try {

0 commit comments

Comments
 (0)