diff --git a/src/hooks/useCombinedPrivileges.hook.ts b/src/hooks/useCombinedPrivileges.hook.ts index 569d05f..8954697 100644 --- a/src/hooks/useCombinedPrivileges.hook.ts +++ b/src/hooks/useCombinedPrivileges.hook.ts @@ -28,9 +28,16 @@ export const useCombinedPrivileges = () => { return privilege?._id; }; + const privilegesGridData = mergedPrivileges.map((privilege) => ({ + name: privilege.name, + description: privilege.description, + type: privilege.type, + price: privilege.price, + })); + if (privilegies) { mergedPrivileges.push(...privilegies.Шаблонизатор, ...examplePrivileges); } - return { mergedPrivileges, isError, errorMessage, getPrivilegeId }; + return { mergedPrivileges, isError, errorMessage, getPrivilegeId, privilegesGridData }; }; diff --git a/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx b/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx index 026954b..b00cdaf 100644 --- a/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx +++ b/src/pages/dashboard/Content/Tariffs/CreateTariff.tsx @@ -6,7 +6,6 @@ import axios from "axios"; import { CustomTextField } from "@root/kitUI/CustomTextField"; - import { addTariffs } from "@root/stores/tariffs"; import { authStore } from "@root/stores/auth"; import { mergedPrivilegeStore } from "@root/stores/mergedPrivileges"; @@ -27,79 +26,78 @@ export default function CreateTariff() { const privilege = findPrivilegeById(privilegeIdField); - console.log(privilege); + console.log(mergedPrivileges); -// function handleCreateTariffClick() { -// if (nameField === "") { -// enqueueSnackbar("Пустое название тарифа"); -// } -// if (amountField === "") { -// enqueueSnackbar("Пустое кол-во едениц привилегия"); -// } -// if (privilegeIdField === "") { -// enqueueSnackbar("Не выбрана привилегия"); -// } + // function handleCreateTariffClick() { + // if (nameField === "") { + // enqueueSnackbar("Пустое название тарифа"); + // } + // if (amountField === "") { + // enqueueSnackbar("Пустое кол-во едениц привилегия"); + // } + // if (privilegeIdField === "") { + // enqueueSnackbar("Не выбрана привилегия"); + // } -// const amount = Number(amountField); -// const customPrice = Number(customPriceField); + // const amount = Number(amountField); + // const customPrice = Number(customPriceField); -// if (isNaN(amount) || !privilege) return; + // if (isNaN(amount) || !privilege) return; -// const newTariff: Tariff = { -// id: nanoid(5), -// name: nameField, -// amount:amount, -// isFront: true, -// privilegeId: privilege.privilegeId, -// customPricePerUnit: customPrice ? customPrice / amount : undefined, -// }; -// addTariffs([newTariff]); + // const newTariff: Tariff = { + // id: nanoid(5), + // name: nameField, + // amount:amount, + // isFront: true, + // privilegeId: privilege.privilegeId, + // customPricePerUnit: customPrice ? customPrice / amount : undefined, + // }; + // addTariffs([newTariff]); - -// } + // } -// const createTariff = async () => { -// if (nameField === "" || amountField === "" || privilegeIdField === "") { -// return; -// } + // const createTariff = async () => { + // if (nameField === "" || amountField === "" || privilegeIdField === "") { + // return; + // } -// try { -// if (!privilege) { -// throw new Error("Привилегия не выбрана"); -// } + // try { + // if (!privilege) { + // throw new Error("Привилегия не выбрана"); + // } -// if (!privilege._id) { -// return; -// } + // if (!privilege._id) { + // return; + // } -// const { data } = await axios({ -// url: "https://admin.pena.digital/strator/tariff/", -// method: "post", -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// data: { -// name: nameField, -// price: Number(customPriceField) * 100, -// isCustom: false, -// privilegies: [ -// { -// name: privilege.name, -// privilegeId: privilege._id, -// serviceKey: privilege.serviceKey, -// description: privilege.description, -// type: privilege.type, -// value: privilege.value, -// price: privilege.price, -// amount: Number(amountField), -// }, -// ], -// }, -// }); -// } catch (error) { -// enqueueSnackbar((error as Error).message); -// } -// }; + // const { data } = await axios({ + // url: "https://admin.pena.digital/strator/tariff/", + // method: "post", + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // data: { + // name: nameField, + // price: Number(customPriceField) * 100, + // isCustom: false, + // privilegies: [ + // { + // name: privilege.name, + // privilegeId: privilege._id, + // serviceKey: privilege.serviceKey, + // description: privilege.description, + // type: privilege.type, + // value: privilege.value, + // price: privilege.price, + // amount: Number(amountField), + // }, + // ], + // }, + // }); + // } catch (error) { + // enqueueSnackbar((error as Error).message); + // } + // }; return (