From f00b11149c03a296ca87950bbee54f18cd445ddc Mon Sep 17 00:00:00 2001
From: merelendor <merelendor@gmail.com>
Date: Mon, 25 Dec 2023 11:09:44 +0300
Subject: [PATCH] update for digital certificates list errors

---
 .../questionnaire/forms/DigitalCertificates.js  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/components/questionnaire/forms/DigitalCertificates.js b/components/questionnaire/forms/DigitalCertificates.js
index d85fc00..e7051c5 100644
--- a/components/questionnaire/forms/DigitalCertificates.js
+++ b/components/questionnaire/forms/DigitalCertificates.js
@@ -120,11 +120,22 @@ export default class DigitalCertificates extends React.Component
 							errors.push('name');
 						}
 
-						if(!cert.IsValid)
+						if(cert.ValidToDate !== null && cert.ValidToDate !== undefined && cert.ValidToDate !== "")
+						{
+							if(moment(cert.ValidToDate) < moment())
+							{
+								errors.push('date');
+							}
+						}
+						else
 						{
 							errors.push('date');
 						}
 
+						if(!cert.IsValid)
+						{
+							errors.push('invalid');
+						}
 						if(apply)
 						{
 							callback(null, [ { id: certificate.id, fields: cert.Subject, valid_to_date: moment(cert.ValidToDate).format("DD.MM.YYYY"), errors } ]);
@@ -281,7 +292,7 @@ export default class DigitalCertificates extends React.Component
 					{ certificates.length > 0 && (
 						<>
 							<div className="feed">
-								<p>Выберите подписанта</p>
+								<p>Список сертификатов, доступных на Вашем компьютере:</p>
 								<div className="feed_list">
 
 									{ certificates.slice(0, show_all ? certificates.length : 2).map((certificate, index) => (
@@ -318,7 +329,7 @@ export default class DigitalCertificates extends React.Component
 															{ certificate.errors.indexOf("name") > -1 ? <p className="item_desc" style={{ color: "#A8026B" }}>Не соответствует ФИО</p> : <p className="item_desc">&nbsp;</p>}
 															{ certificate.errors.indexOf("inn") > -1 ? <p className="item_desc" style={{ color: "#A8026B" }}>Не соответствует ИНН</p> : <p className="item_desc">&nbsp;</p>}
 															<p className="item_desc">&nbsp;</p>
-															{ certificate.errors.indexOf("date") > -1 ? <p className="item_desc" style={{ color: "#A8026B" }}>Срок действия закончился</p> : <p className="item_desc">&nbsp;</p>}
+															{ certificate.errors.indexOf("date") > -1 ? <p className="item_desc" style={{ color: "#A8026B" }}>{ certificate.error.invalid !== undefined && "Сертификат недействителен или нарушена цепочка сертификации" }{ certificate.error.date !== undefined && "Срок действия закончился" }</p> : <p className="item_desc">&nbsp;</p>}
 														</div>
 													) }
 												</div>