From 5e09885178074f65a8f953fc82d280ba8eae59a0 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Thu, 18 Jan 2024 16:09:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=BB=D0=B5=20=D0=9F=D0=BB=D0=B0=D0=B2?= =?UTF-8?q?=D0=B0=D1=8E=D1=89=D0=B0=D1=8F=20=D1=81=D1=82=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20cbxFloatingRate=20-=20=D1=82=D0=B8=D0=BF=D0=B0=20?= =?UTF-8?q?=D0=94=D0=B0/=D0=9D=D0=B5=D1=82.=20=D0=9F=D1=80=D0=B8=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B8=20=D0=9A=D0=9F=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B6=D0=B0=D0=B5=D1=82=D1=81?= =?UTF-8?q?=D1=8F=20=D0=B8=D0=B7=20=D0=B0=D0=BD=D0=B0=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B8=D1=87=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=B2=20=D0=9F=D1=80=D0=B5=D0=B4=D0=BB=D0=BE=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit вывести на форму в разделе Лизинг рядом с полем Продукт --- apps/web/Components/Calculation/Form/Leasing/config.ts | 1 + apps/web/Components/Calculation/config/elements-components.ts | 1 + apps/web/Components/Calculation/config/elements-titles.ts | 1 + apps/web/Components/Calculation/config/elements-types.ts | 1 + apps/web/Components/Calculation/config/map/values.ts | 1 + apps/web/config/default-options.ts | 1 + apps/web/config/default-statuses.ts | 1 + apps/web/config/default-values.ts | 1 + apps/web/config/schema/values.ts | 1 + 9 files changed, 9 insertions(+) diff --git a/apps/web/Components/Calculation/Form/Leasing/config.ts b/apps/web/Components/Calculation/Form/Leasing/config.ts index 23f0338..3653009 100644 --- a/apps/web/Components/Calculation/Form/Leasing/config.ts +++ b/apps/web/Components/Calculation/Form/Leasing/config.ts @@ -5,6 +5,7 @@ export const title = 'Лизинг'; export const rows: FormTabRows = [ [['selectProduct'], { gridTemplateColumns: '1fr' }], + [['cbxPartialVAT', 'cbxFloatingRate']], [['tbxLeaseObjectPrice', 'tbxVATInLeaseObjectPrice', 'tbxLeaseObjectPriceWthtVAT']], [['selectSupplierCurrency', 'tbxSupplierDiscountRub', 'tbxSupplierDiscountPerc']], [['tbxFirstPaymentPerc', 'tbxFirstPaymentRub']], diff --git a/apps/web/Components/Calculation/config/elements-components.ts b/apps/web/Components/Calculation/config/elements-components.ts index d7dde05..c5a0692 100644 --- a/apps/web/Components/Calculation/config/elements-components.ts +++ b/apps/web/Components/Calculation/config/elements-components.ts @@ -134,6 +134,7 @@ const components = wrapComponentsMap({ cbxSupplierFinancing: e.Switch, tbxPi: e.InputNumber, cbxPartialVAT: e.Switch, + cbxFloatingRate: e.Switch, /** Readonly Elements */ labelLeaseObjectRisk: e.Text, diff --git a/apps/web/Components/Calculation/config/elements-titles.ts b/apps/web/Components/Calculation/config/elements-titles.ts index bf555a0..e2db3a4 100644 --- a/apps/web/Components/Calculation/config/elements-titles.ts +++ b/apps/web/Components/Calculation/config/elements-titles.ts @@ -128,6 +128,7 @@ const titles: Record = { cbxSupplierFinancing: 'Финансирование поставщика', tbxPi: 'PI', cbxPartialVAT: 'Частичный НДС', + cbxFloatingRate: 'Плавающая ставка', /** Link Elements */ linkDownloadKp: '', diff --git a/apps/web/Components/Calculation/config/elements-types.ts b/apps/web/Components/Calculation/config/elements-types.ts index 4b7c8cc..5c68284 100644 --- a/apps/web/Components/Calculation/config/elements-types.ts +++ b/apps/web/Components/Calculation/config/elements-types.ts @@ -193,6 +193,7 @@ const types = wrapElementsTypes({ cbxSupplierFinancing: t.Switch, tbxPi: t.Number, cbxPartialVAT: t.Switch, + cbxFloatingRate: t.Switch, labelLeaseObjectRisk: t.Readonly, tbxInsKaskoPriceLeasePeriod: t.Readonly, diff --git a/apps/web/Components/Calculation/config/map/values.ts b/apps/web/Components/Calculation/config/map/values.ts index 5bdf7e2..5d278f4 100644 --- a/apps/web/Components/Calculation/config/map/values.ts +++ b/apps/web/Components/Calculation/config/map/values.ts @@ -131,6 +131,7 @@ const elementsToValues = wrapElementsMap({ cbxSupplierFinancing: 'supplierFinancing', tbxPi: 'pi', cbxPartialVAT: 'partialVAT', + cbxFloatingRate: 'floatingRate', /** Readonly Elements */ labelLeaseObjectRisk: 'leaseObjectRiskName', diff --git a/apps/web/config/default-options.ts b/apps/web/config/default-options.ts index 0080899..15424e4 100644 --- a/apps/web/config/default-options.ts +++ b/apps/web/config/default-options.ts @@ -505,6 +505,7 @@ const defaultOptions: CalculationOptions = { cbxSupplierFinancing: [], tbxPi: [], cbxPartialVAT: [], + cbxFloatingRate: [], }; export default defaultOptions; diff --git a/apps/web/config/default-statuses.ts b/apps/web/config/default-statuses.ts index 5d2a630..04e2477 100644 --- a/apps/web/config/default-statuses.ts +++ b/apps/web/config/default-statuses.ts @@ -6,6 +6,7 @@ const defaultStatuses: CalculationStatuses = { btnCreateKPMini: 'Default', cbxCostIncrease: 'Default', cbxDisableChecks: 'Default', + cbxFloatingRate: 'Default', cbxFullPriceWithDiscount: 'Default', cbxInsDecentral: 'Default', cbxInsUnlimitDrivers: 'Default', diff --git a/apps/web/config/default-values.ts b/apps/web/config/default-values.ts index cc70187..d8a6931 100644 --- a/apps/web/config/default-values.ts +++ b/apps/web/config/default-values.ts @@ -142,6 +142,7 @@ const defaultValues: CalculationValues = { vin: null, withTrailer: false, partialVAT: false, + floatingRate: false, }; export default defaultValues; diff --git a/apps/web/config/schema/values.ts b/apps/web/config/schema/values.ts index 3a5ce52..190803d 100644 --- a/apps/web/config/schema/values.ts +++ b/apps/web/config/schema/values.ts @@ -127,6 +127,7 @@ const ValuesSchema = z.object({ vin: z.string().nullable(), withTrailer: z.boolean(), partialVAT: z.boolean(), + floatingRate: z.boolean(), /** * Link Values