From c1e76b062d0b6eaaedb9e5c2fe1c21160f046231 Mon Sep 17 00:00:00 2001 From: Nastya Date: Wed, 5 Jul 2023 20:23:31 +0300 Subject: [PATCH] =?UTF-8?q?cart=20=D1=81=D1=87=D0=B8=D1=82=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D1=84=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/kitUI/Cart/Cart.tsx | 2 +- src/pages/dashboard/Content/Tariffs/tariffsDG.tsx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/kitUI/Cart/Cart.tsx b/src/kitUI/Cart/Cart.tsx index 77a0ce0..ec49abf 100644 --- a/src/kitUI/Cart/Cart.tsx +++ b/src/kitUI/Cart/Cart.tsx @@ -119,7 +119,7 @@ export default function Cart({ selectedTariffs }: Props) { function handleCalcCartClick() { //рассчитать - const cartItems = cartTariffs.map((tariff) => createCartItem(tariff)); + const cartItems = cartTariffs.filter((tariff) => selectedTariffs.includes(tariff.id)).map((tariff) => createCartItem(tariff)); let loyaltyValue = parseInt(loyaltyField); diff --git a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx index e0b0fa4..7568b32 100644 --- a/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx +++ b/src/pages/dashboard/Content/Tariffs/tariffsDG.tsx @@ -31,6 +31,9 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr const [changingTariff, setChangingTariff] = useState(); const [tariffDelete, setTariffDelete] = useState(false); + +console.log(selectedTariffs) + const closeDeleteModal = () => { setOpenDeleteModal(false) } @@ -79,8 +82,6 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr const gridData = tariffs ?.map((tariff) => { const privilege = findPrivilegeById(tariff.privilegeId); - console.log(tariff.privilegeId) - console.log(privilege) return { id: tariff.id, name: tariff.name, @@ -106,7 +107,7 @@ export default function TariffsDG({ selectedTariffs, handleSelectionChange }: Pr }) .sort((item, previous) => (!item?.isFront && previous?.isFront ? 1 : -1)); - console.log(gridData) + // console.log(gridData) return ( <>