Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix subscription status and action items for free (lifetime) subs (#51628) 

* Fix subscription status and action items for free (lifetime) subs

* Changelog

* Lint
This commit is contained in:
Boro Sitnikovski 2024-09-30 15:14:39 +02:00 committed by GitHub
parent 52d0b8c17d
commit fae492632a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/woocommerce-admin/client/marketplace/components/my-subscriptions/table/rows/functions.tsx
View File

@ -355,9 +355,16 @@ export function subscriptionStatus(
); );
} }
return subscription.autorenew let status;
? __( 'Active', 'woocommerce' ) if ( subscription.lifetime ) {
: __( 'Cancelled', 'woocommerce' ); status = __( 'Lifetime', 'woocommerce' );
} else if ( subscription.autorenew ) {
status = __( 'Active', 'woocommerce' );
} else {
status = __( 'Cancelled', 'woocommerce' );
}
return status;
} }
return { return {
display: getStatus(), display: getStatus(),
@ -377,7 +384,7 @@ export function actions( subscription: Subscription ): TableRow {
let actionButton = null; let actionButton = null;
if ( subscription.product_key === '' ) { if ( subscription.product_key === '' ) {
actionButton = <SubscribeButton subscription={ subscription } />; actionButton = <SubscribeButton subscription={ subscription } />;
} else if ( subscription.expired ) { } else if ( subscription.expired && ! subscription.lifetime ) {
actionButton = <RenewButton subscription={ subscription } />; actionButton = <RenewButton subscription={ subscription } />;
} else if ( } else if (
subscription.local.installed === false && subscription.local.installed === false &&
@ -391,7 +398,7 @@ export function actions( subscription: Subscription ): TableRow {
actionButton = ( actionButton = (
<ConnectButton subscription={ subscription } variant="link" /> <ConnectButton subscription={ subscription } variant="link" />
); );
} else if ( ! subscription.autorenew ) { } else if ( ! subscription.autorenew && ! subscription.lifetime ) {
actionButton = <AutoRenewButton subscription={ subscription } />; actionButton = <AutoRenewButton subscription={ subscription } />;
} }

4
plugins/woocommerce/changelog/fix-wccom-21789-free-subs-display Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Fix subscription status and action items for free (lifetime) subscriptions