From c730993fef3af1dcd313680105d899ce2a302efb Mon Sep 17 00:00:00 2001 From: Tamara Date: Mon, 4 Mar 2024 00:25:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=20?= =?UTF-8?q?=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE=D0=BA=20=D0=B2=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=80=D0=B7=D0=B8=D0=BD=D0=B5,=20=D1=82=D0=B0=D1=80=D0=B8?= =?UTF-8?q?=D1=84=20=D1=81=20=D1=88=D0=B8=D0=BB=D1=8C=D0=B4=D0=B8=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/tariff.ts | 4 +--- src/components/TotalPrice.tsx | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/api/tariff.ts b/src/api/tariff.ts index b65563e..403c9df 100644 --- a/src/api/tariff.ts +++ b/src/api/tariff.ts @@ -74,9 +74,7 @@ export async function getCustomTariffs( const tempCustomTariffsResponse = { ...customTariffsResponse, - squiz: customTariffsResponse.squiz.filter( - ({ name }) => !name.toLocaleLowerCase().includes("шильдик") - ), + squiz: customTariffsResponse.squiz }; return [tempCustomTariffsResponse] diff --git a/src/components/TotalPrice.tsx b/src/components/TotalPrice.tsx index df88fa7..3eeed45 100644 --- a/src/components/TotalPrice.tsx +++ b/src/components/TotalPrice.tsx @@ -92,7 +92,8 @@ export default function TotalPrice({ priceAfterDiscounts, priceBeforeDiscounts, color: theme.palette.gray.dark, width: upMd ? "31.5%" : undefined, display: "flex", - alignItems: "center", + alignItems: upMd ? "center" : "start", + flexDirection: upMd ? "row" : "column", gap: "30px" }} > @@ -129,6 +130,7 @@ export default function TotalPrice({ priceAfterDiscounts, priceBeforeDiscounts, height: "31px", padding: "5px 10px", right: "0px", + top: upMd ? 0 : "17px", }, }} > @@ -158,19 +160,21 @@ export default function TotalPrice({ priceAfterDiscounts, priceBeforeDiscounts, - {notEnoughMoneyAmount > 0 && ( - - Нехватает {currencyFormatter.format(notEnoughMoneyAmount / 100)} - - )} - + + {notEnoughMoneyAmount > 0 && ( + + Не хватает {currencyFormatter.format(notEnoughMoneyAmount / 100)} + + )} + + );