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

Detach vaulting from subscriptions (WIP)

Browse source
This commit is contained in:
emilicastells 2022-11-22 13:35:28 +01:00
parent 28031d927b
commit 2b3b4dcce2
No known key found for this signature in database
GPG key ID: 1520C07081754570
5 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/ppcp-button/src/Assets/SmartButton.php
View file

@ -239,10 +239,6 @@ class SmartButton implements SmartButtonInterface {
$this->render_message_wrapper_registrar(); $this->render_message_wrapper_registrar();
} }
if ( ! $this->can_save_vault_token() && $this->has_subscriptions() ) {
return false;
}
if ( if (
$this->settings->has( 'dcc_enabled' ) $this->settings->has( 'dcc_enabled' )
&& $this->settings->get( 'dcc_enabled' ) && $this->settings->get( 'dcc_enabled' )
@ -444,10 +440,6 @@ class SmartButton implements SmartButtonInterface {
add_action( add_action(
$this->mini_cart_button_renderer_hook(), $this->mini_cart_button_renderer_hook(),
function () { function () {
if ( ! $this->can_save_vault_token() && $this->has_subscriptions() ) {
return;
}
if ( $this->is_cart_price_total_zero() || $this->is_free_trial_cart() ) { if ( $this->is_cart_price_total_zero() || $this->is_free_trial_cart() ) {
return; return;
} }
@ -559,10 +551,6 @@ class SmartButton implements SmartButtonInterface {
*/ */
public function button_renderer( string $gateway_id ) { public function button_renderer( string $gateway_id ) {
if ( ! $this->can_save_vault_token() && $this->has_subscriptions() ) {
return;
}
$available_gateways = WC()->payment_gateways->get_available_payment_gateways(); $available_gateways = WC()->payment_gateways->get_available_payment_gateways();
if ( ! isset( $available_gateways[ $gateway_id ] ) ) { if ( ! isset( $available_gateways[ $gateway_id ] ) ) {
@ -578,9 +566,6 @@ class SmartButton implements SmartButtonInterface {
* Renders the HTML for the credit messaging. * Renders the HTML for the credit messaging.
*/ */
public function message_renderer() { public function message_renderer() {
if ( ! $this->can_save_vault_token() && $this->has_subscriptions() ) {
return false;
}
$product = wc_get_product(); $product = wc_get_product();

2
modules/ppcp-wc-gateway/src/Gateway/CardButtonGateway.php
View file

@ -174,7 +174,7 @@ class CardButtonGateway extends \WC_Payment_Gateway {
if ( $this->onboarded ) { if ( $this->onboarded ) {
$this->supports = array( 'refunds' ); $this->supports = array( 'refunds' );
} }
if ($this->gateways_enabled() && $this->vault_setting_enabled()) { if ($this->gateways_enabled()) {
$this->supports = array( $this->supports = array(
'refunds', 'refunds',
'products', 'products',

2
modules/ppcp-wc-gateway/src/Gateway/CreditCardGateway.php
View file

@ -174,7 +174,7 @@ class CreditCardGateway extends \WC_Payment_Gateway_CC {
if ( $state->current_state() === State::STATE_ONBOARDED ) { if ( $state->current_state() === State::STATE_ONBOARDED ) {
$this->supports = array( 'refunds' ); $this->supports = array( 'refunds' );
} }
if ($this->gateways_enabled() && $this->vault_setting_enabled()) { if ($this->gateways_enabled()) {
$this->supports = array( $this->supports = array(
'refunds', 'refunds',
'products', 'products',

2
modules/ppcp-wc-gateway/src/Gateway/PayPalGateway.php
View file

@ -204,7 +204,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
if ( $this->onboarded ) { if ( $this->onboarded ) {
$this->supports = array( 'refunds' ); $this->supports = array( 'refunds' );
} }
if ($this->gateways_enabled() && $this->vault_setting_enabled()) { if ($this->gateways_enabled()) {
$this->supports = array( $this->supports = array(
'refunds', 'refunds',
'products', 'products',

13
modules/ppcp-wc-gateway/src/Gateway/ProcessPaymentTrait.php
View file

@ -33,19 +33,6 @@ trait ProcessPaymentTrait {
return false; return false;
} }
/**
* Checks if vault setting is enabled.
*
* @return bool Whether vault settings are enabled or not.
* @throws \WooCommerce\PayPalCommerce\WcGateway\Exception\NotFoundException When a setting hasn't been found.
*/
protected function vault_setting_enabled(): bool {
if ( $this->config->has( 'vault_enabled' ) && $this->config->get( 'vault_enabled' ) ) {
return true;
}
return false;
}
/** /**
* Scheduled the vaulted payment check. * Scheduled the vaulted payment check.
* *