Respect BNPL limits_per_currency (country, min, max) #9626
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| Significance: patch | ||
| Type: fix | ||
|
|
||
| Prevent dead space on product pages when no BNPL offers are available. |
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -716,59 +716,163 @@ public static function get_filtered_error_status_code( Exception $e ): int { | |
| } | ||
|
|
||
| /** | ||
| * Get the BNPL limits per currency for a specific payment method. | ||
| * | ||
| * @param string $payment_method The payment method name ('affirm', 'afterpay_clearpay', or 'klarna'). | ||
| * @return array The BNPL limits per currency for the specified payment method. | ||
| */ | ||
|
Comment on lines
-727
to
-763
There was a problem hiding this comment. Mentioned in the PR description, this was added to handle BNPL minimum amounts but is actually comprised of Stripe minimum amounts. It's was only used for that purpose and is safe to remove. |
||
| public static function get_bnpl_limits_per_currency( $payment_method ) { | ||
| switch ( $payment_method ) { | ||
| case 'affirm': | ||
| return [ | ||
| Currency_Code::CANADIAN_DOLLAR => [ | ||
| Country_Code::CANADA => [ | ||
| 'min' => 5000, | ||
| 'max' => 3000000, | ||
| ], // Represents CAD 50 - 30,000 CAD. | ||
| ], | ||
| Currency_Code::UNITED_STATES_DOLLAR => [ | ||
| Country_Code::UNITED_STATES => [ | ||
| 'min' => 5000, | ||
| 'max' => 3000000, | ||
| ], | ||
| ], // Represents USD 50 - 30,000 USD. | ||
| ]; | ||
| case 'afterpay_clearpay': | ||
| return [ | ||
| Currency_Code::AUSTRALIAN_DOLLAR => [ | ||
| Country_Code::AUSTRALIA => [ | ||
| 'min' => 100, | ||
| 'max' => 200000, | ||
| ], // Represents AUD 1 - 2,000 AUD. | ||
| ], | ||
| Currency_Code::CANADIAN_DOLLAR => [ | ||
| Country_Code::CANADA => [ | ||
| 'min' => 100, | ||
| 'max' => 200000, | ||
| ], // Represents CAD 1 - 2,000 CAD. | ||
| ], | ||
| Currency_Code::NEW_ZEALAND_DOLLAR => [ | ||
| Country_Code::NEW_ZEALAND => [ | ||
| 'min' => 100, | ||
| 'max' => 200000, | ||
| ], // Represents NZD 1 - 2,000 NZD. | ||
| ], | ||
| Currency_Code::POUND_STERLING => [ | ||
| Country_Code::UNITED_KINGDOM => [ | ||
| 'min' => 100, | ||
| 'max' => 120000, | ||
| ], // Represents GBP 1 - 1,200 GBP. | ||
| ], | ||
| Currency_Code::UNITED_STATES_DOLLAR => [ | ||
| Country_Code::UNITED_STATES => [ | ||
| 'min' => 100, | ||
| 'max' => 400000, | ||
| ], // Represents USD 1 - 4,000 USD. | ||
| ], | ||
| ]; | ||
| case 'klarna': | ||
| return [ | ||
| Currency_Code::UNITED_STATES_DOLLAR => [ | ||
| Country_Code::UNITED_STATES => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents USD 1 - 10,000 USD. | ||
| ], | ||
| Currency_Code::POUND_STERLING => [ | ||
| Country_Code::UNITED_KINGDOM => [ | ||
| 'min' => 100, | ||
| 'max' => 500000, | ||
| ], // Represents GBP 1 - 5,000 GBP. | ||
| ], | ||
| Currency_Code::EURO => [ | ||
| Country_Code::AUSTRIA => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents EUR 1 - 10,000 EUR. | ||
| Country_Code::BELGIUM => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents EUR 1 - 10,000 EUR. | ||
| Country_Code::GERMANY => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents EUR 1 - 10,000 EUR. | ||
| Country_Code::NETHERLANDS => [ | ||
| 'min' => 100, | ||
| 'max' => 500000, | ||
| ], // Represents EUR 1 - 5,000 EUR. | ||
| Country_Code::FINLAND => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents EUR 1 - 10,000 EUR. | ||
| Country_Code::SPAIN => [ | ||
| 'min' => 100, | ||
| 'max' => 1000000, | ||
| ], // Represents EUR 1 - 10,000 EUR. | ||
| Country_Code::IRELAND => [ | ||
| 'min' => 100, | ||
| 'max' => 400000, | ||
| ], // Represents EUR 1 - 4,000 EUR. | ||
| Country_Code::ITALY => [ | ||
| 'min' => 100, | ||
| 'max' => 400000, | ||
| ], // Represents EUR 1 - 4,000 EUR. | ||
| Country_Code::FRANCE => [ | ||
| 'min' => 100, | ||
| 'max' => 400000, | ||
| ], // Represents EUR 1 - 4,000 EUR. | ||
| ], | ||
| Currency_Code::DANISH_KRONE => [ | ||
| Country_Code::DENMARK => [ | ||
| 'min' => 100, | ||
| 'max' => 10000000, | ||
| ], // Represents DKK 1 - 100,000 DKK. | ||
| ], | ||
| Currency_Code::NORWEGIAN_KRONE => [ | ||
| Country_Code::NORWAY => [ | ||
| 'min' => 100, | ||
| 'max' => 10000000, | ||
| ], // Represents NOK 1 - 100,000 NOK. | ||
| ], | ||
| Currency_Code::SWEDISH_KRONA => [ | ||
| Country_Code::SWEDEN => [ | ||
| 'min' => 100, | ||
| 'max' => 10000000, | ||
| ], // Represents SEK 1 - 100,000 SEK. | ||
| ], | ||
| ]; | ||
| default: | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Check if any BNPL method is available for a given country, currency, and price. | ||
| * | ||
| * @param array $enabled_methods Array of enabled BNPL methods. | ||
| * @param string $country_code Country code. | ||
| * @param string $currency_code Currency code. | ||
| * @param float $price Product price. | ||
| * @return bool True if any BNPL method is available, false otherwise. | ||
| */ | ||
| public static function is_any_bnpl_method_available( array $enabled_methods, string $country_code, string $currency_code, float $price ): bool { | ||
| $price_in_cents = $price; | ||
|
|
||
| foreach ( $enabled_methods as $method ) { | ||
| $limits = self::get_bnpl_limits_per_currency( $method ); | ||
|
|
||
| if ( isset( $limits[ $currency_code ][ $country_code ] ) ) { | ||
| $min_amount = $limits[ $currency_code ][ $country_code ]['min']; | ||
| $max_amount = $limits[ $currency_code ][ $country_code ]['max']; | ||
|
|
||
| if ( $price_in_cents >= $min_amount && $price_in_cents <= $max_amount ) { | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -785,20 +889,12 @@ public static function cache_minimum_amount( $currency, $amount ) { | |
| * Checks if there is a minimum amount required for transactions in a given currency. | ||
| * | ||
| * @param string $currency The currency to check for. | ||
| * | ||
| * @return int|null Either the minimum amount, or `null` if not available. | ||
| */ | ||
| public static function get_cached_minimum_amount( $currency ) { | ||
| $cached = get_transient( 'wcpay_minimum_amount_' . strtolower( $currency ) ); | ||
| return (int) $cached ? (int) $cached : null; | ||
| } | ||
|
Comment on lines
+895
to
898
There was a problem hiding this comment. Similar to the previous comment, reverting this back to it's state prior to #9355. |
||
|
|
||
| /** | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This just ensures we're getting all of the enabled BNPL payment methods.
get_payment_method_ids_enabled_at_checkout()is a filtered list for checkout. This means, if you visit a PDP while you have products in the cart, you might not see the correct BNPL methods in the PMME. For example, with a $5 product in the cart, a $60 PDP won't display Affirm ($50 minimum) because it's been filtered out based on cart totals. Demo here, second example from the bottom. This change solves that.