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

Merge branch 'master' of github.com:merelendor/evoleasing-account

Browse Source
This commit is contained in:
merelendor 2024-05-14 10:33:23 +03:00
commit 5222ec572c
17 changed files with 120 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
actions/questionnaireActions.js
View File

@ -72,6 +72,7 @@ export const getQuestionnaire = ({ dispatch, id }) =>
{
//console.log("ACTION", "questionnaire", "getQuestionnaire()", "response", response.data);
/* DEPRECATED ?
const founder_persons_template = {
signatory_id: null,
lastname: "",
@ -106,6 +107,17 @@ export const getQuestionnaire = ({ dispatch, id }) =>
}
}
};
*/
const citizenship_template = {
title: getCitizenshipTitleByCode(643),
code: 643,
};
const registration_address_template = {
title: null,
fias_id: null,
};
const identity_document_template =
{
@ -117,14 +129,8 @@ export const getQuestionnaire = ({ dispatch, id }) =>
issueby: null,
issueby_search_dadata: null,
placebirth: null,
citizenship: {
title: getCitizenshipTitleByCode(643),
code: 643,
},
registration_address: {
title: null,
fias_id: null,
}
citizenship: citizenship_template,
registration_address: registration_address_template
};
const questionnaire = JSON.parse(JSON.stringify(global.store.getState().questionnaire));
@ -149,6 +155,17 @@ export const getQuestionnaire = ({ dispatch, id }) =>
{
questionnaire.head_person.identity_document = JSON.parse(JSON.stringify(identity_document_template));
}
else
{
if(questionnaire.head_person.identity_document.citizenship === undefined || questionnaire.head_person.identity_document.citizenship === null)
{
questionnaire.head_person.identity_document.citizenship = citizenship_template;
}
if(questionnaire.head_person.identity_document.registration_address === undefined || questionnaire.head_person.identity_document.registration_address === null)
{
questionnaire.head_person.identity_document.registration_address = registration_address_template;
}
}
questionnaire.head_person.identity_document.citizenship = {
title: response.data.head_person !== null && response.data.head_person.identity_document !== null ? getCitizenshipTitleByCode(response.data.head_person.identity_document.citizenship_code) : null,
@ -177,6 +194,17 @@ export const getQuestionnaire = ({ dispatch, id }) =>
{
questionnaire.signatory_person.identity_document = JSON.parse(JSON.stringify(identity_document_template));
}
else
{
if(questionnaire.signatory_person.identity_document.citizenship === undefined || questionnaire.signatory_person.identity_document.citizenship === null)
{
questionnaire.signatory_person.identity_document.citizenship = citizenship_template;
}
if(questionnaire.signatory_person.identity_document.registration_address === undefined || questionnaire.signatory_person.identity_document.registration_address === null)
{
questionnaire.signatory_person.identity_document.registration_address = registration_address_template;
}
}
questionnaire.signatory_person.identity_document.citizenship = {
title: response.data.signatory_person !== null && response.data.signatory_person.identity_document !== null ? getCitizenshipTitleByCode(response.data.signatory_person.identity_document.citizenship_code) : null,
@ -216,6 +244,15 @@ export const getQuestionnaire = ({ dispatch, id }) =>
questionnaire.founder_persons[i].identity_document = JSON.parse(JSON.stringify(identity_document_template));
}
if(questionnaire.founder_persons[i].identity_document.citizenship === undefined || questionnaire.founder_persons[i].identity_document.citizenship === null)
{
questionnaire.founder_persons[i].identity_document.citizenship = citizenship_template;
}
if(questionnaire.founder_persons[i].identity_document.registration_address === undefined || questionnaire.founder_persons[i].identity_document.registration_address === null)
{
questionnaire.founder_persons[i].identity_document.registration_address = registration_address_template;
}
/*
if(questionnaire.founder_persons[i].birthdate === null)
{

2
components/DealsStatus/components/DealContractsSignEDO.js
View File

@ -508,7 +508,7 @@ class DealContractsSignEDO extends React.Component
placeholder="Выберите доверенность"
noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" }
isSearchable={ true }
className="autocomlete autocomlete_with_indicators"
className="autocomplete autocomplete_with_indicators"
classNamePrefix="react-select"
value={ document.attorney_selected }
onChange={ (element) => { this._handle_onAttorneyChange(document.index, element) } }

2
components/EDOSign/index.js
View File

@ -496,7 +496,7 @@ class EDOSign extends React.Component
placeholder="Выберите доверенность"
noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" }
isSearchable={ true }
className="autocomlete autocomlete_with_indicators"
className="autocomplete autocomplete_with_indicators"
classNamePrefix="react-select"
value={ document.attorney_selected }
onChange={ (element) => { this._handle_onAttorneyChange(document.index, element) } }

2
components/questionnaire/AddressSuggests.js
View File

@ -126,7 +126,7 @@ export default class AddressSuggests extends React.Component
const { value, disabled, required, placeholder, className } = this.props;
return (
<div className="autocomlete" style={{ position: "relative" }}>
<div className="autocomplete" style={{ position: "relative" }}>
<input type="text"
autoComplete="off"
style={{ width: "100%" }}

2
components/questionnaire/DocumentIssuerSuggestsInput.js
View File

@ -174,7 +174,7 @@ export default class DocumentIssuerSuggestsInput extends React.Component
const { value, disabled, required, placeholder, name, className, innerStyle } = this.props;
return (
<div className="autocomlete" style={{ ...{ position: "relative" }, ...innerStyle, }}>
<div className="autocomplete" style={{ ...{ position: "relative" }, ...innerStyle, }}>
<input type="text"
autoComplete="off"
style={{ width: "100%" }}

2
components/questionnaire/SuggestsInput.js
View File

@ -170,7 +170,7 @@ export default class SuggestsInput extends React.Component
const { value, disabled, required, placeholder, name, className } = this.props;
return (
<div className="autocomlete" style={{ position: "relative" }}>
<div className="autocomplete" style={{ position: "relative" }}>
<input type="text"
autoComplete="off"
style={{ width: "100%" }}

4
components/questionnaire/forms/AddressSuggestsSelect.js
View File

@ -196,7 +196,7 @@ export default class AddressSuggestsSelect extends React.Component
<AsyncSelect
inputValue={ value }
placeholder="Укажите адрес"
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
cacheOptions={ true }
defaultOptions={ this.state.options }
@ -217,7 +217,7 @@ export default class AddressSuggestsSelect extends React.Component
//value={ value }
defaultInputValue={ value }
placeholder="Укажите адрес"
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
cacheOptions={ true }
defaultOptions={ this.state.options }

1
components/questionnaire/forms/DigitalCertificates.js
View File

@ -332,6 +332,7 @@ export default class DigitalCertificates extends React.Component
{ 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" }}>{ certificate.errors.indexOf('date') > 1 ? "Срок действия закончился" : certificate.errors.indexOf('invalid') > 1 ? "Сертификат недействителен или нарушена цепочка сертификации" : null }</p> : <p className="item_desc">&nbsp;</p>}
{ certificate.errors.length === 1 && certificate.errors[0] === "invalid" && (<p className="item_desc" style={{ color: "#A8026B" }}>Сертификат недействителен или нарушена цепочка сертификации</p>) }
</div>
) }
</div>

10
components/questionnaire/forms/Form_3_Signer/index.js
View File

@ -768,7 +768,7 @@ class Form_3_Signer extends QuestionnaireForm
placeholder="Выберите тип документа"
noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" }
isSearchable={ false }
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
value={ doctypes_personal.filter((type) => head_person.identity_document.doctype === type.value) }
onChange={ (element) => this._handle_onDocumentTypeChange("head_person", element) }
@ -885,7 +885,7 @@ class Form_3_Signer extends QuestionnaireForm
placeholder="Выберите страну"
noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" }
isSearchable={ true }
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
value={ head_person_citizenship.code !== undefined && head_person_citizenship.code !== null ? head_person_citizenship : undefined }
onChange={ (element) => { this._removeError("head_person.identity_document.citizenship"); this._handle_onCitizenshipChange(`head_person.identity_document.citizenship`, element.value) } }
@ -1278,7 +1278,7 @@ class Form_3_Signer extends QuestionnaireForm
placeholder="Выберите тип документа"
noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" }
isSearchable={ false }
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
value={ doctypes_personal.filter((type) => signatory_person.identity_document.doctype === type.value) }
onChange={ (element) => this._handle_onDocumentTypeChange("signatory_person", element) }
@ -1393,7 +1393,7 @@ class Form_3_Signer extends QuestionnaireForm
<div className="form_field" style={{ zIndex: 10 }}>
<label>Гражданство <sup className="required_label">*</sup></label>
<Select
className={ errors.indexOf("signatory_person.identity_document.placebirth") > -1 ? "autocomlete error" : "autocomlete" }
className={ errors.indexOf("signatory_person.identity_document.placebirth") > -1 ? "autocomplete error" : "autocomplete" }
id="signatory_person.identity_document.citizenship"
name="signatory_person.identity_document.citizenship"
options={ citizenships }
@ -1487,7 +1487,7 @@ class Form_3_Signer extends QuestionnaireForm
<div className="form_field">
<label>Право подписи на основании <sup className="required_label">*</sup></label>
<Select
className={ errors.indexOf("signatory_person.signer_rule_basic") > -1 ? "autocomlete error" : "autocomlete" }
className={ errors.indexOf("signatory_person.signer_rule_basic") > -1 ? "autocomplete error" : "autocomplete" }
id="signatory_person.signer_rule_basic"
name="signatory_person.signer_rule_basic"
options={ doctypes_corporate }

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

@ -197,7 +197,7 @@ class ShareholderForm extends React.Component
placeholder="Выберите тип документа"
noOptionsMessage={ ({ inputValue }) => !inputValue ? noOptionsText :"Ничего не найдено" }
isSearchable={ false }
className="autocomlete"
className="autocomplete"
classNamePrefix="react-select"
value={ doctypes_personal.filter((type) => shareholder.identity_document.doctype === type.value) }
onChange={ (element) => { this._removeError("identity_document.doctype"); this._handle_onDocumentTypeChange(`founder_persons[${ index }]`, element); } }
@ -335,7 +335,7 @@ class ShareholderForm extends React.Component
<div className="form_field" style={{ zIndex: 10 }}>
<label>Гражданство <sup className="required_label">*</sup></label>
<Select
className={ errors.indexOf("identity_document.placebirth") > -1 ? "autocomlete error" : "autocomlete" }
className={ errors.indexOf("identity_document.placebirth") > -1 ? "autocomplete error" : "autocomplete" }
id={ `founder_persons[${ index }].identity_document.citizenship` }
name={ `founder_persons[${ index }].identity_document.citizenship` }
options={ [ ...citizenships ] }
@ -356,8 +356,8 @@ class ShareholderForm extends React.Component
<AddressSuggests
className={ errors.indexOf("identity_document.registration_address.name") > -1 ? "error" : "" }
id={ `founder_persons[${ index }].identity_document.registration_address` }
value={ this._checkStrValue(shareholder.identity_document.registration_address.name) }
fias={ this._checkStrValue(shareholder.identity_document.registration_address.fias_id) }
value={ this._checkStrValue(shareholder.identity_document.registration_address?.name) }
fias={ this._checkStrValue(shareholder.identity_document.registration_address?.fias_id) }
onChange={ (data) => { this._removeError("identity_document.registration_address.name"); this._handle_onTextFieldChange(`founder_persons[${ index }].identity_document.registration_address`, data) } }
required={ true }
disabled={ checking }
@ -629,6 +629,7 @@ class Form_4_Shareholders extends QuestionnaireForm
componentDidMount()
{
const founder_persons_template = JSON.parse(JSON.stringify(this.state.founder_persons_template));
traceDebug({ state: this.state });
if(this.state.founder_persons.length === 0)
{
@ -919,6 +920,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 });
traceDebug({ state: this.state });
return (
<form ref={ this.ref_form } onSubmit={ this._handle_onFormSubmit } onKeyDown={(e) => {if (e.key === 'Enter') e.preventDefault() }} className={`questionnaire questionnaire_4 ${ checking && "disabled" }`}>

41
css/forms/style.css
View File

@ -1242,7 +1242,7 @@
.questionnaire .form_field input:not(.rw-input),
.questionnaire .form_field select,
.questionnaire .form_field .date_input_wrapper,
.questionnaire .form_field .autocomlete {
.questionnaire .form_field .autocomplete {
width: calc(100% - 198px);
}
@media all and (max-width: 1024px) {
@ -1250,7 +1250,7 @@
.questionnaire .form_field input:not(.rw-input),
.questionnaire .form_field select,
.questionnaire .form_field .date_input_wrapper,
.questionnaire .form_field .autocomlete {
.questionnaire .form_field .autocomplete {
width: 100%;
max-width: 100% !important;
}
@ -1259,14 +1259,14 @@
.questionnaire .form_field input:not(.rw-input)[type="date"],
.questionnaire .form_field select[type="date"],
.questionnaire .form_field .date_input_wrapper[type="date"],
.questionnaire .form_field .autocomlete[type="date"] {
.questionnaire .form_field .autocomplete[type="date"] {
width: 245px;
}
.questionnaire .form_field textarea + p,
.questionnaire .form_field input:not(.rw-input) + p,
.questionnaire .form_field select + p,
.questionnaire .form_field .date_input_wrapper + p,
.questionnaire .form_field .autocomlete + p {
.questionnaire .form_field .autocomplete + p {
font-size: 11px;
line-height: 15px;
margin-left: 198px;
@ -1277,7 +1277,7 @@
.questionnaire .form_field input:not(.rw-input) + p,
.questionnaire .form_field select + p,
.questionnaire .form_field .date_input_wrapper + p,
.questionnaire .form_field .autocomlete + p {
.questionnaire .form_field .autocomplete + p {
margin-left: 0;
}
}
@ -1321,35 +1321,32 @@
margin-right: 0;
max-width: 800px;
}
.questionnaire .autocomlete {
z-index: 2;
}
.questionnaire .autocomlete * {
.questionnaire .autocomplete * {
outline: none;
box-shadow: none !important;
}
.questionnaire .autocomlete .react-select__control {
.questionnaire .autocomplete .react-select__control {
border-radius: 0;
border: 1px solid rgba(0, 16, 61, 0.12);
height: 40px;
min-height: 40px;
}
.questionnaire .autocomlete .react-select__control.react-select__control--menu-is-open {
.questionnaire .autocomplete .react-select__control.react-select__control--menu-is-open {
border-color: var(--blue);
}
.questionnaire .autocomlete .react-select__control .react-select__value-container {
.questionnaire .autocomplete .react-select__control .react-select__value-container {
padding: 0 12px;
height: 100%;
background: #fff;
}
.questionnaire .autocomlete .react-select__control .react-select__value-container .react-select__input-container {
.questionnaire .autocomplete .react-select__control .react-select__value-container .react-select__input-container {
margin: 0;
padding: 0;
}
.questionnaire .autocomlete .react-select__control .react-select__indicators {
.questionnaire .autocomplete .react-select__control .react-select__indicators {
display: none;
}
.questionnaire .autocomlete .react-select__menu {
.questionnaire .autocomplete .react-select__menu {
border-radius: 0;
border-width: 0px 1px 1px 1px;
border-style: solid;
@ -1360,10 +1357,10 @@
padding: 8px 12px;
z-index: 10;
}
.questionnaire .autocomlete .react-select__menu .react-select__menu-list {
.questionnaire .autocomplete .react-select__menu .react-select__menu-list {
z-index: 10;
}
.questionnaire .autocomlete .react-select__menu .react-select__option {
.questionnaire .autocomplete .react-select__menu .react-select__option {
color: #8E94A7;
font-size: 15px;
line-height: 24px;
@ -1372,22 +1369,22 @@
padding: 0;
z-index: 10;
}
.questionnaire .autocomlete .react-select__menu .react-select__option:not(:last-child) {
.questionnaire .autocomplete .react-select__menu .react-select__option:not(:last-child) {
margin-bottom: 8px;
}
.questionnaire .autocomlete .react-select__menu .react-select__option:hover {
.questionnaire .autocomplete .react-select__menu .react-select__option:hover {
color: #000;
}
.questionnaire .autocomlete .react-select__menu .react-select__option.react-select__option--is-selected {
.questionnaire .autocomplete .react-select__menu .react-select__option.react-select__option--is-selected {
color: var(--blue);
}
@media all and (max-width: 960px) {
.questionnaire .autocomlete .react-select__menu .react-select__option {
.questionnaire .autocomplete .react-select__menu .react-select__option {
font-size: 13px;
line-height: 20px;
}
}
.questionnaire .autocomlete_with_indicators .react-select__control .react-select__indicators {
.questionnaire .autocomplete_with_indicators .react-select__control .react-select__indicators {
display: block !important;
}
.questionnaire .files_list {

8
css/forms/style.less
View File

@ -1466,7 +1466,7 @@
input:not(.rw-input),
select,
.date_input_wrapper,
.autocomlete {
.autocomplete {
width: ~"calc(100% - 198px)";
@ -1542,9 +1542,9 @@
max-width: 800px;
}
.autocomlete
.autocomplete
{
z-index: 2;
// z-index: 2;
* {
outline: none;
box-shadow: none !important;
@ -1629,7 +1629,7 @@
}
}
.autocomlete_with_indicators
.autocomplete_with_indicators
{
.react-select__control
{

15
css/main/style.css
View File

@ -3652,6 +3652,11 @@ main .dropdown_blocks_list .dropdown_block .block_body .fines_detail ul li {
top: 0;
}
}
@media all and (max-width: 960px) {
.helpBox_wrapper .helpBox {
max-width: 100%;
}
}
.helpBox_wrapper .helpBox.hidden {
display: none;
}
@ -3804,12 +3809,22 @@ main .dropdown_blocks_list .dropdown_block .block_body .fines_detail ul li {
display: flex;
align-items: flex-end;
height: 102px;
position: absolute;
left: auto;
right: 0;
bottom: 0;
}
@media all and (max-width: 1080px) {
.rate_us {
position: sticky;
height: 120px;
}
}
@media all and (max-width: 960px) {
.rate_us {
width: 100%;
}
}
.rate_us.opened {
width: 350px;
animation: rate_opened 0.25s normal forwards ease-in-out;

16
css/main/style.less
View File

@ -4069,6 +4069,10 @@ main .dropdown_blocks_list .dropdown_block .block_body {
top: 0;
}
@media all and (max-width: 960px) {
max-width: 100%;
}
&.hidden {
display: none;
@ -4243,11 +4247,23 @@ main .dropdown_blocks_list .dropdown_block .block_body {
align-items: flex-end;
height: 102px;
// fix to bottom
position: absolute;
left: auto;
right: 0;
bottom: 0;
@media all and (max-width: 1080px) {
//display: none;
position: sticky;
height: 120px;
}
@media all and (max-width: 960px) {
width: 100%;
}
&.opened {
form {
display: flex;

2
pages/components/Layout/Account/index.js
View File

@ -54,8 +54,6 @@ export default class AccountLayout extends React.Component
scope.setTag("offstage", `${ auth.observer }`);
scope.setUser({ email: user.email, phone: user.phone });
});
Sentry.captureMessage(`Sentry client test for ACC`);
}
}, 100);
}

2
pages/contract/change/components/Comparison/components/SignEDO/index.js
View File

@ -385,7 +385,7 @@ class SignEDO extends React.Component
placeholder="Выберите доверенность"
noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" }
isSearchable={ true }
className="autocomlete autocomlete_with_indicators"
className="autocomplete autocomplete_with_indicators"
classNamePrefix="react-select"
value={ attorney_selected }
onChange={ (element) => { this._handle_onAttorneyChange(element) } }

1
pages/settings/digital.js
View File

@ -69,7 +69,6 @@ class IndexPage extends React.Component
})
.catch(() =>
{
this.setState({ message })
});
})
}