[CLD-6536] Adjustments to cloud annual renewal announcement bar (#25927)
* Adjustments to cloud annual renewal announcement bar * Add exclusion for trials * Add more exceptions for when on trial during renewal period * Add support for simulated_current_time_ms * A few more changes to allow us to test this post-merge * Fix tests, pipeline * Final fix around emails --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
@@ -11,7 +11,7 @@ import useGetSubscription from 'components/common/hooks/useGetSubscription';
|
||||
import useOpenCloudPurchaseModal from 'components/common/hooks/useOpenCloudPurchaseModal';
|
||||
import useOpenSalesLink from 'components/common/hooks/useOpenSalesLink';
|
||||
|
||||
import {daysToExpiration} from 'utils/cloud_utils';
|
||||
import {daysToCancellation, daysToExpiration} from 'utils/cloud_utils';
|
||||
|
||||
export const creditCardExpiredBanner = (setShowCreditCardBanner: (value: boolean) => void) => {
|
||||
return (
|
||||
@@ -68,8 +68,8 @@ export const CloudAnnualRenewalBanner = () => {
|
||||
if (!subscription || !subscription.cancel_at || (subscription.will_renew === 'true' && !subscription.delinquent_since)) {
|
||||
return null;
|
||||
}
|
||||
const daysUntilExpiration = daysToExpiration(subscription?.end_at);
|
||||
const daysUntilCancelation = daysToExpiration(subscription?.cancel_at);
|
||||
const daysUntilExpiration = daysToExpiration(subscription);
|
||||
const daysUntilCancelation = daysToCancellation(subscription);
|
||||
const renewButton = (
|
||||
<button
|
||||
className='btn btn-primary'
|
||||
@@ -96,6 +96,11 @@ export const CloudAnnualRenewalBanner = () => {
|
||||
message: <></>,
|
||||
};
|
||||
|
||||
// If outside the 60 day window or on a trial, don't show this banner.
|
||||
if (daysUntilExpiration > 60 || subscription.is_free_trial === 'true') {
|
||||
return null;
|
||||
}
|
||||
|
||||
if (daysUntilExpiration <= 7) {
|
||||
alertBannerProps.mode = 'danger';
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user