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

Fix merge conflict

Browse source
This commit is contained in:
Emili Castells Guasch 2024-10-22 12:34:31 +02:00
commit 0e7fa666bc
47 changed files with 11354 additions and 342 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/ppcp-wc-gateway/services.php
View file

@ -119,7 +119,8 @@ return array(
$container->get( 'wcgateway.place-order-button-text' ),
$container->get( 'api.endpoint.payment-tokens' ),
$container->get( 'vaulting.vault-v3-enabled' ),
$container->get( 'vaulting.wc-payment-tokens' )
$container->get( 'vaulting.wc-payment-tokens' ),
$container->get( 'wcgateway.settings.admin-settings-enabled' )
);
},
'wcgateway.credit-card-gateway' => static function ( ContainerInterface $container ): CreditCardGateway {
@ -1941,4 +1942,8 @@ return array(
$container->get( 'woocommerce.logger.woocommerce' )
);
},
'wcgateway.settings.admin-settings-enabled' => static function( ContainerInterface $container ): bool {
return $container->has( 'settings.url' );
},
);