Mirrors/plane
1
0
Fork 0
mirror of https://github.com/makeplane/plane.git synced 2026-07-13 05:49:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1016 from makeplane/fix-upgrade-link

Browse Source 
release: v1.3.0-rc44
This commit is contained in:
sriram veeraghanta
2024-09-03 00:13:33 +05:30
committed by GitHub
parent 8e4b206772 a11ab36010
commit 75c84435a9
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
web/ee/components/license/pro-plan-cloud-upgrade-modal.tsx
View File

@@ -214,9 +214,17 @@ export const ProPlanCloudUpgradeModal: FC<ProPlanCloudUpgradeModalProps> = (prop
?.unit_amount || 0) / 1200;
const yearlyDiscount = calculateYearlyDiscount(monthlyPrice, yearlyPrice);
const isInTrailPeriod =
subscriptionDetail?.has_activated_free_trial && subscriptionDetail?.trial_end_date ? true : false;
subscriptionDetail?.has_activated_free_trial &&
subscriptionDetail?.subscription &&
subscriptionDetail?.trial_end_date &&
new Date(subscriptionDetail.trial_end_date) >= new Date();
const isTrialCompleted =
subscriptionDetail?.has_activated_free_trial && !subscriptionDetail?.trial_end_date ? true : false;
subscriptionDetail &&
!subscriptionDetail.subscription &&
subscriptionDetail.has_activated_free_trial &&
subscriptionDetail.product === "FREE"
? true
: false;
return (
<ModalCore isOpen={isOpen} handleClose={handleClose} width={EModalWidth.XXL} className="rounded-xl">
@@ -266,7 +274,9 @@ export const ProPlanCloudUpgradeModal: FC<ProPlanCloudUpgradeModalProps> = (prop
features={PRO_PLAN_FEATURES_MAP}
isLoading={isLoading}
handlePaymentLink={(priceId: string) =>
isInTrailPeriod ? handleSubscriptionPageRedirection(priceId) : handlePaymentLink(priceId)
isInTrailPeriod && !isTrialCompleted
? handleSubscriptionPageRedirection(priceId)
: handlePaymentLink(priceId)
}
yearlyPlanOnly={yearlyPlan}
trialLoader={trialLoader}