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

Merge branch 'dev' of penahub.gitlab.yandexcloud.net:frontend/admin into dev

Browse Source
This commit is contained in:
krokodilka 2023-06-15 23:33:42 +03:00
commit f8b6afdd18
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,6 @@ interface MergedTariff {
} }
export default function Cart({ selectedTariffs }: Props) { export default function Cart({ selectedTariffs }: Props) {
const tariffs = useTariffStore((store) => store.tariffs);
const discounts = useDiscountStore((store) => store.discounts); const discounts = useDiscountStore((store) => store.discounts);
const cartTotal = useCartStore((state) => state.cartTotal); const cartTotal = useCartStore((state) => state.cartTotal);
const setCartTotal = useCartStore((store) => store.setCartTotal); const setCartTotal = useCartStore((store) => store.setCartTotal);
@ -56,8 +55,8 @@ export default function Cart({ selectedTariffs }: Props) {
const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false); const [isNonCommercial, setIsNonCommercial] = useState<boolean>(false);
const exampleTariffs = useTariffStore((state) => state.tariffs); const exampleTariffs = useTariffStore((state) => state.tariffs);
const [tariffss, setTariffs] = useState<any>(); const [tariffs, setTariffs] = useState<any>();
const mergeTariffs: MergedTariff[] = [...exampleTariffs, ...(tariffss || [])]; const mergeTariffs: MergedTariff[] = [...exampleTariffs, ...(tariffs || [])];
console.log(cartTotal, "cartTotal"); console.log(cartTotal, "cartTotal");
@ -122,11 +121,12 @@ export default function Cart({ selectedTariffs }: Props) {
function handleCalcCartClick() { function handleCalcCartClick() {
//рассчитать //рассчитать
const cartTariffs = mergeTariffs.filter((tariff) => selectedTariffs.includes(tariff._id ? tariff._id : tariff.id)); const cartTariffs = mergeTariffs.filter((tariff) => selectedTariffs.includes(tariff._id ? tariff._id : tariff.id));
const cartItems = cartTariffs.map((tariff) => createCartItem(tariff)); const cartItems = cartTariffs.map((tariff) => createCartItem(tariff));
console.log(cartTariffs); console.log(cartTariffs);
console.log(cartItems); // console.log(cartItems);
console.log("selectedTariffs"); // console.log("selectedTariffs");
console.log(selectedTariffs); // console.log(selectedTariffs);
let loyaltyValue = parseInt(loyaltyField); let loyaltyValue = parseInt(loyaltyField);