0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-17 23:44:39 -05:00

Updated action for continuing a subscription

refs https://github.com/TryGhost/Team/issues/530

A continueSubscription action has been added to handle continuing
subscriptions as a different flow since we now have `smart_cancel` for the cancellation. The "continue subscription" button in Portal is updated to use the new action to correctly continue a subscription instead of old action which did both cancel and continue.
This commit is contained in:
Rish 2021-03-30 13:35:27 +05:30 committed by Fabien O'Carroll
parent 1caaa3f2fe
commit 778ffe2f81
2 changed files with 4 additions and 6 deletions

View file

@ -318,9 +318,8 @@ const CancelContinueSubscription = ({member, onAction, action, brandColor, showO
<CancelNotice /> <CancelNotice />
<ActionButton <ActionButton
onClick={(e) => { onClick={(e) => {
onAction('cancelSubscription', { onAction('continueSubscription', {
subscriptionId: subscription.id, subscriptionId: subscription.id
cancelAtPeriodEnd: !subscription.cancel_at_period_end
}); });
}} }}
isRunning={isRunning} isRunning={isRunning}

View file

@ -385,9 +385,8 @@ export default class AccountPlanPage extends React.Component {
const subscription = getSubscriptionFromId({subscriptionId, member}); const subscription = getSubscriptionFromId({subscriptionId, member});
const subscriptionPlan = getPlanFromSubscription({subscription}); const subscriptionPlan = getPlanFromSubscription({subscription});
if (!cancelAtPeriodEnd) { if (!cancelAtPeriodEnd) {
this.context.onAction('cancelSubscription', { this.context.onAction('continueSubscription', {
subscriptionId, subscriptionId
cancelAtPeriodEnd
}); });
} else { } else {
this.setState({ this.setState({