woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-07 19:54:15 +08:00
Code Issues Projects Packages Wiki Activity Actions

Return message without changing the response

Browse source
This commit is contained in:
carmenmaymo 2023-06-19 08:44:11 +02:00
parent b668cf5d87
commit d22cdba4a4
No known key found for this signature in database
GPG key ID: 6023F686B0F3102E
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/ppcp-api-client/src/Exception/PayPalApiException.php
View file

@ -59,7 +59,6 @@ class PayPalApiException extends RuntimeException {
if ( ! isset( $response->links ) || ! is_array( $response->links ) ) { if ( ! isset( $response->links ) || ! is_array( $response->links ) ) {
$response->links = array(); $response->links = array();
} }
$response = $this->add_improved_error_message( $response );
/** /**
* The JSON response object. * The JSON response object.
@ -68,7 +67,7 @@ class PayPalApiException extends RuntimeException {
*/ */
$this->response = $response; $this->response = $response;
$this->status_code = $status_code; $this->status_code = $status_code;
$message = $response->message; $message = $this->get_customer_friendly_message($response);
if ( $response->name ) { if ( $response->name ) {
$message = '[' . $response->name . '] ' . $message; $message = '[' . $response->name . '] ' . $message;
} }
@ -146,14 +145,14 @@ class PayPalApiException extends RuntimeException {
} }
/** /**
* Adds an improved error message to the response if the error detail is known. * Returns a friendly message if the error detail is known.
* *
* @param stdClass $json The response. * @param stdClass $json The response.
* @return stdClass * @return string
*/ */
public function add_improved_error_message( stdClass $json ): stdClass { public function get_customer_friendly_message( stdClass $json ): string {
if ( ! isset( $json->details ) ) { if ( empty( $json->details ) ) {
return $json; return $json->message;
} }
$improved_keys_messages = array( $improved_keys_messages = array(
'PAYMENT_DENIED' => __( 'PayPal rejected the payment. Please reach out to the PayPal support for more information.', 'woocommerce-paypal-payments' ), 'PAYMENT_DENIED' => __( 'PayPal rejected the payment. Please reach out to the PayPal support for more information.', 'woocommerce-paypal-payments' ),
@ -175,8 +174,8 @@ class PayPalApiException extends RuntimeException {
); );
if ( $improved_errors ) { if ( $improved_errors ) {
$improved_errors = array_values( $improved_errors ); $improved_errors = array_values( $improved_errors );
$json->message = $improved_keys_messages[ $improved_errors[0] ]; return $improved_keys_messages[ $improved_errors[0] ];
} }
return $json; return $json->message;
} }
} }