diff --git a/src/pages/dashboard/Content/Discounts/index.tsx b/src/pages/dashboard/Content/Discounts/index.tsx index 0990691..06173ff 100644 --- a/src/pages/dashboard/Content/Discounts/index.tsx +++ b/src/pages/dashboard/Content/Discounts/index.tsx @@ -90,44 +90,6 @@ const columns: GridColDef[] = [ } ]; -const rows: Array = [ - { - id: 1, name: "Скидка 1", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Опросник", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ], active: false, incomeMore: 1, basketMore: 10, toTime: 20, toCapacity: 30 - }, - { - id: 2, name: "Скидка 2", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Опросник", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ], active: true, incomeMore: 1, basketMore: 10, toTime: 20, toCapacity: 30 - }, - { - id: 3, name: "Скидка 3", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Опросник", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ], active: false, incomeMore: 1, basketMore: 10, toTime: 20, toCapacity: 30 - }, -]; const Discounts: React.FC = () => { const [checkboxState, setCheckboxState] = React.useState(false); @@ -144,7 +106,6 @@ const Discounts: React.FC = () => { const discountsArray = useDiscountStore(state => state.discountsArray); const discountsArraySet = useDiscountStore(state => state.setDiscountsArray); - //discountsArraySet( rows ); const discountsActiveArray = useDiscountStore(state => state.discountsActiveArray); const discountsActiveArraySet = useDiscountStore(state => state.setDiscountsActiveArray); let discountsActiveArrayUpdated: Array; diff --git a/src/pages/dashboard/Content/Promocode/index.tsx b/src/pages/dashboard/Content/Promocode/index.tsx index 76c810b..f852fa8 100644 --- a/src/pages/dashboard/Content/Promocode/index.tsx +++ b/src/pages/dashboard/Content/Promocode/index.tsx @@ -57,45 +57,6 @@ const columns: GridColDef[] = [ } ]; -const testPromocodes: Array = [ - { - id: 1, name: "Промокод 1", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Шаблонизатор документов", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ] - }, - { - id: 2, name: "Промокод 2", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Шаблонизатор документов", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ] - }, - { - id: 3, name: "Промокод 3", endless: false, from: "", dueTo: "", privileges: [ - { - good: "Шаблонизатор документов", - discount: 0.3 - }, - { - good: "Опросник", - discount: 0.2 - } - ] - }, -]; - const Promocodes: React.FC = () => { const [checkboxState, setCheckboxState] = React.useState(false); const toggleCheckbox = () => { setCheckboxState(!checkboxState); }; diff --git a/src/pages/dashboard/Content/Tariffs/DataGridElement/index.tsx b/src/pages/dashboard/Content/Tariffs/DataGridElement/index.tsx index c917530..878517f 100644 --- a/src/pages/dashboard/Content/Tariffs/DataGridElement/index.tsx +++ b/src/pages/dashboard/Content/Tariffs/DataGridElement/index.tsx @@ -80,21 +80,6 @@ const columns: GridColDef[] = [ }, ]; */ -const testPromocodeArray: Array = [ - { - id: 1, name: "Промокод 1", endless: false, from: "", dueTo: "", privileges: [ - { good: "Шаблонизатор документов", discount: 0.15 }, - { good: "Опросник", discount: 0.3 } - ] - }, - { - id: 1, name: "Промокод 2", endless: false, from: "", dueTo: "", privileges: [ - { good: "Шаблонизатор документов", discount: 0.4 }, - { good: "Опросник", discount: 0.6 } - ] - } -]; - const DataGridElement: React.FC = ({ openModal }) => { const promocodeArray = usePromocodeStore(state => state.promocodeArray); const promocodeArraySet = usePromocodeStore(state => state.setPromocodeArray); @@ -105,10 +90,6 @@ const DataGridElement: React.FC = ({ openModal }) => { const [selectedPromocodeIndex, setSelectedPromocodeIndex] = useState(-1); const [promocodeField, setPromocodeField] = useState(""); - useEffect(function setTestPromocodeArray() { - promocodeArraySet(testPromocodeArray); - }, [promocodeArraySet]); - const onRowsSelectionHandler = (ids: GridSelectionModel) => { const result: Array = []; ids.forEach((id) => tariffsArray.forEach((row) => { @@ -120,7 +101,9 @@ const DataGridElement: React.FC = ({ openModal }) => { const handleToBasket = () => cartRowsDataSet(tariffsSelectedRowsData); - const checkPromocode = () => setSelectedPromocodeIndex(promocodeArray.findIndex(promocode => promocode.name === promocodeField)); + const checkPromocode = () => { + setSelectedPromocodeIndex(promocodeArray.findIndex(promocode => promocode.name === promocodeField)); + } const tariffsArrayConverted = useMemo(() => convertTariffs(tariffsArray), [tariffsArray]); diff --git a/src/stores/discounts.ts b/src/stores/discounts.ts index 83736ed..d946a74 100644 --- a/src/stores/discounts.ts +++ b/src/stores/discounts.ts @@ -1,6 +1,7 @@ import create from "zustand"; import { devtools, persist } from "zustand/middleware"; import { Discount } from "../model/cart"; +import { testDiscounts } from "./mocks/discounts"; interface DiscountStore { @@ -16,7 +17,7 @@ export const useDiscountStore = create()( devtools( persist( (set, get) => ({ - discountsArray: [], + discountsArray: testDiscounts, setDiscountsArray: (array: Array) => set({ discountsArray: array }), discountsActiveArray: [], setDiscountsActiveArray: (array: Array) => set({ discountsActiveArray: array }), diff --git a/src/stores/mocks/discounts.ts b/src/stores/mocks/discounts.ts new file mode 100644 index 0000000..7c4c5a1 --- /dev/null +++ b/src/stores/mocks/discounts.ts @@ -0,0 +1,52 @@ +import { Discount } from "../../model/cart"; + +export const testDiscounts: Discount[] = [ + { + id: 1, + name: "Скидка 1", + endless: false, + from: "", + dueTo: "", + privileges: [ + { good: "Опросник", discount: 0.3 }, + { good: "Опросник", discount: 0.2 }, + ], + active: false, + incomeMore: 1, + basketMore: 10, + toTime: 20, + toCapacity: 30, + }, + { + id: 2, + name: "Скидка 2", + endless: false, + from: "", + dueTo: "", + privileges: [ + { good: "Опросник", discount: 0.3 }, + { good: "Опросник", discount: 0.2 }, + ], + active: true, + incomeMore: 1, + basketMore: 10, + toTime: 20, + toCapacity: 30, + }, + { + id: 3, + name: "Скидка 3", + endless: false, + from: "", + dueTo: "", + privileges: [ + { good: "Опросник", discount: 0.3 }, + { good: "Опросник", discount: 0.2 }, + ], + active: false, + incomeMore: 1, + basketMore: 10, + toTime: 20, + toCapacity: 30, + }, +]; \ No newline at end of file diff --git a/src/stores/mocks/promocodes.ts b/src/stores/mocks/promocodes.ts new file mode 100644 index 0000000..df52ad6 --- /dev/null +++ b/src/stores/mocks/promocodes.ts @@ -0,0 +1,17 @@ +import { Promocode } from "../../model/cart"; + + +export const testPromocodes: Promocode[] = [ + { + id: 1, name: "Промокод 1", endless: false, from: "", dueTo: "", privileges: [ + { good: "Шаблонизатор документов", discount: 0.15 }, + { good: "Опросник", discount: 0.3 } + ] + }, + { + id: 1, name: "Промокод 2", endless: false, from: "", dueTo: "", privileges: [ + { good: "Шаблонизатор документов", discount: 0.4 }, + { good: "Опросник", discount: 0.6 } + ] + } +]; \ No newline at end of file diff --git a/src/stores/promocodes.ts b/src/stores/promocodes.ts index b05e809..303d881 100644 --- a/src/stores/promocodes.ts +++ b/src/stores/promocodes.ts @@ -1,6 +1,7 @@ import create from "zustand"; import { devtools, persist } from "zustand/middleware"; import { Promocode } from "../model/cart"; +import { testPromocodes } from "./mocks/promocodes"; interface PromocodeStore { @@ -12,7 +13,7 @@ export const usePromocodeStore = create()( devtools( persist( (set, get) => ({ - promocodeArray: [], + promocodeArray: testPromocodes, setPromocodeArray: (array: Array) => set({ promocodeArray: array }), }), {