Skip to content

MSD Billing: Modify removal flow for one-time purchases #107445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrismccluskey wants to merge 3 commits into
base: trunk
Choose a base branch
from
+24 −1
Open

MSD Billing: Modify removal flow for one-time purchases #107445

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db3431a
MSD Billing: Modify removal flow for one-time purchases
chrismccluskey Dec 2, 2025
ea5b822
Only show message about purchase being removed if subscription is not…
chrismccluskey Dec 4, 2025
4f600bc
Add an error message if customer is redirected because the purchase i…
chrismccluskey Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion client/dashboard/me/billing-purchases/cancel-purchase/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import {
isAkismetProduct,
isPartnerPurchase,
willAtomicSiteRevertAfterPurchaseDeactivation,
isOneTimePurchase,
} from '../../../utils/purchase';
import CancelHeaderTitle from './cancel-header-title';
import CancelPurchaseForm from './cancel-purchase-form';
Expand Down Expand Up @@ -1040,7 +1041,7 @@ export default function CancelPurchase() {
! purchase.is_cancelable &&
! purchase.is_removable
) {
if ( ! createdErrorNoticeForRedirect.current ) {
if ( purchase.subscription_status !== 'active' && ! createdErrorNoticeForRedirect.current ) {
createErrorNotice(
__(
'This purchase has already been removed. Please contact support if you believe this to be in error.'
Expand All @@ -1049,6 +1050,28 @@ export default function CancelPurchase() {
);
createdErrorNoticeForRedirect.current = true;
}
if (
isOneTimePurchase( purchase ) &&
! purchase.is_refundable &&
! createdErrorNoticeForRedirect.current
) {
createErrorNotice(
__(
'This one time purchase cannot be cancelled. Please contact support if you need assistance.'
),
{ type: 'snackbar' }
);
createdErrorNoticeForRedirect.current = true;
}
if ( ! createdErrorNoticeForRedirect.current ) {
createErrorNotice(
__(
'This product cannot be cancelled or removed. Please contact support if you need assistance.'
),
{ type: 'snackbar' }
);
createdErrorNoticeForRedirect.current = true;
}
return false;
}

Expand Down