From 32a2539d6f99a8d60edc123c71c9df51167cc3d9 Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Wed, 3 Oct 2018 12:39:09 +0530 Subject: [PATCH 1/2] Express Checkout - Billing Agreement Error Handling, PFW-264 --- ...ass-wc-gateway-paypal-express-request-angelleye.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php index d1d115c09..2d09dddd6 100644 --- a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php +++ b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php @@ -199,9 +199,17 @@ public function angelleye_redirect_action($url) { public function angelleye_set_express_checkout() { try { $this->angelleye_set_express_checkout_request(); - if ($this->response_helper->ec_is_response_success_or_successwithwarning($this->paypal_response)) { + if ($this->response_helper->ec_is_response_success($this->paypal_response)) { $this->angelleye_redirect_action($this->paypal_response['REDIRECTURL']); exit; + } elseif ($this->response_helper->ec_is_response_successwithwarning($this->paypal_response)) { + if( !empty($this->paypal_response['L_ERRORCODE0']) && $this->paypal_response['L_ERRORCODE0'] == '11452') { + $this->angelleye_write_error_log_and_send_email_notification($paypal_action_name = 'SetExpressCheckout'); + $this->angelleye_redirect(); + } else { + $this->angelleye_redirect_action($this->paypal_response['REDIRECTURL']); + exit; + } } else { $this->angelleye_write_error_log_and_send_email_notification($paypal_action_name = 'SetExpressCheckout'); $this->angelleye_redirect(); From ee4f81b8999f8d6371181274ce569f02753d9d5a Mon Sep 17 00:00:00 2001 From: kcppdevelopers Date: Wed, 3 Oct 2018 13:27:36 +0530 Subject: [PATCH 2/2] Express Checkout - Billing Agreement Error Handling, PFW-264 --- .../class-wc-gateway-paypal-express-request-angelleye.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php index 2d09dddd6..96a3f1813 100644 --- a/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php +++ b/angelleye-includes/express-checkout/class-wc-gateway-paypal-express-request-angelleye.php @@ -1051,7 +1051,7 @@ public function angelleye_write_error_log_and_send_email_notification($paypal_ac $error_display_type_message = sprintf(__('There was a problem paying with PayPal. Please try another method.', 'paypal-for-woocommerce')); } $error_display_type_message = apply_filters('ae_ppec_error_user_display_message', $error_display_type_message, $ErrorCode, $ErrorLongMsg); - if (AngellEYE_Utility::is_cart_contains_subscription() == false) { + if (function_exists('wc_add_notice')) { wc_add_notice($error_display_type_message, 'error'); } }