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

Jump to bottom

Fix wrong payment tasks display logic #34892

Merged
merged 2 commits into from
Oct 3, 2022
Merged

Fix wrong payment tasks display logic #34892

merged 2 commits into from
Oct 3, 2022

Conversation

chihsuan
Copy link
Member

@chihsuan chihsuan commented Sep 30, 2022 •
edited
Loading

All Submissions:

Changes proposed in this Pull Request:

Closes #34893 .

This PR fixes the wrong payment task display logic.

  • Set up payments should not be displayed when WC pay task is completed and vice versa.

Test zip: https://github.com/woocommerce/woocommerce/actions/runs/3156126725

How to test the changes in this Pull Request:

  1. Go to OBW
  2. Choose US as store country in the step 1
  3. Complete OBW with WCPay installed.
  4. Go to WooCommerce > Home
  5. Complete Set up WooCommerce Payments task
  6. Complete the remaining tasks on task list
  7. When task list is completed, please enable the task list again
  8. Observe that Set up WooCommerce Payments task is still displayed and marked as completed while Set up payments task is not shown.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully run tests with your changes locally?
  • Have you created a changelog file for each project being changed, ie pnpm --filter=<project> run changelog add?

FOR PR REVIEWER ONLY:

  • I have reviewed that everything is sanitized/escaped appropriately for any SQL or XSS injection possibilities. I made sure Linting is not ignored or disabled.

@chihsuan chihsuan self-assigned this Sep 30, 2022
@github-actions github-actions bot added focus: react admin plugin: woocommerce Issues related to the WooCommerce Core plugin. labels Sep 30, 2022
@chihsuan chihsuan added this to the 7.0.0 milestone Sep 30, 2022
@chihsuan chihsuan added the release: cherry-pick Commits from this PR also needs to be added to current release branch. label Sep 30, 2022
@chihsuan chihsuan marked this pull request as ready for review September 30, 2022 02:28
@github-actions
Copy link
Contributor

github-actions bot commented Sep 30, 2022 •
edited
Loading

Test Results Summary

Commit SHA: 6079093

Test 🧪Passed ✅Failed 🚨Broken 🚧Skipped ⏭️Unknown ❔Total 📊Duration ⏱️
API Tests11800201200m 44s
E2E Tests187002018913m 42s
 To view the full API test report, click here.
To view the full E2E test report, click here.
To view all test reports, visit the WooCommerce Test Reports Dashboard.

@chihsuan chihsuan requested a review from a team September 30, 2022 03:56
@chihsuan chihsuan force-pushed the fix/payment-task-display-problem branch from 9813c8d to 6079093 Compare October 3, 2022 05:14
rjchow
rjchow approved these changes Oct 3, 2022
View reviewed changes
Copy link
Contributor

@rjchow rjchow left a comment

Choose a reason for hiding this comment

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

Fix seems to work correctly! 🚢
Discovered another issue p1664779377044819/1664765407.476729-slack-C01SFMVEYAK but will create another issue for that.

@adrianduffell
Copy link
Contributor

adrianduffell commented Oct 3, 2022 •
edited
Loading

Thanks @chihsuan, It tested well for me too! I also checked it using a country not eligible for WC Pay and in that case the Set up payments task showed in place as expected 👍

@chihsuan chihsuan merged commit c4befcd into trunk Oct 3, 2022
@chihsuan chihsuan deleted the fix/payment-task-display-problem branch October 3, 2022 08:34
@github-actions
Copy link
Contributor

github-actions bot commented Oct 3, 2022

Hi @chihsuan, thanks for merging this pull request. Please take a look at these follow-up tasks you may need to perform:

  • Add the release: add testing instructions label

@github-actions github-actions bot mentioned this pull request Oct 3, 2022
Merged
github-actions bot pushed a commit that referenced this pull request Oct 3, 2022
@chihsuan
Fix wrong payment tasks display logic (#34892)
15274db 
* Fix the wc pay view logic so that we don't display it even when payment task is completed

* Add changelog
@github-actions github-actions bot mentioned this pull request Oct 3, 2022
Merged
roykho pushed a commit that referenced this pull request Oct 3, 2022
@github-actions @chihsuan
Cherry pick 34892 into release/7.0 (#34921)
28a3f67 
* Fix wrong payment tasks display logic (#34892)

* Fix the wc pay view logic so that we don't display it even when payment task is completed

* Add changelog

* Prep for cherry pick 34892

Co-authored-by: Chi-Hsuan Huang <chihsuan.tw@gmail.com>
Co-authored-by: WooCommerce Bot <no-reply@woocommerce.com>
@roykho roykho removed the release: cherry-pick Commits from this PR also needs to be added to current release branch. label Oct 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rjchow rjchow rjchow approved these changes

Assignees

@chihsuan chihsuan

Labels
plugin: woocommerce Issues related to the WooCommerce Core plugin.
Projects
None yet
Milestone
7.0.0
Development

Successfully merging this pull request may close these issues.

"Set up payments" task display unnecessarily
4 participants
@chihsuan @adrianduffell @rjchow @roykho