IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #937 from ONLYOFFICE/bugfix/fixed-display-payments

Browse Source 
Bugfix/fixed display payments
This commit is contained in:
Alexey Safronov 2022-10-20 17:38:17 +03:00 committed by GitHub
commit 26d61fd378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/MetadataUrlField.js
View File

@ -17,7 +17,7 @@ const MetadataUrlField = ({ labelText, name, placeholder, tooltipContent }) => {
return (
<div className="metadata-field">
<Text className="label" fontSize="13px" fontWeight={600}>
<Text className="label" fontSize="13px" as="div" fontWeight={600}>
{labelText}
<HelpButton tooltipContent={tooltipContent} />
</Text>

14
packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/sub-components/UploadXML.js
View File

@ -16,7 +16,7 @@ import { Base } from "@docspace/components/themes";
const StyledUploadIcon = styled(UploadIcon)`
path {
stroke: ${(props) =>
props.isDisabled
props.disabled
? props.theme.client.settings.integration.sso.iconButtonDisabled
: props.theme.client.settings.integration.sso.iconButton} !important;
}
@ -34,6 +34,10 @@ const UploadXML = (props) => {
uploadXml,
} = props;
const isDisabledProp = {
disabled: !enableSso || uploadXmlUrl.trim().length === 0 || isLoadingXml,
};
return (
<FieldContainer
className="xml-input"
@ -52,13 +56,7 @@ const UploadXML = (props) => {
<Button
className="upload-button"
icon={
<StyledUploadIcon
isDisabled={
!enableSso || uploadXmlUrl.trim().length === 0 || isLoadingXml
}
/>
}
icon={<StyledUploadIcon {...isDisabledProp} />}
isDisabled={
!enableSso || uploadXmlUrl.trim().length === 0 || isLoadingXml
}

12
packages/client/src/pages/PortalSettings/categories/payments/index.js
View File

@ -112,6 +112,7 @@ const PaymentsPage = ({
currentTariffPlanTitle,
tariffPlanTitle,
expandArticle,
setPortalQuota,
}) => {
const { t, ready } = useTranslation(["Payments", "Common", "Settings"]);
@ -152,9 +153,7 @@ const PaymentsPage = ({
(async () => {
moment.locale(language);
const requests = [];
requests.push(getSettingsPayment());
const requests = [getSettingsPayment(), setPortalQuota()];
if (!currencySymbol && !startValue)
requests.push(setPortalPaymentQuotas());
@ -410,7 +409,11 @@ export default inject(({ auth, payments }) => {
} = auth;
const { showText: expandArticle } = settingsStore;
const { isFreeTariff, currentTariffPlanTitle } = currentQuotaStore;
const {
isFreeTariff,
currentTariffPlanTitle,
setPortalQuota,
} = currentQuotaStore;
const {
isNotPaidPeriod,
isPaidPeriod,
@ -464,5 +467,6 @@ export default inject(({ auth, payments }) => {
replaceFeaturesValues,
portalPaymentQuotasFeatures,
currentTariffPlanTitle,
setPortalQuota,
};
})(withRouter(observer(PaymentsPage)));