move test values

This commit is contained in:
nflnkr 2023-02-20 14:49:35 +03:00
parent c0f924ab09
commit a43a6a19f7
7 changed files with 76 additions and 100 deletions

@ -90,44 +90,6 @@ const columns: GridColDef[] = [
}
];
const rows: Array<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
},
];
const Discounts: React.FC = () => {
const [checkboxState, setCheckboxState] = React.useState<boolean>(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<number>;

@ -57,45 +57,6 @@ const columns: GridColDef[] = [
}
];
const testPromocodes: Array<Promocode> = [
{
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<boolean>(false);
const toggleCheckbox = () => { setCheckboxState(!checkboxState); };

@ -80,21 +80,6 @@ const columns: GridColDef[] = [
},
]; */
const testPromocodeArray: Array<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 }
]
}
];
const DataGridElement: React.FC<MWProps> = ({ openModal }) => {
const promocodeArray = usePromocodeStore(state => state.promocodeArray);
const promocodeArraySet = usePromocodeStore(state => state.setPromocodeArray);
@ -105,10 +90,6 @@ const DataGridElement: React.FC<MWProps> = ({ openModal }) => {
const [selectedPromocodeIndex, setSelectedPromocodeIndex] = useState(-1);
const [promocodeField, setPromocodeField] = useState<string>("");
useEffect(function setTestPromocodeArray() {
promocodeArraySet(testPromocodeArray);
}, [promocodeArraySet]);
const onRowsSelectionHandler = (ids: GridSelectionModel) => {
const result: Array<ArrayProps> = [];
ids.forEach((id) => tariffsArray.forEach((row) => {
@ -120,7 +101,9 @@ const DataGridElement: React.FC<MWProps> = ({ 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]);

@ -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<DiscountStore>()(
devtools(
persist(
(set, get) => ({
discountsArray: [],
discountsArray: testDiscounts,
setDiscountsArray: (array: Array<Discount>) => set({ discountsArray: array }),
discountsActiveArray: [],
setDiscountsActiveArray: (array: Array<number>) => set({ discountsActiveArray: array }),

@ -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,
},
];

@ -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 }
]
}
];

@ -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<PromocodeStore>()(
devtools(
persist(
(set, get) => ({
promocodeArray: [],
promocodeArray: testPromocodes,
setPromocodeArray: (array: Array<Promocode>) => set({ promocodeArray: array }),
}),
{