diff --git a/actions/questionnaireActions.js b/actions/questionnaireActions.js index 4c222d5..fa22821 100644 --- a/actions/questionnaireActions.js +++ b/actions/questionnaireActions.js @@ -9,6 +9,7 @@ import { eachSeries, each } from "async"; import * as actionTypes from '../constants/actionTypes'; import { getCitizenshipTitleByCode } from '../utils/citizenship'; import { questionnaire_template } from '../reducers/initialState'; +import { getCompanyInfo } from './companyActions'; if(process.browser) { @@ -26,11 +27,28 @@ if(process.browser) }; } +export const createQuestionnaire = (deal_id) => +{ + return new Promise((resolve, reject) => + { + axios.post(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/create`, { deal_id }, { + withCredentials: true, + }) + .then(() => {}).catch(() => {}).finally(() => + { + getCompanyInfo({ dispatch: global.store.dispatch }) + .then(() => {}).catch(() => {}).finally(() => + { + resolve(); + }); + }); + }); +} + export const getQuestionnaire = ({ dispatch, id }) => { //console.log("ACTION", "support", "getAppeals()", `${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/get`); - return new Promise((resolve, reject) => { axios.get(`${ process.env.NEXT_PUBLIC_SELF_API_HOST }/api/questionnaire/read`, {}) diff --git a/components/DealsStatus/DealsList.js b/components/DealsStatus/DealsList.js index 60dc9bd..3c8a2d2 100644 --- a/components/DealsStatus/DealsList.js +++ b/components/DealsStatus/DealsList.js @@ -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 (
{ 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 } diff --git a/components/DealsStatus/DealsListDeal.js b/components/DealsStatus/DealsListDeal.js index d75a80e..6a5cf53 100644 --- a/components/DealsStatus/DealsListDeal.js +++ b/components/DealsStatus/DealsListDeal.js @@ -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 (
diff --git a/components/DealsStatus/components/DealContractsSignEDO.js b/components/DealsStatus/components/DealContractsSignEDO.js index b2d617a..9f19dc4 100644 --- a/components/DealsStatus/components/DealContractsSignEDO.js +++ b/components/DealsStatus/components/DealContractsSignEDO.js @@ -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 (
@@ -505,7 +473,6 @@ class DealContractsSignEDO extends React.Component
{ documents.map((document, index) => { - console.log({ document }); return (
@@ -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, diff --git a/components/DealsStatus/components/DealContractsSignPaper.js b/components/DealsStatus/components/DealContractsSignPaper.js index 19c1337..8a11f77 100644 --- a/components/DealsStatus/components/DealContractsSignPaper.js +++ b/components/DealsStatus/components/DealContractsSignPaper.js @@ -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 (
@@ -311,7 +284,6 @@ export default class DealContractsSignPaper extends React.Component
{ documents.map((document, index) => { - console.log({ document }); return (
diff --git a/components/DealsStatus/components/DocumentsForm.js b/components/DealsStatus/components/DocumentsForm.js index 0d972ed..5bbd812 100644 --- a/components/DealsStatus/components/DocumentsForm.js +++ b/components/DealsStatus/components/DocumentsForm.js @@ -4,11 +4,96 @@ import { SpinnerCircular } from "spinners-react"; import FileDropzoneDeals from "../../FileDropzoneDeals"; -import { attachDealDocument, removeDealDocument, sendDealDocuments, } from "../../../actions"; +import { attachDealDocument, createQuestionnaire, removeDealDocument, sendDealDocuments, } from "../../../actions"; import Step from "./Step"; import md5 from "md5"; +class QuestionnaireForm extends React.Component +{ + constructor(props) + { + super(props); + this.state = { + loading: false + } + } + + _handle_onQuestionnaire = (event) => + { + event.preventDefault(); + const { onQuestionnaire } = this.props; + + onQuestionnaire(); + } + + _handle_onCreateQuestionnaire = (event) => + { + event.preventDefault(); + const { onQuestionnaire, deal_id } = this.props; + + this.setState({ loading: true, }, () => + { + createQuestionnaire(deal_id) + .then(() => + { + onQuestionnaire(); + }); + }); + } + + render() + { + const { loading } = this.state; + const { questionnaire_status } = this.props; + + switch(questionnaire_status) + { + case "need_to_fill": + { + return ( +
+

Требуется обновить данные в анкете

+ +
+ ) + } + + case "need_to_create": + { + return ( +
+

Требуется предоставить данные в анкете клиента

+ +
+ ) + } + + case "up_to_date": + { +
+

Вам не требуется актуализация данных анкеты Клиента

+
+ } + + default: + { + return ( +
+

Проводится проверка анкеты Вашей организации

+
+ ) + } + } + } +} + export default class DocumentsForm extends Step { constructor(props) @@ -20,6 +105,7 @@ export default class DocumentsForm extends Step uploading: false, completed: false, loading: true, + questionnaire_loading: false, }; this.status = 102; } @@ -61,34 +147,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 +182,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 +197,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 +252,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(); @@ -218,49 +262,39 @@ export default class DocumentsForm extends Step }); } - _handle_onQuestionnaire = (event) => - { - const { onQuestionnaire } = this.props; - - event.preventDefault(); - onQuestionnaire(); - } - _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; + const { documents, questionnaire_status, } = this.props; let c = true; - if(documents !== undefined) + if(questionnaire_status !== "need_to_fill" && questionnaire_status !== "need_to_create") { - for(let g in documents) + if(documents !== undefined) { - if(!documents[g].add) + for(let g in documents) { - continue; - } - - 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) - { - c = false; - break; - } - else - { - for(let f in uploaded[group].files) + if(!documents[g].add) { - if(!uploaded[group].files[f].uploaded) + continue; + } + + const group = md5(`${ documents[g].doc_id }_${ documents[g].name }`); + + if(uploaded[group] === undefined || uploaded[group].files.length === 0) + { + c = false; + break; + } + else + { + for(let f in uploaded[group].files) { - c = false; - break; + if(!uploaded[group].files[f].uploaded) + { + c = false; + break; + } } } } @@ -274,31 +308,9 @@ 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 ( -
- -
- ) - } - } - - return null; - } - */ - render() { - const { index, statuscode_id, dealSelected, documents, questionnaire_status, } = this.props; + const { index, statuscode_id, dealSelected, documents, questionnaire_status, onQuestionnaire, } = this.props; const { open, uploaded, uploading, loading, completed } = this.state; return ( @@ -319,24 +331,11 @@ export default class DocumentsForm extends Step

Анкета клиента:

- { questionnaire_status === "need_to_fill" ? ( -
-

Требуется обновить данные в анкете

- -
- ) : ( - <> - { questionnaire_status !== "up_to_date" ? ( -
-

Проводится проверка анкеты Вашей организации

-
- ) : ( -
-

Вам не требуется актуализация данных анкеты Клиента

-
- ) } - - ) } +
{ documents === undefined ? ( @@ -344,7 +343,6 @@ export default class DocumentsForm extends Step ) : ( <> { documents.map((document, index) => { - console.log({ document }); const group = md5(`${ document.doc_id }_${ document.name }`); return (
diff --git a/components/DealsStatus/components/LeasingRegistration.js b/components/DealsStatus/components/LeasingRegistration.js index cdd3cb2..c84cea3 100644 --- a/components/DealsStatus/components/LeasingRegistration.js +++ b/components/DealsStatus/components/LeasingRegistration.js @@ -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) => (
-
- PDF -
+
-

{ contract.name }

+

{ contract.name }

{ moment(contract.date).format("DD.MM.YYYY") } { contract.brand_name } @@ -327,11 +326,9 @@ export default class LeasingRegistration extends Step { contracts.length > 0 ? contracts.map((contract, index) => (
-
- PDF -
+
-

{ contract.name }

+

{ contract.name }

{ moment(contract.date).format("DD.MM.YYYY") } { contract.brand_name } diff --git a/components/DealsStatus/components/Offers.js b/components/DealsStatus/components/Offers.js index 543d22d..9c234bd 100644 --- a/components/DealsStatus/components/Offers.js +++ b/components/DealsStatus/components/Offers.js @@ -180,8 +180,6 @@ export default class Offers extends Step { offers.map((offer, offer_index) => { - console.log({ offer }); - return ( { statuscode_id === this.status && offer.quote_status ? ( diff --git a/components/DealsStatus/components/SignPlannedContract.js b/components/DealsStatus/components/SignPlannedContract.js index 8f61a15..bc8ec8e 100644 --- a/components/DealsStatus/components/SignPlannedContract.js +++ b/components/DealsStatus/components/SignPlannedContract.js @@ -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) { diff --git a/components/DealsStatus/components/SignedContract.js b/components/DealsStatus/components/SignedContract.js index 7a808a1..0cab11b 100644 --- a/components/DealsStatus/components/SignedContract.js +++ b/components/DealsStatus/components/SignedContract.js @@ -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, }); } diff --git a/components/DealsStatus/index.js b/components/DealsStatus/index.js index e4551f3..fda915c 100644 --- a/components/DealsStatus/index.js +++ b/components/DealsStatus/index.js @@ -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 ( -
-
-
-

Статусы сделок

- -
-
-
-
-
-

Сделка 1

- - -

Выбор КП

-
-
-

Сделка 1

- - -

Программа финансирования

-
-
-

Сделка 1

- - -

Сборка пакета документов

-
-
-

Сделка 1

- - -

Проверка документов

-
-
-

Сделка 1

- - -

Принятие решения по заявке

-
-
-

Сделка 1

- - -

Оформление лизинга

-
-
-

Сделка 1

- - -

Выбор типа подписания

-
-
-
-
-
-
- ) - } -} - 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 } /> - {/*} - { - 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, } diff --git a/components/EDOSign/index.js b/components/EDOSign/index.js index c06eeb9..d65bf06 100644 --- a/components/EDOSign/index.js +++ b/components/EDOSign/index.js @@ -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 (
@@ -492,7 +461,6 @@ class EDOSign extends React.Component
{ documents.map((document, index) => { - console.log({ document }); return (
@@ -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, diff --git a/components/LogFileDownload/index.js b/components/LogFileDownload/index.js index 83f2a8f..9ad3c16 100644 --- a/components/LogFileDownload/index.js +++ b/components/LogFileDownload/index.js @@ -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(() => {}); diff --git a/css/main/style.css b/css/main/style.css index a623cac..1a70596 100644 --- a/css/main/style.css +++ b/css/main/style.css @@ -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; diff --git a/css/main/style.less b/css/main/style.less index 11dc93b..4b0a379 100644 --- a/css/main/style.less +++ b/css/main/style.less @@ -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 { diff --git a/pages/api/company.js b/pages/api/company.js index 2c20572..e5550bc 100644 --- a/pages/api/company.js +++ b/pages/api/company.js @@ -34,6 +34,7 @@ export default async function handler(req, res) }) .then((crm_response) => { + console.log("/Account/GetCompanyInfo/", "RESPONSE", { data: crm_response.data }); res.status(200).json({ ...crm_response.data, ...{ active: client_jwt_decoded.acc_number } }); }) .catch((error) => diff --git a/pages/api/questionnaire/create.js b/pages/api/questionnaire/create.js new file mode 100644 index 0000000..1c89d3b --- /dev/null +++ b/pages/api/questionnaire/create.js @@ -0,0 +1,20 @@ +import CRMRequestPost from '../../../lib/CRMRequestPost'; + +export default async function handler(req, res) +{ + console.log("\n\n", "API", "/questionnaire/create"); + const { deal_id } = req.body; + + const payload = { + opp_number: deal_id, + }; + + console.log({ payload }); + + await CRMRequestPost({ req, res, + path: `${ process.env.CRM_API_HOST }/lk/Questionnaire/Create`, + params: payload, + headers: { "Content-Type": "application/json" }, + log: true, + }); +} \ No newline at end of file diff --git a/pages/index.js b/pages/index.js index 3f75034..0a3ed8c 100644 --- a/pages/index.js +++ b/pages/index.js @@ -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 ( diff --git a/pages/settings/digital.js b/pages/settings/digital.js index 532ab40..4a44863 100644 --- a/pages/settings/digital.js +++ b/pages/settings/digital.js @@ -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 ( @@ -134,22 +132,6 @@ class IndexPage extends React.Component

У Вас пока нет подключенных операторов ЭДО. Запросите отправку нового приглашения.

) } - {/*} - -