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

Added logic of trial at header-container

Browse Source
This commit is contained in:
TatianaLopaeva 2020-09-01 10:34:20 +03:00
parent 991cc488d7
commit 35a0cf98c0
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,7 @@ class Body extends React.PureComponent {
culture, culture,
timezone, timezone,
utcHoursOffset, utcHoursOffset,
trialMode,
} = this.props; } = this.props;
const { const {
isVisibleModalDialog, isVisibleModalDialog,
@ -119,6 +120,7 @@ class Body extends React.PureComponent {
<HeaderContainer <HeaderContainer
t={t} t={t}
expiresDate={expiresDate} expiresDate={expiresDate}
trialMode={trialMode}
languages={languages} languages={languages}
culture={culture} culture={culture}
timezone={timezone} timezone={timezone}
@ -169,6 +171,7 @@ function mapStateToProps(state) {
helpUrl: state.payments.helpUrl, helpUrl: state.payments.helpUrl,
buyUrl: state.payments.buyUrl, buyUrl: state.payments.buyUrl,
expiresDate: state.payments.currentLicense.expiresDate, expiresDate: state.payments.currentLicense.expiresDate,
trialMode: state.payments.trialLicense.trialMode,
culture: state.auth.settings.culture, culture: state.auth.settings.culture,
timezone: state.auth.settings.timezone, timezone: state.auth.settings.timezone,
utcHoursOffset: state.auth.settings.utcHoursOffset, utcHoursOffset: state.auth.settings.utcHoursOffset,

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

@ -4,7 +4,7 @@ import styled from "styled-components";
import moment from "moment"; import moment from "moment";
// import moment "moment/min/moment-with-locales"; // import moment "moment/min/moment-with-locales";
import { Text, utils } from "asc-web-components"; import { Text, utils } from "asc-web-components";
import { Error401 } from "asc-web-common";
const { tablet } = utils.device; const { tablet } = utils.device;
const StyledHeader = styled.div` const StyledHeader = styled.div`
@ -74,41 +74,42 @@ const HeaderContainer = ({
culture, culture,
timezone, timezone,
utcHoursOffset, utcHoursOffset,
trialMode,
}) => { }) => {
const moment = require("moment"); const moment = require("moment");
require("moment/min/locales.min"); require("moment/min/locales.min");
moment.locale(culture); moment.locale(culture);
// expiresDate = ;
const currentUserDate = moment().utcOffset(utcHoursOffset); const currentUserDate = moment().utcOffset(utcHoursOffset);
return moment( return moment(
moment.utc(expiresDate).set("hour", 0).set("minute", 0).set("second", 0) moment.utc(expiresDate).set("hour", 0).set("minute", 0).set("second", 0)
).isAfter( ).isAfter(currentUserDate.set("hour", 0).set("minute", 0).set("second", 0))
currentUserDate.set("hour", 0).set("minute", 0).set("second", 0) ? !trialMode && (
) ? ( <StyledHeader>
<StyledHeader> <Text className="payments-header">{t("Using")}</Text>
<Text className="payments-header">{t("Using")}</Text> <Text className="payments-header-additional_support">
<Text className="payments-header-additional_support"> {t("SubscriptionAndUpdatesExpires")}{" "}
{t("SubscriptionAndUpdatesExpires")}{" "} {moment.utc(expiresDate).format("LL")}
{moment.utc(expiresDate).format("LL")} {/* Техническая поддержка и обновления недоступны для вашей лицензии с 1
{/* Техническая поддержка и обновления недоступны для вашей лицензии с 1
марта 2021 года. */} марта 2021 года. */}
</Text> </Text>
{/* <Text className="payments-header-additional_portals"> {/* <Text className="payments-header-additional_portals">
{t("createdPortals")} {createPortals} {t("createdPortals")} {createPortals}
</Text> */} </Text> */}
</StyledHeader> </StyledHeader>
) : ( )
<StyledHeader> : !trialMode && (
<Text className="payments-header">{t("Using")}</Text> <StyledHeader>
<Text className="payments-header-additional_support"> <Error401> </Error401>
{t("SupportNotAvailable")} <Text className="payments-header">{t("Using")}</Text>
{moment.utc(expiresDate).startOf("day").format("dddd, MMMM D, YYYY")} <Text className="payments-header-additional_support">
</Text> {t("SupportNotAvailable")}
</StyledHeader> {moment
); .utc(expiresDate)
.startOf("day")
.format("dddd, MMMM D, YYYY")}
</Text>
</StyledHeader>
);
}; };
HeaderContainer.propTypes = { HeaderContainer.propTypes = {