PenaSide/adminFront
3
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
Dev

See merge request frontend/admin!29
This commit is contained in:
Mikhail 2023-07-12 15:56:11 +00:00
commit 1d951c99db
32 changed files with 1408 additions and 1161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/discounts.ts
View File

@ -133,3 +133,13 @@ export function createDiscountObject({
return discount; return discount;
} }
export function changeDiscount (discountId:string, discount:Discount) {
return makeRequest<Discount>({
url: baseUrl + "/discount/" + discountId,
method: "patch",
useToken: true,
bearer: true,
body: discount,
});
}

52
src/hooks/tariff.hook.ts
View File

@ -1,52 +0,0 @@
import { useEffect, useState } from "react";
import axios from "axios";
export type Privilege = {
createdAt: string;
description: string;
isDeleted: boolean;
name: string;
price: number;
privilegeId: string;
serviceKey: string;
type: "count" | "day" | "mb";
updatedAt: string;
value: string;
_id: string;
};
type UseTariffs = {
tariffs: Record<string, Privilege[]> | undefined;
isError: boolean;
isLoading: boolean;
errorMessage: string;
};
export const useTariffs = (): UseTariffs => {
const [tariffs, setTariffs] = useState<Record<string, Privilege[]>>();
const [isLoading, setIsLoading] = useState(false);
const [isError, setIsError] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
useEffect(() => {
const getPrivilegies = async () => {
const { data } = await axios<Record<string, Privilege[]>>({
method: "get",
url: "https://admin.pena.digital/strator/tariff/",
});
return data;
};
setIsLoading(true);
getPrivilegies()
.then(setTariffs)
.catch(() => {
setIsError(true);
setErrorMessage("Ошибка при получении тарифов");
})
.finally(() => setIsLoading(false));
}, []);
return { tariffs, isError, isLoading, errorMessage };
};

33
src/hooks/useCombinedPrivileges.hook.ts
View File

@ -1,33 +0,0 @@
import { useEffect, useState } from "react";
import { usePrivilegeStore } from "@root/stores/privilegesStore";
import { useRefreshPrivilegesStore } from "./useRefreshPrivilegesStore.hook";
import { exampleCartValues } from "@stores/mocks/exampleCartValues"
import { mergedBackFrontPrivilege } from "@root/model/privilege";
interface UseCombinedPrivileges {
mergedPrivileges: mergedBackFrontPrivilege[]
}
const translatorServiceKey = {
Шаблонизатор: "templategen"
}
export const useCombinedPrivileges = ():UseCombinedPrivileges => {
const [mergedPrivileges, setMergedPrivileges] = useState<mergedBackFrontPrivilege[]>([])
const backendPrivileges = usePrivilegeStore((state) => state.privileges);
const frontendPrivileges = exampleCartValues.privileges;
useEffect(() => {
setMergedPrivileges([...backendPrivileges.map((privilege) => ({
serviceKey: privilege.serviceKey,
privilegeId: privilege.privilegeId,
name: privilege.name,
description: privilege.description,
type: privilege.type,
price: privilege.price,
})), ...frontendPrivileges])
}, [backendPrivileges])
return { mergedPrivileges };
};

30
src/hooks/useDiscounts.hook.ts Normal file
View File

@ -0,0 +1,30 @@
import { authStore } from "@root/stores/auth";
import { setDiscounts } from "@root/stores/discounts";
import type { GetDiscountResponse } from "@root/model/discount";
const makeRequest = authStore.getState().makeRequest;
export const useDiscounts = () => {
const requestDiscounts = async () => {
const controller = new AbortController();
makeRequest<never, GetDiscountResponse>({
url: "https://admin.pena.digital/price/discounts",
method: "get",
useToken: true,
bearer: true,
signal: controller.signal,
})
.then((result) => {
setDiscounts(result.Discounts);
})
.catch((error) => {
console.log("Error fetching discounts", error);
});
return () => controller.abort();
};
return { requestDiscounts };
};

53
src/hooks/useGetPrivileges.hook.ts
View File

