Remove dcc continuation leftovers

This commit is contained in:
Alex P 2022-07-19 09:29:12 +03:00
parent 619e9d2552
commit c11635343d

View file

@ -79,12 +79,6 @@ class DisableGateways {
return $methods; return $methods;
} }
if ( $this->is_credit_card() ) {
return array(
CreditCardGateway::ID => $methods[ CreditCardGateway::ID ],
PayPalGateway::ID => $methods[ PayPalGateway::ID ],
);
}
return array( PayPalGateway::ID => $methods[ PayPalGateway::ID ] ); return array( PayPalGateway::ID => $methods[ PayPalGateway::ID ] );
} }
@ -112,23 +106,20 @@ class DisableGateways {
* @return bool * @return bool
*/ */
private function needs_to_disable_gateways(): bool { private function needs_to_disable_gateways(): bool {
return $this->session_handler->order() !== null &&
'card' !== $this->session_handler->funding_source();
}
/**
* Whether the current PayPal session is done via DCC payment.
*
* @return bool
*/
private function is_credit_card(): bool {
$order = $this->session_handler->order(); $order = $this->session_handler->order();
if ( ! $order ) { if ( ! $order ) {
return false; return false;
} }
if ( ! $order->payment_source() || ! $order->payment_source()->card() ) {
return false; $source = $order->payment_source();
if ( $source && $source->card() ) {
return false; // DCC.
} }
if ( 'card' === $this->session_handler->funding_source() ) {
return false; // Card buttons.
}
return true; return true;
} }
} }