From 472ae616b35a027e23b9463a780d1110af0837f6 Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 20 Nov 2023 12:21:38 +0300 Subject: [PATCH 1/4] questionnaire founder disable passport issuer code check if it is not russian passport --- components/questionnaire/forms/DigitalSignaturesList.js | 2 +- .../questionnaire/forms/Form_4_Shareholders/index.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/components/questionnaire/forms/DigitalSignaturesList.js b/components/questionnaire/forms/DigitalSignaturesList.js index 89c04cd..30ffe50 100644 --- a/components/questionnaire/forms/DigitalSignaturesList.js +++ b/components/questionnaire/forms/DigitalSignaturesList.js @@ -231,7 +231,7 @@ export default class DigitalSignaturesList extends React.Component ) } { certificates_error === "OTHER" && ( -
+
diff --git a/components/questionnaire/forms/Form_4_Shareholders/index.js b/components/questionnaire/forms/Form_4_Shareholders/index.js index c540277..5aa4355 100644 --- a/components/questionnaire/forms/Form_4_Shareholders/index.js +++ b/components/questionnaire/forms/Form_4_Shareholders/index.js @@ -762,6 +762,14 @@ class Form_4_Shareholders extends QuestionnaireForm { for(let i in check) { + if(check[i] === "identity_document.code") + { + if(parseInt(_get(founder_persons[f], "identity_document.doctype"), 10) !== 100000000) + { + continue; + } + } + const v = _get(founder_persons[f], check[i]); if(check[i] === "telephone") { @@ -883,6 +891,7 @@ class Form_4_Shareholders extends QuestionnaireForm { const { checking } = this.props; const { founder_persons, client_contacts, loading, address, status, errors, } = this.state; + console.log("Form_4_Shareholders", { errors }); return (
{if (e.key === 'Enter') e.preventDefault() }} className={`questionnaire questionnaire_4 ${ checking && "disabled" }`}> From 558f210e999774ac01b3032d8cb00a85504a64c3 Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 20 Nov 2023 12:37:26 +0300 Subject: [PATCH 2/4] questionnaire hotfix for PDF generation on foreign citizen --- pages/api/questionnaire/download.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/questionnaire/download.js b/pages/api/questionnaire/download.js index 8c27cbd..5d2bc82 100644 --- a/pages/api/questionnaire/download.js +++ b/pages/api/questionnaire/download.js @@ -197,7 +197,7 @@ export default async function handler(req, res) const { placebirth, citizenship, doctype, seria, docnumber, code, issueby, issuedate, } = questionnaire[group][p].identity_document; fields[group][p][field].bind = form.getTextField(fields[group][p][field].name); if(fields[group][p][field].size !== undefined) { fields[group][p][field].bind.setFontSize(fields[group][p][field].size); } - fields[group][p][field].bind.setText(`${ moment(birthdate).format("DD.MM.YYYY") }, ${ placebirth }, ${ citizenship.title }, ${ personal_doctypes[doctype].toString().toUpperCase() } ${ seria.toString() } ${ docnumber.toString() }, выдан ${ issueby.toString() }, ${ moment(issuedate).format("DD.MM.YYYY") }, ${ code.toString() }`.toUpperCase()); + fields[group][p][field].bind.setText(`${ moment(birthdate).format("DD.MM.YYYY") }, ${ placebirth }, ${ citizenship.title }, ${ personal_doctypes[doctype].toString().toUpperCase() } ${ seria.toString() } ${ docnumber.toString() }, выдан ${ issueby.toString() }, ${ moment(issuedate).format("DD.MM.YYYY") }${ code !== undefined && code !== null ? ", " + code.toString() : "" }`.toUpperCase()); } else if(field === "registration") { From 11301a5e6b818af377ef4cf890338a6c1199f205 Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 20 Nov 2023 16:58:19 +0300 Subject: [PATCH 3/4] production hotfix for questionnaire sending to CRM - parseFloat on founder_part --- pages/api/questionnaire/send.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pages/api/questionnaire/send.js b/pages/api/questionnaire/send.js index 99b871b..38464d8 100644 --- a/pages/api/questionnaire/send.js +++ b/pages/api/questionnaire/send.js @@ -193,6 +193,7 @@ export default async function handler(req, res) for(let i in founder_persons) { founder_persons[i].founder_number = parseInt(i, 10) + 1; + founder_persons[i].founder_part = parseFloat(founder_persons[i].founder_part); founder_persons[i].telephone = checkNullEmpty(founder_persons[i].telephone) ? founder_persons[i].telephone.replace(/[^0-9]/g, '') : null; founder_persons[i].identity_document.issuedate = checkNullEmpty(founder_persons[i].identity_document.issuedate) ? moment(founder_persons[i].identity_document.issuedate).format("YYYY-MM-DD") : null; founder_persons[i].identity_document.citizenship_code = founder_persons[i].identity_document.citizenship.code.toString(); @@ -368,6 +369,7 @@ export default async function handler(req, res) if(crm_send_error.response !== undefined) { console.error("crm_send_error", { status: crm_send_error.response.status, data: crm_send_error.response.data }); + console.error({ payload: inspect(payload, true, null, true) }); } else { From 7b1e8db3d6622a013d57c43ea2deb8a039f3bfcd Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 20 Nov 2023 16:59:03 +0300 Subject: [PATCH 4/4] revert logic of founder's part size back to personal > 100% --- .../questionnaire/forms/Form_4_Shareholders/index.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/questionnaire/forms/Form_4_Shareholders/index.js b/components/questionnaire/forms/Form_4_Shareholders/index.js index 5aa4355..24a6562 100644 --- a/components/questionnaire/forms/Form_4_Shareholders/index.js +++ b/components/questionnaire/forms/Form_4_Shareholders/index.js @@ -806,13 +806,18 @@ class Form_4_Shareholders extends QuestionnaireForm } } + if(parseInt(total_parts, 10) > 100) + { + errors[0].push(`founder_part_total`); + } + if(parseInt(_get(founder_persons[f], "identity_document.doctype"), 10) === 100000000 && errors.indexOf("identity_document.seria") < 0 && errors.indexOf("identity_document.docnumber") < 0) { const founder_document_check_response = await checkDocumentData({ seria: _get(founder_persons[f], "identity_document.seria"), number: _get(founder_persons[f], "identity_document.docnumber"), }); - + if(founder_document_check_response[0] !== undefined && founder_document_check_response[0].qc !== 0) { errors[f].push(`identity_document.invalid`); @@ -822,11 +827,6 @@ class Form_4_Shareholders extends QuestionnaireForm } } - if(parseInt(total_parts, 10) !== 100) - { - errors[0].push(`founder_part_total`); - } - this.setState({ errors, loading: false }, () => { window.scroll(0, 0);