diff --git a/src/api/tariff.ts b/src/api/tariff.ts index c5ddc7c..f03ad1b 100644 --- a/src/api/tariff.ts +++ b/src/api/tariff.ts @@ -1,6 +1,5 @@ -import { makeRequest } from "@frontend/kitui"; +import { Tariff, makeRequest } from "@frontend/kitui"; import { CreateTariffBody, CustomTariff } from "@root/model/customTariffs"; -import { Tariff } from "@root/model/tariff"; export function createTariff(tariff: CreateTariffBody) { @@ -18,4 +17,4 @@ export function getTariffById(tariffId:string){ method: "get", useToken: true, }); -} \ No newline at end of file +} diff --git a/src/model/tariff.ts b/src/model/tariff.ts index 265595f..3085dad 100644 --- a/src/model/tariff.ts +++ b/src/model/tariff.ts @@ -1,20 +1,7 @@ -import { PrivilegeWithAmount } from "./privilege"; +import { Tariff } from "@frontend/kitui"; export interface GetTariffsResponse { totalPages: number; tariffs: Tariff[]; } - -export interface Tariff { - _id: string; - name: string; - /** Кастомная цена, undefined если isCustom === true */ - price?: number; - isCustom: boolean; - privilegies: PrivilegeWithAmount[]; - isDeleted: boolean; - createdAt?: string; - updatedAt?: string; - deletedAt?: string; -} \ No newline at end of file diff --git a/src/stores/cart.ts b/src/stores/cart.ts index 2cf493d..fccc2b8 100644 --- a/src/stores/cart.ts +++ b/src/stores/cart.ts @@ -1,5 +1,4 @@ -import { CartData, Discount } from "@frontend/kitui"; -import { Tariff } from "@root/model/tariff"; +import { CartData, Discount, Tariff } from "@frontend/kitui"; import { calcCart } from "@root/utils/calcCart/calcCart"; import { produce } from "immer"; import { create } from "zustand"; diff --git a/src/stores/tariffs.ts b/src/stores/tariffs.ts index 9df24ce..8fc68c2 100644 --- a/src/stores/tariffs.ts +++ b/src/stores/tariffs.ts @@ -1,4 +1,4 @@ -import { Tariff } from "@root/model/tariff"; +import { Tariff } from "@frontend/kitui"; import { create } from "zustand"; import { devtools } from "zustand/middleware"; diff --git a/src/utils/calcCart/calcCart.ts b/src/utils/calcCart/calcCart.ts index f5b169a..b00ab06 100644 --- a/src/utils/calcCart/calcCart.ts +++ b/src/utils/calcCart/calcCart.ts @@ -1,5 +1,4 @@ -import { CartData, Discount, PrivilegeCartData, applyCartDiscount, applyLoyaltyDiscount, applyPrivilegeDiscounts, applyServiceDiscounts } from "@frontend/kitui"; -import { Tariff } from "@root/model/tariff"; +import { CartData, Discount, PrivilegeCartData, Tariff, applyCartDiscount, applyLoyaltyDiscount, applyPrivilegeDiscounts, applyServiceDiscounts } from "@frontend/kitui"; export function calcCart(tariffs: Tariff[], discounts: Discount[], purchasesAmount: number): CartData { diff --git a/src/utils/calcTariffPrices.ts b/src/utils/calcTariffPrices.ts index 29ae571..000c592 100644 --- a/src/utils/calcTariffPrices.ts +++ b/src/utils/calcTariffPrices.ts @@ -1,6 +1,5 @@ -import { Tariff } from "@root/model/tariff"; import { ServiceKeyToPrivilegesMap } from "@root/model/privilege"; -import { CartData, Discount, findCartDiscount, findLoyaltyDiscount, findPrivilegeDiscount, findServiceDiscount } from "@frontend/kitui"; +import { CartData, Discount, Tariff, findCartDiscount, findLoyaltyDiscount, findPrivilegeDiscount, findServiceDiscount } from "@frontend/kitui"; export function calcIndividualTariffPrices( diff --git a/src/utils/hooks/useCart.ts b/src/utils/hooks/useCart.ts index 40311bd..c7b2875 100644 --- a/src/utils/hooks/useCart.ts +++ b/src/utils/hooks/useCart.ts @@ -1,10 +1,9 @@ -import { devlog } from "@frontend/kitui"; +import { Tariff, devlog } from "@frontend/kitui"; import { getTariffById } from "@root/api/tariff"; import { useTariffStore } from "@root/stores/tariffs"; import { removeTariffFromCart, useUserStore } from "@root/stores/user"; import { useEffect } from "react"; import { addCartTariffs, removeMissingCartTariffs, setCartTariffStatus, useCartStore } from "@root/stores/cart"; -import { Tariff } from "@root/model/tariff"; import { isAxiosError } from "axios"; import { useDiscountStore } from "@root/stores/discounts"; diff --git a/src/utils/hooks/useTariffs.ts b/src/utils/hooks/useTariffs.ts index f11ec40..7875392 100644 --- a/src/utils/hooks/useTariffs.ts +++ b/src/utils/hooks/useTariffs.ts @@ -1,5 +1,5 @@ -import { devlog, makeRequest } from "@frontend/kitui"; -import { GetTariffsResponse, Tariff } from "@root/model/tariff"; +import { Tariff, devlog, makeRequest } from "@frontend/kitui"; +import { GetTariffsResponse } from "@root/model/tariff"; import { useEffect, useLayoutEffect, useRef } from "react";