diff --git a/src/client/Containers/Calculation/lib/fetchData.js b/src/client/Containers/Calculation/lib/fetchData.js index b380bb1..694d6ba 100644 --- a/src/client/Containers/Calculation/lib/fetchData.js +++ b/src/client/Containers/Calculation/lib/fetchData.js @@ -1,5 +1,5 @@ import { gql } from '@apollo/client'; -import { currentDate } from 'client/common/constants'; +import { currentDate } from 'client/tools/date'; import CalculationService from 'client/services/CalculationService'; import CalculationStore from 'client/stores/CalculationStore'; import { getUser } from 'client/tools/user'; diff --git a/src/client/stores/CalculationStore/Effects/action.ts b/src/client/stores/CalculationStore/Effects/action.ts index 40ee8ad..2b510d4 100644 --- a/src/client/stores/CalculationStore/Effects/action.ts +++ b/src/client/stores/CalculationStore/Effects/action.ts @@ -1,13 +1,14 @@ +// @ts-nocheck import { gql } from '@apollo/client'; import { message } from 'antd'; import { openNotification } from 'client/Elements/Notification'; import CalculationService from 'client/services/CalculationService'; import { prepareCalculationData } from 'client/services/prepareData'; import CalculationStore from 'client/stores/CalculationStore'; +import { getUser } from 'client/tools/user'; import { TAction } from 'core/types/Calculation/Store/effect'; import { ITableCell } from 'core/types/Calculation/Store/tables'; import { TableProps } from './../../../../core/types/Calculation/Store/tables'; -import { getUser } from 'client/tools/user'; const actions: TAction = { createLead: () => { @@ -240,7 +241,7 @@ const actions: TAction = { title: 'Ошибка во время расчета графика', description: 'Укажите стоимость КАСКО', })(); - return; + // return; } if ( @@ -261,7 +262,7 @@ const actions: TAction = { title: 'Ошибка во время расчета графика', description: 'Укажите стоимость КАСКО, включаемую в график', })(); - return; + // return; } CalculationStore.setTableRow( 'tableInsurance', diff --git a/src/client/stores/CalculationStore/Effects/reaction.ts b/src/client/stores/CalculationStore/Effects/reaction.ts index 1cb20a5..f99082f 100644 --- a/src/client/stores/CalculationStore/Effects/reaction.ts +++ b/src/client/stores/CalculationStore/Effects/reaction.ts @@ -7,7 +7,7 @@ import { ITableCell, TableProps } from 'core/types/Calculation/Store/tables'; import { toJS } from 'mobx'; import { calcPrice, calculatePerc, calculateRub } from './lib/tools'; import { gql } from '@apollo/client'; -import { currentDate } from 'client/common/constants'; +import { currentDate } from 'client/tools/date'; const reactionEffects: IReactionEffect[] = [ calculationStore => ({ diff --git a/src/client/common/constants.js b/src/client/tools/date.js similarity index 100% rename from src/client/common/constants.js rename to src/client/tools/date.js diff --git a/src/core/Data/initialOptions.ts b/src/core/Data/initialOptions.ts index d922c6f..29b67dd 100644 --- a/src/core/Data/initialOptions.ts +++ b/src/core/Data/initialOptions.ts @@ -1,5 +1,5 @@ import { TEntityQuery } from 'core/types/Entities/query'; -import { currentDate } from 'client/common/constants'; +import { currentDate } from 'client/tools/date'; const initialOptions: TEntityQuery[] = [ {