@ -1,53 +0,0 @@
import { useEffect, useState } from "react";
import axios from "axios";
import { RealPrivilege } from "@root/model/privilege";
export type Privilege = {
createdAt: string;
description: string;
isDeleted: boolean;
name: string;
price: number;
privilegeId: string;
serviceKey: string;
type: "count" | "day" | "mb";
updatedAt: string;
value: string;
_id: string;
};
type UsePrivilegies = {
privilegies: RealPrivilege[]
isError: boolean;
isLoading: boolean;
errorMessage: string;
};
export const useGetPrivilegies = (): UsePrivilegies => {
const [privilegies, setPrivilegies] = useState<RealPrivilege[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [isError, setIsError] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
useEffect(() => {
const getPrivilegies = async () => {
const { data } = await axios<RealPrivilege[]>({
method: "get",
url: "https://admin.pena.digital/strator/privilege/service",
});
return data;
};
setIsLoading(true);
getPrivilegies()
.then(setPrivilegies)
.catch(() => {
setIsError(true);
setErrorMessage("Ошибка при получении привилегий");
})
.finally(() => setIsLoading(false));
}, []);
return { privilegies, isError, isLoading, errorMessage };
};

82
src/hooks/useGetTariffs.hook.ts
View File

@ -1,82 +0,0 @@
import { useEffect, useState } from "react";
import axios from "axios";
import { authStore } from "@root/stores/auth";
import { Tariff, Tariff_BACKEND } from "@root/model/tariff";
import { resetTariffsStore } from "@root/stores/tariffsStore";
type UseGetTariffs = {
requestTariffs: (page?: number, limit?: number) => Promise<void>;
isLoading: boolean;
};
type GetTariffsResponse = {
totalPages: number;
tariffs: Tariff_BACKEND[];
};
export const useGetTariffs = (): UseGetTariffs => {
const token = authStore((state) => state.token);
const [allTariffs, setAllTariffs] = useState<Record<string, Tariff>>({});
const [isLoading, setIsLoading] = useState(false);
let newSt:Record<string, Tariff>
const requestTariffs = async (page: number = 1): Promise<void> => {
setIsLoading(true);
try {
const { data } = await axios.get<GetTariffsResponse>(
"https://admin.pena.digital/strator/tariff/",
{
params: { page, limit: 100 },
headers: { Authorization: `Bearer ${token}` },
}
);
// data.tariffs.forEach(async (t:any) => {
// await axios({
// method: "delete",
// url: "https://admin.pena.digital/strator/tariff/delete",
// headers: {
// Authorization: `Bearer ${token}`,
// },
// data: { id: t._id },
// });
// })
const tariffsObj:Record<string, Tariff> = {}
data.tariffs.filter((tariff) => {return !tariff.isDeleted}).forEach((tariff) => {
tariffsObj[tariff._id] = {
id: tariff._id,
name: tariff.name,
isCustom: tariff.price ? true : false,
amount: tariff.privilegies[0].amount,
isFront: false,
privilegeId: tariff.privilegies[0].privilegeId,
price: tariff.privilegies[0].price,
isDeleted: tariff.isDeleted,
customPricePerUnit: tariff.price,
}
})
newSt = {...newSt, ...tariffsObj}
if (page < data.totalPages) {
return requestTariffs(page + 1);
}
resetTariffsStore(newSt)
setIsLoading(false);
} catch {
setIsLoading(false);
throw new Error("Ошибка при получении тарифов");
}
}
return { requestTariffs, isLoading };
};

88
src/hooks/usePrivilegies.hook.ts Normal file
View File

@ -0,0 +1,88 @@
import { useState, useEffect } from "react";
import { authStore } from "@root/stores/auth";
import { resetPrivilegeArray } from "@root/stores/privilegesStore";
import { exampleCartValues } from "@stores/mocks/exampleCartValues";
import type { RealPrivilege } from "@root/model/privilege";
export type Privilege = {
createdAt: string;
description: string;
isDeleted: boolean;
name: string;
price: number;
privilegeId: string;
serviceKey: string;
type: "count" | "day" | "mb";
updatedAt: string;
value: string;
_id: string;
};
type SeverPrivilegiesResponse = {
templategen: RealPrivilege[];
};
type UsePrivilegies = {
requestPrivilegies: () => Promise<void>;
isError: boolean;
isLoading: boolean;
errorMessage: string;
};
const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
export const usePrivilegies = (): UsePrivilegies => {
const [privilegies, setPrivilegies] = useState<RealPrivilege[]>([]);
const [isLoading, setIsLoading] = useState(false);
const [isError, setIsError] = useState(false);
const [errorMessage, setErrorMessage] = useState("");
const { makeRequest } = authStore.getState();
useEffect(() => {
let extracted: RealPrivilege[] = [];
for (let serviceKey in privilegies) {
//Приходит объект. В его значениях массивы привилегий для разных сервисов. Высыпаем в общую кучу и обновляем стор
extracted = extracted.concat(privilegies[serviceKey]);
}
let readyArray = extracted.map((privilege) => ({
serviceKey: privilege.serviceKey,
privilegeId: privilege.privilegeId,
name: privilege.name,
description: privilege.description,
type: privilege.type,
price: privilege.price,
value: privilege.value,
id: privilege._id,
}));
resetPrivilegeArray([...readyArray, ...exampleCartValues.privileges]);
}, [privilegies]);
const requestPrivilegies = async () => {
setIsLoading(true);
await makeRequest<never, SeverPrivilegiesResponse>({
url: baseUrl + "/privilege/service",
method: "get",
})
.then(({ templategen }) => setPrivilegies(templategen))
.catch(() => {
setIsError(true);
setErrorMessage("Ошибка при получении привилегий");
})
.finally(() => setIsLoading(false));
};
return {
requestPrivilegies,
isError,
isLoading,
errorMessage,
};
};

40
src/hooks/useRefreshPrivilegesStore.hook.ts
View File

@ -1,40 +0,0 @@
import { useEffect, useState } from "react";
import axios from "axios";
import { RealPrivilege } from "@root/model/privilege";
import { resetPrivilegeArray } from "@root/stores/privilegesStore";
import { useGetPrivilegies } from "./useGetPrivileges.hook";
type RefreshPrivilegesStore = {
isError: boolean;
isLoading: boolean;
errorMessage: string;
};
export const useRefreshPrivilegesStore = (): RefreshPrivilegesStore => {
const gotten = useGetPrivilegies()
const [isLoading, setIsLoading] = useState(gotten.isLoading);
const [isError, setIsError] = useState(gotten.isError);
const [errorMessage, setErrorMessage] = useState(gotten.errorMessage);
useEffect(() => {
let extracted:RealPrivilege[] = []
for (let serviceKey in gotten.privilegies) { //Приходит объект. В его значениях массивы привилегий для разных сервисов. Высыпаем в общую кучу и обновляем стор
extracted = extracted.concat(gotten.privilegies[serviceKey])
}
let readyArray = extracted.map((privilege) => ({
serviceKey: privilege.serviceKey,
privilegeId: privilege.privilegeId,
name: privilege.name,
description: privilege.description,
type: privilege.type,
price: privilege.price,
value: privilege.value,
id: privilege._id,
}))
resetPrivilegeArray(readyArray)
}, [gotten.privilegies]);
return {isError:gotten.isError, isLoading:gotten.isLoading, errorMessage:gotten.errorMessage};
};

77
src/hooks/useTariffs.hook.ts Normal file
View File

@ -0,0 +1,77 @@
import { useEffect, useState } from "react";
import { Tariff, Tariff_BACKEND } from "@root/model/tariff";
import { resetTariffsStore } from "@root/stores/tariffsStore";
import { authStore } from "@root/stores/auth";
type UseGetTariffs = {
requestTariffs: (page?: number, tariffs?: Tariff_BACKEND[]) => Promise<void>;
isLoading: boolean;
};
type GetTariffsResponse = {
totalPages: number;
tariffs: Tariff_BACKEND[];
};
const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
export const useTariffs = (): UseGetTariffs => {
const [isLoading, setIsLoading] = useState(false);
const [tariffsList, setTariffsList] = useState<Tariff_BACKEND[]>([]);
const { makeRequest } = authStore.getState();
useEffect(() => {
const convertedTariffs: Record<string, Tariff> = {};
tariffsList
.filter(({ isDeleted }) => !isDeleted)
.forEach((tariff) => {
convertedTariffs[tariff._id] = {
id: tariff._id,
name: tariff.name,
isCustom: tariff.price ? true : false,
amount: tariff.privilegies[0].amount,
isFront: false,
privilegeId: tariff.privilegies[0].privilegeId,
price: tariff.privilegies[0].price,
isDeleted: tariff.isDeleted,
customPricePerUnit: tariff.price,
};
});
resetTariffsStore(convertedTariffs);
}, [tariffsList]);
const requestTariffs = async (
page: number = 1,
existingTariffs: Tariff_BACKEND[] = []
): Promise<void> => {
setIsLoading(true);
try {
const { tariffs, totalPages } = await makeRequest<
never,
GetTariffsResponse
>({
url: baseUrl + `/tariff/?page=${page}&limit=${100}`,
method: "get",
bearer: true,
});
if (page < totalPages) {
return requestTariffs(page + 1, [...existingTariffs, ...tariffs]);
}
setTariffsList([...existingTariffs, ...tariffs]);
} catch {
throw new Error("Ошибка при получении тарифов");
} finally {
setIsLoading(false);
}
};
return { requestTariffs, isLoading };
};

133
src/kitUI/Cart/Cart.tsx
View File

@ -15,21 +15,30 @@ import {
FormControlLabel, FormControlLabel,
} from "@mui/material"; } from "@mui/material";
import Input from "@kitUI/input"; import Input from "@kitUI/input";
import { useEffect, useState } from "react"; import { useState } from "react";
import { GridSelectionModel } from "@mui/x-data-grid"; import { GridSelectionModel } from "@mui/x-data-grid";
import { calcCartData, createCartItem, findDiscountFactor, formatDiscountFactor } from "./calc"; import {
calcCartData,
createCartItem,
findDiscountFactor,
formatDiscountFactor,
} from "./calc";
import { AnyDiscount, CartItemTotal } from "@root/model/cart"; import { AnyDiscount, CartItemTotal } from "@root/model/cart";
import { Privilege } from "@root/model/tariff"; import { Privilege } from "@root/model/tariff";
import { useMockDiscountStore } from "@root/stores/discounts"; import { useDiscountStore, setDiscounts } from "@root/stores/discounts";
import { useCartStore } from "@root/stores/cart"; import { useCartStore } from "@root/stores/cart";
import { findPrivilegeById } from "@root/stores/privilegesStore"; import { findPrivilegeById } from "@root/stores/privilegesStore";
import { testUser } from "@root/stores/mocks/user"; import { testUser } from "@root/stores/mocks/user";
import { useTariffStore } from "@root/stores/tariffsStore"; import { useTariffStore } from "@root/stores/tariffsStore";
import { Discount } from "@root/model/discount";
import { authStore } from "@root/stores/auth";
interface Props { interface Props {
requestPrivilegies: () => Promise<void>;
requestDiscounts: () => Promise<() => void>;
selectedTariffs: GridSelectionModel; selectedTariffs: GridSelectionModel;
} }
@ -49,13 +58,19 @@ interface MergedTariff {
isFront: boolean; isFront: boolean;
} }
export default function Cart({ selectedTariffs }: Props) { export default function Cart({
let cartTariffs = Object.values(useTariffStore().tariffs) requestPrivilegies,
const discounts = useMockDiscountStore((store) => store.discounts); requestDiscounts,
selectedTariffs,
}: Props) {
let cartTariffs = Object.values(useTariffStore().tariffs);
// const discounts = useDiscountStore((store) => store.discounts);
const [discounts, setDiscounts] = useState<Discount[]>([]);
const cartTotal = useCartStore((state) => state.cartTotal); const cartTotal = useCartStore((state) => state.cartTotal);
const setCartTotal = useCartStore((store) => store.setCartTotal); const setCartTotal = useCartStore((store) => store.setCartTotal);
const [couponField, setCouponField] = useState<string>(""); const [couponField, setCouponField] = useState<string>("");
const [loyaltyField, setLoyaltyField] = useState<string>(""); const [loyaltyField, setLoyaltyField] = useState<string>("");
const makeRequest = authStore.getState().makeRequest;
const [errorMessage, setErrorMessage] = useState<string | null>(null); const [errorMessage, setErrorMessage] = useState<string | null>(null);
const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false); const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false);
@ -63,25 +78,43 @@ export default function Cart({ selectedTariffs }: Props) {
const privilege = findPrivilegeById(cartItemTotal.tariff.privilegeId); const privilege = findPrivilegeById(cartItemTotal.tariff.privilegeId);
const service = privilege?.serviceKey; const service = privilege?.serviceKey;
const serviceDiscount = service ? cartTotal.discountsByService[service] : null; const serviceDiscount = service
? cartTotal.discountsByService[privilege?.serviceKey]
: null;
console.log(cartTotal.discountsByService);
console.log(serviceDiscount);
console.log(cartItemTotal);
const envolvedDiscountsElement = ( const envolvedDiscountsElement = (
<Box> <Box>
{cartItemTotal.envolvedDiscounts.map((discount, index, arr) => ( {cartItemTotal.envolvedDiscounts.map((discount, index, arr) => (
<span key={discount._id}> <span key={discount.ID}>
<DiscountTooltip discount={discount} cartItemTotal={cartItemTotal} /> <DiscountTooltip
{index < arr.length - (serviceDiscount ? 0 : 1) && <span>,&nbsp;</span>} discount={discount}
cartItemTotal={cartItemTotal}
/>
{index < arr.length - (serviceDiscount ? 0 : 1) && (
<span>,&nbsp;</span>
)}
</span> </span>
))} ))}
{serviceDiscount && ( {serviceDiscount && (
<span> <span>
<DiscountTooltip discount={serviceDiscount} cartItemTotal={cartItemTotal} /> <DiscountTooltip
discount={serviceDiscount}
cartItemTotal={cartItemTotal}
/>
</span> </span>
)} )}
</Box> </Box>
); );
const totalIncludingServiceDiscount = cartItemTotal.totalPrice * (serviceDiscount?.target.factor || 1); const totalIncludingServiceDiscount =
cartItemTotal.totalPrice * (serviceDiscount?.Target.Factor || 1);
console.log(cartItemTotal.totalPrice);
console.log(serviceDiscount?.Target.Factor);
console.log(serviceDiscount);
return { return {
id: cartItemTotal.tariff.id, id: cartItemTotal.tariff.id,
@ -96,7 +129,10 @@ export default function Cart({ selectedTariffs }: Props) {
const cartDiscountsResultFactor = const cartDiscountsResultFactor =
cartDiscounts && cartDiscounts &&
cartDiscounts?.length > 1 && cartDiscounts?.length > 1 &&
cartDiscounts.reduce((acc, discount) => acc * findDiscountFactor(discount), 1); cartDiscounts.reduce(
(acc, discount) => acc * findDiscountFactor(discount),
1
);
const envolvedCartDiscountsElement = cartDiscounts && ( const envolvedCartDiscountsElement = cartDiscounts && (
<Box <Box
@ -106,26 +142,45 @@ export default function Cart({ selectedTariffs }: Props) {
}} }}
> >
{cartDiscounts?.map((discount, index, arr) => ( {cartDiscounts?.map((discount, index, arr) => (
<span key={discount._id}> <span key={discount.ID}>
<DiscountTooltip discount={discount} /> <DiscountTooltip discount={discount} />
{index < arr.length - 1 && <span>,&nbsp;</span>} {index < arr.length - 1 && <span>,&nbsp;</span>}
</span> </span>
))} ))}
&nbsp; &nbsp;
{cartDiscountsResultFactor && `= ${formatDiscountFactor(cartDiscountsResultFactor)}`} {cartDiscountsResultFactor &&
`= ${formatDiscountFactor(cartDiscountsResultFactor)}`}
</Box> </Box>
); );
function handleCalcCartClick() { async function handleCalcCartClick() {
//рассчитать await requestPrivilegies();
await requestDiscounts();
const cartItems = cartTariffs.map((tariff) => createCartItem(tariff)); //рассчитать
const dis = await makeRequest<unknown>({
url: "https://admin.pena.digital/price/discounts",
method: "get",
useToken: true,
bearer: true,
});
console.log(dis);
// @ts-ignore
setDiscounts(dis.Discounts);
const cartItems = cartTariffs
.filter((tariff) => selectedTariffs.includes(tariff.id))
.map((tariff) => createCartItem(tariff));
console.log(cartItems);
let loyaltyValue = parseInt(loyaltyField); let loyaltyValue = parseInt(loyaltyField);
if (!isFinite(loyaltyValue)) loyaltyValue = 0; if (!isFinite(loyaltyValue)) loyaltyValue = 0;
const activeDiscounts = discounts.filter((discount) => !discount.disabled); const activeDiscounts = discounts.filter(
(discount) => !discount.Deprecated
);
const cartData = calcCartData({ const cartData = calcCartData({
user: testUser, user: testUser,
@ -269,22 +324,34 @@ export default function Cart({ selectedTariffs }: Props) {
}} }}
> >
<TableCell> <TableCell>
<Typography variant="h4" sx={{ color: theme.palette.secondary.main }}> <Typography
variant="h4"
sx={{ color: theme.palette.secondary.main }}
>
Имя Имя
</Typography> </Typography>
</TableCell> </TableCell>
<TableCell> <TableCell>
<Typography variant="h4" sx={{ color: theme.palette.secondary.main }}> <Typography
variant="h4"
sx={{ color: theme.palette.secondary.main }}
>
Описание Описание
</Typography> </Typography>
</TableCell> </TableCell>
<TableCell> <TableCell>
<Typography variant="h4" sx={{ color: theme.palette.secondary.main }}> <Typography
variant="h4"
sx={{ color: theme.palette.secondary.main }}
>
Скидки Скидки
</Typography> </Typography>
</TableCell> </TableCell>
<TableCell> <TableCell>
<Typography variant="h4" sx={{ color: theme.palette.secondary.main }}> <Typography
variant="h4"
sx={{ color: theme.palette.secondary.main }}
>
стоимость стоимость
</Typography> </Typography>
</TableCell> </TableCell>
@ -325,7 +392,7 @@ export default function Cart({ selectedTariffs }: Props) {
color: theme.palette.secondary.main, color: theme.palette.secondary.main,
}} }}
> >
{row.price.toFixed(2)} ₽ {(row.price / 100).toFixed(2)} ₽
</TableCell> </TableCell>
</TableRow> </TableRow>
))} ))}
@ -354,7 +421,7 @@ export default function Cart({ selectedTariffs }: Props) {
marginTop: "10px", marginTop: "10px",
}} }}
> >
ИТОГО: <span>{cartTotal?.totalPrice.toFixed(2)} ₽</span> ИТОГО: <span>{(cartTotal?.totalPrice / 100).toFixed(2)} ₽</span>
</Typography> </Typography>
</> </>
)} )}
@ -368,19 +435,27 @@ export default function Cart({ selectedTariffs }: Props) {
); );
} }
function DiscountTooltip({ discount, cartItemTotal }: { discount: AnyDiscount; cartItemTotal?: CartItemTotal }) { function DiscountTooltip({
discount,
cartItemTotal,
}: {
discount: Discount;
cartItemTotal?: CartItemTotal;
}) {
const discountText = formatDiscountFactor(findDiscountFactor(discount)); const discountText = formatDiscountFactor(findDiscountFactor(discount));
return ( return discountText ? (
<Tooltip <Tooltip
title={ title={
<> <>
<Typography>Скидка: {discount?.name}</Typography> <Typography>Скидка: {discount?.Name}</Typography>
<Typography>{discount?.description}</Typography> <Typography>{discount?.Description}</Typography>
</> </>
} }
> >
<span>{discountText}</span> <span>{discountText}</span>
</Tooltip> </Tooltip>
) : (
<span>Ошибка поиска значения скидки</span>
); );
} }

522
src/kitUI/Cart/calc.test.ts
View File

