From 7e17f67ef8d490eff94df577759e92ea88033292 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Mon, 13 Feb 2023 19:05:18 +0300 Subject: [PATCH] fix load-kp --- apps/web/process/load-kp/reactions.ts | 1 + apps/web/trpc/routers/quote.ts | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/web/process/load-kp/reactions.ts b/apps/web/process/load-kp/reactions.ts index a4a49e3..8faa363 100644 --- a/apps/web/process/load-kp/reactions.ts +++ b/apps/web/process/load-kp/reactions.ts @@ -73,6 +73,7 @@ export default function loadKpReactions({ store, trpcClient }: ReactionsContext) content: `Ошибка во время загрузки КП ${quoteName}`, key, }); + $calculation.element('selectQuote').resetValue(); }) .finally(() => { $process.delete('LoadKP'); diff --git a/apps/web/trpc/routers/quote.ts b/apps/web/trpc/routers/quote.ts index b0ac4f1..7f0fb76 100644 --- a/apps/web/trpc/routers/quote.ts +++ b/apps/web/trpc/routers/quote.ts @@ -10,6 +10,7 @@ import { GetQuoteDataInputSchema, GetQuoteDataOutputSchema } from '@/process/loa import getPaymentsDataFromKP from '@/process/payments/get-kp-data'; import getPriceDataFromKP from '@/process/price/get-kp-data'; import getSupplierAgentsDataFromKP from '@/process/supplier-agent/get-kp-values'; +import { shake } from 'radash'; const DEFAULT_OSAGO_ROW = defaultInsuranceValues.find((x) => x.key === 'osago'); const DEFAULT_KASKO_ROW = defaultInsuranceValues.find((x) => x.key === 'kasko'); @@ -27,15 +28,20 @@ const quoteRouter = t.router({ const { values: leasingObjectValues } = await getLeasingObjectDataFromKP(input); const { fingap, insurance: fingapInsurance } = await getFingapDataFromKP(input); + // TODO: remove this temp fix + const quoteValues = shake({ + ...configuratorValues, + ...supplierAgentsValues, + ...paymentsValues, + ...priceValues, + ...bonusValues, + ...leasingObjectValues, + }); + return { values: { ...defaultValues, - ...configuratorValues, - ...supplierAgentsValues, - ...paymentsValues, - ...priceValues, - ...bonusValues, - ...leasingObjectValues, + ...quoteValues, }, payments, insurance: {