From 07292023e6067702838e6b49da22491ac94a6736 Mon Sep 17 00:00:00 2001 From: merelendor Date: Wed, 30 Aug 2023 15:59:26 +0300 Subject: [PATCH 1/2] fix for PDF generation --- .../questionnaire/forms/Form_1_Main/index.js | 2 +- pages/api/questionnaire/download.js | 21 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/components/questionnaire/forms/Form_1_Main/index.js b/components/questionnaire/forms/Form_1_Main/index.js index dced84c..1099353 100644 --- a/components/questionnaire/forms/Form_1_Main/index.js +++ b/components/questionnaire/forms/Form_1_Main/index.js @@ -332,7 +332,7 @@ class Form_1_Main extends QuestionnaireForm name="licenses" placeholder="Укажите, если деятельность подлежит лицензированию" onChange={ (event) => { this._removeError("licenses"); this._handle_onTextFieldChange(event.target.name, event.target.value); } } - required={ true } + required={ false } disabled={ checking } defaultValue={ this._checkStrValue(licenses) } /> diff --git a/pages/api/questionnaire/download.js b/pages/api/questionnaire/download.js index 4350937..e331b63 100644 --- a/pages/api/questionnaire/download.js +++ b/pages/api/questionnaire/download.js @@ -169,15 +169,18 @@ export default async function handler(req, res) color: rgb(0.87, 0.87, 0.87), }); - page.drawText(questionnaire[group], { - x: 152, - y: questionnaire[group].length > 500 ? 195 : (questionnaire[group].length > 400) ? 195 : 193, - size: questionnaire[group].length > 500 ? 4 : (questionnaire[group].length > 400) ? 5 : 6, - font: formFont, - color: rgb(0, 0, 0), - maxWidth: 412, - lineHeight: questionnaire[group].length > 500 ? 4 : (questionnaire[group].length > 400) ? 5 : 6, - }); + if(questionnaire[group] !== null) + { + page.drawText(questionnaire[group], { + x: 152, + y: questionnaire[group].length > 500 ? 195 : (questionnaire[group].length > 400) ? 195 : 193, + size: questionnaire[group].length > 500 ? 4 : (questionnaire[group].length > 400) ? 5 : 6, + font: formFont, + color: rgb(0, 0, 0), + maxWidth: 412, + lineHeight: questionnaire[group].length > 500 ? 4 : (questionnaire[group].length > 400) ? 5 : 6, + }); + } } else if(group === "founder_persons") { From 11301a5e6b818af377ef4cf890338a6c1199f205 Mon Sep 17 00:00:00 2001 From: merelendor Date: Mon, 20 Nov 2023 16:58:19 +0300 Subject: [PATCH 2/2] 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 {