Skip to content
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

Fix/stats not showing discount for sale #40348

Merged
merged 2 commits into from
Nov 26, 2024
Merged

Fix/stats not showing discount for sale #40348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b08f843
Fix issue where stats is not showing sale discount
CodeyGuyDylan Nov 26, 2024
e6e80b3
changelog
CodeyGuyDylan Nov 26, 2024
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: 0 additions & 1 deletion projects/packages/my-jetpack/_inc/components/product-card/pricing-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import usePricingData from './use-pricing-data';

const PriceComponent = ( { slug }: { slug: string } ) => {
const { discountPrice, fullPrice, currencyCode } = usePricingData( slug );

return (
<div className={ styles.priceContainer }>
{ discountPrice && (
Expand Down
8 changes: 5 additions & 3 deletions projects/packages/my-jetpack/_inc/components/product-card/use-pricing-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import useMyJetpackConnection from '../../hooks/use-my-jetpack-connection';

const parsePricingData = ( pricingForUi: ProductCamelCase[ 'pricingForUi' ] ) => {
const { tiers, wpcomFreeProductSlug, introductoryOffer } = pricingForUi;

if ( pricingForUi.tiers ) {
const {
discountPrice,
Expand All @@ -33,18 +32,21 @@ const parsePricingData = ( pricingForUi: ProductCamelCase[ 'pricingForUi' ] ) =>
}

const {
discountPrice,
discountPricePerMonth,
fullPrice,
fullPricePerMonth,
currencyCode,
isIntroductoryOffer,
wpcomProductSlug,
} = pricingForUi;
const hasDiscount = discountPrice && discountPrice !== fullPrice;
const eligibleForIntroDiscount = ! introductoryOffer?.reason;
return {
wpcomFreeProductSlug,
wpcomProductSlug,
discountPrice:
// Only display discount if site is elgible
isIntroductoryOffer && ! introductoryOffer?.reason ? discountPricePerMonth : null,
hasDiscount && eligibleForIntroDiscount ? discountPricePerMonth : null,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I am wrong, but I think we can do it this way where the discount isn't shown if the site is not eligible for an intro discount since sales are always for new purchases only 🤔 Let me know if I am wrong or am missing something. There may be an edge case in there that this would not work for

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I think this is correct. I mean, it sounds right to me! 👍

fullPrice: fullPricePerMonth,
currencyCode,
};
Expand Down
2 changes: 1 addition & 1 deletion ...ackages/my-jetpack/_inc/data/evaluation-recommendations/use-evaluation-recommendations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const useEvaluationRecommendations = () => {
// in zero(0) unownedRecommendedModules.
const ownedProducts = (
process?.env?.NODE_ENV === 'development'
? [ 'anti-spam', 'extras', 'stats', 'jetpack-ai' ]
? [ 'anti-spam', 'extras', 'jetpack-ai' ]
: getMyJetpackWindowInitialState( 'lifecycleStats' )?.ownedProducts || []
) as JetpackModule[];
// We filter out owned modules, and return the top recommendations
Expand Down
4 changes: 4 additions & 0 deletions projects/packages/my-jetpack/changelog/fix-stats-not-showing-discount-for-sale
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Fix stats not showing sale discount
Loading