feat: add Store API multi-currency support #8816
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Size Change: +57 B (0%) Total Size: 1.26 MB
ℹ️ View Unchanged
|
frosso
commented
May 14, 2024
| * | ||
| * @return bool True if request is a Store API request, false otherwise. | ||
| */ | ||
| public static function is_store_api_request(): bool { |
There was a problem hiding this comment.
Moved from includes/woopay/class-woopay-session.php
| /** | ||
| * The Store API route patterns that should be handled by the WooPay session handler. | ||
| */ | ||
| const STORE_API_ROUTE_PATTERNS = [ |
There was a problem hiding this comment.
Moved from includes/woopay/class-woopay-session.php
| * | ||
| * @return bool True if request is a Store API request, false otherwise. | ||
| */ | ||
| private static function is_store_api_request(): bool { |
There was a problem hiding this comment.
Moved to includes/class-wc-payments-utils.php for reusability
| /** | ||
| * The Store API route patterns that should be handled by the WooPay session handler. | ||
| */ | ||
| const STORE_API_ROUTE_PATTERNS = [ |
There was a problem hiding this comment.
Moved to includes/class-wc-payments-utils.php for reusability
| @@ -244,11 +244,11 @@ public function init_hooks() { | |||
|
|
|||
| $is_frontend_request = ! is_admin() && ! defined( 'DOING_CRON' ) && ! WC()->is_rest_api_request(); | |||
|
|
|||
| if ( $is_frontend_request ) { | |||
| if ( $is_frontend_request || \WC_Payments_Utils::is_store_api_request() ) { | |||
There was a problem hiding this comment.
Ensures that the currency query string parameter can be used by the Store API
| @@ -57,7 +57,7 @@ public function is_page_with_vars( array $pages, array $vars ): bool { | |||
| * @return boolean | |||
| */ | |||
| public static function is_admin_api_request(): bool { | |||
| return 0 === stripos( wp_get_referer(), admin_url() ) && WC()->is_rest_api_request(); | |||
| return 0 === stripos( wp_get_referer(), admin_url() ) && WC()->is_rest_api_request() && ! \WC_Payments_Utils::is_store_api_request(); | |||
There was a problem hiding this comment.
WC API requests were marked as "admin API" requests (which they aren't)
6 tasks
frosso
requested review from
a team and
gpressutto5
and removed request for
a team
gpressutto5
reviewed
May 14, 2024
There was a problem hiding this comment.
As you can see in the images below, I encountered some problems, but I'm not sure if they happen because of this PR or because of the Cart-Token implementation for PRBs.
| Apple Pay USD | Apple Pay EUR | Google Pay USD | Google Pay EUR | |
|---|---|---|---|---|
develop |
 |
 |
 |
 |
| This PR |  |
|
 |
 |
- When I use Apple Pay, the amount is always Pending, even after loading the shipping fee.
- Taxes are not being calculated.
- The shipping fee is not itemized.
|
@gpressutto5 thank you for the report! The itemized amounts not being displayed is something I still need to fix on the main PR, unfortunately :( |
gpressutto5
approved these changes
May 15, 2024
Base automatically changed from
refactor/pdp-payment-request-tokenized-cart
to
develop
May 17, 2024 08:52
6 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #
Changes proposed in this Pull Request
Adding multi-currency support to the Store API.
Tangentially, this also helps fix the multi-currency feature with the tokenized cart.
Testing instructions
The main purpose of this is to support the multi-currency feature with the Store API.
You can check this behavior by going into a block-based page (e.g.: block-based checkout page) and making this example request on a store with USD as the main currency and with EUR enabled:
You'll notice that in the response, the
totals.currency_codestring corresponds to the EUR currency.To further test this behavior with the tokenized cart with PRBs:
With this product (the single unit price is 14EUR/15USD):
Before - selected currency is EUR, but displayed currency in the PRB dialog is USD & price is 2x USD single unit price:
After - selected currency is EUR, displayed currency in the PRB dialog is accurate and price is accurate:
npm run changelogto add a changelog file, choosepatchto leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.Post merge