upgrade kitui

use cart calc functions from kitui fix cart discount list display fix types
2024-03-27 17:50:14 +03:00 · 2024-03-27 17:50:14 +03:00 · 473f77568c
commit 473f77568c
parent 1f133351e5
23 changed files with 229 additions and 1493 deletions
--- a/package.json
+++ b/package.json
@ -6,7 +6,7 @@
    "@date-io/dayjs": "^2.15.0",
    "@emotion/react": "^11.10.4",
    "@emotion/styled": "^11.10.4",
-    "@frontend/kitui": "^1.0.59",
+    "@frontend/kitui": "^1.0.77",
    "@material-ui/pickers": "^3.3.10",
    "@mui/icons-material": "^5.10.3",
    "@mui/material": "^5.10.5",
@ -36,6 +36,7 @@
    "numeral": "^2.0.6",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-error-boundary": "^4.0.13",
    "react-numeral": "^1.1.1",
    "react-router-dom": "^6.3.0",
    "react-scripts": "^5.0.1",
--- a/src/api/discounts.ts
+++ b/src/api/discounts.ts
@ -8,6 +8,8 @@ import type {
  DiscountType,
  GetDiscountResponse,
 } from "@root/model/discount";
+import useSWR from "swr";
+import { enqueueSnackbar } from "notistack";

 const baseUrl = process.env.REACT_APP_DOMAIN + "/price"

@ -213,3 +215,33 @@ export const requestDiscounts = async (): Promise<
    return [null, `Ошибка получения скидок. ${error}`];
  }
 };
+
+async function getDiscounts() {
+    try {
+        const discountsResponse = await makeRequest<never, GetDiscountResponse>({
+            url: baseUrl + "/discounts",
+            method: "get",
+            useToken: true,
+        });
+
+        return discountsResponse.Discounts.filter((discount) => !discount.Deprecated);
+    } catch (nativeError) {
+        const [error] = parseAxiosError(nativeError);
+
+        throw new Error(`Ошибка получения списка скидок. ${error}`);
+    }
+}
+
+export function useDiscounts() {
+    const { data } = useSWR("discounts", getDiscounts, {
+        keepPreviousData: true,
+        suspense: true,
+        onError: (error) => {
+            if (!(error instanceof Error)) return;
+
+            enqueueSnackbar(error.message, { variant: "error" });
+        }
+    });
+
+    return data;
+}
--- a/src/api/privilegies.ts
+++ b/src/api/privilegies.ts
@ -1,13 +1,13 @@
-import { makeRequest } from "@frontend/kitui";
+import { CustomPrivilege, makeRequest } from "@frontend/kitui";

 import { parseAxiosError } from "@root/utils/parse-error";

-import { PrivilegeWithAmount } from "@frontend/kitui";
+import { Privilege } from "@frontend/kitui";
 import type { TMockData } from "./roles";

 type SeverPrivilegesResponse = {
-  templategen: PrivilegeWithAmount[];
-  squiz: PrivilegeWithAmount[];
+  templategen: CustomPrivilege[];
+  squiz: CustomPrivilege[];
 };

 const baseUrl = process.env.REACT_APP_DOMAIN + "/strator"
