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

Added AcceptLicense

Browse Source
This commit is contained in:
TatianaLopaeva 2020-09-17 17:07:32 +03:00
parent a858a3a846
commit fbb0787eff
5 changed files with 78 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/index.js
View File

@ -14,6 +14,7 @@ import {
setPaymentsLicense,
getSettingsPayment,
resetUploadedLicense,
AcceptPaymentsLicense,
} from "../../../store/payments/actions";
import { createI18N } from "../../../helpers/i18n";
@ -68,6 +69,8 @@ class Body extends React.PureComponent {
currentProductId,
licenseUpload,
resetUploadedLicense,
AcceptPaymentsLicense,
expiresDate,
} = this.props;
// if (currentProductId !== prevProps.currentProductId) {
@ -75,13 +78,14 @@ class Body extends React.PureComponent {
// }
if (licenseUpload) {
AcceptPaymentsLicense();
getSettingsPayment();
resetUploadedLicense();
}
}
onButtonClickUpload = (file) => {
const { setPaymentsLicense, t } = this.props;
const { setPaymentsLicense, t, AcceptPaymentsLicense } = this.props;
let fd = new FormData();
fd.append("files", file);
@ -149,4 +153,5 @@ export default connect(mapStateToProps, {
setCurrentProductId,
getSettingsPayment,
resetUploadedLicense,
AcceptPaymentsLicense,
})(withRouter(PaymentsEnterprise));

102
web/ASC.Web.Client/src/components/pages/PaymentsEnterprise/sub-components/header-container.js
View File

@ -1,9 +1,10 @@
import React from "react";
import React, { useEffect } from "react";
import PropTypes from "prop-types";
import styled from "styled-components";
import { connect } from "react-redux";
import { withRouter } from "react-router";
import { Text, utils } from "asc-web-components";
import { WebStorageStateStore } from "oidc-client";
const { tablet } = utils.device;
@ -48,48 +49,65 @@ const StyledHeader = styled.div`
}
`;
const HeaderContainer = ({
t,
expiresDate,
culture,
utcHoursOffset,
trialMode,
}) => {
const moment = require("moment");
require("moment/min/locales.min");
moment.locale(culture);
const currentUserDate = moment().utcOffset(utcHoursOffset);
class HeaderContainer extends React.Component {
constructor(props) {
super(props);
return new Date(currentUserDate).setHours(0, 0, 0, 0) <
expiresDate.setHours(0, 0, 0, 0) ? (
<StyledHeader>
<Text className="payments-header">{t("Using")}</Text>
<Text className="payments-header-additional_support">
{t("SubscriptionAndUpdatesExpires")}{" "}
{moment(expiresDate).startOf("day").format(" D MMMM, YYYY")}
{"."}
</Text>
</StyledHeader>
) : !trialMode ? (
<StyledHeader>
<Text className="payments-header">{t("Using")}</Text>
const { expiresDate, trialMode } = props;
<Text className="payments-header-additional_support" color="#C96C27">
{t("SupportNotAvailable")}{" "}
{moment(expiresDate).startOf("day").format("ddd, D MMMM, YYYY")}
{". "}
{t("LicenseRenewal")}
</Text>
</StyledHeader>
) : (
<StyledHeader>
<Text className="payments-header">{t("TrialPeriodExpired")}</Text>
<Text className="payments-header-additional_support">
{t("ThanksToUser")}
</Text>
</StyledHeader>
);
};
this.state = {
expiresDate: expiresDate,
trialMode: trialMode,
};
}
componentDidUpdate(prevProps) {
const { expiresDate, trialMode } = this.props;
if (expiresDate !== prevProps.expiresDate) {
this.setState({ expiresDate: expiresDate });
}
}
render() {
const { t, culture, utcHoursOffset, trialMode } = this.props;
const { expiresDate } = this.state;
const moment = require("moment");
require("moment/min/locales.min");
moment.locale(culture);
const currentUserDate = moment().utcOffset(utcHoursOffset);
return new Date(currentUserDate).setHours(0, 0, 0, 0) <
expiresDate.setHours(0, 0, 0, 0) ? (
<StyledHeader>
<Text className="payments-header">{t("Using")}</Text>
<Text className="payments-header-additional_support">
{t("SubscriptionAndUpdatesExpires")}{" "}
{moment(expiresDate).startOf("day").format(" D MMMM, YYYY")}
{"."}
</Text>
</StyledHeader>
) : !trialMode ? (
<StyledHeader>
<Text className="payments-header">{t("Using")}</Text>
<Text className="payments-header-additional_support" color="#C96C27">
{t("SupportNotAvailable")}{" "}
{moment(expiresDate).startOf("day").format("ddd, D MMMM, YYYY")}
{". "}
{t("LicenseRenewal")}
</Text>
</StyledHeader>
) : (
<StyledHeader>
<Text className="payments-header">{t("TrialPeriodExpired")}</Text>
<Text className="payments-header-additional_support">
{t("ThanksToUser")}
</Text>
</StyledHeader>
);
}
}
HeaderContainer.propTypes = {
t: PropTypes.func.isRequired,
@ -103,7 +121,7 @@ function mapStateToProps({ auth, payments }) {
culture: auth.settings.culture,
utcHoursOffset: auth.settings.utcHoursOffset,
expiresDate: payments.currentLicense.expiresDate,
trialMode: payments.trialMode,
trialMode: payments.currentLicense.trialMode,
};
}
export default connect(mapStateToProps)(withRouter(HeaderContainer));

5
web/ASC.Web.Client/src/store/payments/actions.js
View File

@ -39,3 +39,8 @@ export function setPaymentsLicense(confirmKey, data) {
.then((res) => dispatch(setLicenseUpload(res)));
};
}
export function AcceptPaymentsLicense() {
return (dispatch) => {
return api.settings.AcceptLicense().then((res) => console.log(res));
};
}

6
web/ASC.Web.Common/src/api/settings/index.js
View File

@ -168,3 +168,9 @@ export function getPaymentSettings() {
url: `/settings/payment.json`
});
}
export function AcceptLicense() {
return request({
method: "post",
url: `/settings/license/accept.json`
});
}

1
web/ASC.Web.Components/src/components/icons/svg/index.js
View File

@ -71,6 +71,7 @@ import OrigImportIcon from "./import.react.svg";
import OrigCatalogPinIcon from "./catalog.pin.react.svg";
import OrigCopyIcon from "./copy.react.svg";
import OrigShareEmailIcon from "./share.e-mail.react.svg";
import OrigPaymentsIcon from "./payments.react.svg";
import OrigShareGooglePlusIcon from "./share.google.plus.react.svg";
import OrigSendClockIcon from "./send.clock.react.svg";
import OrigAccessNoneIcon from "./access.none.react.svg";