From db8a6cccd2965e0fb67c4a650578bbd1aca4eb92 Mon Sep 17 00:00:00 2001 From: Narek Zakarian Date: Tue, 26 Nov 2024 18:18:02 +0400 Subject: [PATCH] Create `countryPriceInfo` util --- .../AcdcOptionalPaymentMethods.js | 2 +- .../BcdcOptionalPaymentMethods.js | 2 +- .../OptionalPaymentMethods.js | 3 - .../WelcomeDocs/AcdcFlow.js | 6 +- .../WelcomeDocs/BcdcFlow.js | 10 +-- .../WelcomeDocs/WelcomeDocs.js | 78 ------------------- 6 files changed, 6 insertions(+), 95 deletions(-) diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/AcdcOptionalPaymentMethods.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/AcdcOptionalPaymentMethods.js index e70d0fcbc..2022cac60 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/AcdcOptionalPaymentMethods.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/AcdcOptionalPaymentMethods.js @@ -2,13 +2,13 @@ import BadgeBox, { BADGE_BOX_TITLE_BIG } from '../BadgeBox'; import { __, sprintf } from '@wordpress/i18n'; import Separator from '../Separator'; import generatePriceText from '../../../utils/badgeBoxUtils'; +import { countryPriceInfo } from '../../../utils/countryPriceInfo'; const AcdcOptionalPaymentMethods = ( { isFastlane, isPayLater, storeCountry, storeCurrency, - countryPriceInfo, } ) => { if ( isFastlane && isPayLater && storeCountry === 'us' ) { return ( diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/BcdcOptionalPaymentMethods.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/BcdcOptionalPaymentMethods.js index 0ad3c0e69..b5e4b7d2e 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/BcdcOptionalPaymentMethods.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/BcdcOptionalPaymentMethods.js @@ -1,12 +1,12 @@ import BadgeBox from '../BadgeBox'; import { __, sprintf } from '@wordpress/i18n'; import generatePriceText from '../../../utils/badgeBoxUtils'; +import { countryPriceInfo } from '../../../utils/countryPriceInfo'; const BcdcOptionalPaymentMethods = ( { isPayLater, storeCountry, storeCurrency, - countryPriceInfo, } ) => { if ( isPayLater && storeCountry === 'us' ) { return ( diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/OptionalPaymentMethods.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/OptionalPaymentMethods.js index 0ba17a2b2..129088f59 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/OptionalPaymentMethods.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/OptionalPaymentMethods/OptionalPaymentMethods.js @@ -7,7 +7,6 @@ const OptionalPaymentMethods = ( { isPayLater, storeCountry, storeCurrency, - countryPriceInfo, } ) => { return (
@@ -17,14 +16,12 @@ const OptionalPaymentMethods = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> ) : ( ) }
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/AcdcFlow.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/AcdcFlow.js index 3ef3e422d..1c167d756 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/AcdcFlow.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/AcdcFlow.js @@ -2,6 +2,8 @@ import BadgeBox, { BADGE_BOX_TITLE_BIG } from '../BadgeBox'; import { __, sprintf } from '@wordpress/i18n'; import Separator from '../Separator'; import generatePriceText from '../../../utils/badgeBoxUtils'; +import { countryPriceInfo } from '../../../utils/countryPriceInfo'; + import OptionalPaymentMethods from '../OptionalPaymentMethods/OptionalPaymentMethods'; const AcdcFlow = ( { @@ -9,7 +11,6 @@ const AcdcFlow = ( { isPayLater, storeCountry, storeCurrency, - countryPriceInfo, } ) => { if ( isFastlane && isPayLater && storeCountry === 'us' ) { return ( @@ -116,7 +117,6 @@ const AcdcFlow = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> @@ -202,7 +202,6 @@ const AcdcFlow = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> @@ -282,7 +281,6 @@ const AcdcFlow = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/BcdcFlow.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/BcdcFlow.js index ec2b738d5..6c984cfc1 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/BcdcFlow.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/BcdcFlow.js @@ -2,14 +2,10 @@ import BadgeBox, { BADGE_BOX_TITLE_BIG } from '../BadgeBox'; import { __, sprintf } from '@wordpress/i18n'; import Separator from '../Separator'; import generatePriceText from '../../../utils/badgeBoxUtils'; +import { countryPriceInfo } from '../../../utils/countryPriceInfo'; import OptionalPaymentMethods from '../OptionalPaymentMethods/OptionalPaymentMethods'; -const BcdcFlow = ( { - isPayLater, - storeCountry, - storeCurrency, - countryPriceInfo, -} ) => { +const BcdcFlow = ( { isPayLater, storeCountry, storeCurrency } ) => { if ( isPayLater && storeCountry === 'us' ) { return (
@@ -115,7 +111,6 @@ const BcdcFlow = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } />
@@ -187,7 +182,6 @@ const BcdcFlow = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> ); diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/WelcomeDocs.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/WelcomeDocs.js index 4f0538c18..b3b60fee1 100644 --- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/WelcomeDocs.js +++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/WelcomeDocs/WelcomeDocs.js @@ -19,82 +19,6 @@ const WelcomeDocs = ( { 'https://woocommerce.com/document/woocommerce-paypal-payments/#manual-credential-input ' ); - const countryPriceInfo = { - us: { - currencySymbol: '$', - fixedFee: 0.49, - checkout: 3.49, - ccf: 2.59, - dw: 2.59, - apm: 2.59, - fastlane: 2.59, - standardCardFields: 2.99, - }, - uk: { - currencySymbol: '£', - fixedFee: 0.3, - checkout: 2.9, - ccf: 1.2, - dw: 1.2, - apm: 1.2, - standardCardFields: 1.2, - }, - ca: { - currencySymbol: '$', - fixedFee: 0.3, - checkout: 2.9, - ccf: 2.7, - dw: 2.7, - apm: 2.9, - standardCardFields: 2.9, - }, - au: { - currencySymbol: '$', - fixedFee: 0.3, - checkout: 2.6, - ccf: 1.75, - dw: 1.75, - apm: 2.6, - standardCardFields: 2.6, - }, - fr: { - currencySymbol: '€', - fixedFee: 0.35, - checkout: 2.9, - ccf: 1.2, - dw: 1.2, - apm: 1.2, - standardCardFields: 1.2, - }, - it: { - currencySymbol: '€', - fixedFee: 0.35, - checkout: 3.4, - ccf: 1.2, - dw: 1.2, - apm: 1.2, - standardCardFields: 1.2, - }, - de: { - currencySymbol: '€', - fixedFee: 0.39, - checkout: 2.99, - ccf: 2.99, - dw: 2.99, - apm: 2.99, - standardCardFields: 2.99, - }, - es: { - currencySymbol: '€', - fixedFee: 0.35, - checkout: 2.9, - ccf: 1.2, - dw: 1.2, - apm: 1.2, - standardCardFields: 1.2, - }, - }; - return (

@@ -109,14 +33,12 @@ const WelcomeDocs = ( { isPayLater={ isPayLater } storeCountry={ storeCountry } storeCurrency={ storeCurrency } - countryPriceInfo={ countryPriceInfo } /> ) : ( ) }