@ -28,11 +28,11 @@ export const getRoles = async (): Promise<[TMockData | null, string?]> => {
 };

 export const putPrivilege = async (
-  body: Omit<PrivilegeWithAmount, "_id" | "updatedAt">
+  body: Omit<Privilege, "_id" | "updatedAt">
 ): Promise<[unknown, string?]> => {
  try {
    const putedPrivilege = await makeRequest<
-      Omit<PrivilegeWithAmount, "_id" | "updatedAt">,
+      Omit<Privilege, "_id" | "updatedAt">,
      unknown
    >({
      url: baseUrl + "/privilege",
@ -70,9 +70,9 @@ export const requestServicePrivileges = async (): Promise<

 export const requestPrivileges = async (
  signal: AbortSignal | undefined
-): Promise<[PrivilegeWithAmount[], string?]> => {
+): Promise<[CustomPrivilege[], string?]> => {
  try {
-    const privilegesResponse = await makeRequest<never, PrivilegeWithAmount[]>(
+    const privilegesResponse = await makeRequest<never, CustomPrivilege[]>(
      {
        url: baseUrl + "/privilege",
        method: "get",
--- a/src/api/tariffs.ts
+++ b/src/api/tariffs.ts
@ -2,7 +2,7 @@ import { makeRequest } from "@frontend/kitui";

 import { parseAxiosError } from "@root/utils/parse-error";

-import type { PrivilegeWithAmount } from "@frontend/kitui";
+import type { Privilege } from "@frontend/kitui";
 import type { Tariff } from "@frontend/kitui";
 import type { EditTariffRequestBody } from "@root/model/tariff";

@ -12,7 +12,7 @@ type CreateTariffBackendRequest = {
  order: number;
  price: number;
  isCustom: boolean;
-  privileges: Omit<PrivilegeWithAmount, "_id" | "updatedAt">[];
+  privileges: Omit<Privilege, "_id" | "updatedAt">[];
 };

 type GetTariffsResponse = {
@ -52,7 +52,7 @@ export const putTariff = async (tariff: Tariff): Promise<[null, string?]> => {
        price: tariff.price ?? 0,
        isCustom: false,
        order: tariff.order || 1,
-        description: tariff.description,
+        description: tariff.description ?? "",
        privileges: tariff.privileges,
      },
    });
--- a/src/kitUI/Cart/Cart.tsx
+++ b/src/kitUI/Cart/Cart.tsx
@ -1,36 +1,35 @@
+import { calcCart } from "@frontend/kitui";
+import Input from "@kitUI/input";
 import {
-    Button,
-    Paper,
-    Box,
-    Typography,
-    TableHead,
-    TableRow,
-    TableCell,
-    TableBody,
-    Table,
    Alert,
+    Box,
+    Button,
    Checkbox,
    FormControlLabel,
-    useTheme, useMediaQuery
+    Paper,
+    Table,
+    TableBody,
+    TableCell,
+    TableHead,
+    TableRow,
+    Typography,
+    useMediaQuery,
+    useTheme
 } from "@mui/material";
-import Input from "@kitUI/input";
-import { useState } from "react";
+import { requestDiscounts } from "@root/services/discounts.service";
+import { requestPrivileges } from "@root/services/privilegies.service";
 import { setCartData, useCartStore } from "@root/stores/cart";
 import { useTariffStore } from "@root/stores/tariffs";
-import { useDiscountStore } from "@root/stores/discounts";
-import { requestPrivileges } from "@root/services/privilegies.service";
-import { requestDiscounts } from "@root/services/discounts.service";
-import { DiscountTooltip } from "./DiscountTooltip";
-import CartItemRow from "./CartItemRow";
-import { calcCart, formatDiscountFactor } from "@root/utils/calcCart/calcCart";
-import { Discount, findDiscountFactor } from "@frontend/kitui";
 import { currencyFormatter } from "@root/utils/currencyFormatter";
+import { useState } from "react";
+import CartItemRow from "./CartItemRow";
+import { useDiscounts } from "@root/api/discounts";


 export default function Cart() {
    const theme = useTheme();
    const mobile = useMediaQuery(theme.breakpoints.down(400));
-    let discounts = useDiscountStore(state => state.discounts);
+    const discounts = useDiscounts();
    const cartData = useCartStore((store) => store.cartData);
    const tariffs = useTariffStore(state => state.tariffs);
    const [couponField, setCouponField] = useState<string>("");
@ -39,10 +38,6 @@ export default function Cart() {
    const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false);
    const selectedTariffIds = useTariffStore(state => state.selectedTariffIds);

-    const cartDiscounts = [cartData?.appliedCartPurchasesDiscount, cartData?.appliedLoyaltyDiscount].filter((d): d is Discount => !!d);
-
-    const cartDiscountsResultFactor = findDiscountFactor(cartData?.appliedCartPurchasesDiscount) * findDiscountFactor(cartData?.appliedLoyaltyDiscount);
-
    async function handleCalcCartClick() {
        await requestPrivileges();
        await requestDiscounts();
@ -224,45 +219,22 @@ export default function Cart() {
                            </TableRow>
                        </TableHead>
                        <TableBody>
-                            {cartData.services.flatMap(service => service.tariffs.map(taroffCartData => (
-                                <CartItemRow
-                                    tariffCartData={taroffCartData}
-                                    appliedServiceDiscount={service.appliedServiceDiscount}
-                                />
-                            )))}
+                            {cartData.services.flatMap(service => service.tariffs.map(tariffCartData => {
+                                const appliedDiscounts = tariffCartData.privileges.flatMap(
+                                    privilege => Array.from(privilege.appliedDiscounts)
+                                ).sort((a, b) => a.Layer - b.Layer);
+
+                                return (
+                                    <CartItemRow
+                                        key={tariffCartData.id}
+                                        tariffCartData={tariffCartData}
+                                        appliedDiscounts={appliedDiscounts}
+                                    />
+                                );
+                            }))}
                        </TableBody>
                    </Table>

-                    <Typography
-                        id="transition-modal-title"
-                        variant="h6"
-                        sx={{
-                            fontWeight: "normal",
-                            textAlign: "center",
-                            marginTop: "15px",
-                            fontSize: "16px",
-                        }}
-                    >
-                        Скидки корзины:
-                        {cartDiscounts && (
-                            <Box
-                                sx={{
-                                    display: "inline-flex",
-                                    flexWrap: "wrap",
-                                }}
-                            >
-                                {cartDiscounts?.map((discount, index, arr) => (
-                                    <span key={discount.ID}>
-                                        <DiscountTooltip discount={discount} />
-                                        {index < arr.length - 1 && <span>,&nbsp;</span>}
-                                    </span>
-                                ))}
-                                &nbsp;
-                                {cartDiscountsResultFactor && `= ${formatDiscountFactor(cartDiscountsResultFactor)}`}
-                            </Box>
-                        )}
-                    </Typography>
-
                    <Typography
                        id="transition-modal-title"
                        variant="h6"
--- a/src/kitUI/Cart/CartItemRow.tsx
+++ b/src/kitUI/Cart/CartItemRow.tsx
@ -7,14 +7,12 @@ import { useEffect } from "react";

 interface Props {
    tariffCartData: TariffCartData;
-    appliedServiceDiscount: Discount | null;
+    appliedDiscounts: Discount[];
 }

-export default function CartItemRow({ tariffCartData, appliedServiceDiscount }: Props) {
+export default function CartItemRow({ tariffCartData, appliedDiscounts }: Props) {
    const theme = useTheme();

-    const envolvedDiscounts = [tariffCartData.privileges[0].appliedPrivilegeDiscount, appliedServiceDiscount].filter((d): d is Discount => !!d);
-
    useEffect(() => {
        if (tariffCartData.privileges.length > 1) {
            console.warn(`Количество привилегий в тарифе ${tariffCartData.name}(${tariffCartData.id}) больше одного`);
@ -39,22 +37,17 @@ export default function CartItemRow({ tariffCartData, appliedServiceDiscount }:
                {tariffCartData.privileges[0].description}
            </TableCell>
            <TableCell>
-                {envolvedDiscounts.map((discount, index, arr) => (
+                {appliedDiscounts.map((discount, index, arr) => (
                    <span key={discount.ID}>
                        <DiscountTooltip discount={discount} />
-                        {index < arr.length - (appliedServiceDiscount ? 0 : 1) && (
+                        {index < arr.length - 1 && (
                            <span>,&nbsp;</span>
                        )}
                    </span>
                ))}
-                {appliedServiceDiscount && (
-                    <span>
-                        <DiscountTooltip discount={appliedServiceDiscount} />
-                    </span>
-                )}
            </TableCell>
            <TableCell>
-                {currencyFormatter.format(tariffCartData.price)}
+                {currencyFormatter.format(tariffCartData.price / 100)}
            </TableCell>
        </TableRow>
    );
--- a/src/kitUI/Cart/DiscountTooltip.tsx
+++ b/src/kitUI/Cart/DiscountTooltip.tsx
@ -1,27 +1,28 @@
-import { Tooltip, Typography } from "@mui/material";
-import { Discount, findDiscountFactor } from "@frontend/kitui";
-import { formatDiscountFactor } from "@root/utils/calcCart/calcCart";
-
-
-interface Props {
-    discount: Discount;
-}
-
-export function DiscountTooltip({ discount }: Props) {
-    const discountText = formatDiscountFactor(findDiscountFactor(discount));
-
-    return discountText ? (
-        <Tooltip
-            title={
-                <>
-                    <Typography>Скидка: {discount?.Name}</Typography>
-                    <Typography>{discount?.Description}</Typography>
-                </>
-            }
-        >
-            <span>{discountText}</span>
-        </Tooltip>
-    ) : (
-        <span>Ошибка поиска значения скидки</span>
-    );
-}
+import { Tooltip, Typography } from "@mui/material";
+import { Discount, findDiscountFactor } from "@frontend/kitui";
+import { formatDiscountFactor } from "@root/utils/formatDiscountFactor";
+
+
+interface Props {
+    discount: Discount;
+}
+
+export function DiscountTooltip({ discount }: Props) {
+    const discountText = formatDiscountFactor(findDiscountFactor(discount));
+
+    return discountText ? (
+        <Tooltip
+            title={
+                <>
+                    <Typography>Слой: {discount.Layer}</Typography>
+                    <Typography>Название: {discount.Name}</Typography>
+                    <Typography>Описание: {discount.Description}</Typography>
+                </>
+            }
+        >
+            <span>{discountText}</span>
+        </Tooltip>
+    ) : (
+        <span>Ошибка поиска значения скидки</span>
+    );
+}
--- a/src/model/tariff.ts
+++ b/src/model/tariff.ts
@ -1,4 +1,4 @@
-import { PrivilegeWithAmount } from "@frontend/kitui";
+import { Privilege } from "@frontend/kitui";

 export const SERVICE_LIST = [
    {
@ -25,5 +25,5 @@ export type EditTariffRequestBody = {
    order: number;
    price: number;
    isCustom: boolean;
-    privileges: Omit<PrivilegeWithAmount, "_id" | "updatedAt">[];
+    privileges: Omit<Privilege, "_id" | "updatedAt">[];
 };
--- a/src/pages/Setting/CardPrivilegie.tsx
+++ b/src/pages/Setting/CardPrivilegie.tsx
@ -2,14 +2,14 @@ import { KeyboardEvent, useRef, useState } from "react";
 import { enqueueSnackbar } from "notistack";
 import {Box, IconButton, TextField, Tooltip, Typography, useMediaQuery, useTheme} from "@mui/material";
 import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined";
-import { PrivilegeWithAmount } from "@frontend/kitui";
+import { CustomPrivilege } from "@frontend/kitui";
 import { putPrivilege } from "@root/api/privilegies";
 import SaveIcon from '@mui/icons-material/Save';
 import { currencyFormatter } from "@root/utils/currencyFormatter";


 interface CardPrivilege {
-  privilege: PrivilegeWithAmount;
+  privilege: CustomPrivilege;
 }

 export const СardPrivilege = ({ privilege }: CardPrivilege) => {
@ -27,7 +27,7 @@ export const СardPrivilege = ({ privilege }: CardPrivilege) => {

  const putPrivileges = async () => {

-    const [_, putedPrivilegeError] = await putPrivilege({
+    const [, putedPrivilegeError] = await putPrivilege({
      name: privilege.name,
      privilegeId: privilege.privilegeId,
      serviceKey: privilege.serviceKey,
--- a/src/pages/dashboard/Content/DiscountManagement/ControlPanel.tsx
+++ b/src/pages/dashboard/Content/DiscountManagement/ControlPanel.tsx
@ -6,6 +6,7 @@ import { changeDiscount } from "@root/api/discounts";
 import { findDiscountsById } from "@root/stores/discounts";

 import { requestDiscounts } from "@root/services/discounts.service";
+import { mutate } from "swr";

 interface Props {
  selectedRows: GridSelectionModel;
@ -24,7 +25,7 @@ export default function DiscountDataGrid({ selectedRows }: Props) {
        return enqueueSnackbar("Скидка не найдена");
      }

-      const [_, changedDiscountError] = await changeDiscount(String(id), {
+      const [, changedDiscountError] = await changeDiscount(String(id), {
        ...discount,
        Deprecated: isActive,
      });
@ -34,6 +35,7 @@ export default function DiscountDataGrid({ selectedRows }: Props) {
      } else {
        fatal += 1;
      }
+      mutate("discounts");
    }

    await requestDiscounts();
--- a/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx
+++ b/src/pages/dashboard/Content/DiscountManagement/CreateDiscount.tsx
@ -23,6 +23,7 @@ import { DiscountType, discountTypes } from "@root/model/discount";
 import { createDiscount } from "@root/api/discounts";
 import usePrivileges from "@root/utils/hooks/usePrivileges";
 import { Formik, Field, Form, FormikHelpers } from "formik";
+import { mutate } from "swr";

 interface Values {
    discountNameField: string,
@ -92,6 +93,7 @@ export default function CreateDiscount() {
    }

    if (createdDiscountResponse) {
+      mutate("discounts");
      addDiscount(createdDiscountResponse);
    }
  }
--- a/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
+++ b/src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
@ -18,7 +18,8 @@ import { deleteDiscount } from "@root/api/discounts";
 import { GridSelectionModel } from "@mui/x-data-grid";
 import { requestDiscounts } from "@root/services/discounts.service";
 import AutorenewIcon from "@mui/icons-material/Autorenew";
-import { formatDiscountFactor } from "@root/utils/calcCart/calcCart";
+import { formatDiscountFactor } from "@root/utils/formatDiscountFactor";
+import { mutate } from "swr";

 const columns: GridColDef[] = [
  // {
@ -93,6 +94,7 @@ const columns: GridColDef[] = [
        disabled={row.deleted}
        onClick={() => {
          deleteDiscount(row.id).then(([discount]) => {
+            mutate("discounts");
            if (discount) {
              updateDiscount(discount);
            }
--- a/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx
+++ b/src/pages/dashboard/Content/DiscountManagement/EditDiscountDialog.tsx
@ -31,6 +31,7 @@ import { getDiscountTypeFromLayer } from "@root/utils/discount";
 import usePrivileges from "@root/utils/hooks/usePrivileges";
 import { enqueueSnackbar } from "notistack";
 import { useEffect, useState } from "react";
+import { mutate } from "swr";

 export default function EditDiscountDialog() {
  const theme = useTheme();
@ -59,17 +60,17 @@ export default function EditDiscountDialog() {
    function setDiscountFields() {
      if (!discount) return;

-      setServiceType(discount.Condition.Group);
+      setServiceType(discount.Condition.Group ?? "");
      setDiscountType(getDiscountTypeFromLayer(discount.Layer));
      setDiscountNameField(discount.Name);
      setDiscountDescriptionField(discount.Description);
-      setPrivilegeIdField(discount.Condition.Product);
+      setPrivilegeIdField(discount.Condition.Product ?? "");
      setDiscountFactorField(((1 - discount.Target.Factor) * 100).toFixed(2));
-      setPurchasesAmountField(discount.Condition.PurchasesAmount.toString());
+      setPurchasesAmountField(discount.Condition.PurchasesAmount ?? "");
      setCartPurchasesAmountField(
-        discount.Condition.CartPurchasesAmount.toString()
+        discount.Condition.CartPurchasesAmount ?? ""
      );
-      setDiscountMinValueField(discount.Condition.PriceFrom.toString());
+      setDiscountMinValueField(discount.Condition.PriceFrom ?? "");
    },
    [discount]
  );
@ -137,6 +138,7 @@ export default function EditDiscountDialog() {
    }

    if (patchedDiscountResponse) {
+      mutate("discounts");
      updateDiscount(patchedDiscountResponse);
      closeEditDiscountDialog();
    }
--- a/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx
+++ b/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx
@ -17,7 +17,7 @@ import {
  findPrivilegeById,
  usePrivilegeStore,
 } from "@root/stores/privilegesStore";
-import { PrivilegeWithAmount } from "@frontend/kitui";
+import { Privilege } from "@frontend/kitui";
 import { currencyFormatter } from "@root/utils/currencyFormatter";
 import { Formik, Field, Form, FormikHelpers } from "formik";

@ -28,7 +28,7 @@ interface Values {
  customPriceField: string,
  privilegeIdField: string,
  orderField: number,
-  privilege: PrivilegeWithAmount | null
+  privilege: Privilege | null
 }

 export default function CreateTariff() {
@ -68,7 +68,7 @@ export default function CreateTariff() {
      formikHelpers: FormikHelpers<Values>
  ) => {
    if (values.privilege !== null) {
-      const [_, createdTariffError] = await createTariff({
+      const [, createdTariffError] = await createTariff({
        name: values.nameField,
        price: Number(values.customPriceField) * 100,
        order: values.orderField,
@ -185,7 +185,7 @@ export default function CreateTariff() {
                      {privileges.map((privilege) => (
                          <MenuItem
                              data-cy={`select-option-${privilege.description}`}
-                              key={privilege.description}
+                              key={privilege._id}
                              value={privilege._id}
                              sx={{whiteSpace: "normal", wordBreak: "break-world"}}
                          >
--- a/src/pages/dashboard/Content/Tariffs/TariffsInfo.tsx
+++ b/src/pages/dashboard/Content/Tariffs/TariffsInfo.tsx
@ -1,17 +1,23 @@
-import { Typography } from "@mui/material";
-import Cart from "@root/kitUI/Cart/Cart";
-import TariffsDG from "./tariffsDG";
-
-
-export default function TariffsInfo() {
-
-    return (
-        <>
-            <Typography variant="h6" mt="20px">
-                Список тарифов
-            </Typography>
-            <TariffsDG />
-            <Cart />
-        </>
-    );
-}
+import { CircularProgress, Typography } from "@mui/material";
+import Cart from "@root/kitUI/Cart/Cart";
+import TariffsDG from "./tariffsDG";
+import { Suspense } from "react";
+import { ErrorBoundary } from "react-error-boundary";
+
+
+export default function TariffsInfo() {
+
+    return (
+        <>
+            <Typography variant="h6" mt="20px">
+                Список тарифов
+            </Typography>
+            <TariffsDG />
+            <ErrorBoundary fallback={<Typography>Что-то пошло не так</Typography>}>
+                <Suspense fallback={<CircularProgress />}>
+                    <Cart />
+                </Suspense>
+            </ErrorBoundary>
+        </>
+    );
+}
--- a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
+++ b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
@ -34,7 +34,7 @@ const columns: GridColDef<Tariff, string | number>[] = [
    { field: "type", headerName: "Единица", width: 100, valueGetter: ({ row }) => row.privileges[0].type },
    { field: "pricePerUnit", headerName: "Цена за ед.", width: 100, valueGetter: ({ row }) => currencyFormatter.format(row.privileges[0].price / 100) },
    { field: "isCustom", headerName: "Кастомная цена", width: 130, valueGetter: ({ row }) => row.isCustom ? "Да" : "Нет" },
-    { field: "total", headerName: "Сумма", width: 60, valueGetter: ({ row }) => currencyFormatter.format(getTariffPrice(row) / 100) },
+    { field: "total", headerName: "Сумма", width: 100, valueGetter: ({ row }) => currencyFormatter.format(getTariffPrice(row) / 100) },
    {
        field: "delete",
        headerName: "Удаление",
--- a/src/services/privilegies.service.ts
+++ b/src/services/privilegies.service.ts
@ -1,10 +1,10 @@
 import { resetPrivilegeArray } from "@root/stores/privilegesStore";
 import { requestServicePrivileges } from "@root/api/privilegies";

-import type { PrivilegeWithAmount } from "@frontend/kitui";
+import type { CustomPrivilege } from "@frontend/kitui";

-const mutatePrivileges = (privileges: PrivilegeWithAmount[]) => {
-  let extracted: PrivilegeWithAmount[] = [];
+const mutatePrivileges = (privileges: CustomPrivilege[]) => {
+  let extracted: CustomPrivilege[] = [];
  for (let serviceKey in privileges) {
    //Приходит объект. В его значениях массивы привилегий для разных сервисов. Высыпаем в общую кучу и обновляем стор
    extracted = extracted.concat(privileges[serviceKey]);
--- a/src/stores/privilegesStore.ts
+++ b/src/stores/privilegesStore.ts
@ -1,26 +1,26 @@
-import { create } from "zustand";
-import { devtools } from "zustand/middleware";
-import { PrivilegeWithAmount } from "@frontend/kitui";
-
-
-interface PrivilegeStore {
-    privileges: PrivilegeWithAmount[];
-}
-
-export const usePrivilegeStore = create<PrivilegeStore>()(
-    devtools(
-        (set, get) => ({
-            privileges: [],
-        }),
-        {
-            name: "Privileges",
-            enabled: process.env.NODE_ENV === "development",
-        }
-    )
-);
-
-export const resetPrivilegeArray = (privileges: PrivilegeStore["privileges"]) => usePrivilegeStore.setState({ privileges });
-
-export const findPrivilegeById = (privilegeId: string) => {
-    return usePrivilegeStore.getState().privileges.find((privilege) => privilege._id === privilegeId || privilege.privilegeId === privilegeId) ?? null;
-};
+import { create } from "zustand";
+import { devtools } from "zustand/middleware";
+import { CustomPrivilege } from "@frontend/kitui";
+
+
+interface PrivilegeStore {
+    privileges: CustomPrivilege[];
+}
+
+export const usePrivilegeStore = create<PrivilegeStore>()(
+    devtools(
+        (set, get) => ({
+            privileges: [],
+        }),
+        {
+            name: "Privileges",
+            enabled: process.env.NODE_ENV === "development",
+        }
+    )
+);
+
+export const resetPrivilegeArray = (privileges: PrivilegeStore["privileges"]) => usePrivilegeStore.setState({ privileges });
+
+export const findPrivilegeById = (privilegeId: string) => {
+    return usePrivilegeStore.getState().privileges.find((privilege) => privilege._id === privilegeId || privilege.privilegeId === privilegeId) ?? null;
+};
--- a/src/utils/calcCart/calcCart.test.ts
+++ b/src/utils/calcCart/calcCart.test.ts
--- a/src/utils/calcCart/calcCart.ts
+++ b/src/utils/calcCart/calcCart.ts
@ -1,82 +0,0 @@
-import { CartData, Discount, PrivilegeCartData, Tariff, TariffCartData, applyCartDiscount, applyLoyaltyDiscount, applyPrivilegeDiscounts, applyServiceDiscounts } from "@frontend/kitui";
-
-
-export function calcCart(
-    tariffs: Tariff[],
-    discounts: Discount[],
-    purchasesAmount: number,
-    coupon?: string,
-): CartData {
-    const cartData: CartData = {
-        services: [],
-        priceBeforeDiscounts: 0,
-        priceAfterDiscounts: 0,
-        itemCount: 0,
-        appliedCartPurchasesDiscount: null,
-        appliedLoyaltyDiscount: null,
-        allAppliedDiscounts: [],
-    };
-
-    const serviceTariffType: Record<string, number> = {};
-
-    tariffs.forEach(tariff => {
-        let serviceData = cartData.services.find(service => service.serviceKey === tariff.privileges[0].serviceKey);
-        if (!serviceData) {
-            serviceData = {
-                serviceKey: tariff.privileges[0].serviceKey,
-                tariffs: [],
-                price: 0,
-                appliedServiceDiscount: null,
-            };
-            cartData.services.push(serviceData);
-        }
-
-        const tariffCartData: TariffCartData = {
-            price: tariff.price ?? 0,
-            isCustom: tariff.isCustom,
-            privileges: [],
-            id: tariff._id,
-            name: tariff.name,
-        };
-        serviceData.tariffs.push(tariffCartData);
-
-        tariff.privileges.forEach(privilege => {
-            serviceTariffType[privilege.serviceKey] ??= +tariff.isCustom;
-            const isIncompatibleTariffs = serviceTariffType[privilege.serviceKey] ^ +tariff.isCustom;
-            if (isIncompatibleTariffs) throw new Error("Если взят готовый тариф, то кастомный на этот сервис сделать уже нельзя");
-
-            const privilegePrice = privilege.amount * privilege.price;
-
-            if (!tariff.price) tariffCartData.price += privilegePrice;
-
-            const privilegeCartData: PrivilegeCartData = {
-                serviceKey: privilege.serviceKey,
-                amount: privilege.amount,
-                privilegeId: privilege.privilegeId,
-                description: privilege.description,
-                price: privilegePrice,
-                appliedPrivilegeDiscount: null,
-            };
-
-            tariffCartData.privileges.push(privilegeCartData);
-            cartData.priceAfterDiscounts += privilegePrice;
-            cartData.itemCount++;
-        });
-
-        cartData.priceBeforeDiscounts += tariffCartData.price;
-        serviceData.price += tariffCartData.price;
-    });
-
-    applyPrivilegeDiscounts(cartData, discounts);
-    applyServiceDiscounts(cartData, discounts);
-    applyCartDiscount(cartData, discounts);
-    applyLoyaltyDiscount(cartData, discounts, purchasesAmount);
-
-    cartData.allAppliedDiscounts = Array.from(new Set(cartData.allAppliedDiscounts));
-
-    return cartData;
-}
-
-export function formatDiscountFactor(factor: number): string {
-    return `${((1 - factor) * 100).toFixed(1)}%`;
-}
--- a/src/utils/formatDiscountFactor.ts
+++ b/src/utils/formatDiscountFactor.ts
@ -0,0 +1,3 @@
+export function formatDiscountFactor(factor: number): string {
+    return `${((1 - factor) * 100).toFixed(1)}%`;
+}
--- a/src/utils/hooks/usePrivileges.ts
+++ b/src/utils/hooks/usePrivileges.ts
@ -1,29 +1,28 @@
-import { useEffect } from "react";
-
-import { requestPrivileges } from "@root/api/privilegies";
-
-import type { PrivilegeWithAmount } from "@frontend/kitui";
-
-export default function usePrivileges({
-  onError,
-  onNewPrivileges,
-}: {
-  onNewPrivileges: (response: PrivilegeWithAmount[]) => void;
-  onError?: (error: any) => void;
-}) {
-  useEffect(() => {
-    const controller = new AbortController();
-
-    requestPrivileges(controller.signal).then(
-      ([privilegesResponse, privilegesError]) => {
-        if (privilegesError) {
-          return onError?.(privilegesError);
-        }
-
-        onNewPrivileges(privilegesResponse);
-      }
-    );
-
-    return () => controller.abort();
-  }, [onError, onNewPrivileges]);
-}
+import { useEffect } from "react";
+
+import { requestPrivileges } from "@root/api/privilegies";
+
+import type { CustomPrivilege } from "@frontend/kitui";
+
+export default function usePrivileges({
+  onError,
+  onNewPrivileges,
+}: {
+  onNewPrivileges: (response: CustomPrivilege[]) => void;
+  onError?: (error: any) => void;
+}) {
+  useEffect(() => {
+    const controller = new AbortController();
+
+    requestPrivileges(controller.signal).then(
+      ([privilegesResponse, privilegesError]) => {
+        if (privilegesError) {
+          return onError?.(privilegesError);
+        }
+        onNewPrivileges(privilegesResponse);
+      }
+    );
+
+    return () => controller.abort();
+  }, [onError, onNewPrivileges]);
+}
--- a/yarn.lock
+++ b/yarn.lock
@ -1433,10 +1433,10 @@
    lodash.isundefined "^3.0.1"
    lodash.uniq "^4.5.0"

-"@frontend/kitui@^1.0.59":
-  version "1.0.59"
-  resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.59.tgz#c4584506bb5cab4fc1df35f5b1d0d66ec379a9a1"
-  integrity sha1-xFhFBrtcq0/B3zX1sdDWbsN5qaE=
+"@frontend/kitui@^1.0.77":
+  version "1.0.77"
+  resolved "https://penahub.gitlab.yandexcloud.net/api/v4/projects/21/packages/npm/@frontend/kitui/-/@frontend/kitui-1.0.77.tgz#a749dee0e7622b4c4509e8354ace47299b0606f7"
+  integrity sha1-p0ne4OdiK0xFCeg1Ss5HKZsGBvc=
  dependencies:
    immer "^10.0.2"
    reconnecting-eventsource "^1.6.2"
@ -10472,6 +10472,13 @@ react-dom@^18.2.0:
    loose-envify "^1.1.0"
    scheduler "^0.23.0"

+react-error-boundary@^4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/react-error-boundary/-/react-error-boundary-4.0.13.tgz#80386b7b27b1131c5fbb7368b8c0d983354c7947"
+  integrity sha512-b6PwbdSv8XeOSYvjt8LpgpKrZ0yGdtZokYwkwV2wlcZbxgopHX/hgPl5VgpnoVOWd868n1hktM8Qm4b+02MiLQ==
+  dependencies:
+    "@babel/runtime" "^7.12.5"
+
 react-error-overlay@^6.0.11:
  version "6.0.11"
  resolved "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.11.tgz"