fixes for deal end contracts statuses, remove some part of console.log

This commit is contained in:
merelendor 2023-10-31 15:57:12 +03:00
parent 0cb0fc8ddf
commit 4f0ac0464e
16 changed files with 65 additions and 355 deletions

View File

@ -11,16 +11,20 @@ export default class DealsList extends React.Component
this.items_ref = [];
}
_scrollToDeal = (index) =>
{
const element = this.list_ref.current.children[index];
const y = (element.getBoundingClientRect().top + window.scrollY - 90);
window.scrollTo({top: y, behavior: 'smooth'});
}
_handle_onSelectDeal = (deal_id, index) =>
{
const { onSelectDeal } = this.props;
onSelectDeal(deal_id);
setTimeout(() =>
{
const element = this.list_ref.current.children[index];
const y = (element.getBoundingClientRect().top + window.scrollY - 90);
window.scrollTo({top: y, behavior: 'smooth'});
this._scrollToDeal(index);
}, 50);
}
@ -41,8 +45,6 @@ export default class DealsList extends React.Component
{
const { status, deals, questionnaire_status, dealSelected, onCloseDeal, onDealsUpdate, onDealContractsUpdate, onQuestionnaire } = this.props;
console.log({ deals });
return (
<div className="contractStatus_list" ref={ this.list_ref }>
{ deals.list !== undefined && deals.list !== null && deals.list.map((deal, index) =>
@ -58,6 +60,7 @@ export default class DealsList extends React.Component
dealSelected={ dealSelected }
deals={ deals }
questionnaire_status={ questionnaire_status }
onFocusDeal={ () => this._scrollToDeal(index) }
onCloseDeal={ this._handle_onCloseDeal }
onDealsUpdate={ onDealsUpdate }
onDealContractsUpdate={ onDealContractsUpdate }

View File

@ -58,8 +58,6 @@ export default class DealsListDeal extends React.Component
const { onSelectDeal, index, comment, opp_number, statuscode_id, statuscode_name } = this.props;
const step = statuscode_id - 100;
console.log("deal list item", { props: this.props });
return (
<div className="list_item">
<div>

View File

@ -28,7 +28,6 @@ class DealContractsSignEDO extends React.Component
static getDerivedStateFromProps(nextProps, prevState)
{
console.log("DealContractsSignEDO", "getDerivedStateFromProps", { nextProps });
return {
operators: nextProps.operators,
edo_message: nextProps.edo_message,
@ -71,7 +70,6 @@ class DealContractsSignEDO extends React.Component
for(let i in documents)
{
console.log({ fin: documents[i] });
if(!documents[i].error && !documents[i].completed)
{
completed = false;
@ -84,13 +82,9 @@ class DealContractsSignEDO extends React.Component
_sign = () =>
{
//const { documents } = this.props;
const { operator_selected, step } = this.state;
const documents = [ ...this.state.documents ];
console.log("_handle_onFormSubmit");
console.log({ documents, operator_selected });
this.setState({ loading: true }, () =>
{
eachSeries(documents, async (document, callback) =>
@ -102,8 +96,8 @@ class DealContractsSignEDO extends React.Component
else if(document.signing)
{
await this._updateDocs(document.index, { loading: true, });
const status_result = await docEDOStatus({ contract_number: document.id });
if(status_result.status === 3)
{
await this._updateDocs(document.index, { loading: false, signing: false, ready: false, completed: true, });
@ -117,11 +111,8 @@ class DealContractsSignEDO extends React.Component
}
else if(document.ready)
{
console.log({ document })
await this._updateDocs(document.index, { loading: true, });
const status_result = await docEDOStatus({ contract_number: document.id });
console.log({ status_result });
if(status_result.status > 0)
{
@ -133,7 +124,6 @@ class DealContractsSignEDO extends React.Component
}
else
{
console.log({ document })
await this._updateDocs(document.index, { loading: true });
if(document.attorney && document.attorney_selected !== undefined)
@ -145,16 +135,10 @@ class DealContractsSignEDO extends React.Component
edo_box: operator_selected.edo_box,
});
console.log("\n\nIMPORTANT !!!!!!!!!!\n\n");
console.log({ create_edo_project_result });
const get_guid_entity_result = await signGetGUIDEntity({
contract_number: document.id,
});
console.log("\n\nENTITY !!!!!!!!!!\n\n");
console.log({ get_guid_entity_result });
const wmdoc_result = await signGetWMDoc({
entity_name: "evo_contract",
entity_id: get_guid_entity_result.entityid,
@ -162,7 +146,6 @@ class DealContractsSignEDO extends React.Component
evo_id: "144",
code: "Leas_Contract",
});
console.log({ wmdoc_result });
const connect_result = await docEDOConnect({ contract_number: document.id });
@ -178,8 +161,6 @@ class DealContractsSignEDO extends React.Component
else
{
const create_print_form_result = await signCheckCreatePrintForm({ contract_number: document.id, sign_type: "EDO" });
console.log({ create_print_form_result });
const docs = { status: create_print_form_result.status };
if(create_print_form_result.status !== "success")
@ -195,14 +176,12 @@ class DealContractsSignEDO extends React.Component
if(create_print_form_result.status === "success")
{
const check_attorney_client_result = await signCheckPowerAttorneyClient({ contract_number: document.id })
console.log({ check_attorney_client_result });
await this._updateDocs(document.index, { attorney: check_attorney_client_result.power_attorney_required, });
if(check_attorney_client_result.power_attorney_required)
{
const get_attorney_client_result = await signGetPowerAttorneyClient({ contract_number: document.id });
console.log({ get_attorney_client_result });
if(get_attorney_client_result === null)
{
@ -250,7 +229,6 @@ class DealContractsSignEDO extends React.Component
sign_type: "EDO",
evo_id: "144",
});
console.log({ wmdoc_result });
const connect_result = await docEDOConnect({ contract_number: document.id });
@ -296,10 +274,6 @@ class DealContractsSignEDO extends React.Component
const { onFinish, onGoToEDOInvites } = this.props;
const { operators, operator_selected, step, finished } = this.state;
const documents = [ ...this.state.documents ];
console.log("_handle_onFormSubmit");
console.log({ documents, operator_selected });
if(operators !== null && operators.length === 0)
{
@ -341,7 +315,6 @@ class DealContractsSignEDO extends React.Component
_handle_onAttorneyChange = (index, attorney) =>
{
console.log("_handle_onAttorneyChange", { index, attorney });
this._updateDocs(index, { attorney_selected: attorney });
}
@ -357,7 +330,6 @@ class DealContractsSignEDO extends React.Component
contract_number: documents[index].id,
});
console.log("_handle_onDownloadFile", { link_result });
await getFile({ id: link_result.url, filename: `ЛК ЭВОЛЮЦИЯ ${ documents[index].id }.${ link_result.extension }` });
await this._updateDocs(index, { loading: false, disabled: false, });
@ -405,8 +377,6 @@ class DealContractsSignEDO extends React.Component
const { onCancel } = this.props;
const { documents } = this.state;
console.log("documents", documents, "LEN", documents.length);
var clean = false;
if(documents.length === 0)
{
@ -425,7 +395,6 @@ class DealContractsSignEDO extends React.Component
this.setState({ loading: true, disabled: true }, async () =>
{
const status_result = await docEDOStatus({ contract_number: documents[index].id });
console.log({ status_result });
if(status_result.status >= 2)
{
@ -461,7 +430,6 @@ class DealContractsSignEDO extends React.Component
{
const { step, operators, edo_message, documents, loading, disabled, finished, operator_selected } = this.state;
const { onCancel, } = this.props;
console.log({ operators, documents });
return (
<div className="edo_detail">
@ -505,7 +473,6 @@ class DealContractsSignEDO extends React.Component
<div className="docs_list medium-icon edo_sign_documents_list">
{ documents.map((document, index) =>
{
console.log({ document });
return (
<div className="edo_sign_documents_document" key={ index }>
<div className="edo_sign_documents_document_left">
@ -616,7 +583,6 @@ class DealContractsSignEDO extends React.Component
function mapStateToProps(state, ownProps)
{
console.log("DealContractsSignEDO", "mapStateToProps", { state: state });
return {
operators: state.edo.operators,
edo_message: state.edo.message,

View File

@ -60,17 +60,14 @@ export default class DealContractsSignPaper extends React.Component
for(let i in documents)
{
console.log({ fin: documents[i] });
if(documents[i].error)
{
console.log(11111);
continue;
}
else
{
if(!documents[i].completed)
{
console.log(22222);
completed = false;
break;
}
@ -82,12 +79,8 @@ export default class DealContractsSignPaper extends React.Component
_sign = () =>
{
//const { documents } = this.props;
const documents = [ ...this.state.documents ];
console.log("DealContractsSignPaper", "_sign");
console.log({ documents, });
this.setState({ loading: true }, () =>
{
eachSeries(documents, async (document, callback) =>
@ -103,19 +96,10 @@ export default class DealContractsSignPaper extends React.Component
else if(document.ready)
{
callback();
/*
console.log({ document })
await this._updateDocs(document.index, { loading: true, });
*/
}
else
{
console.log({ document })
// await this._updateDocs(document.index, { loading: true });
const create_print_form_result = await signCheckCreatePrintForm({ contract_number: document.id, sign_type: "Paper" });
console.log({ create_print_form_result });
const docs = { status: create_print_form_result.status };
if(create_print_form_result.status !== "success")
@ -141,7 +125,6 @@ export default class DealContractsSignPaper extends React.Component
evo_id: "60",
code: "Leas_Contract",
});
console.log({ wmdoc_result });
await this._updateDocs(document.index, {
entity_id: get_guid_entity_result.entityid,
@ -182,10 +165,6 @@ export default class DealContractsSignPaper extends React.Component
const { onFinish } = this.props;
const { finished } = this.state;
const documents = [ ...this.state.documents ];
console.log("_handle_onFormSubmit");
console.log({ documents, });
if(finished)
{
@ -209,7 +188,6 @@ export default class DealContractsSignPaper extends React.Component
contract_number: documents[index].id,
});
console.log("_handle_onDownloadFile", { link_result });
await getFile({ id: link_result.url, filename: `ЛК ЭВОЛЮЦИЯ ${ documents[index].id }.${ link_result.extension }` });
await this._updateDocs(index, { loading: false, disabled: false, ready: false, uploading: true, });
@ -257,8 +235,6 @@ export default class DealContractsSignPaper extends React.Component
const { onCancel } = this.props;
const { documents } = this.state;
console.log("documents", documents, "LEN", documents.length);
var clean = false;
if(documents.length === 0)
{
@ -273,7 +249,6 @@ export default class DealContractsSignPaper extends React.Component
const { documents } = this.state;
const { deal_id } = this.props;
console.log("_handle_onUploadFile", { files, index });
await this._updateDocs(index, { loading: true });
this.setState({ loading: true, disabled: true }, async () =>
@ -299,9 +274,7 @@ export default class DealContractsSignPaper extends React.Component
render()
{
const { documents, loading, disabled, finished, operator_selected } = this.state;
const { onCancel, } = this.props;
console.log({ documents });
const { documents, loading, disabled, finished, } = this.state;
return (
<div className="edo_detail">
@ -311,7 +284,6 @@ export default class DealContractsSignPaper extends React.Component
<div className="docs_list medium-icon edo_sign_documents_list">
{ documents.map((document, index) =>
{
console.log({ document });
return (
<div className="edo_sign_documents_document" key={ index }>
<div className="edo_sign_documents_document_left">

View File

@ -61,34 +61,33 @@ export default class DocumentsForm extends Step
event.stopPropagation();
const { dealSelected, onDealsUpdate } = this.props;
this.setState({ loading: true }, () =>
this.props.onFocusDeal();
setTimeout(() =>
{
sendDealDocuments({ deal_id: dealSelected })
.then(() =>
this.setState({ loading: true }, () =>
{
onDealsUpdate();
})
.catch(() =>
{
sendDealDocuments({ deal_id: dealSelected })
.then(() =>
{
onDealsUpdate();
})
.catch(() =>
{
});
});
})
}, 100);
}
_onSendFileStats = (group, index) =>
{
console.log("_onSendFileStats", { group, index });
return new Promise((resolve) =>
{
const uploaded = { ...this.state.uploaded };
uploaded[group].files[index].uploaded = true;
this.setState({ uploaded }, () =>
{
console.log("_onSendFileStats", { uploaded });
resolve();
});
})
@ -97,8 +96,6 @@ export default class DocumentsForm extends Step
_handle_onAddFile = ({ document_id, document_name, files, update }) =>
{
const existed_files = { ...this.state.uploaded };
console.log({ document_id, document_name, files, update });
console.log("_handle_onAddFile", { existed_files });
const group = md5(`${ document_id }_${ document_name }`);
const document_files = existed_files[ group ] === undefined ? [] : existed_files[ group ].files;
@ -114,39 +111,21 @@ export default class DocumentsForm extends Step
for(let nf in files)
{
console.log("_handle_onAddFile", { files });
//let e = false;
//for(let ef in document_files)
//{
// if(document_files[ef].name === files[nf].name) { e = true; }
//}
files[nf].document_id = document_id;
files[nf].group = group;
files[nf].group_name = document_name;
files[nf].uploaded = false;
files[nf].update = update;
//if(!e)
//{
// const ei = parseInt(existed_files[ document_id ].files.length, 10) > 0 ? parseInt(existed_files[ document_id ].files.length, 10) : 0;
// const new_index = ei + parseInt(nf, 10);
// console.log({ new_index });
// files[nf].index = new_index;
files[nf].document_id = document_id;
files[nf].group = group;
files[nf].group_name = document_name;
files[nf].uploaded = false;
files[nf].update = update;
document_files.push(files[nf]);
//}
document_files.push(files[nf]);
existed_files[ group ].files = document_files;
}
this.setState({ uploaded: existed_files, uploading: true }, () =>
{
console.log({ existed_files });
const { opp_number } = this.props;
console.log("DOUBLE", { files });
eachSeries(files, (file, callback) =>
{
const payload = {
@ -187,27 +166,6 @@ export default class DocumentsForm extends Step
uploaded[group].files = list;
/*
for(let i in uploaded[document_id].files)
{
if(uploaded[document_id].files[i].name !== file.name)
{
list.push(uploaded[document_id].files[i]);
}
}
*/
/*
if(list.length > 0)
{
uploaded[document_id].files = list;
}
else
{
delete uploaded[document_id];
}
*/
this.setState({ uploaded }, () =>
{
const completed = this._checkFilesCompleted();
@ -228,10 +186,6 @@ export default class DocumentsForm extends Step
_checkFilesCompleted = () =>
{
// const documents_length = this.props.documents.length;
// const files_length = Object.keys(this.state.files).length;
// const c = files_length >= documents_length ? true : false;
const { uploaded } = this.state;
const { documents } = this.props;
@ -246,7 +200,6 @@ export default class DocumentsForm extends Step
}
const group = md5(`${ documents[g].doc_id }_${ documents[g].name }`);
console.log({ g: documents[g], group });
if(uploaded[group] === undefined || uploaded[group].files.length === 0)
{
@ -274,28 +227,6 @@ export default class DocumentsForm extends Step
return c;
}
/*
_renderHeaderButtons = () =>
{
const { open, uploading, completed, loading, } = this.state;
const { statuscode_id } = this.props;
if(open && !uploading && !loading)
{
if(this.status === statuscode_id)
{
return (
<div className="buttons">
<button className="button button button-blue" onClick={ this._handle_onSendFiles } disabled={ completed ? false : true }>Отправить документы</button>
</div>
)
}
}
return null;
}
*/
render()
{
const { index, statuscode_id, dealSelected, documents, questionnaire_status, } = this.props;
@ -344,7 +275,6 @@ export default class DocumentsForm extends Step
) : (
<>
{ documents.map((document, index) => {
console.log({ document });
const group = md5(`${ document.doc_id }_${ document.name }`);
return (
<div className="block deal_documents_form_group" key={ index }>

View File

@ -9,6 +9,7 @@ import DealContractsSignEDO from "./DealContractsSignEDO";
import DealContractsSignPaper from "./DealContractsSignPaper";
import SignPlannedContract from "./SignPlannedContract";
import SignedContract from "./SignedContract";
import Link from "next/link";
export default class LeasingRegistration extends Step
{
@ -298,11 +299,9 @@ export default class LeasingRegistration extends Step
{ contracts.length > 0 ?
contracts.map((contract, index) => (
<div className="document" key={ index }>
<div className="icon">
<span className="extension">PDF</span>
</div>
<div className="icon formal"></div>
<div className="title">
<p>{ contract.name }</p>
<p><Link href={`/contract/${ contract.name }/payments`}><a>{ contract.name }</a></Link></p>
<div className="description">
<span>{ moment(contract.date).format("DD.MM.YYYY") }</span>
<span>{ contract.brand_name }</span>
@ -327,11 +326,9 @@ export default class LeasingRegistration extends Step
{ contracts.length > 0 ?
contracts.map((contract, index) => (
<div className="document" key={ index }>
<div className="icon">
<span className="extension">PDF</span>
</div>
<div className="icon formal"></div>
<div className="title">
<p>{ contract.name }</p>
<p><Link href={`/contract/${ contract.name }/payments`}><a>{ contract.name }</a></Link></p>
<div className="description">
<span>{ moment(contract.date).format("DD.MM.YYYY") }</span>
<span>{ contract.brand_name }</span>

View File

@ -180,8 +180,6 @@ export default class Offers extends Step
<tbody>
{ offers.map((offer, offer_index) =>
{
console.log({ offer });
return (
<tr key={ offer_index }>
{ statuscode_id === this.status && offer.quote_status ? (

View File

@ -30,12 +30,10 @@ export default class SignPlannedContract extends React.Component
async componentDidMount()
{
const { contract } = this.props;
console.log("SignPlannedContract", "CDM", { props: this.props });
if(contract.sign_type === "EDO")
{
const status_result = await docEDOStatus({ contract_number: contract.name });
console.log("SignPlannedContract", "CDM", { status_result });
this.setState({ contract_entity_id: status_result.edoid, status: status_result.status, loading: false, url: status_result.url_edo });
}
else
@ -57,23 +55,17 @@ export default class SignPlannedContract extends React.Component
_handle_downloadFile = () =>
{
console.log("_handle_downloadFile");
const { contract } = this.props;
//const { contract_entity_id } = this.state;
this.setState({ disabled: true, loading_download_file: true, error: false, }, async () =>
{
const check_result = await signCheckDownloadContractProject({ contract_number: contract.name });
if(check_result.status === "success")
{
console.log("_handle_downloadFile", { check_result });
const link_result = await signGetFileContractProject({
contract_number: contract.name
});
console.log("_handle_downloadFile", { link_result });
await getFile({ id: link_result.url, filename: `ЛК ЭВОЛЮЦИЯ ${ contract.name }.${ link_result.extension }` });
this.setState({ disabled: false, loading_download_file: false, error: false, uploading: contract.sign_type === "EDO" ? false : true, });
}
@ -81,20 +73,11 @@ export default class SignPlannedContract extends React.Component
{
this.setState({ disabled: false, loading_download_file: false, error: true, uploading: false, message: check_result.message !== undefined && check_result.message !== null ? check_result.message : "Возникла ошибка обработки документа" })
}
/*
const wmdoc_result = await signDownloadFile({
payload: { entity_name: "evo_contract", entity_id: contract_entity_id, sign_type: edo ? "EDO" : "Paper", evo_id: "144", },
filename: `ЛК ЭВОЛЮЦИЯ ${ contract.name }.pdf`,
});
console.log({ wmdoc_result });
*/
});
}
_handle_cancelSign = () =>
{
console.log("_handle_cancelSign");
const { contract, onDealContractsUpdate } = this.props;
this.setState({ disabled: true, loading_cancel_sign: true }, async () =>
@ -105,7 +88,6 @@ export default class SignPlannedContract extends React.Component
const cancel_result = await signCancelDocument({ contract_number: contract.name, doc_type_id: contract.sign_type === "EDO" ? "144" : "60" });
setTimeout(() => {
onDealContractsUpdate();
// this.setState({ disabled: false, loading_cancel_sign: false });
}, 1000);
}
else
@ -122,8 +104,6 @@ export default class SignPlannedContract extends React.Component
_handle_sendToEDO = () =>
{
console.log("_handle_sendToEDO");
const { contract, onDealContractsUpdate } = this.props;
this.setState({ disabled: true, loading_signing: true }, async () =>
@ -132,7 +112,6 @@ export default class SignPlannedContract extends React.Component
if(check_result.status === "success")
{
const status_result = await docEDOStatus({ contract_number: contract.name });
console.log({ status_result });
if(status_result.status > 0)
{
@ -166,7 +145,6 @@ export default class SignPlannedContract extends React.Component
_handle_onGoToEDO = () =>
{
const { url } = this.state;
console.log("_handle_onGoToEDO", { url });
if(url !== undefined && url !== null)
{

View File

@ -23,8 +23,6 @@ export default class SignedContract extends React.Component
_handle_downloadFile = () =>
{
console.log("_handle_downloadFile");
const { contract } = this.props;
this.setState({ loading: true, error: false, }, async () =>
@ -32,13 +30,10 @@ export default class SignedContract extends React.Component
const check_result = await signCheckDownloadContractProject({ contract_number: contract.name });
if(check_result.status === "success")
{
console.log("_handle_downloadFile", { check_result });
const link_result = await signGetFileContractProject({
contract_number: contract.name
});
console.log("_handle_downloadFile", { link_result });
await getFile({ id: link_result.url, filename: `ЛК ЭВОЛЮЦИЯ ${ contract.name }.${ link_result.extension }` });
this.setState({ loading: false, error: false, });
}

View File

@ -4,78 +4,6 @@ import DealsList from "./DealsList";
import SingleDeal from "./SingleDeal";
import { getDeals, getDealOffers, getDealDocuments, getDealContracts } from "../../actions";
class AllContractsModal extends React.Component
{
constructor(props)
{
super(props);
}
render()
{
const { open, close, activeContract, handleContractSelected } = this.props
return (
<div className={open ? "fade opened" : "fade"}>
<div className="contractStatus_modal all_contracts_modal">
<div className="modal_header">
<p className="modal_title">Статусы сделок</p>
<button className="modal_close" onClick={close}></button>
</div>
<div className="modal_body">
<div className="contractStatus_list">
<div className="single_status">
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_1"></i>
<p>Выбор КП</p>
</div>
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_2"></i>
<p>Программа финансирования</p>
</div>
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_3"></i>
<p>Сборка пакета документов</p>
</div>
<div className="current">
<p>Сделка 1</p>
<span></span>
<i className="status_4"></i>
<p>Проверка документов</p>
</div>
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_5"></i>
<p>Принятие решения по заявке</p>
</div>
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_6"></i>
<p>Оформление лизинга</p>
</div>
<div>
<p>Сделка 1</p>
<span></span>
<i className="status_7"></i>
<p>Выбор типа подписания</p>
</div>
</div>
</div>
</div>
</div>
</div>
)
}
}
class DealsStatus extends React.Component
{
constructor(props)
@ -93,7 +21,6 @@ class DealsStatus extends React.Component
static getDerivedStateFromProps(nextProps, prevState)
{
console.log("DealsStatus", "getDerivedStateFromProps", { nextProps });
return {
deals: nextProps.deals,
}
@ -109,7 +36,6 @@ class DealsStatus extends React.Component
_onDealsUpdate = () =>
{
console.log("_onDealsUpdate");
return new Promise((resolve) =>
{
const { dispatch } = this.props;
@ -128,8 +54,6 @@ class DealsStatus extends React.Component
_onDealContractsUpdate = (deal_id) =>
{
console.log("_onDealContractsUpdate");
const { dispatch } = this.props;
getDealContracts({ dispatch, deal_id, });
}
@ -161,7 +85,6 @@ class DealsStatus extends React.Component
{
const { dispatch } = this.props;
console.log("_handle_onSelectDeal", { deal_id });
this.setState({ dealSelected: deal_id });
getDealOffers({ dispatch, deal_id, });
@ -199,16 +122,6 @@ class DealsStatus extends React.Component
onDealContractsUpdate={ this._onDealContractsUpdate }
onQuestionnaire={ onQuestionnaire }
/>
{/*}
<AllContractsModal
open={allContractModalOpened}
close={() => {
this._handleModalToggle("all")
}}
activeContract={currentSelected}
handleContractSelected={this._handleContractSelected}
/>
{*/}
</>
) }
</>
@ -218,7 +131,6 @@ class DealsStatus extends React.Component
function mapStateToProps(state, ownProps)
{
console.log({ "DealsStatus.state": state });
return {
deals: state.deals,
}

View File

@ -29,7 +29,6 @@ class EDOSign extends React.Component
static getDerivedStateFromProps(nextProps, prevState)
{
console.log("EDOSign", "getDerivedStateFromProps", { nextProps });
return {
operators: nextProps.operators,
edo_message: nextProps.edo_message,
@ -72,7 +71,6 @@ class EDOSign extends React.Component
for(let i in documents)
{
console.log({ fin: documents[i] });
if(!documents[i].completed)
completed = false;
break;
@ -83,13 +81,9 @@ class EDOSign extends React.Component
_sign = () =>
{
//const { documents } = this.props;
const { operator_selected, step } = this.state;
const documents = [ ...this.state.documents ];
console.log("_handle_onFormSubmit");
console.log({ documents, operator_selected });
this.setState({ loading: true }, () =>
{
eachSeries(documents, async (document, callback) =>
@ -116,11 +110,8 @@ class EDOSign extends React.Component
}
else if(document.ready)
{
console.log({ document })
await this._updateDocs(document.index, { loading: true, });
const status_result = await docEDOStatus({ contract_number: document.id });
console.log({ status_result });
if(status_result.status > 0)
{
@ -132,7 +123,6 @@ class EDOSign extends React.Component
}
else
{
console.log({ document })
await this._updateDocs(document.index, { loading: true });
if(document.attorney && document.attorney_selected !== undefined)
@ -144,16 +134,10 @@ class EDOSign extends React.Component
edo_box: operator_selected.edo_box,
});
console.log("\n\nIMPORTANT !!!!!!!!!!\n\n");
console.log({ create_edo_project_result });
const get_guid_entity_result = await signGetGUIDEntity({
contract_number: document.id,
});
console.log("\n\nENTITY !!!!!!!!!!\n\n");
console.log({ get_guid_entity_result });
const wmdoc_result = await signGetWMDoc({
entity_name: "evo_contract",
entity_id: get_guid_entity_result.entityid,
@ -161,7 +145,6 @@ class EDOSign extends React.Component
evo_id: "144",
code: "Leas_Contract",
});
console.log({ wmdoc_result });
const connect_result = await docEDOConnect({ contract_number: document.id });
@ -177,8 +160,6 @@ class EDOSign extends React.Component
else
{
const create_print_form_result = await signCheckCreatePrintForm({ contract_number: document.id, sign_type: "EDO" });
console.log({ create_print_form_result });
const docs = { status: create_print_form_result.status };
if(create_print_form_result.status !== "success")
@ -194,14 +175,12 @@ class EDOSign extends React.Component
if(create_print_form_result.status === "success")
{
const check_attorney_client_result = await signCheckPowerAttorneyClient({ contract_number: document.id })
console.log({ check_attorney_client_result });
await this._updateDocs(document.index, { attorney: check_attorney_client_result.power_attorney_required, });
if(check_attorney_client_result.power_attorney_required)
{
const get_attorney_client_result = await signGetPowerAttorneyClient({ contract_number: document.id });
console.log({ get_attorney_client_result });
if(get_attorney_client_result === null)
{
@ -249,7 +228,6 @@ class EDOSign extends React.Component
sign_type: "EDO",
evo_id: "144",
});
console.log({ wmdoc_result });
const connect_result = await docEDOConnect({ contract_number: document.id });
@ -297,9 +275,6 @@ class EDOSign extends React.Component
const { operators, operator_selected, step, finished } = this.state;
const documents = [ ...this.state.documents ];
console.log("_handle_onFormSubmit");
console.log({ documents, operator_selected });
if(operators !== null && operators.length === 0)
{
onGoToEDOInvites();
@ -340,7 +315,6 @@ class EDOSign extends React.Component
_handle_onAttorneyChange = (index, attorney) =>
{
console.log("_handle_onAttorneyChange", { index, attorney });
this._updateDocs(index, { attorney_selected: attorney });
}
@ -356,7 +330,6 @@ class EDOSign extends React.Component
contract_number: documents[index].id,
});
console.log("_handle_onDownloadFile", { link_result });
await getFile({ id: link_result.url, filename: `ЛК ЭВОЛЮЦИЯ ${ documents[index].id }.${ link_result.extension }` });
await this._updateDocs(index, { loading: false, disabled: false, });
@ -392,8 +365,6 @@ class EDOSign extends React.Component
const { onCancel } = this.props;
const { documents } = this.state;
console.log("documents", documents, "LEN", documents.length);
var clean = false;
if(documents.length === 0)
{
@ -412,7 +383,6 @@ class EDOSign extends React.Component
this.setState({ loading: true, disabled: true }, async () =>
{
const status_result = await docEDOStatus({ contract_number: documents[index].id });
console.log({ status_result });
if(status_result.status >= 2)
{
@ -448,7 +418,6 @@ class EDOSign extends React.Component
{
const { step, operators, edo_message, documents, loading, disabled, finished, operator_selected } = this.state;
const { onCancel, } = this.props;
console.log({ operators, documents });
return (
<div className="edo_detail">
@ -492,7 +461,6 @@ class EDOSign extends React.Component
<div className="docs_list medium-icon edo_sign_documents_list">
{ documents.map((document, index) =>
{
console.log({ document });
return (
<div className="edo_sign_documents_document" key={ index }>
<div className="edo_sign_documents_document_left">
@ -603,7 +571,6 @@ class EDOSign extends React.Component
function mapStateToProps(state, ownProps)
{
console.log("EDOSign", "mapStateToProps", { state: state });
return {
operators: state.edo.operators,
edo_message: state.edo.message,

View File

@ -11,9 +11,6 @@ export default class LogFileDownload extends React.Component
{
const { log } = this.props;
console.log("LOG", "LogFileDownload", { props: this.props });
console.log("LOG", "LogFileDownload", { log });
logDocumentAccess(log)
.then(() => {})
.catch(() => {});

View File

@ -6122,11 +6122,18 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
.contractStatus_modal .single_status > div .status_body .wrap p {
font-weight: 400;
}
.contractStatus_modal .single_status > div .status_body .wrap .single_text {
padding-top: 20px;
padding-left: 20px;
padding-bottom: 10px;
}
.contractStatus_modal .single_status > div .status_body .wrap .single_text p {
display: flex;
color: #8E94A7;
margin-right: 20%;
padding-top: 10px;
padding-top: 0px;
padding-left: 40px;
position: relative;
}
@media all and (max-width: 768px) {
.contractStatus_modal .single_status > div .status_body .wrap .single_text p {
@ -6142,14 +6149,13 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
min-height: 40px;
height: 40px;
min-width: 40px;
margin-right: 20px;
margin-top: -10px;
margin-top: -20px;
position: absolute;
left: -10px;
top: 50%;
background-image: url("data:image/svg+xml,%3Csvg width='40' height='40' viewBox='0 0 40 40' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='40' height='40' rx='8' fill='%232F80ED' fill-opacity='0.1'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M20 29C24.9706 29 29 24.9706 29 20C29 15.0294 24.9706 11 20 11C15.0294 11 11 15.0294 11 20C11 24.9706 15.0294 29 20 29ZM21 14.5C21 13.9477 20.5523 13.5 20 13.5C19.4477 13.5 19 13.9477 19 14.5V19.75C19 20.4404 19.5596 21 20.25 21H23.5C24.0523 21 24.5 20.5523 24.5 20C24.5 19.4477 24.0523 19 23.5 19H21V14.5Z' fill='%232F80ED'/%3E%3C/svg%3E");
}
@media all and (max-width: 768px) {
.contractStatus_modal .single_status > div .status_body .wrap .single_text p:before {
margin-top: -13px;
}
}
.contractStatus_modal .single_status > div .status_body .wrap table {
font-size: 12px;
@ -6462,6 +6468,9 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block .block_body .fines_
font-size: 8px;
}
}
.contractStatus_modal .single_status > div .status_body .documents .document .icon.formal {
background-image: url("data:image/svg+xml,%3Csvg width='26' height='28' viewBox='0 0 26 28' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M2 3.5C2 1.84315 3.34315 0.5 5 0.5H18.3701L20.7774 4L23.1848 7.06354V24.5C23.1848 26.1569 21.8417 27.5 20.1848 27.5H5C3.34314 27.5 2 26.1569 2 24.5V3.5Z' fill='%231C01A9'/%3E%3Cpath opacity='0.4' d='M23.1858 11.5V7L19.334 6.5L23.1858 11.5Z' fill='%230C0C0C'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 7.50098)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 12.501)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 17.501)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 22.501)' stroke='%23F0F0F0'/%3E%3Cpath d='M23.1858 7H19.3711C18.8188 7 18.3711 6.55228 18.3711 6V3.5V0.5L23.1858 7Z' fill='%232F80ED'/%3E%3C/svg%3E");
}
.contractStatus_modal .single_status > div .status_body .documents .document .title {
display: flex;
flex-direction: column;

View File

@ -6935,12 +6935,17 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
.single_text {
//max-width: 565px;
//margin: auto;
padding-top: 20px;
padding-left: 20px;
padding-bottom: 10px;
p {
display: flex;
color: #8E94A7;
margin-right: 20%;
padding-top: 10px;
padding-top: 0px;
padding-left: 40px;
position: relative;
@media all and (max-width: 768px) {
margin-right: 0;
@ -6955,13 +6960,15 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
min-height: 40px;
height: 40px;
min-width: 40px;
margin-right: 20px;
margin-top: -10px;
margin-top: -20px;
position: absolute;
left: -10px;
top: 50%;
background-image: url("data:image/svg+xml,%3Csvg width='40' height='40' viewBox='0 0 40 40' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='40' height='40' rx='8' fill='%232F80ED' fill-opacity='0.1'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M20 29C24.9706 29 29 24.9706 29 20C29 15.0294 24.9706 11 20 11C15.0294 11 11 15.0294 11 20C11 24.9706 15.0294 29 20 29ZM21 14.5C21 13.9477 20.5523 13.5 20 13.5C19.4477 13.5 19 13.9477 19 14.5V19.75C19 20.4404 19.5596 21 20.25 21H23.5C24.0523 21 24.5 20.5523 24.5 20C24.5 19.4477 24.0523 19 23.5 19H21V14.5Z' fill='%232F80ED'/%3E%3C/svg%3E");
@media all and (max-width: 768px) {
margin-top: -13px;
//margin-top: -13px;
}
}
}
@ -7362,6 +7369,10 @@ main .dropdown_blocks_list.zero-margin.gibdd .dropdown_block {
font-size: 8px;
}
}
&.formal {
background-image: url("data:image/svg+xml,%3Csvg width='26' height='28' viewBox='0 0 26 28' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M2 3.5C2 1.84315 3.34315 0.5 5 0.5H18.3701L20.7774 4L23.1848 7.06354V24.5C23.1848 26.1569 21.8417 27.5 20.1848 27.5H5C3.34314 27.5 2 26.1569 2 24.5V3.5Z' fill='%231C01A9'/%3E%3Cpath opacity='0.4' d='M23.1858 11.5V7L19.334 6.5L23.1858 11.5Z' fill='%230C0C0C'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 7.50098)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 12.501)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 17.501)' stroke='%23F0F0F0'/%3E%3Cline y1='-0.5' x2='11.5553' y2='-0.5' transform='matrix(1 -9.89866e-05 0.000132759 1 6.81445 22.501)' stroke='%23F0F0F0'/%3E%3Cpath d='M23.1858 7H19.3711C18.8188 7 18.3711 6.55228 18.3711 6V3.5V0.5L23.1858 7Z' fill='%232F80ED'/%3E%3C/svg%3E");
}
}
.title {

View File

@ -216,7 +216,6 @@ class IndexPage extends React.Component
_handle_onQuestionnaire = () =>
{
console.log(" _handle_onQuestionnaire ");
this.props.router.push("/questionnaire");
}
@ -278,9 +277,6 @@ class IndexPage extends React.Component
Закрыт: "closed"
}
console.log("contracts", contracts)
console.log("company", company)
return (
<React.Fragment>
<Head>

View File

@ -60,7 +60,6 @@ class IndexPage extends React.Component
{
event.preventDefault();
console.log("_handle_onFormSubmit");
this.setState({ loading: true }, () =>
{
inviteToEDO()
@ -86,7 +85,6 @@ class IndexPage extends React.Component
var list = operators !== null && invites !== null ? [ ...operators, ...invites ] : null;
console.log({ operators, invites });
return (
<React.Fragment>
<Head>
@ -134,22 +132,6 @@ class IndexPage extends React.Component
<p>У Вас пока нет подключенных операторов ЭДО. Запросите отправку нового приглашения.</p>
)
}
{/*}
<label>Оператор ЭДО <sup className="required_label">*</sup></label>
<Select
id="edo_operators_list"
name="edo_operators_list"
options={ operators }
placeholder="Выберите оператора"
noOptionsMessage={ ({ inputValue }) => !inputValue ? "" :"Ничего не найдено" }
isSearchable={ true }
className="autocomlete autocomlete_with_indicators"
classNamePrefix="react-select"
value={ operator !== undefined ? operator : undefined }
onChange={ (element) => { this._handle_onOperatorChange(element) } }
required={ true }
/>
{*/}
</div>
<div className="form_field" style={{ display: "flex", justifyContent: "flex-end" }}>
<button type="submit" className="button button-blue" style={{ minWidth: "232px" }}>
@ -180,7 +162,6 @@ class IndexPage extends React.Component
function mapStateToProps(state, ownProps)
{
console.log("mapStateToProps", "operators", { edo: state.edo });
return {
observer: state.auth.observer,
user: state.user,