Skip to content

Order creation: Prevent subscription products to be added to an order #15960

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

Merged
merged 8 commits into from
Aug 4, 2025
Merged

Order creation: Prevent subscription products to be added to an order #15960

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9b87427
prevent subscription products to be added to an order
iamgabrielma Jul 30, 2025
636090c
update release notes
iamgabrielma Jul 30, 2025
debe2a9
Handle variableSubscription case from view
iamgabrielma Jul 31, 2025
5a17b10
simplify, and unit tests
iamgabrielma Jul 31, 2025
b419d94
simplify check by using existing selectionEnabled
iamgabrielma Aug 1, 2025
b5e48c7
hide disclosure indicator for parent variable product when is not sel…
iamgabrielma Aug 1, 2025
866c91c
remove unused isSubscriptionProduct and associated tests
iamgabrielma Aug 1, 2025
04fab3b
Merge branch 'trunk' into task/WOOMOB-938-prevent-subs-products-from-…
iamgabrielma Aug 4, 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
1 change: 1 addition & 0 deletions RELEASE-NOTES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
23.0
-----
- [*] Shipping Labels: Made HS tariff number field required in customs form for EU destinations [https://github.com/woocommerce/woocommerce-ios/pull/15946]
- [*] Order Creation: Prevent subscription products to be added to an order [https://github.com/woocommerce/woocommerce-ios/pull/15960]

22.9
-----
Expand Down
7 changes: 7 additions & 0 deletions WooCommerce/Classes/ViewRelated/Products/ProductSelector/ProductSelectorViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,6 +848,8 @@ private extension ProductSelectorViewModel {
switch (source, product.productType, product.variations) {
case (.orderForm, .booking, _):
return .unsupported(reason: Localization.bookableProductUnsupportedReason)
case (.orderForm, .subscription, _), (.orderForm, .variableSubscription, _):
return .unsupported(reason: Localization.subscriptionProductUnsupportedReason)
case (_, _, let variations) where variations.isEmpty:
return selectedItemsIDs.contains(product.productID) ? .selected : .notSelected
default:
Expand Down Expand Up @@ -981,6 +983,11 @@ private extension ProductSelectorViewModel {
value: "Bookable products are not supported for order creation",
comment: "Message explaining unsupported bookable products for order creation"
)
static let subscriptionProductUnsupportedReason = NSLocalizedString(
"productSelectorViewModel.subscriptionProductUnsupportedReason",
value: "Subscription products are not supported for order creation",
comment: "Message explaining unsupported subscription products for order creation"
)
}
}

Expand Down