diff --git a/actions/contractActions.js b/actions/contractActions.js index 4bd959c..745ad17 100644 --- a/actions/contractActions.js +++ b/actions/contractActions.js @@ -336,7 +336,7 @@ export const getContractFines = ({ dispatch, contract, }) => //console.log("ACTION", "getContractFines", "response.data", response.data); - let query = nSQL(response.data.fines).query("select"); + let query = nSQL(response.data).query("select"); query = query.orderBy({ date: "desc" }); query.exec().then((rows) => { diff --git a/components/DealsStatus/SingleDeal.js b/components/DealsStatus/SingleDeal.js index 6de518f..d3599fa 100644 --- a/components/DealsStatus/SingleDeal.js +++ b/components/DealsStatus/SingleDeal.js @@ -763,7 +763,7 @@ class StatusPositiveDecision extends Step
{ statuscode_id === this.status ? ( -

Идёт подготовка необходимых документов

+

Идёт подготовка необходимых документов для заключения сделки

) : (

Документы подготовлены

) } diff --git a/pages/contract/components/InnerMenu/index.js b/pages/contract/components/InnerMenu/index.js index bba4312..48556ed 100644 --- a/pages/contract/components/InnerMenu/index.js +++ b/pages/contract/components/InnerMenu/index.js @@ -65,7 +65,6 @@ class InnerMenu extends React.Component { //console.log("Contract", "InnerMenu", "_loadMenu()"); - const { number, dispatch } = this.props; const { contracts_info, contract_events, contract_fines } = this.state; @@ -75,10 +74,15 @@ class InnerMenu extends React.Component if(contracts_info[ number ] === undefined) { getContractInfo({ dispatch, number }) - .then(() => { //console.log(11); - resolve(); }) - .catch(() => { //console.log(12); - resolve(); }); + .then(() => + { + //console.log(11); + resolve(); + }) + .catch(() => { + //console.log(12); + resolve(); + }); } else { @@ -90,10 +94,16 @@ class InnerMenu extends React.Component if(contract_events[ number ] === undefined) { getContractEvents({ dispatch, contract: number }) - .then(() => { //console.log(21); - resolve(); }) - .catch(() => { //console.log(22); - resolve(); }); + .then(() => + { + //console.log(21); + resolve(); + }) + .catch(() => + { + //console.log(22); + resolve(); + }); } else { @@ -105,10 +115,16 @@ class InnerMenu extends React.Component if(contract_fines[ number ] === undefined) { getContractFines({ dispatch, contract: number }) - .then(() => { //console.log(31); - resolve(); }) - .catch(() => { //console.log(32); - resolve(); }); + .then(() => + { + //console.log(31); + resolve(); + }) + .catch(() => + { + //console.log(32); + resolve(); + }); } else {