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

pcp-37 / return to checkout after three times trying but returned with insufficient funds error

Browse source
This commit is contained in:
David Remer 2020-09-02 08:43:41 +03:00
parent ae12409454
commit 00389dac84
6 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/ppcp-wc-gateway/src/Endpoint/class-returnurlendpoint.php
View file

@ -77,6 +77,14 @@ class ReturnUrlEndpoint {
$success = $this->gateway->process_payment( $wc_order_id );
if ( isset( $success['result'] ) && 'success' === $success['result'] ) {
add_filter(
'allowed_redirect_hosts',
function( $allowed_hosts ) : array {
$allowed_hosts[] = 'www.paypal.com';
$allowed_hosts[] = 'www.sandbox.paypal.com';
return (array) $allowed_hosts;
}
);
wp_safe_redirect( $success['redirect'] );
exit();
}

12
modules/ppcp-wc-gateway/src/Gateway/class-paypalgateway.php
View file

@ -184,6 +184,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
*/
//phpcs:disable WordPress.Security.NonceVerification.Recommended
if ( isset( $_REQUEST['ppcp-resume-order'] ) && $wc_order->has_status( 'processing' ) ) {
$this->session_handler->destroy_session_data();
return array(
'result' => 'success',
'redirect' => $this->get_return_url( $wc_order ),
@ -193,6 +194,7 @@ class PayPalGateway extends \WC_Payment_Gateway {
try {
if ( $this->order_processor->process( $wc_order, $woocommerce ) ) {
$this->session_handler->destroy_session_data();
return array(
'result' => 'success',
'redirect' => $this->get_return_url( $wc_order ),
@ -200,10 +202,18 @@ class PayPalGateway extends \WC_Payment_Gateway {
}
} catch ( PayPalApiException $error ) {
if ( $error->has_detail( 'INSTRUMENT_DECLINED' ) ) {
$this->session_handler->increment_insufficient_funding_tries();
$host = $this->config->has( 'sandbox_on' ) && $this->config->get( 'sandbox_on' ) ?
'https://www.sandbox.paypal.com/' : 'https://www.paypal.com/';
$url = $host . 'checkoutnow?token=' . $this->session_handler->order()->id();
if ( $this->session_handler->insufficient_funding_tries() >= 3 ) {
$this->session_handler->destroy_session_data();
wc_add_notice(
__( 'Please use a different payment method.', 'paypal-for-woocommerce' ),
'error'
);
return null;
}
return array(
'result' => 'success',
'redirect' => $url,

2
modules/ppcp-wc-gateway/src/Processor/class-orderprocessor.php
View file

@ -131,7 +131,7 @@ class OrderProcessor {
*/
public function process( \WC_Order $wc_order, \WooCommerce $woocommerce ): bool {
$order = $this->session_handler->order();
if (! $order) {
if ( ! $order ) {
return false;
}
$wc_order->update_meta_data( PayPalGateway::ORDER_ID_META_KEY, $order->id() );