From c7d83914ac4cb0586398872e2032c48eb0159569 Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Thu, 1 Sep 2022 20:26:32 +0300 Subject: [PATCH] Web: Added the ability to change the tariff by access rights. --- .../payments/PayerInformationContainer.js | 20 ++++++------------- .../categories/payments/PriceCalculation.js | 16 ++++++++------- .../categories/payments/index.js | 2 ++ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/payments/PayerInformationContainer.js b/packages/client/src/pages/PortalSettings/categories/payments/PayerInformationContainer.js index c1269ba06e..25398c1c27 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/PayerInformationContainer.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/PayerInformationContainer.js @@ -39,20 +39,15 @@ const StyledContainer = styled.div` } `; -const PayerInformationContainer = ({ - style, - theme, - rights, - - accountLink, -}) => { +const PayerInformationContainer = ({ style, theme, user, accountLink }) => { const { t } = useTranslation("Payments"); const payerName = `${"Test Name" + " (" + t("Payer") + ")"}`; const email = "example email"; - const isLinkAvailable = rights === "3" ? false : true; + const payer = false; + const isLinkAvailable = user.isOwner || payer; const renderTooltip = () => { return ( @@ -109,19 +104,16 @@ const PayerInformationContainer = ({ }; export default inject(({ auth, payments }) => { - const { quota, portalQuota } = auth; + const { quota, portalQuota, userStore } = auth; const { accountLink } = payments; - //const rights = "2"; - //const rights = "3"; - const rights = "1"; + const { user } = userStore; return { quota, portalQuota, theme: auth.settingsStore.theme, - rights, - + user, accountLink, }; })(observer(PayerInformationContainer)); diff --git a/packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js b/packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js index 9bff930c43..63ca9d91f6 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/PriceCalculation.js @@ -34,7 +34,7 @@ let timeout = null, const PriceCalculation = ({ t, - rights, + user, theme, setPaymentLink, portalQuota, @@ -115,7 +115,10 @@ const PriceCalculation = ({ }, 1000); }; - const isDisabled = rights === "3" || rights === "2" ? true : false; + const payer = false; + const isDisabled = isFreeTariff + ? false + : (!user.isOwner && !user.isAdmin) || !payer; const color = isDisabled ? { color: theme.text.disableColor } : {}; @@ -151,15 +154,13 @@ export default inject(({ auth, payments }) => { maxAvailableManagersCount, } = payments; const { theme } = auth.settingsStore; - const { portalQuota, pricePerManager, isFreeTariff } = auth; - //const rights = "2"; - //const rights = "3"; - const rights = "1"; + const { userStore, portalQuota, pricePerManager, isFreeTariff } = auth; + const { user } = userStore; + return { isFreeTariff, setManagersCount, tariffsInfo, - rights, theme, setPaymentLink, portalQuota, @@ -169,5 +170,6 @@ export default inject(({ auth, payments }) => { maxManagersCount, minAvailableManagersCount, maxAvailableManagersCount, + user, }; })(observer(PriceCalculation)); diff --git a/packages/client/src/pages/PortalSettings/categories/payments/index.js b/packages/client/src/pages/PortalSettings/categories/payments/index.js index aece274221..93b8052e21 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/index.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/index.js @@ -174,7 +174,9 @@ const PaymentsPage = ({ )} {!isFreeTariff && } + + {isNotPaid ? (