From 80c03bdcd91131cf4180b85a28070449fcc9efc8 Mon Sep 17 00:00:00 2001 From: nflnkr <105123049+nflnkr@users.noreply.github.com> Date: Sat, 25 Feb 2023 16:59:16 +0300 Subject: [PATCH] remove package functionality --- src/model/cart.ts | 6 ++-- src/model/tariff.ts | 7 ----- .../dashboard/Content/Tariffs/cartCalcs.ts | 30 ------------------- 3 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/model/cart.ts b/src/model/cart.ts index 7af6b1b..d9074a4 100644 --- a/src/model/cart.ts +++ b/src/model/cart.ts @@ -180,7 +180,7 @@ export namespace Cart { } export interface CartItem { - item: Tariffs.Tariff | Tariffs.Package; + item: Tariffs.Tariff; /** * Посчитанная цена пункта корзины */ @@ -196,12 +196,12 @@ export namespace Cart { */ envolvedDiscounts: string[]; totalPrice: number; - item: Tariffs.Tariff | Tariffs.Package; + item: Tariffs.Tariff; } export interface CartTotal { items: CartItemTotal[]; totalPrice: number; - priceByService: { [Key in Tariffs.ServiceType]: number;} + priceByService: { [Key in Tariffs.ServiceType]: number; }; } } \ No newline at end of file diff --git a/src/model/tariff.ts b/src/model/tariff.ts index f3d878a..55c7b81 100644 --- a/src/model/tariff.ts +++ b/src/model/tariff.ts @@ -77,11 +77,4 @@ export namespace Tariffs { */ customPrice?: number; } - - export interface Package { - id: string; - name: string; - services: ServiceType[]; - tariffs: Tariff[]; - } } \ No newline at end of file diff --git a/src/pages/dashboard/Content/Tariffs/cartCalcs.ts b/src/pages/dashboard/Content/Tariffs/cartCalcs.ts index 087e5aa..216b1d9 100644 --- a/src/pages/dashboard/Content/Tariffs/cartCalcs.ts +++ b/src/pages/dashboard/Content/Tariffs/cartCalcs.ts @@ -61,12 +61,6 @@ export function calcCartData( totalPrice: cartItem.price, }; - if (isPackage(cartItem.item)) { - // TODO implement for package - - throw new Error("unimplemented"); - } - const tariff = cartItem.item; const maxPrivilegeDiscount = findMaxApplicablePrivilegeDiscount(discounts, tariff); @@ -177,12 +171,6 @@ function calcCartItemWithPromocode( totalPrice: 0, }; - if (isPackage(cartItem.item)) { - // TODO implement for package - - throw new Error("unimplemented"); - } - const tariff = cartItem.item; discount.target.products.forEach(product => { @@ -195,22 +183,4 @@ function calcCartItemWithPromocode( priceByService[tariff.privilege.serviceKey] = cartItemTotal.totalPrice; return cartItemTotal; -} - -export function packTariffs(tariffs: Tariffs.Tariff[], id: string, name: string): Tariffs.Package { - const services: Tariffs.ServiceType[] = []; - tariffs.forEach(tariff => { - if (!services.includes(tariff.privilege.serviceKey)) services.push(tariff.privilege.serviceKey); - }); - - return { - id, - name, - services, - tariffs, - }; -} - -export function isPackage(item: Tariffs.Tariff | Tariffs.Package): item is Tariffs.Package { - return "tariffs" in item; } \ No newline at end of file