evo/evoleasing-account
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotfixes for PDF generation and files group on sending to CRM

Browse Source
This commit is contained in:
merelendor 2023-04-20 16:28:00 +03:00
parent 67eac69bd5
commit b3e624bb03
4 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
actions/questionnaireActions.js
View File

@ -74,13 +74,13 @@ export const getQuestionnaire = ({ dispatch, id }) =>
seria: "", seria: "",
docnumber: "", docnumber: "",
issuedate: "", issuedate: "",
icode: "", code: "",
issueby: "", issueby: "",
issueby_search_dadata: "", issueby_search_dadata: "",
placebirth: "", placebirth: "",
citizenship: { citizenship: {
title: "", title: getCitizenshipTitleByCode(643),
code: "", code: 643,
}, },
registration_address: { registration_address: {
title: "", title: "",
@ -95,13 +95,13 @@ export const getQuestionnaire = ({ dispatch, id }) =>
seria: "", seria: "",
docnumber: "", docnumber: "",
issuedate: "", issuedate: "",
icode: "", code: "",
issueby: "", issueby: "",
issueby_search_dadata: "", issueby_search_dadata: "",
placebirth: "", placebirth: "",
citizenship: { citizenship: {
title: "", title: getCitizenshipTitleByCode(643),
code: "", code: 643,
}, },
registration_address: { registration_address: {
title: "", title: "",
@ -129,7 +129,7 @@ export const getQuestionnaire = ({ dispatch, id }) =>
questionnaire.head_person = { ...questionnaire.head_person, ...response.data.head_person }; questionnaire.head_person = { ...questionnaire.head_person, ...response.data.head_person };
if(questionnaire.head_person.identity_document === null) if(questionnaire.head_person.identity_document === null)
{ {
questionnaire.head_person.identity_document = head_person_identity_document; questionnaire.head_person.identity_document = JSON.parse(JSON.stringify(identity_document_template));
} }
questionnaire.head_person.identity_document.citizenship = { questionnaire.head_person.identity_document.citizenship = {
@ -141,7 +141,7 @@ export const getQuestionnaire = ({ dispatch, id }) =>
questionnaire.signatory_person = { ...questionnaire.signatory_person, ...response.data.signatory_person }; questionnaire.signatory_person = { ...questionnaire.signatory_person, ...response.data.signatory_person };
if(questionnaire.signatory_person.identity_document === null) if(questionnaire.signatory_person.identity_document === null)
{ {
questionnaire.signatory_person.identity_document = signatory_person_identity_document; questionnaire.signatory_person.identity_document = JSON.parse(JSON.stringify(identity_document_template));
} }
questionnaire.signatory_person.identity_document.citizenship = { questionnaire.signatory_person.identity_document.citizenship = {
@ -163,7 +163,7 @@ export const getQuestionnaire = ({ dispatch, id }) =>
} }
else else
{ {
questionnaire.founder_persons[i].identity_document = { ...founder_persons_template.identity_document }; questionnaire.founder_persons[i].identity_document = JSON.parse(JSON.stringify(identity_document_template));
} }
} }
} }
@ -182,7 +182,7 @@ export const getQuestionnaire = ({ dispatch, id }) =>
} }
else else
{ {
questionnaire.client_contacts[i].identity_document = { ...founder_persons_template.identity_document }; questionnaire.client_contacts[i].identity_document = JSON.parse(JSON.stringify(identity_document_template));
} }
} }
} }

5
components/questionnaire/forms/Form_4_Shareholders/index.js
View File

@ -807,6 +807,11 @@ class Form_4_Shareholders extends QuestionnaireForm
const { checking } = this.props; const { checking } = this.props;
const { founder_persons, client_contacts, loading, address, status, errors, } = this.state; const { founder_persons, client_contacts, loading, address, status, errors, } = this.state;
if(errors.length > 0)
{
console.error(errors);
}
return ( return (
<form ref={ this.ref_form } onSubmit={ this._handle_onFormSubmit } onKeyDown={(e) => {if (e.key === 'Enter') e.preventDefault() }} className={`questionnaire questionnaire_4 ${ checking && "disabled" }`}> <form ref={ this.ref_form } onSubmit={ this._handle_onFormSubmit } onKeyDown={(e) => {if (e.key === 'Enter') e.preventDefault() }} className={`questionnaire questionnaire_4 ${ checking && "disabled" }`}>
<p className="title">4. Сведения об участниках (акционерах) и бенефициарных владельцах</p> <p className="title">4. Сведения об участниках (акционерах) и бенефициарных владельцах</p>

6
pages/api/questionnaire/download.js
View File

@ -140,9 +140,9 @@ export default async function handler(req, res)
const pdfDoc = await PDFDocument.load(formPdfBytes); const pdfDoc = await PDFDocument.load(formPdfBytes);
pdfDoc.registerFontkit(fontkit); pdfDoc.registerFontkit(fontkit);
const formFont = await pdfDoc.embedFont(fontBytes); const formFont = await pdfDoc.embedFont(fontBytes);
const form = pdfDoc.getForm(); const form = pdfDoc.getForm();
for(let group in fields) for(let group in fields)
{ {
if(group === "founder_persons") if(group === "founder_persons")
@ -223,7 +223,7 @@ export default async function handler(req, res)
{ {
if(group === "main") if(group === "main")
{ {
if(!questionnaire[group].is_individual_executive) if(!questionnaire.signatory_person.delegation_agreement)
{ {
const r = ["individual_executive_oop", "individual_executive_inn", "individual_executive_kpp", "individual_executive_docnum", "individual_executive_docdate"]; const r = ["individual_executive_oop", "individual_executive_inn", "individual_executive_kpp", "individual_executive_docnum", "individual_executive_docdate"];
if(r.indexOf(field) > -1) { continue; } if(r.indexOf(field) > -1) { continue; }

6
pages/api/questionnaire/send.js
View File

@ -243,13 +243,11 @@ export default async function handler(req, res)
//console.log(parsed.head_person_files[i]); //console.log(parsed.head_person_files[i]);
files_to_send.push({ ...parsed.head_person_files[i], ...{ number: 1, } }) files_to_send.push({ ...parsed.head_person_files[i], ...{ number: 1, } })
} }
/*
for(let i in parsed.delegation_files) for(let i in parsed.delegation_files)
{ {
console.log(parsed.delegation_files[i]); console.log(parsed.delegation_files[i])
files_to_send.push({ ...parsed.delegation_files[i], ...{ number: 1, } }) files_to_send.push({ ...parsed.delegation_files[i], ...{ number: 166, } })
} }
*/
for(let i in parsed.signatory_person_files) for(let i in parsed.signatory_person_files)
{ {
//console.log(parsed.signatory_person_files[i]); //console.log(parsed.signatory_person_files[i]);