woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

Merge branch 'trunk' of github.com:woocommerce/woocommerce-paypal-payments into PCP-3771-axo-refactor-pay-pal-script-loading-to-prevent-conflicts

Browse source
This commit is contained in:
Daniel Dudzic 2024-10-08 09:17:08 +02:00
commit 733eee08a2
No known key found for this signature in database
GPG key ID: 31B40D33E3465483
8 changed files with 260 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/ppcp-axo-block/resources/css/gateway.scss
View file

@ -301,3 +301,13 @@ a.wc-block-axo-change-link {
#shipping-fields .wc-block-components-checkout-step__heading {
display: flex;
}
// 11. Fastlane modal info message fix
.wc-block-components-text-input {
.wc-block-components-form &,
& {
paypal-watermark {
white-space: wrap;
}
}
}

9
modules/ppcp-axo-block/src/AxoBlockModule.php
View file

@ -102,7 +102,14 @@ class AxoBlockModule implements ServiceModule, ExtendingModule, ExecutableModule
add_action(
'woocommerce_blocks_payment_method_type_registration',
function( PaymentMethodRegistry $payment_method_registry ) use ( $c ): void {
$payment_method_registry->register( $c->get( 'axoblock.method' ) );
/*
* Only register the method if we are not in the admin
* (to avoid two Debit & Credit Cards gateways in the
* checkout block in the editor: one from ACDC one from Axo).
*/
if ( ! is_admin() ) {
$payment_method_registry->register( $c->get( 'axoblock.method' ) );
}
}
);