8000 Adds promo code to upsell ad in upsell modals by vraja-pro · Pull Request #21674 · Yoast/wordpress-seo · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Adds promo code to upsell ad in upsell modals #21674

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’ 8000 ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Oct 1, 2024
Merged

Adds promo code to upsell ad in upsell modals #21674

merged 2 commits into from
Oct 1, 2024

Conversation

vraja-pro
Copy link
Contributor
@vraja-pro vraja-pro commented Oct 1, 2024 •
edited
Loading

Context

Summary

This PR can be summarized in the following changelog entry:

  • Adds promo code to Black Friday ad in the upsell modals.

Relevant technical choices:

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

  • Make sure Yoast premium is not active.
  • Enable Black Friday promotion by editing src/promotions/domain/black-friday-promotion.php replace line 16:
new Time_Interval( \gmmktime( 12, 00, 00, 11, 28, 2023 ), \gmmktime( 12, 00, 00, 12, 3, 2024 ) )
  • Edit a post and click on the "Add related keyphrase" and "Add synonyms" links.
  • Check you see the promo code in the black Friday strip as in the design.
    Screenshot 2024-10-01 at 12 44 17

Relevant test scenarios

  • Changes should be tested with the browser console open
  • Changes should be tested on different posts/pages/taxonomies/custom post types/custom taxonomies
  • Changes should be tested on different editors (Default Block/Gutenberg/Classic/Elementor/other)
  • Changes should be tested on different browsers
  • Changes should be tested on multisite

Test instructions for QA when the code is in the RC

  • QA should use the same steps as above.

QA can test this PR by following these steps:

Impact check

This PR affects the following parts of the plugin, which may require extra testing:

UI changes

  • This PR changes the UI in the plugin. I have added the 'UI change' label to this PR.

Other environments

  • This PR also affects Shopify. I have added a changelog entry starting with [shopify-seo], added test instructions for Shopify and attached the Shopify label to this PR.

Documentation

  • I have written documentation for this change. For example, comments in the Relevant technical choices, comments in the code, documentation on Confluence / shared Google Drive / Yoast developer portal, or other.

Quality assurance

  • I have tested this code to the best of my abilities.
  • During testing, I had activated all plugins that Yoast SEO provides integrations for.
  • I have added unit tests to verify the code works as intended.
  • If any part of the code is behind a feature flag, my test instructions also cover cases where the feature flag is switched off.
  • I have written this PR in accordance with my team's definition of done.
  • I have checked that the base branch is correctly set.

Innovation

  • No innovation project is applicable for this PR.
  • This PR falls under an innovation project. I have attached the innovation label.
  • I have added my hours to the WBSO document.

Fixes 23.6 - BF - Black Friday promo code is missing in upsell popup

@vraja-pro vraja-pro added the changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog label Oct 1, 2024
@vraja-pro vraja-pro changed the base branch from trunk to release/23.6 October 1, 2024 09:40
@vraja-pro vraja-pro added this to the 23.6 milestone Oct 1, 2024
@vraja-pro vraja-pro force-pushed the 1866-236---bf---black-friday-promo-code-is-missing-in-upsell-popup branch from 4cddd11 to 15090f5 Compare October 1, 2024 09:43
@coveralls
Copy link
coveralls commented Oct 1, 2024 •
edited
Loading

Pull Request Test Coverage Report for Build b9cc623a90c55e3cef73000cfb7cf526aca6f18a

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall first build on 1866-236---bf---black-friday-promo-code-is-missing-in-upsell-popup at 26.789%
Totals Coverage Status
Change from base Build ceefe744ef4088bfe8215e3b36404aff4cb528a1: 26.8%
Covered Lines: 3729
Relevant Lines: 12794
💛 - Coveralls

igorschoester
igorschoester requested changes Oct 1, 2024
View reviewed changes
Copy link
Member
@igorschoester igorschoester left a comment

Choose a reason for hiding this comment

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

CR 🏗️

packages/js/src/components/UpsellBox.js Outdated
</div> }
<div className="yst-flex yst-flex-col yst-items-center yst-bg-black yst-border-amber-300 yst-border-y yst-border-x-0 yst-border-solid yst-gap-2 yst-py-2 yst-leading-5">
<div className="yst-mx-auto yst-text-amber-300 yst-text-lg">{ __( "BLACK FRIDAY | 30% OFF", "wordpress-seo" ) }</div>
<div className="yst-text-white yst-text-base yst-font-semibold">Promo code: BF2024</div>
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't we translate Promo code?

packages/js/src/components/UpsellBox.js Outdated
</div> }
<div className="yst-flex yst-flex-col yst-items-center yst-bg-black yst-border-amber-300 yst-border-y yst-border-x-0 yst-border-solid yst-gap-2 yst-py-2 yst-leading-5">
<div className="yst-mx-auto yst-text-amber-300 yst-text-lg">{ __( "BLACK FRIDAY | 30% OFF", "wordpress-seo" ) }</div>
<div className="yst-text-white yst-text-base yst-font-semibold">Promo code: BF2024</div>
Copy link
Member

Choose a reason for hiding this comment

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

Linting error: Trailing spaces not allowed no-trailing-spaces

Suggested change
<div className="yst-text-white yst-text-base yst-font-semibold">Promo code: BF2024</div>
<div className="yst-text-white yst-text-base yst-font-semibold">Promo code: BF2024</div>

igorschoester
igorschoester approved these changes Oct 1, 2024
View reviewed changes
Copy link
Member
@igorschoester igorschoester left a comment

Choose a reason for hiding this comment

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

CR && AT ✅

@igorschoester igorschoester merged commit 8e31441 into release/23.6 Oct 1, 2024
15 of 16 checks passed
@igorschoester igorschoester deleted the 1866-236---bf---black-friday-promo-code-is-missing-in-upsell-popup branch October 1, 2024 11:10
igorschoester added a commit that referenced this pull request Oct 2, 2024
@igorschoester
Revert "Merge pull request #21674 from Yoast/1866-236---bf---black-fr…
296c5c2 
…iday-promo-code-is-missing-in-upsell-popup"

This reverts commit 8e31441, reversing
changes made to ceefe74.
@igorschoester igorschoester mentioned this pull request 8F29 Oct 2, 2024
Merged
26 tasks
vraja-pro added a commit that referenced this pull request Oct 2, 2024
@vraja-pro
Merge pull request #21677 from Yoast/284-remove-mentions-of-coupon-co…
91e08a1 
…de-from-black-friday-ads

Revert "Merge pull request #21674 from Yoast/1866-236---bf---black-fr…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@igorschoester igorschoester igorschoester approved these changes

Assignees
No one assigned
Labels
changelog: non-user-facing Needs to be included in the 'Non-userfacing' category in the changelog
Projects
None yet
Milestone
23.6
Development

Successfully merging this pull request may close these issues.
3 participants
@vraja-pro @coveralls @igorschoester
0