From b1484bbf8bb2c26ccb0349d83972a22b6340a98b Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 16 Nov 2020 18:32:35 +0300 Subject: [PATCH] add insurances to createKp query --- .../stores/CalculationStore/Effects/action.ts | 16 ++++++++++++---- src/core/types/Calculation/Requests.ts | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/client/stores/CalculationStore/Effects/action.ts b/src/client/stores/CalculationStore/Effects/action.ts index 2c6a0a7..6a1d3dd 100644 --- a/src/client/stores/CalculationStore/Effects/action.ts +++ b/src/client/stores/CalculationStore/Effects/action.ts @@ -1,5 +1,4 @@ // @ts-nocheck -import { toJS } from 'mobx'; import { gql } from '@apollo/client'; import { message } from 'antd'; import { openNotification } from 'client/Elements/Notification'; @@ -9,8 +8,8 @@ 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 { Status } from 'core/types/statuses'; +import { TableProps } from './../../../../core/types/Calculation/Store/tables'; const actions: TAction = { createLead: () => { @@ -158,9 +157,16 @@ const actions: TAction = { }, createKP: async () => { - const { values } = CalculationStore; + const { values, tables } = CalculationStore; const calculationRes = await actions.calculate(); + const insurances = tables.tableInsurance.rows.map(insuranceRow => + Object.keys(insuranceRow).map(prop => ({ + [prop]: insuranceRow[prop].value, + })), + ); + + console.log('insurances', insurances); const { columns, postValues, @@ -168,7 +174,7 @@ const actions: TAction = { preparedPayments, } = calculationRes; - const domainName = (await getUser()).FullName; + const domainName = (await getUser()).FullName || ''; // if (process.env.NODE_ENV === 'development') { console.log('values', values); console.log('domainName', domainName); @@ -177,6 +183,7 @@ const actions: TAction = { CalculationService.createKp({ domainName, calculation: { + insurances, preparedValues, preparedPayments, calculationColumns: columns, @@ -205,6 +212,7 @@ const actions: TAction = { marginTop: '7vh', }, }); + if (quote.offerprintform) window.open(quote.offerprintform, '_blank'); }); }) diff --git a/src/core/types/Calculation/Requests.ts b/src/core/types/Calculation/Requests.ts index 51c6008..ae7c7ea 100644 --- a/src/core/types/Calculation/Requests.ts +++ b/src/core/types/Calculation/Requests.ts @@ -6,6 +6,7 @@ import { CRMEntityNames } from 'core/types/Entities/crmEntityNames'; import { TEntityQuery } from '../Entities/query'; import { ColumnsNames, IColumn, PostValues } from 'core/types/Calculation/Core'; import { TValues } from 'core/types/Calculation/Store/values'; +import { TableProps } from 'core/types/Calculation/Store/tables'; export interface IGetEntitiesRequest { queries: TEntityQuery[]; @@ -30,6 +31,7 @@ export interface IGetCalculationRequest { export interface ICreateKpRequest { domainName: string; calculation: { + insurances: TableProps[]; preparedValues: PreparedValues; preparedPayments: PreparedPayments; calculationColumns: { [column in ColumnsNames]?: IColumn };