woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 12:25:15 +08:00
Code Issues Projects Packages Wiki Activity Actions

🔀 Merge branch 'temp/settings-ui'

Browse source 
# Conflicts:
#	modules/ppcp-settings/resources/css/_variables.scss
#	modules/ppcp-settings/resources/js/Components/Screens/Overview/TabPaymentMethods.js
This commit is contained in:
Philipp Stracker 2024-12-09 11:27:41 +01:00
commit e9a37da091
No known key found for this signature in database
37 changed files with 617 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/AcdcOptionalPaymentMethods.js
View file

@ -1,4 +1,4 @@
import BadgeBox, { BADGE_BOX_TITLE_BIG } from '../BadgeBox';
import BadgeBox from '../BadgeBox';
import { __, sprintf } from '@wordpress/i18n';
import Separator from '../Separator';
import generatePriceText from '../../../utils/badgeBoxUtils';
@ -10,7 +10,7 @@ const AcdcOptionalPaymentMethods = ( {
storeCountry,
storeCurrency,
} ) => {
if ( isFastlane && isPayLater && storeCountry === 'us' ) {
if ( isFastlane && isPayLater && storeCountry === 'US' ) {
return (
<div className="ppcp-r-optional-payment-methods__wrapper">
<BadgeBox

4
modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/AcdcFlow.js
View file

@ -12,7 +12,7 @@ const AcdcFlow = ( {
storeCountry,
storeCurrency,
} ) => {
if ( isFastlane && isPayLater && storeCountry === 'us' ) {
if ( isFastlane && isPayLater && storeCountry === 'US' ) {
return (
<div className="ppcp-r-welcome-docs__wrapper">
<div className="ppcp-r-welcome-docs__col">
@ -123,7 +123,7 @@ const AcdcFlow = ( {
);
}
if ( isPayLater && storeCountry === 'uk' ) {
if ( isPayLater && storeCountry === 'UK' ) {
return (
<div className="ppcp-r-welcome-docs__wrapper">
<div className="ppcp-r-welcome-docs__col">

2
modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/BcdcFlow.js
View file

@ -6,7 +6,7 @@ import { countryPriceInfo } from '../../../utils/countryPriceInfo';
import OptionalPaymentMethods from '../OptionalPaymentMethods/OptionalPaymentMethods';
const BcdcFlow = ( { isPayLater, storeCountry, storeCurrency } ) => {
if ( isPayLater && storeCountry === 'us' ) {
if ( isPayLater && storeCountry === 'US' ) {
return (
<div className="ppcp-r-welcome-docs__wrapper">
<div className="ppcp-r-welcome-docs__col">