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

Fix method id check

Browse source
This commit is contained in:
Alex P 2023-11-23 08:46:48 +02:00
parent 018ba0de3e
commit ea35893a82
No known key found for this signature in database
GPG key ID: 54487A734A204D71
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/ppcp-blocks/resources/js/checkout-block.js
View file

@ -32,6 +32,8 @@ const PayPalComponent = ({
const [paypalOrder, setPaypalOrder] = useState(null);
const methodId = fundingSource ? `${config.id}-${fundingSource}` : config.id;
useEffect(() => {
// fill the form if in continuation (for product or mini-cart buttons)
if (!config.scriptData.continuation || !config.scriptData.continuation.order || window.ppcpContinuationFilled) {
@ -223,7 +225,7 @@ const PayPalComponent = ({
}
useEffect(() => {
if (activePaymentMethod !== config.id) {
if (activePaymentMethod !== methodId) {
return;
}
@ -259,7 +261,7 @@ const PayPalComponent = ({
}, [onPaymentSetup, paypalOrder, activePaymentMethod]);
useEffect(() => {
if (activePaymentMethod !== config.id) {
if (activePaymentMethod !== methodId) {
return;
}
const unsubscribe = onCheckoutFail(({ processingResponse }) => {
@ -349,7 +351,8 @@ if (config.usePlaceOrder && !config.scriptData.continuation) {
for (const fundingSource of ['paypal', ...config.enabledFundingSources]) {
registerExpressPaymentMethod({
name: fundingSource === 'paypal' ? config.id : `${config.id}-${fundingSource}`,
name: `${config.id}-${fundingSource}`,
paymentMethodId: config.id,
label: <div dangerouslySetInnerHTML={{__html: config.title}}/>,
content: <PayPalComponent isEditing={false} fundingSource={fundingSource}/>,
edit: <PayPalComponent isEditing={true}/>,