@ -8,295 +8,295 @@ import { calcCartData, createCartItem } from "./calc";
const MAX_PRICE_ERROR = 0.01; const MAX_PRICE_ERROR = 0.01;
const discounts = exampleCartValues.discounts; const discounts = exampleCartValues.discounts;
describe("cart tests", () => { // describe("cart tests", () => {
it("без скидок", () => { // it("без скидок", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[0]); // const testCase = prepareTestCase(exampleCartValues.testCases[0]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("сумма в корзине достигла 5к, поэтому применилась скидка", () => { // it("сумма в корзине достигла 5к, поэтому применилась скидка", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[1]); // const testCase = prepareTestCase(exampleCartValues.testCases[1]);
// работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.) // // работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.)
const discountsWithoutTemplategen = discounts.filter(discount => { // const discountsWithoutTemplategen = discounts.filter(discount => {
return !( // return !(
discount.conditionType === "service" && // discount.conditionType === "service" &&
discount.condition.service.id === "templategen" // discount.condition.service.id === "templategen"
); // );
}); // });
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts: discountsWithoutTemplategen, // discounts: discountsWithoutTemplategen,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("добавил кастомный тариф такой, чтобы пофвилась скидка на продукт", () => { // it("добавил кастомный тариф такой, чтобы пофвилась скидка на продукт", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[2]); // const testCase = prepareTestCase(exampleCartValues.testCases[2]);
// работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.) // // работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.)
const discountsWithoutTemplategen = discounts.filter(discount => { // const discountsWithoutTemplategen = discounts.filter(discount => {
return !( // return !(
discount.conditionType === "service" && // discount.conditionType === "service" &&
discount.condition.service.id === "templategen" // discount.condition.service.id === "templategen"
); // );
}); // });
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts: discountsWithoutTemplategen, // discounts: discountsWithoutTemplategen,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("т.е. применилась не id14, а id15, потому что применяется наибольшая подходящая. в то же время, на скидку за лояльность ещё не хватает", () => { // it("т.е. применилась не id14, а id15, потому что применяется наибольшая подходящая. в то же время, на скидку за лояльность ещё не хватает", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[3]); // const testCase = prepareTestCase(exampleCartValues.testCases[3]);
// работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.) // // работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.)
const discountsWithoutTemplategen = discounts.filter(discount => { // const discountsWithoutTemplategen = discounts.filter(discount => {
return !( // return !(
discount.conditionType === "service" && // discount.conditionType === "service" &&
discount.condition.service.id === "templategen" // discount.condition.service.id === "templategen"
); // );
}); // });
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts: discountsWithoutTemplategen, // discounts: discountsWithoutTemplategen,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("case 5", () => { // it("case 5", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[4]); // const testCase = prepareTestCase(exampleCartValues.testCases[4]);
// работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.) // // работает если не учитывать скидки id26, id27 (скидка на templategen от 1000/5000 р.)
const discountsWithoutTemplategen = discounts.filter(discount => { // const discountsWithoutTemplategen = discounts.filter(discount => {
return !( // return !(
discount.conditionType === "service" && // discount.conditionType === "service" &&
discount.condition.service.id === "templategen" // discount.condition.service.id === "templategen"
); // );
}); // });
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts: discountsWithoutTemplategen, // discounts: discountsWithoutTemplategen,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("история про то, как скидки за привилегии помешали получить скидку за сервис", () => { // it("история про то, как скидки за привилегии помешали получить скидку за сервис", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[5]); // const testCase = prepareTestCase(exampleCartValues.testCases[5]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("то же что и выше, но без лояльности", () => { // it("то же что и выше, но без лояльности", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[6]); // const testCase = prepareTestCase(exampleCartValues.testCases[6]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("история про то, как получилось получить скидку за сервис", () => { // it("история про то, как получилось получить скидку за сервис", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[7]); // const testCase = prepareTestCase(exampleCartValues.testCases[7]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("две скидки за сервис", () => { // it("две скидки за сервис", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[8]); // const testCase = prepareTestCase(exampleCartValues.testCases[8]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("юзер использовал промокод id33. он заменяет скидку на p6 собой. в один момент времени может быть активирован только 1 промокод, т.е. после активации следующего, предыдущий заменяется. но в промокоде может быть несколько скидок. промокоды имеют скидки только на привелеги", () => { // it("юзер использовал промокод id33. он заменяет скидку на p6 собой. в один момент времени может быть активирован только 1 промокод, т.е. после активации следующего, предыдущий заменяется. но в промокоде может быть несколько скидок. промокоды имеют скидки только на привелеги", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[9]); // const testCase = prepareTestCase(exampleCartValues.testCases[9]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
isNonCommercial: false, // isNonCommercial: false,
coupon: "ABCD", // coupon: "ABCD",
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("юзер подтвердил свой статус НКО, поэтому, не смотря на то что он достиг по лояльности уровня скидки id2, она не применилась, а применилась id32", () => { // it("юзер подтвердил свой статус НКО, поэтому, не смотря на то что он достиг по лояльности уровня скидки id2, она не применилась, а применилась id32", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[10]); // const testCase = prepareTestCase(exampleCartValues.testCases[10]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
isNonCommercial: true, // isNonCommercial: true,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
it("case 12", () => { // it("case 12", () => {
const testCase = prepareTestCase(exampleCartValues.testCases[11]); // const testCase = prepareTestCase(exampleCartValues.testCases[11]);
const cartTotal = calcCartData({ // const cartTotal = calcCartData({
user: testCase.user, // user: testCase.user,
purchasesAmount: testCase.user.PurchasesAmount, // purchasesAmount: testCase.user.PurchasesAmount,
cartItems: testCase.cartItems, // cartItems: testCase.cartItems,
discounts, // discounts,
}) as CartTotal; // }) as CartTotal;
const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)]; // const allEnvolvedDiscounts: string[] = [...cartTotal.envolvedCartDiscounts.map(discount => discount._id)];
cartTotal.items.forEach(cartItem => { // cartTotal.items.forEach(cartItem => {
allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id)); // allEnvolvedDiscounts.push(...cartItem.envolvedDiscounts.map(discount => discount._id));
}); // });
SERVICE_LIST.map(service => service.serviceKey).forEach(service => { // SERVICE_LIST.map(service => service.serviceKey).forEach(service => {
if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id); // if (cartTotal.discountsByService[service]) allEnvolvedDiscounts.push(cartTotal.discountsByService[service]!._id);
}); // });
expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort()); // expect(allEnvolvedDiscounts.sort()).toEqual(testCase.expect.envolvedDiscounts.sort());
expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeGreaterThan(testCase.expect.price - MAX_PRICE_ERROR);
expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR); // expect(cartTotal.totalPrice).toBeLessThan(testCase.expect.price + MAX_PRICE_ERROR);
}); // });
}); // });
function prepareTestCase(testCase: TestCase): ({ function prepareTestCase(testCase: TestCase): ({

168
src/kitUI/Cart/calc.ts
View File

@ -10,9 +10,11 @@ import {
ServiceDiscount, ServiceDiscount,
UserDiscount, UserDiscount,
} from "@root/model/cart"; } from "@root/model/cart";
import { Discount } from "@root/model/discount";
import { User } from "../../model/user"; import { User } from "../../model/user";
import { findPrivilegeById } from "@root/stores/privilegesStore"; import { findPrivilegeById } from "@root/stores/privilegesStore";
import { SERVICE_LIST, ServiceType, Tariff } from "@root/model/tariff"; import { SERVICE_LIST, ServiceType, Tariff } from "@root/model/tariff";
import { enqueueSnackbar } from "notistack";
export function calcCartData({ export function calcCartData({
user, user,
@ -25,12 +27,12 @@ export function calcCartData({
user: User; user: User;
purchasesAmount: number; purchasesAmount: number;
cartItems: CartItem[]; cartItems: CartItem[];
discounts: AnyDiscount[]; discounts: Discount[];
isNonCommercial?: boolean; isNonCommercial?: boolean;
coupon?: string; coupon?: string;
}): CartTotal | Error | null { }): CartTotal | Error | null {
let isIncompatibleTariffs = false; let isIncompatibleTariffs = false;
console.log(discounts)
const defaultTariffTypePresent: { [Key in ServiceType]: boolean } = { const defaultTariffTypePresent: { [Key in ServiceType]: boolean } = {
dwarfener: false, dwarfener: false,
squiz: false, squiz: false,
@ -75,7 +77,7 @@ export function calcCartData({
// layer 0 // layer 0
for (const discount of discounts) { for (const discount of discounts) {
if (discount.conditionType !== "userType" || !isNonCommercial) continue; if (discount.Condition.UserType.length !== 0 || !isNonCommercial) continue;
cartItems.forEach((cartItem) => { cartItems.forEach((cartItem) => {
cartTotal.items.push({ cartTotal.items.push({
@ -92,7 +94,7 @@ export function calcCartData({
cartTotal.totalPrice += cartItem.price; cartTotal.totalPrice += cartItem.price;
}); });
cartTotal.totalPrice *= discount.target.factor; cartTotal.totalPrice *= discount.Target.Factor;
cartTotal.envolvedCartDiscounts.push(discount); cartTotal.envolvedCartDiscounts.push(discount);
return cartTotal; return cartTotal;
@ -111,112 +113,124 @@ export function calcCartData({
const tariff = cartItem.tariff; const tariff = cartItem.tariff;
const privilegesAffectedByCoupon: string[] = []; const privilegesAffectedByCoupon: string[] = [];
couponDiscount?.target.products.forEach((product) => { couponDiscount?.Target.Products.forEach((product) => {
if (product.privilegeId !== tariff.privilegeId) return; if (product.ID !== tariff.privilegeId ) return;
if (tariff.customPricePerUnit !== undefined && !couponDiscount.overwhelm) return; if (tariff.customPricePerUnit !== undefined && !couponDiscount?.Target.Overhelm) return;
cartItemTotal.totalPrice *= product.factor; cartItemTotal.totalPrice *= product.Factor;
cartItemTotal.envolvedDiscounts.push(couponDiscount); cartItemTotal.envolvedDiscounts.push(couponDiscount);
cartTotal.couponState = "applied"; cartTotal.couponState = "applied";
privilegesAffectedByCoupon.push(product.privilegeId); privilegesAffectedByCoupon.push(couponDiscount.Condition.Product);
});
const privilegeDiscount = findMaxApplicablePrivilegeDiscount(discounts, tariff);
privilegeDiscount?.target.products.forEach((product) => {
if (product.privilegeId !== tariff.privilegeId) return;
if (tariff.customPricePerUnit !== undefined) return;
if (privilegesAffectedByCoupon.includes(privilegeDiscount.condition.privilege.id)) return;
cartItemTotal.totalPrice *= product.factor;
cartItemTotal.envolvedDiscounts.push(privilegeDiscount);
}); });
const privilege = findPrivilegeById(cartItem.tariff.privilegeId); const privilege = findPrivilegeById(cartItem.tariff.privilegeId);
const privilegeDiscount = findMaxApplicablePrivilegeDiscount(discounts, tariff);
privilegeDiscount?.Target.Products.forEach((product) => {
console.log( privilegeDiscount.Condition.Product !== privilege?.privilegeId)
if (privilegeDiscount.Condition.Product !== privilege?.privilegeId) return;
if (tariff.customPricePerUnit !== 0) return;
if (privilegesAffectedByCoupon.includes(privilegeDiscount.Condition.Product)) return;
cartItemTotal.totalPrice *= product.Factor;
cartItemTotal.envolvedDiscounts.push(privilegeDiscount);
});
if (!privilege) if (!privilege)
throw new Error(`Привилегия не найдена в тарифе ${cartItem.tariff.name} с id ${cartItem.tariff.id}`); throw new Error(`Привилегия не найдена в тарифе ${cartItem.tariff.name} с id ${cartItem.tariff.id}`);
cartTotal.items.push(cartItemTotal); cartTotal.items.push(cartItemTotal);
cartTotal.priceByService[privilege.serviceKey] += cartItemTotal.totalPrice; cartTotal.priceByService[privilege.serviceKey] += cartItemTotal.totalPrice;
console.log("cartTotal.priceByService")
console.log(cartTotal.priceByService)
} }
// layer 2 // layer 2
console.log("l2")
SERVICE_LIST.map((service) => service.serviceKey).forEach((service) => { SERVICE_LIST.map((service) => service.serviceKey).forEach((service) => {
const serviceDiscount = findMaxServiceDiscount(service, discounts, cartTotal.priceByService); const serviceDiscount = findMaxServiceDiscount(service, discounts, cartTotal.priceByService);
console.log(serviceDiscount)
if (serviceDiscount) { if (serviceDiscount) {
cartTotal.priceByService[service] *= serviceDiscount.target.factor; cartTotal.priceByService[service] *= serviceDiscount.Target.Factor;
cartTotal.discountsByService[service] = serviceDiscount; cartTotal.discountsByService[service] = serviceDiscount;
console.log(cartTotal.discountsByService)
} }
console.log(cartTotal.totalPrice)
console.log(cartTotal.priceByService[service])
cartTotal.totalPrice += cartTotal.priceByService[service]; cartTotal.totalPrice += cartTotal.priceByService[service];
}); });
// layer 3 // layer 3
const cartPurchasesAmountDiscount = findMaxCartPurchasesAmountDiscount(discounts, cartTotal); const cartPurchasesAmountDiscount = findMaxCartPurchasesAmountDiscount(discounts, cartTotal);
console.log(cartPurchasesAmountDiscount)
if (cartPurchasesAmountDiscount) { if (cartPurchasesAmountDiscount) {
cartTotal.totalPrice *= cartPurchasesAmountDiscount.factor; cartTotal.totalPrice *= cartPurchasesAmountDiscount.Target.Factor;
cartTotal.envolvedCartDiscounts.push(cartPurchasesAmountDiscount); cartTotal.envolvedCartDiscounts.push(cartPurchasesAmountDiscount);
} }
// layer 4 // layer 4
const totalPurchasesAmountDiscount = findMaxTotalPurchasesAmountDiscount(discounts, purchasesAmount); const totalPurchasesAmountDiscount = findMaxTotalPurchasesAmountDiscount(discounts, purchasesAmount);
console.log(totalPurchasesAmountDiscount)
if (totalPurchasesAmountDiscount) { if (totalPurchasesAmountDiscount) {
cartTotal.totalPrice *= totalPurchasesAmountDiscount.factor; cartTotal.totalPrice *= totalPurchasesAmountDiscount.Target.Factor;
cartTotal.envolvedCartDiscounts.push(totalPurchasesAmountDiscount); cartTotal.envolvedCartDiscounts.push(totalPurchasesAmountDiscount);
} }
return cartTotal; return cartTotal;
} }
function findMaxApplicablePrivilegeDiscount(discounts: AnyDiscount[], tariff: Tariff): PrivilegeDiscount | null { function findMaxApplicablePrivilegeDiscount(discounts: Discount[], tariff: Tariff): Discount | null {
const applicableDiscounts = discounts.filter((discount): discount is PrivilegeDiscount => { const applicableDiscounts = discounts.filter((discount): discount is Discount => {
return ( return (
discount.conditionType === "privilege" && discount.Condition.Product !== "" &&
tariff.privilegeId === discount.condition.privilege.id && findPrivilegeById(tariff.privilegeId)?.privilegeId === discount.Condition.Product &&
tariff.amount >= discount.condition.privilege.value tariff.amount >= Number(discount.Condition.Term)
); );
}); });
if (!applicableDiscounts.length) return null; if (!applicableDiscounts.length) return null;
const maxValueDiscount = applicableDiscounts.reduce((prev, current) => const maxValueDiscount = applicableDiscounts.reduce((prev, current) =>
current.condition.privilege.value > prev.condition.privilege.value ? current : prev Number(current.Condition.Term) > Number(prev.Condition.Term) ? current : prev
); );
return maxValueDiscount; return maxValueDiscount;
} }
function findMaxCartPurchasesAmountDiscount( function findMaxCartPurchasesAmountDiscount(
discounts: AnyDiscount[], discounts: Discount[],
cartTotal: CartTotal cartTotal: CartTotal
): CartPurchasesAmountDiscount | null { ): Discount | null {
const applicableDiscounts = discounts.filter((discount): discount is CartPurchasesAmountDiscount => { const applicableDiscounts = discounts.filter((discount): discount is Discount => {
return ( return (
discount.conditionType === "cartPurchasesAmount" && cartTotal.totalPrice >= discount.condition.cartPurchasesAmount discount.Condition.CartPurchasesAmount > 0 && cartTotal.totalPrice >= Number(discount.Condition.CartPurchasesAmount)
); );
}); });
console.log(applicableDiscounts)
if (!applicableDiscounts.length) return null; if (!applicableDiscounts.length) return null;
const maxValueDiscount = applicableDiscounts.reduce((prev, current) => const maxValueDiscount = applicableDiscounts.reduce((prev, current) =>
current.condition.cartPurchasesAmount > prev.condition.cartPurchasesAmount ? current : prev Number(current.Condition.CartPurchasesAmount) > Number(prev.Condition.CartPurchasesAmount) ? current : prev
); );
return maxValueDiscount; return maxValueDiscount;
} }
function findMaxTotalPurchasesAmountDiscount( function findMaxTotalPurchasesAmountDiscount(
discounts: AnyDiscount[], discounts: Discount[],
purchasesAmount: number purchasesAmount: number
): PurchasesAmountDiscount | null { ): Discount | null {
const applicableDiscounts = discounts.filter((discount): discount is PurchasesAmountDiscount => { const applicableDiscounts = discounts.filter((discount): discount is Discount => {
return discount.conditionType === "purchasesAmount" && purchasesAmount >= discount.condition.purchasesAmount; return discount.Condition.PurchasesAmount > 0 && purchasesAmount >= Number(discount.Condition.PurchasesAmount);
}); });
console.log(discounts)
if (!applicableDiscounts.length) return null; if (!applicableDiscounts.length) return null;
const maxValueDiscount = applicableDiscounts.reduce((prev, current) => const maxValueDiscount = applicableDiscounts.reduce((prev, current) =>
current.condition.purchasesAmount > prev.condition.purchasesAmount ? current : prev Number(current.Condition.PurchasesAmount) > Number(prev.Condition.PurchasesAmount) ? current : prev
); );
return maxValueDiscount; return maxValueDiscount;
@ -224,30 +238,30 @@ function findMaxTotalPurchasesAmountDiscount(
function findMaxServiceDiscount( function findMaxServiceDiscount(
service: ServiceType, service: ServiceType,
discounts: AnyDiscount[], discounts: Discount[],
priceByService: ServiceToPriceMap priceByService: ServiceToPriceMap
): ServiceDiscount | null { ): Discount | null {
const discountsForTariffService = discounts.filter((discount): discount is ServiceDiscount => { console.log(discounts,service)
const discountsForTariffService = discounts.filter((discount): discount is Discount => {
return ( return (
discount.conditionType === "service" && discount.Condition.Group === service &&
discount.condition.service.id === service && priceByService[service] >= Number(discount.Condition.PriceFrom)
priceByService[service] >= discount.condition.service.value
); );
}); });
if (!discountsForTariffService.length) return null; if (!discountsForTariffService.length) return null;
const maxValueDiscount = discountsForTariffService.reduce((prev, current) => { const maxValueDiscount = discountsForTariffService.reduce((prev, current) => {
return current.condition.service.value > prev.condition.service.value ? current : prev; return Number(current.Condition.PriceFrom) > Number(prev.Condition.PriceFrom) ? current : prev;
}); });
return maxValueDiscount; return maxValueDiscount;
} }
function findUserDiscount(discounts: AnyDiscount[], user: User, coupon: string): UserDiscount | null { function findUserDiscount(discounts: Discount[], user: User, coupon: string): Discount | null {
const userDiscount = discounts.find((discount): discount is UserDiscount => { const userDiscount = discounts.find((discount): discount is Discount => {
return ( return (
discount.conditionType === "user" && discount.condition.user === user.ID && discount.condition.coupon === coupon discount.Condition.User.length !== 0 && discount.Condition.User === user.ID && discount.Condition.Coupon === coupon
); );
}); });
@ -255,34 +269,42 @@ function findUserDiscount(discounts: AnyDiscount[], user: User, coupon: string):
} }
export function createCartItem(tariff: Tariff): CartItem { export function createCartItem(tariff: Tariff): CartItem {
const pricePerUnit = tariff.customPricePerUnit ?? findPrivilegeById(tariff.privilegeId)?.price ?? 0;
const price = pricePerUnit * tariff.amount;
return { tariff, price, id: "someId" }; const privilege = findPrivilegeById(tariff.privilegeId)?.price || 0
if (!privilege) {
enqueueSnackbar(
`Привилегия с id ${tariff.privilegeId} не найдена в тарифе ${tariff.name} с id ${tariff.id}`
);
}
const price = tariff.isCustom ? (tariff.price || 0) : privilege * tariff.amount || 0
return { tariff, price, id: tariff.id };
} }
export function findDiscountFactor(discount: AnyDiscount): number { export function findDiscountFactor(discount: Discount): any {
switch (discount.conditionType) { if (discount.Condition.CartPurchasesAmount > 0)
case "cartPurchasesAmount": return Number(discount.Target.Factor);
return discount.factor;
case "purchasesAmount": if (discount.Condition.PurchasesAmount > 0)
return discount.factor; return Number(discount.Target.Factor);
case "privilege": {
const product = discount.target.products[0]; if (discount.Condition.Product !== "") {
const product = discount.Target.Products[0];
if (!product) throw new Error("Discount target product not found");
return Number(product.Factor);
}
if ((discount.Condition.Group as string) !== "")
return Number(discount.Target.Factor);
if (discount.Condition.UserType)
return Number(discount.Target.Factor);
if (discount.Condition.User !== "") {
const product = discount.Target.Products[0];
if (!product) throw new Error("Discount target product not found"); if (!product) throw new Error("Discount target product not found");
return product.factor; return Number(product.Factor);
}
case "user": {
const product = discount.target.products[0];
if (!product) throw new Error("Discount target product not found");
return product.factor;
}
case "service":
return discount.target.factor;
case "userType":
return discount.target.factor;
} }
} }

7
src/model/cart.ts
View File

@ -1,4 +1,5 @@
import { ServiceType, Privilege, Tariff } from "./tariff"; import { ServiceType, Privilege, Tariff } from "./tariff";
import { Discount } from "@root/model/discount";
interface DiscountBase { interface DiscountBase {
_id: string; _id: string;
@ -119,7 +120,7 @@ export interface CartItem {
/** Пункт корзины с уже примененными скидками */ /** Пункт корзины с уже примененными скидками */
export interface CartItemTotal { export interface CartItemTotal {
/** Массив с id примененных скидок */ /** Массив с id примененных скидок */
envolvedDiscounts: (PrivilegeDiscount | UserDiscount)[]; envolvedDiscounts: Discount[];
totalPrice: number; totalPrice: number;
tariff: Tariff; tariff: Tariff;
} }
@ -129,7 +130,7 @@ export type ServiceToPriceMap = {
}; };
export type ServiceToDiscountMap = { export type ServiceToDiscountMap = {
[Key in ServiceType]: ServiceDiscount | null; [Key in ServiceType]: Discount | null;
}; };
export interface CartTotal { export interface CartTotal {
@ -139,6 +140,6 @@ export interface CartTotal {
/** Скидки по сервисам */ /** Скидки по сервисам */
discountsByService: ServiceToDiscountMap; discountsByService: ServiceToDiscountMap;
/** Учтенные скидки типов userType, cartPurchasesAmount, totalPurchasesAmount */ /** Учтенные скидки типов userType, cartPurchasesAmount, totalPurchasesAmount */
envolvedCartDiscounts: (UserTypeDiscount | CartPurchasesAmountDiscount | PurchasesAmountDiscount)[]; envolvedCartDiscounts: (Discount)[];
couponState: "applied" | "not found" | null; couponState: "applied" | "not found" | null;
} }

5
src/model/tariff.ts
View File

@ -20,15 +20,16 @@ export type PrivilegeType = "unlim" | "gencount" | "activequiz" | "abcount" | "e
export interface Privilege_BACKEND { export interface Privilege_BACKEND {
name: string; name: string;
privilegeId: string; privilegeId: string;
serviceKey: string; serviceKey: "templategen" | "squiz" | "dwarfener";
amount: number; amount: number;
description: string; description: string;
price: number; price: number;
type: string; type: "count" | "day" | "mb";
value: string; value: string;
updatedAt: string; updatedAt: string;
_id: string; _id: string;
} }
export type Tariff_FRONTEND = { export type Tariff_FRONTEND = {
id: string, id: string,
name: string, name: string,

48
src/pages/Setting/CardPrivilegie.tsx
View File

@ -1,8 +1,10 @@
import { useRef, useState } from "react"; import { useRef, useState } from "react";
import axios from "axios";
import { enqueueSnackbar } from "notistack"; import { enqueueSnackbar } from "notistack";
import { Box, IconButton, TextField, Tooltip, Typography } from "@mui/material"; import { Box, IconButton, TextField, Tooltip, Typography } from "@mui/material";
import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined"; import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined";
import { authStore } from "@root/stores/auth";
import type { Privilege_BACKEND } from "@root/model/tariff";
interface CardPrivilegie { interface CardPrivilegie {
name: string; name: string;
@ -11,14 +13,28 @@ interface CardPrivilegie {
description: string; description: string;
value?: string; value?: string;
privilegeId: string; privilegeId: string;
serviceKey: string; serviceKey: "templategen" | "squiz" | "dwarfener";
amount: number amount: number;
} }
export const СardPrivilegie = ({ name, type, price, description, value, privilegeId, serviceKey }: CardPrivilegie) => { const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
export const СardPrivilegie = ({
name,
type,
price,
description,
value = "",
privilegeId,
serviceKey,
}: CardPrivilegie) => {
const [inputOpen, setInputOpen] = useState<boolean>(false); const [inputOpen, setInputOpen] = useState<boolean>(false);
const [inputValue, setInputValue] = useState<string>(""); const [inputValue, setInputValue] = useState<string>("");
const priceRef = useRef<any>(null); const priceRef = useRef<any>(null);
const { makeRequest } = authStore.getState();
const translationType = { const translationType = {
count: "за единицу", count: "за единицу",
@ -27,15 +43,15 @@ export const СardPrivilegie = ({ name, type, price, description, value, privile
}; };
const PutPrivilegies = () => { const PutPrivilegies = () => {
axios({ makeRequest<Omit<Privilege_BACKEND, "_id" | "updatedAt">>({
url: baseUrl + "/privilege/",
method: "put", method: "put",
url: "https://admin.pena.digital/strator/privilege/", body: {
data: {
name: name, name: name,
privilegeId: privilegeId, privilegeId: privilegeId,
serviceKey: serviceKey, serviceKey: serviceKey,
description: description, description: description,
amount:1, amount: 1,
type: type, type: type,
value: value, value: value,
price: Number(inputValue), price: Number(inputValue),
@ -94,10 +110,18 @@ export const СardPrivilegie = ({ name, type, price, description, value, privile
}, },
}} }}
placement="top" placement="top"
title={<Typography sx={{ fontSize: "16px" }}>{description}</Typography>} title={
<Typography sx={{ fontSize: "16px" }}>{description}</Typography>
}
> >
<IconButton disableRipple> <IconButton disableRipple>
<svg width="40" height="40" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg
width="40"
height="40"
viewBox="0 0 20 20"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path <path
d="M9.25 9.25H10V14.5H10.75" d="M9.25 9.25H10V14.5H10.75"
stroke="#7E2AEA" stroke="#7E2AEA"
@ -117,7 +141,9 @@ export const СardPrivilegie = ({ name, type, price, description, value, privile
</IconButton> </IconButton>
</Box> </Box>
</Box> </Box>
<Box sx={{ width: "600px", display: "flex", justifyContent: "space-around" }}> <Box
sx={{ width: "600px", display: "flex", justifyContent: "space-around" }}
>
{inputOpen ? ( {inputOpen ? (
<TextField <TextField
type="number" type="number"

1
src/pages/Setting/ConditionalRender.tsx
View File

@ -1,4 +1,3 @@
import axios from "axios";
import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
type ConditionalRenderProps = { type ConditionalRenderProps = {

18
src/pages/Setting/FormDeleteRoles.tsx
View File

@ -1,5 +1,4 @@
import { useState } from "react"; import { useState } from "react";
import axios from "axios";
import { import {
Button, Button,
Checkbox, Checkbox,
@ -11,6 +10,7 @@ import {
TextField, TextField,
} from "@mui/material"; } from "@mui/material";
import { MOCK_DATA_USERS } from "@root/api/roles"; import { MOCK_DATA_USERS } from "@root/api/roles";
import { authStore } from "@root/stores/auth";
const ITEM_HEIGHT = 48; const ITEM_HEIGHT = 48;
const ITEM_PADDING_TOP = 8; const ITEM_PADDING_TOP = 8;
@ -22,9 +22,13 @@ const MenuProps = {
}, },
}; };
const baseUrl =
process.env.NODE_ENV === "production" ? "" : "https://admin.pena.digital";
export default function DeleteForm() { export default function DeleteForm() {
const [personName, setPersonName] = useState<string[]>([]); const [personName, setPersonName] = useState<string[]>([]);
const [roleId, setRoleId] = useState<string>(); const [roleId, setRoleId] = useState<string>();
const { makeRequest } = authStore.getState();
const handleChange = (event: SelectChangeEvent<typeof personName>) => { const handleChange = (event: SelectChangeEvent<typeof personName>) => {
const { const {
@ -34,11 +38,14 @@ export default function DeleteForm() {
}; };
const rolesDelete = (id = "") => { const rolesDelete = (id = "") => {
axios.delete("https://admin.pena.digital/role/" + id); makeRequest({ url: baseUrl + "/role/" + id, method: "delete" });
}; };
return ( return (
<> <>
<Button onClick={() => rolesDelete(roleId)} sx={{ mr: "5px", bgcolor: "#fe9903", color: "white" }}> <Button
onClick={() => rolesDelete(roleId)}
sx={{ mr: "5px", bgcolor: "#fe9903", color: "white" }}
>
Удалить Удалить
</Button> </Button>
<TextField <TextField
@ -73,7 +80,10 @@ export default function DeleteForm() {
> >
{MOCK_DATA_USERS.map(({ name, id }) => ( {MOCK_DATA_USERS.map(({ name, id }) => (
<MenuItem key={id} value={name}> <MenuItem key={id} value={name}>
<Checkbox onClick={() => setRoleId(id)} checked={personName.indexOf(name) > -1} /> <Checkbox
onClick={() => setRoleId(id)}
checked={personName.indexOf(name) > -1}
/>
<ListItemText primary={name} /> <ListItemText primary={name} />
</MenuItem> </MenuItem>
))} ))}

47
src/pages/dashboard/Content/DiscountManagement/ControlPanel.tsx Normal file
View File

@ -0,0 +1,47 @@
import { Box, Button, IconButton, useTheme } from "@mui/material";
import { DataGrid, GridColDef, GridRowsProp, GridToolbar } from "@mui/x-data-grid";
import { formatDiscountFactor } from "@root/kitUI/Cart/calc";
import { openEditDiscountDialog, setDiscounts, setSelectedDiscountIds, updateDiscount, useDiscountStore } from "@root/stores/discounts";
import { changeDiscount } from "@root/api/discounts";
import { findDiscountsById } from "@root/stores/discounts";
import { GridSelectionModel, GridRowId } from "@mui/x-data-grid";
import { enqueueSnackbar } from "notistack";
interface Props {
selectedRows: GridSelectionModel
}
export default function DiscountDataGrid({selectedRows}:Props) {
const changeData = (isActive:boolean) => {
let done = 0
let fatal = 0
selectedRows.forEach((id:GridRowId) => {
const discount = findDiscountsById(String(id))
if (discount) {
discount.Deprecated = isActive
changeDiscount(String(id), discount)
.then(() => {
done += 1
})
.catch(() => {
fatal += 1
})
.finally(() => {
if (done) enqueueSnackbar("Успешно изменён статус " + done + " скидок")
if (fatal) enqueueSnackbar(fatal + " скидок не изменили статус")
})
} else {
enqueueSnackbar("Скидка не найдена")
}
})
}
return (
<Box width="400px" display="flex" justifyContent="space-between">
<Button onClick={() => changeData(false)}>Активировать</Button>
<Button onClick={() => changeData(true)}>Деактивировать</Button>
</Box>
);
}

90
src/pages/dashboard/Content/DiscountManagement/DiscountDataGrid.tsx
View File

@ -1,12 +1,24 @@
import { Box, IconButton, useTheme } from "@mui/material"; import { useEffect } from "react";
import { DataGrid, GridColDef, GridRowsProp, GridToolbar } from "@mui/x-data-grid"; import { Box, IconButton, useTheme, Tooltip } from "@mui/material";
import {
DataGrid,
GridColDef,
GridRowsProp,
GridToolbar,
} from "@mui/x-data-grid";
import { formatDiscountFactor } from "@root/kitUI/Cart/calc"; import { formatDiscountFactor } from "@root/kitUI/Cart/calc";
import { openEditDiscountDialog, setDiscounts, setSelectedDiscountIds, updateDiscount, useDiscountStore } from "@root/stores/discounts"; import {
import useDiscounts from "@root/utils/hooks/useDiscounts"; openEditDiscountDialog,
import DeleteIcon from '@mui/icons-material/Delete'; setSelectedDiscountIds,
import EditIcon from '@mui/icons-material/Edit'; updateDiscount,
useDiscountStore,
} from "@root/stores/discounts";
import DeleteIcon from "@mui/icons-material/Delete";
import EditIcon from "@mui/icons-material/Edit";
import { deleteDiscount } from "@root/api/discounts"; import { deleteDiscount } from "@root/api/discounts";
import { GridSelectionModel } from "@mui/x-data-grid";
import { useDiscounts } from "@root/hooks/useDiscounts.hook";
import AutorenewIcon from "@mui/icons-material/Autorenew";
const columns: GridColDef[] = [ const columns: GridColDef[] = [
// { // {
@ -89,13 +101,7 @@ const columns: GridColDef[] = [
}, },
]; ];
const layerTranslate = [ const layerTranslate = ["", "Товар", "Сервис", "корзина", "лояльность"];
"",
"Товар",
"Сервис",
"корзина",
"лояльность",
];
const layerValue = [ const layerValue = [
"", "",
"Term", "Term",
@ -103,37 +109,67 @@ const layerValue = [
"CartPurchasesAmount", "CartPurchasesAmount",
"PurchasesAmount", "PurchasesAmount",
]; ];
interface Props {
export default function DiscountDataGrid() { selectedRowsHC: (array: GridSelectionModel) => void;
}
export default function DiscountDataGrid({ selectedRowsHC }: Props) {
const theme = useTheme(); const theme = useTheme();
const selectedDiscountIds = useDiscountStore((state) => state.selectedDiscountIds); const selectedDiscountIds = useDiscountStore(
const realDiscounts = useDiscountStore(state => state.discounts); (state) => state.selectedDiscountIds
const editDiscountId = useDiscountStore(state => state.editDiscountId); );
const realDiscounts = useDiscountStore((state) => state.discounts);
const editDiscountId = useDiscountStore((state) => state.editDiscountId);
const { requestDiscounts } = useDiscounts();
useDiscounts({ onNewDiscounts: setDiscounts }); useEffect(() => {
requestDiscounts();
}, []);
const rowBackDicounts: GridRowsProp = realDiscounts.filter(e => e.Layer > 0).map(discount => { const rowBackDicounts: GridRowsProp = realDiscounts
console.log(discount.Condition[layerValue[discount.Layer] as keyof typeof discount.Condition]) .filter((e) => e.Layer > 0)
return({ .map((discount) => {
console.log(
discount.Condition[
layerValue[discount.Layer] as keyof typeof discount.Condition
]
);
return {
id: discount.ID, id: discount.ID,
name: discount.Name, name: discount.Name,
description: discount.Description, description: discount.Description,
conditionType: layerTranslate[discount.Layer], conditionType: layerTranslate[discount.Layer],
factor: formatDiscountFactor(discount.Target.Factor), factor: formatDiscountFactor(discount.Target.Factor),
value: discount.Condition[layerValue[discount.Layer] as keyof typeof discount.Condition], value:
discount.Condition[
layerValue[discount.Layer] as keyof typeof discount.Condition
],
active: discount.Deprecated ? "🚫" : "✅", active: discount.Deprecated ? "🚫" : "✅",
deleted: discount.Audit.Deleted, deleted: discount.Audit.Deleted,
})}); };
});
return ( return (
<Box sx={{ width: "100%", marginTop: "55px", p: "16px", maxWidth: "1000px" }}> <Box
sx={{ width: "100%", marginTop: "55px", p: "16px", maxWidth: "1000px" }}
>
<Tooltip title="обновить список привилегий">
<IconButton
onClick={requestDiscounts}
style={{ display: "block", margin: "0 auto" }}
>
<AutorenewIcon sx={{ color: "white" }} />
</IconButton>
</Tooltip>
<Box sx={{ height: 600 }}> <Box sx={{ height: 600 }}>
<DataGrid <DataGrid
checkboxSelection={true} checkboxSelection={true}
rows={rowBackDicounts} rows={rowBackDicounts}
columns={columns} columns={columns}
selectionModel={selectedDiscountIds} selectionModel={selectedDiscountIds}
onSelectionModelChange={setSelectedDiscountIds} onSelectionModelChange={(array: GridSelectionModel) => {
selectedRowsHC(array);
setSelectedDiscountIds(array);
}}
disableSelectionOnClick disableSelectionOnClick
sx={{ sx={{
color: theme.palette.secondary.main, color: theme.palette.secondary.main,

12
src/pages/dashboard/Content/DiscountManagement/DiscountManagement.tsx
View File

@ -4,10 +4,17 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import DiscountDataGrid from "./DiscountDataGrid"; import DiscountDataGrid from "./DiscountDataGrid";
import CreateDiscount from "./CreateDiscount"; import CreateDiscount from "./CreateDiscount";
import EditDiscountDialog from "./EditDiscountDialog"; import EditDiscountDialog from "./EditDiscountDialog";
import ControlPanel from "./ControlPanel";
import { useState } from "react";
import { GridSelectionModel } from "@mui/x-data-grid";
const DiscountManagement: React.FC = () => { const DiscountManagement: React.FC = () => {
const theme = useTheme(); const theme = useTheme();
const [selectedRows, setSelectedRows] = useState<GridSelectionModel>([])
const selectedRowsHC = (array:GridSelectionModel) => {
setSelectedRows(array)
}
return ( return (
<LocalizationProvider dateAdapter={AdapterDayjs}> <LocalizationProvider dateAdapter={AdapterDayjs}>
@ -25,8 +32,11 @@ const DiscountManagement: React.FC = () => {
СКИДКИ СКИДКИ
</Typography> </Typography>
<CreateDiscount /> <CreateDiscount />
<DiscountDataGrid /> <DiscountDataGrid
selectedRowsHC={selectedRowsHC}
/>
<EditDiscountDialog /> <EditDiscountDialog />
<ControlPanel selectedRows={selectedRows}/>
</LocalizationProvider> </LocalizationProvider>
); );
}; };

83
src/pages/dashboard/Content/Tariffs/CreateTariff.tsx
View File

@ -1,66 +1,83 @@
import { useState } from "react"; import { useState } from "react";
import { Typography, Container, Button, Select, MenuItem, FormControl, InputLabel, useTheme, Box } from "@mui/material"; import {
import { nanoid } from "nanoid"; Typography,
Container,
Button,
Select,
MenuItem,
FormControl,
InputLabel,
useTheme,
Box,
} from "@mui/material";
import { enqueueSnackbar } from "notistack"; import { enqueueSnackbar } from "notistack";
import axios from "axios";
import { CustomTextField } from "@root/kitUI/CustomTextField"; import { CustomTextField } from "@root/kitUI/CustomTextField";
import { Tariff } from "@root/model/tariff";
import { authStore } from "@root/stores/auth"; import { authStore } from "@root/stores/auth";
import { findPrivilegeById, usePrivilegeStore } from "@root/stores/privilegesStore"; import {
import { useGetTariffs } from "@root/hooks/useGetTariffs.hook"; findPrivilegeById,
usePrivilegeStore,
} from "@root/stores/privilegesStore";
interface Props { import type { Privilege_BACKEND } from "@root/model/tariff";
getTariffs: () => void
}
export default function CreateTariff() { type CreateTariffProps = {
requestTariffs: () => Promise<void>;
};
const { token } = authStore(); type CreateTariffBackendRequest = {
name: string;
price: number;
isCustom: boolean;
privilegies: Omit<Privilege_BACKEND, "_id" | "updatedAt">[];
};
const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
export default function CreateTariff({ requestTariffs }: CreateTariffProps) {
const { makeRequest } = authStore();
const theme = useTheme(); const theme = useTheme();
const privileges = usePrivilegeStore( store => store.privileges); const privileges = usePrivilegeStore((store) => store.privileges);
const [nameField, setNameField] = useState<string>(""); const [nameField, setNameField] = useState<string>("");
const [amountField, setAmountField] = useState<string>(""); const [amountField, setAmountField] = useState<string>("");
const [customPriceField, setCustomPriceField] = useState<string>(""); const [customPriceField, setCustomPriceField] = useState<string>("");
const [privilegeIdField, setPrivilegeIdField] = useState<string>(""); const [privilegeIdField, setPrivilegeIdField] = useState<string>("");
const privilege = findPrivilegeById(privilegeIdField) const privilege = findPrivilegeById(privilegeIdField);
const { requestTariffs } = useGetTariffs()
const checkFulledFields = () => { const checkFulledFields = () => {
if (nameField.length === 0) { if (nameField.length === 0) {
enqueueSnackbar("Пустое название тарифа"); enqueueSnackbar("Пустое название тарифа");
return false return false;
} }
if (amountField.length === 0) { if (amountField.length === 0) {
enqueueSnackbar("Пустое кол-во едениц привилегии"); enqueueSnackbar("Пустое кол-во едениц привилегии");
return false return false;
} }
if (privilegeIdField.length === 0) { if (privilegeIdField.length === 0) {
enqueueSnackbar("Не выбрана привилегия"); enqueueSnackbar("Не выбрана привилегия");
return false return false;
} }
if (!privilege) { if (!privilege) {
enqueueSnackbar("Привилегия с таким id не найдена"); enqueueSnackbar("Привилегия с таким id не найдена");
return false return false;
}
return true
} }
return true;
};
const createTariffBackend = () => { const createTariffBackend = () => {
if (checkFulledFields() && privilege !== null) { if (checkFulledFields() && privilege !== null) {
axios({ makeRequest<CreateTariffBackendRequest>({
url: "https://admin.pena.digital/strator/tariff/", url: baseUrl + "/tariff/",
method: "post", method: "post",
headers: { bearer: true,
Authorization: `Bearer ${token}`, body: {
},
data: {
name: nameField, name: nameField,
price: Number(customPriceField) * 100, price: Number(customPriceField) * 100,
isCustom: false, isCustom: false,
@ -79,13 +96,13 @@ export default function CreateTariff() {
}, },
}) })
.then(() => { .then(() => {
requestTariffs() requestTariffs();
}) })
.catch(() => { .catch(() => {
enqueueSnackbar("что-то пошло не так") enqueueSnackbar("что-то пошло не так");
}) });
}
} }
};
// const createTariffFrontend = () => { // const createTariffFrontend = () => {
// if (checkFulledFields() && privilege !== null) { // if (checkFulledFields() && privilege !== null) {
// updateTariffStore({ // updateTariffStore({
@ -205,7 +222,7 @@ export default function CreateTariff() {
/> />
<Button <Button
onClick={() => { onClick={() => {
createTariffBackend() createTariffBackend();
}} }}
> >
Создать Создать

63
src/kitUI/DeleteModal.tsx → src/pages/dashboard/Content/Tariffs/DeleteModal.tsx
View File

@ -6,56 +6,65 @@ import Modal from "@mui/material/Modal";
import { GridSelectionModel } from "@mui/x-data-grid"; import { GridSelectionModel } from "@mui/x-data-grid";
import { useTariffStore } from "@root/stores/tariffsStore"; import { useTariffStore } from "@root/stores/tariffsStore";
import { enqueueSnackbar } from "notistack"; import { enqueueSnackbar } from "notistack";
import axios from "axios";
import { authStore } from "@root/stores/auth"; import { authStore } from "@root/stores/auth";
import { useGetTariffs } from "@root/hooks/useGetTariffs.hook";
type DeleteModalProps = { type DeleteModalProps = {
open: boolean | string; open: boolean | string;
handleClose: () => void; handleClose: () => void;
selectedTariffs: any; selectedTariffs: any;
requestTariffs: () => Promise<void>;
}; };
type DeleteTariffRequest = {
id: string;
};
const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
export default function DeleteModal({ export default function DeleteModal({
open, open,
handleClose, handleClose,
selectedTariffs selectedTariffs,
requestTariffs,
}: DeleteModalProps) { }: DeleteModalProps) {
const { requestTariffs } = useGetTariffs() const { makeRequest } = authStore();
const { token } = authStore();
const tariffs = useTariffStore((state) => state.tariffs); const tariffs = useTariffStore((state) => state.tariffs);
const deleteTariff = async (id: string): Promise<void> => { const deleteTariff = async (id: string): Promise<void> => {
const currentTariff = tariffs[id] const currentTariff = tariffs[id];
if (!currentTariff) { if (!currentTariff) {
enqueueSnackbar("Тариф не найден"); enqueueSnackbar("Тариф не найден");
return return;
} }
try { try {
await axios.delete("https://admin.pena.digital/strator/tariff/", { await makeRequest<DeleteTariffRequest>({
data: { id }, url: baseUrl + "/tariff/",
headers: { Authorization: `Bearer ${token}` }, method: "delete",
bearer: true,
body: { id },
}); });
} catch { } catch {
enqueueSnackbar("Ошибка при удалении тарифа на бэкэнде"); enqueueSnackbar("Ошибка при удалении тарифа на бэкэнде");
} }
}; };
const onClickTariffDelete = () => { const onClickTariffDelete = () => {
if (typeof open === 'string' ) { if (typeof open === "string") {
deleteTariff(open) deleteTariff(open);
requestTariffs() requestTariffs();
handleClose(); handleClose();
return return;
} }
selectedTariffs.forEach((id:string) => { selectedTariffs.forEach((id: string) => {
deleteTariff(id) deleteTariff(id);
}) });
handleClose(); handleClose();
requestTariffs() requestTariffs();
}; };
return ( return (
<div> <div>
@ -80,12 +89,22 @@ export default function DeleteModal({
}} }}
> >
<Typography id="modal-modal-title" variant="h6" component="h2"> <Typography id="modal-modal-title" variant="h6" component="h2">
Вы уверены, что хотите удалить {typeof open === 'string' ? "тариф" : "тарифы"} ? Вы уверены, что хотите удалить{" "}
{typeof open === "string" ? "тариф" : "тарифы"} ?
</Typography> </Typography>
<Box <Box
sx={{ mt: "20px", display: "flex", width: "332px", justifyContent: "space-between", alignItems: "center" }} sx={{
mt: "20px",
display: "flex",
width: "332px",
justifyContent: "space-between",
alignItems: "center",
}}
>
<Button
onClick={() => onClickTariffDelete()}
sx={{ width: "40px", height: "25px" }}
> >
<Button onClick={() => onClickTariffDelete()} sx={{ width: "40px", height: "25px" }}>
Да Да
</Button> </Button>
{/* <Typography>Тариф:</Typography> {/* <Typography>Тариф:</Typography>

153
src/pages/dashboard/Content/Tariffs/EditModal.tsx
View File

@ -5,64 +5,72 @@ import Button from "@mui/material/Button";
import Typography from "@mui/material/Typography"; import Typography from "@mui/material/Typography";
import Modal from "@mui/material/Modal"; import Modal from "@mui/material/Modal";
import TextField from "@mui/material/TextField"; import TextField from "@mui/material/TextField";
import axios from "axios";
import { authStore } from "@root/stores/auth"; import { authStore } from "@root/stores/auth";
import { Privilege, Tariff } from "@root/model/tariff"; import { Privilege, Tariff } from "@root/model/tariff";
import { useTariffStore, updateTariff } from "@root/stores/tariffsStore"; import { useTariffStore } from "@root/stores/tariffsStore";
import { arrayBuffer } from "stream/consumers";
import { useGetTariffs } from "@root/hooks/useGetTariffs.hook";
import { findPrivilegeById } from "@root/stores/privilegesStore"; import { findPrivilegeById } from "@root/stores/privilegesStore";
import { enqueueSnackbar } from "notistack"; import { enqueueSnackbar } from "notistack";
interface EditProps { interface EditProps {
tarifIid: string, tarifIid: string;
tariffName: string, tariffName: string;
tariffPrice: number, tariffPrice: number;
privilege: Privilege, privilege: Privilege;
token: string
} }
type EditTariffBackendRequest = {
name: string;
price: number;
isCustom: boolean;
privilegies: Omit<Privilege_BACKEND, "_id" | "updatedAt">[];
};
const baseUrl =
process.env.NODE_ENV === "production"
? "/strator"
: "https://admin.pena.digital/strator";
const editTariff = ({ const editTariff = ({
tarifIid, tarifIid,
tariffName, tariffName,
tariffPrice, tariffPrice,
privilege, privilege,
token }: EditProps): Promise<unknown> => {
}:EditProps): Promise<unknown> => { const { makeRequest } = authStore.getState();
return axios({
return makeRequest<EditTariffBackendRequest>({
method: "put", method: "put",
url: `https://admin.pena.digital/strator/tariff/${tarifIid}`, url: baseUrl + `/tariff/${tarifIid}`,
headers: { bearer: true,
Authorization: `Bearer ${token}`, body: {
},
data: {
name: tariffName, name: tariffName,
price: tariffPrice, price: tariffPrice,
isCustom: false, isCustom: false,
privilegies: [privilege] privilegies: [privilege],
}, },
}); });
} };
interface Props { interface Props {
tariff: Tariff tariff: Tariff;
requestTariffs: () => Promise<void>;
} }
export default function EditModal({tariff = undefined}:Props) { export default function EditModal({
tariff = undefined,
requestTariffs,
}: Props) {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const [name, setName] = useState(""); const [name, setName] = useState("");
const [price, setPrice] = useState(""); const [price, setPrice] = useState("");
const { token } = authStore();
const tariffs = useTariffStore((state) => state.tariffs); const tariffs = useTariffStore((state) => state.tariffs);
const currentTariff = tariff ? tariffs[tariff.id] : undefined const currentTariff = tariff ? tariffs[tariff.id] : undefined;
const { requestTariffs } = useGetTariffs()
useEffect(() => { useEffect(() => {
setOpen(tariff !== undefined) setOpen(tariff !== undefined);
}, [tariff]) }, [tariff]);
return <Modal return (
<Modal
open={open} open={open}
onClose={() => setOpen(false)} onClose={() => setOpen(false)}
aria-labelledby="modal-modal-title" aria-labelledby="modal-modal-title"
@ -82,7 +90,12 @@ export default function EditModal({tariff = undefined}:Props) {
p: 4, p: 4,
}} }}
> >
<Typography id="modal-modal-title" variant="h6" component="h2" sx={{ whiteSpace: "nowrap" }}> <Typography
id="modal-modal-title"
variant="h6"
component="h2"
sx={{ whiteSpace: "nowrap" }}
>
Редактирование тариффа Редактирование тариффа
</Typography> </Typography>
@ -96,7 +109,9 @@ export default function EditModal({tariff = undefined}:Props) {
value={name} value={name}
sx={{ marginBottom: "10px" }} sx={{ marginBottom: "10px" }}
/> />
<Typography>Цена за единицу: {currentTariff.pricePerUnit}</Typography> <Typography>
Цена за единицу: {currentTariff.pricePerUnit}
</Typography>
<TextField <TextField
onChange={(event) => setPrice(event.target.value)} onChange={(event) => setPrice(event.target.value)}
label="Цена за единицу" label="Цена за единицу"
@ -104,57 +119,67 @@ export default function EditModal({tariff = undefined}:Props) {
value={price} value={price}
sx={{ marginBottom: "10px" }} sx={{ marginBottom: "10px" }}
/> />
<Button onClick={() => { <Button
onClick={() => {
if (!currentTariff.isFront) { if (!currentTariff.isFront) {
const privilege = findPrivilegeById(currentTariff.privilegeId); const privilege = findPrivilegeById(
privilege.privilegeId = privilege.id currentTariff.privilegeId
console.log(privilege) );
privilege.privilegeId = privilege.id;
console.log(privilege);
//back //back
if (privilege !== null) { if (privilege !== null) {
privilege.amount = tariff.amount;
privilege.amount = tariff.amount privilege.privilegeName = privilege.name;
privilege.privilegeName = privilege.name privilege.privilegeId = privilege.id;
privilege.privilegeId = privilege.id privilege.serviceName = privilege.serviceKey;
privilege.serviceName = privilege.serviceKey console.log(privilege);
console.log(privilege)
editTariff({ editTariff({
tarifIid: currentTariff.id, tarifIid: currentTariff.id,
tariffName: name ? name : currentTariff.name, tariffName: name ? name : currentTariff.name,
tariffPrice: price ? Number(price) : currentTariff.price ? currentTariff.price : privilege.price, tariffPrice: price
? Number(price)
: currentTariff.price
? currentTariff.price
: privilege.price,
isDeleted: currentTariff.isDeleted, isDeleted: currentTariff.isDeleted,
customPricePerUnit: currentTariff.price, customPricePerUnit: currentTariff.price,
privilege: privilege, privilege: privilege,
token: token }).then(() => {
}) setOpen(false);
.then(() => { requestTariffs();
setOpen(false) });
requestTariffs()
})} else {
enqueueSnackbar(`Привилегия с id ${currentTariff.privilegeId} не найдена в тарифе ${currentTariff.name} с id ${currentTariff.id}`)
}
} else {//front/store
let array = tariffs
let index
tariffs.forEach((p:any, i:number) => {
if (currentTariff.id == p.id) index = i
})
if (index !== undefined) {
array[index].name = name
array[index].amount = Number(price)
updateTariffs(array)
setOpen(false)
} else { } else {
console.log("не нашел такой тариф в сторе") enqueueSnackbar(
`Привилегия с id ${currentTariff.privilegeId} не найдена в тарифе ${currentTariff.name} с id ${currentTariff.id}`
);
} }
} else {
//front/store
let array = tariffs;
let index;
tariffs.forEach((p: any, i: number) => {
if (currentTariff.id == p.id) index = i;
});
if (index !== undefined) {
array[index].name = name;
array[index].amount = Number(price);
updateTariffs(array);
setOpen(false);
} else {
console.log("не нашел такой тариф в сторе");
} }
}}>Редактировать</Button> }
}}
>
Редактировать
</Button>
</Box> </Box>
)} )}
</Box> </Box>
</Modal> </Modal>
);
} }

26
src/pages/dashboard/Content/Tariffs/Privileges/Privileges.tsx
View File

@ -1,8 +1,8 @@
import { GridColDef } from "@mui/x-data-grid"; import { GridColDef } from "@mui/x-data-grid";
import DataGrid from "@kitUI/datagrid"; import DataGrid from "@kitUI/datagrid";
import { Typography } from "@mui/material"; import { Tooltip, IconButton } from "@mui/material";
import { useCombinedPrivileges } from "@root/hooks/useCombinedPrivileges.hook";
import { usePrivilegeStore } from "@root/stores/privilegesStore"; import { usePrivilegeStore } from "@root/stores/privilegesStore";
import AutorenewIcon from "@mui/icons-material/Autorenew";
const columns: GridColDef[] = [ const columns: GridColDef[] = [
{ field: "id", headerName: "id", width: 150 }, { field: "id", headerName: "id", width: 150 },
@ -12,13 +12,15 @@ const columns: GridColDef[] = [
{ field: "price", headerName: "Стоимость", width: 100 }, { field: "price", headerName: "Стоимость", width: 100 },
]; ];
export default function Privileges() { type Props = {
requestPrivilegies: () => Promise<void>;
};
export default function Privileges({ requestPrivilegies }: Props) {
const privileges = usePrivilegeStore((state) => state.privileges); const privileges = usePrivilegeStore((state) => state.privileges);
// const { mergedPrivileges } = useCombinedPrivileges(); // const { mergedPrivileges } = useCombinedPrivileges();
const privilegesGridData = privileges const privilegesGridData = privileges
.filter(privilege => ( .filter((privilege) => !privilege.isDeleted)
!privilege.isDeleted
))
.map((privilege) => ({ .map((privilege) => ({
id: privilege.privilegeId, id: privilege.privilegeId,
name: privilege.name, name: privilege.name,
@ -28,9 +30,13 @@ export default function Privileges() {
})); }));
return ( return (
<DataGrid <>
rows={privilegesGridData} <Tooltip title="обновить список привилегий">
columns={columns} <IconButton onClick={requestPrivilegies}>
/> <AutorenewIcon sx={{ color: "white" }} />
</IconButton>
</Tooltip>
<DataGrid rows={privilegesGridData} columns={columns} />
</>
); );
} }

44
src/pages/dashboard/Content/Tariffs/index.tsx
View File

@ -4,27 +4,27 @@ import { GridSelectionModel } from "@mui/x-data-grid";
import Cart from "@root/kitUI/Cart/Cart"; import Cart from "@root/kitUI/Cart/Cart";
import axios from "axios"; import { useTariffs } from "@root/hooks/useTariffs.hook";
import { enqueueSnackbar } from "notistack"; import { usePrivilegies } from "@root/hooks/usePrivilegies.hook";
import { authStore } from "@root/stores/auth"; import { useDiscounts } from "@root/hooks/useDiscounts.hook";
import { useTariffStore } from "@root/stores/tariffsStore";
import { usePrivilegeStore } from "@root/stores/privilegesStore";
import { useGetTariffs } from "@root/hooks/useGetTariffs.hook";
import TariffsDG from "./tariffsDG"; import TariffsDG from "./tariffsDG";
import CreateTariff from "./CreateTariff"; import CreateTariff from "./CreateTariff";
import Privileges from "./Privileges/Privileges"; import Privileges from "./Privileges/Privileges";
import ChangePriceModal from "./Privileges/ChangePriceModal"; import ChangePriceModal from "./Privileges/ChangePriceModal";
import {useRefreshPrivilegesStore} from "@root/hooks/useRefreshPrivilegesStore.hook"
import { Tariff } from "@root/model/tariff";
export default function Tariffs() { export default function Tariffs() {
const token = authStore((state) => state.token); const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>(
// const tariffs = useTariffStore((state) => state.tariffs); []
const privileges = usePrivilegeStore((state) => state.privileges); );
const tariffs = useTariffStore((state) => state.tariffs); const { requestTariffs } = useTariffs();
const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>([]); const { requestPrivilegies } = usePrivilegies();
const { requestDiscounts } = useDiscounts();
useEffect(() => {
requestTariffs();
requestPrivilegies();
}, []);
return ( return (
<Container <Container
@ -36,28 +36,28 @@ export default function Tariffs() {
alignItems: "center", alignItems: "center",
}} }}
> >
<button onClick={() => console.log(privileges)}>provileges</button>
<button onClick={() => console.log(tariffs)}>tariffs</button>
<Typography variant="h6">Список привилегий</Typography> <Typography variant="h6">Список привилегий</Typography>
<Privileges /> <Privileges requestPrivilegies={requestPrivilegies} />
<ChangePriceModal /> <ChangePriceModal />
<CreateTariff /> <CreateTariff requestTariffs={requestTariffs} />
<Typography variant="h6" mt="20px"> <Typography variant="h6" mt="20px">
Список тарифов Список тарифов
</Typography> </Typography>
<TariffsDG <TariffsDG
selectedTariffs={selectedTariffs} selectedTariffs={selectedTariffs}
handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)} handleSelectionChange={setSelectedTariffs}
requestTariffs={requestTariffs}
/> />
<Cart selectedTariffs={selectedTariffs} /> <Cart
requestPrivilegies={requestPrivilegies}
requestDiscounts={requestDiscounts}
selectedTariffs={selectedTariffs}
/>
</Container> </Container>
); );
} }

70
src/pages/dashboard/Content/Tariffs/tariffsDG.tsx
View File

@ -1,39 +1,41 @@
// @ts-nocheck // @ts-nocheck
import React from "react"; import React from "react";
import { useEffect, useState } from "react"; import { useState } from "react";
import { GridColDef, GridSelectionModel, GridToolbar } from "@mui/x-data-grid"; import { GridColDef, GridSelectionModel, GridToolbar } from "@mui/x-data-grid";
import { Box, Button, IconButton } from "@mui/material"; import { Box, Button, IconButton, Tooltip } from "@mui/material";
import BackspaceIcon from "@mui/icons-material/Backspace"; import BackspaceIcon from "@mui/icons-material/Backspace";
import { enqueueSnackbar } from "notistack";
import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined"; import ModeEditOutlineOutlinedIcon from "@mui/icons-material/ModeEditOutlineOutlined";
import DataGrid from "@kitUI/datagrid"; import DataGrid from "@kitUI/datagrid";
import { deleteTariffs, useTariffStore } from "@root/stores/tariffsStore"; import { useTariffStore } from "@root/stores/tariffsStore";
import { SERVICE_LIST } from "@root/model/tariff";
import { findPrivilegeById } from "@root/stores/privilegesStore"; import { findPrivilegeById } from "@root/stores/privilegesStore";
import axios from "axios"; import DeleteModal from "@root/pages/dashboard/Content/Tariffs/DeleteModal";
import { authStore } from "@root/stores/auth";
import DeleteModal from "@root/kitUI/DeleteModal";
import EditModal from "./EditModal"; import EditModal from "./EditModal";
import { Tariff } from "@root/model/tariff"; import { Tariff } from "@root/model/tariff";
import AutorenewIcon from "@mui/icons-material/Autorenew";
interface Props { interface Props {
selectedTariffs: GridSelectionModel; selectedTariffs: GridSelectionModel;
handleSelectionChange: (selectionModel: GridSelectionModel) => void; handleSelectionChange: (selectionModel: GridSelectionModel) => void;
requestTariffs: () => Promise<void>;
} }
export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Props) { export default function TariffsDG({
const tariffs = Object.values(useTariffStore().tariffs) selectedTariffs,
const [deletedRows, setDeletedRows] = useState<string[]>([]); handleSelectionChange,
requestTariffs,
}: Props) {
const tariffs = Object.values(useTariffStore().tariffs);
const [openDeleteModal, setOpenDeleteModal] = useState(false); const [openDeleteModal, setOpenDeleteModal] = useState(false);
const [changingTariff, setChangingTariff] = useState<Tariff | undefined>(); const [changingTariff, setChangingTariff] = useState<Tariff | undefined>();
const [tariffDelete, setTariffDelete] = useState(false);
console.log(selectedTariffs);
const closeDeleteModal = () => { const closeDeleteModal = () => {
setOpenDeleteModal(false) setOpenDeleteModal(false);
} };
const columns: GridColDef[] = [ const columns: GridColDef[] = [
{ field: "id", headerName: "ID", width: 100 }, { field: "id", headerName: "ID", width: 100 },
@ -75,25 +77,26 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr
}, },
]; ];
const gridData = tariffs const gridData = tariffs
?.map((tariff) => { ?.map((tariff) => {
console.log(tariff);
const privilege = findPrivilegeById(tariff.privilegeId); const privilege = findPrivilegeById(tariff.privilegeId);
console.log(tariff.privilegeId)
console.log(privilege)
return { return {
id: tariff.id, id: tariff.id,
name: tariff.name, name: tariff.name,
serviceName: privilege?.serviceKey == "templategen" ? "Шаблонизатор" : privilege?.serviceKey, serviceName:
privilege?.serviceKey == "templategen"
? "Шаблонизатор"
: privilege?.serviceKey,
privilegeName: privilege?.name, privilegeName: privilege?.name,
amount: tariff.amount, amount: tariff.amount,
pricePerUnit: tariff.isCustom pricePerUnit: tariff.isCustom
? (tariff.customPricePerUnit || 0) / 100 ? (tariff.customPricePerUnit || 0) / 100
: (tariff?.price || 0) / 100, : (tariff?.price || 0) / 100,
type: type:
findPrivilegeById(tariff.privilegeId)?.type === "count" findPrivilegeById(tariff.privilegeId)?.value === "шаблон"
? "день" ? "штука"
: "шт.", : findPrivilegeById(tariff.privilegeId)?.value,
customPricePerUnit: tariff.customPricePerUnit === 0 ? "Нет" : "Да", customPricePerUnit: tariff.customPricePerUnit === 0 ? "Нет" : "Да",
total: tariff.amount total: tariff.amount
? (tariff.amount * ? (tariff.amount *
@ -106,10 +109,15 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr
}) })
.sort((item, previous) => (!item?.isFront && previous?.isFront ? 1 : -1)); .sort((item, previous) => (!item?.isFront && previous?.isFront ? 1 : -1));
console.log(gridData) // console.log(gridData)
return ( return (
<> <>
<Tooltip title="обновить список тарифов">
<IconButton onClick={() => requestTariffs()}>
<AutorenewIcon sx={{ color: "white" }} />
</IconButton>
</Tooltip>
<DataGrid <DataGrid
disableSelectionOnClick={true} disableSelectionOnClick={true}
checkboxSelection={true} checkboxSelection={true}
@ -120,8 +128,19 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr
onSelectionModelChange={handleSelectionChange} onSelectionModelChange={handleSelectionChange}
/> />
{selectedTariffs.length ? ( {selectedTariffs.length ? (
<Box component="section" sx={{ width: "100%", display: "flex", justifyContent: "start", mb: "30px" }}> <Box
<Button onClick={() => setOpenDeleteModal(true)} sx={{ mr: "20px", zIndex: "10000" }}> component="section"
sx={{
width: "100%",
display: "flex",
justifyContent: "start",
mb: "30px",
}}
>
<Button
onClick={() => setOpenDeleteModal(true)}
sx={{ mr: "20px", zIndex: "10000" }}
>
Удаление Удаление
</Button> </Button>
</Box> </Box>
@ -134,8 +153,9 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr
closeDeleteModal(); closeDeleteModal();
}} }}
selectedTariffs={selectedTariffs} selectedTariffs={selectedTariffs}
requestTariffs={requestTariffs}
/> />
<EditModal tariff={changingTariff}/> <EditModal tariff={changingTariff} requestTariffs={requestTariffs} />
</> </>
); );
} }

48
src/pages/dashboard/Content/Users.tsx
View File

@ -1,7 +1,6 @@
import * as React from "react"; import * as React from "react";
import { useState, useEffect } from "react"; import { useState, useEffect } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import axios from "axios";
import { import {
AccordionDetails, AccordionDetails,
AccordionSummary, AccordionSummary,
@ -33,6 +32,9 @@ import theme from "../../../theme";
import type { UsersType } from "../../../api/roles"; import type { UsersType } from "../../../api/roles";
const baseUrl =
process.env.NODE_ENV === "production" ? "" : "https://admin.pena.digital";
const Users: React.FC = () => { const Users: React.FC = () => {
const { makeRequest } = authStore(); const { makeRequest } = authStore();
// makeRequest({ // makeRequest({
@ -89,22 +91,24 @@ const Users: React.FC = () => {
useEffect(() => { useEffect(() => {
async function axiosRoles() { async function axiosRoles() {
try { try {
const { data } = await axios({ const rolesResponse = await makeRequest<never, TMockData>({
method: "get", method: "get",
url: "https://admin.pena.digital/strator/role/", url: baseUrl + "/strator/role/",
}); });
setRoles(data);
setRoles(rolesResponse);
} catch (error) { } catch (error) {
console.error("Ошибка при получении ролей!"); console.error("Ошибка при получении ролей!");
} }
} }
async function gettingRegisteredUsers() { async function gettingRegisteredUsers() {
try { try {
const { data } = await axios({ const usersResponse = await makeRequest<never, UsersType>({
method: "get", method: "get",
url: "https://hub.pena.digital/user/", url: baseUrl + "/user/",
}); });
setUsers(data);
setUsers(usersResponse);
} catch (error) { } catch (error) {
console.error("Ошибка при получении пользователей!"); console.error("Ошибка при получении пользователей!");
} }
@ -112,11 +116,12 @@ const Users: React.FC = () => {
async function gettingListManagers() { async function gettingListManagers() {
try { try {
const { data } = await axios({ const managersResponse = await makeRequest<never, UsersType>({
method: "get", method: "get",
url: "https://hub.pena.digital/user/", url: baseUrl + "/user/",
}); });
setManager(data);
setManager(managersResponse);
} catch (error) { } catch (error) {
console.error("Ошибка при получении менеджеров!"); console.error("Ошибка при получении менеджеров!");
} }
@ -127,7 +132,9 @@ const Users: React.FC = () => {
axiosRoles(); axiosRoles();
}, [selectedValue]); }, [selectedValue]);
const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>([]); const [selectedTariffs, setSelectedTariffs] = useState<GridSelectionModel>(
[]
);
return ( return (
<React.Fragment> <React.Fragment>
<Button <Button
@ -187,7 +194,10 @@ const Users: React.FC = () => {
alignItems: "right", alignItems: "right",
}} }}
> >
<ClearIcon sx={{ color: theme.palette.secondary.main }} onClick={() => handleChangeAccordion("")} /> <ClearIcon
sx={{ color: theme.palette.secondary.main }}
onClick={() => handleChangeAccordion("")}
/>
</Box> </Box>
</AccordionSummary> </AccordionSummary>
<AccordionDetails> <AccordionDetails>
@ -414,20 +424,28 @@ const Users: React.FC = () => {
</Box> </Box>
</Box> </Box>
</Box> </Box>
<Box component="section" sx={{ width: "90%", mt: "45px", display: "flex", justifyContent: "center" }}> <Box
component="section"
sx={{
width: "90%",
mt: "45px",
display: "flex",
justifyContent: "center",
}}
>
<ConditionalRender <ConditionalRender
isLoading={false} isLoading={false}
role={selectedValue} role={selectedValue}
childrenManager={ childrenManager={
<ServiceUsersDG <ServiceUsersDG
users={manager} users={manager}
handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)} handleSelectionChange={setSelectedTariffs}
/> />
} }
childrenUser={ childrenUser={
<ServiceUsersDG <ServiceUsersDG
users={users} users={users}
handleSelectionChange={(selectionModel) => setSelectedTariffs(selectionModel)} handleSelectionChange={setSelectedTariffs}
/> />
} }
/> />

65
src/pages/dashboard/index.tsx
View File

@ -1,49 +1,47 @@
import * as React from "react"; import * as React from "react";
import {Outlet} from 'react-router-dom' import { Outlet } from "react-router-dom";
import {useTheme} from '@mui/material/styles'; import { useTheme } from "@mui/material/styles";
import {Box} from "@mui/material"; import { Box } from "@mui/material";
import {ThemeProvider} from "@mui/material"; import { ThemeProvider } from "@mui/material";
import CssBaseline from '@mui/material/CssBaseline'; import CssBaseline from "@mui/material/CssBaseline";
import Menu from "./Menu"; import Menu from "./Menu";
import Header from "./Header"; import Header from "./Header";
import ModalAdmin from "./ModalAdmin"; import ModalAdmin from "./ModalAdmin";
import ModalUser from "./ModalUser"; import ModalUser from "./ModalUser";
import ModalEntities from "./ModalEntities"; import ModalEntities from "./ModalEntities";
import {useMatch} from "react-router-dom"; import { useMatch } from "react-router-dom";
import {useRefreshPrivilegesStore} from "@root/hooks/useRefreshPrivilegesStore.hook"
import { useGetTariffs } from "@root/hooks/useGetTariffs.hook";
export default () => { export default () => {
useRefreshPrivilegesStore() const theme = useTheme();
const {requestTariffs} = useGetTariffs()
React.useEffect(() => {
requestTariffs()
},[])
const theme = useTheme()
return ( return (
<React.Fragment> <React.Fragment>
<Box sx={{ <Box
sx={{
backgroundColor: theme.palette.primary.main, backgroundColor: theme.palette.primary.main,
color: theme.palette.secondary.main, color: theme.palette.secondary.main,
height: "100%" height: "100%",
}} }}
> >
<Box sx={{ <Box
sx={{
backgroundColor: theme.palette.content.main, backgroundColor: theme.palette.content.main,
display: "flex", display: "flex",
width: "100%", width: "100%",
height: "100%" height: "100%",
}}> }}
>
<Menu/> <Menu />
<Box sx={{ <Box
sx={{
width: "100%", width: "100%",
display: "flex", display: "flex",
flexDirection: "column", flexDirection: "column",
justifyContent: "space-between", justifyContent: "space-between",
alignItems: "center" alignItems: "center",
}}> }}
<Box sx={{ >
<Box
sx={{
width: "100%", width: "100%",
height: "100vh", height: "100vh",
display: "flex", display: "flex",
@ -51,17 +49,18 @@ export default () => {
alignItems: "center", alignItems: "center",
overflow: "auto", overflow: "auto",
overflowY: "auto", overflowY: "auto",
padding: "160px 5px" padding: "160px 5px",
}}> }}
<Outlet/> >
<Outlet />
</Box> </Box>
</Box> </Box>
</Box> </Box>
</Box> </Box>
<ModalAdmin open={useMatch('/modalAdmin') !== null}/> <ModalAdmin open={useMatch("/modalAdmin") !== null} />
<ModalUser open={useMatch('/modalUser') !== null}/> <ModalUser open={useMatch("/modalUser") !== null} />
<ModalEntities open={useMatch('/modalEntities') !== null}/> <ModalEntities open={useMatch("/modalEntities") !== null} />
</React.Fragment> </React.Fragment>
) );
} };

2
src/stores/discounts.ts
View File

@ -29,6 +29,8 @@ export const useDiscountStore = create<DiscountStore>()(
export const setDiscounts = (discounts: DiscountStore["discounts"]) => useDiscountStore.setState({ discounts }); export const setDiscounts = (discounts: DiscountStore["discounts"]) => useDiscountStore.setState({ discounts });
export const findDiscountsById = (discountId: string):(Discount| null) => useDiscountStore.getState().discounts.find(discount => discount.ID === discountId) ?? null;
export const addDiscount = (discount: DiscountStore["discounts"][number]) => useDiscountStore.setState( export const addDiscount = (discount: DiscountStore["discounts"][number]) => useDiscountStore.setState(
state => ({ discounts: [...state.discounts, discount] }) state => ({ discounts: [...state.discounts, discount] })
); );

BIN
src/stores/tariffs.ts.zip Normal file
View File

Binary file not shown.

31
src/utils/hooks/useDiscounts.ts
View File

@ -1,31 +0,0 @@
import { Discount, GetDiscountResponse } from "@root/model/discount";
import { authStore } from "@root/stores/auth";
import { useEffect } from "react";
const makeRequest = authStore.getState().makeRequest;
export default function useDiscounts({ onError, onNewDiscounts }: {
onNewDiscounts: (response: Discount[]) => void;
onError?: (error: any) => void;
}) {
useEffect(() => {
const controller = new AbortController();
makeRequest<never, GetDiscountResponse>({
url: "https://admin.pena.digital/price/discounts",
method: "get",
useToken: true,
bearer: true,
signal: controller.signal,
}).then(result => {
console.log("New discounts", result);
onNewDiscounts(result.Discounts);
}).catch(error => {
console.log("Error fetching discounts", error);
onError?.(error);
});
return () => controller.abort();
}, [onError, onNewDiscounts]);
}