woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-31 06:52:50 +08:00
Code Issues Projects Packages Wiki Activity Actions

Merge pull request #633 from woocommerce/pcp-615-invalid-address

Browse source 
Retry without shipping field when got invalid address error
This commit is contained in:
Emili Castells 2022-05-17 12:53:00 +02:00 • committed by GitHub
commit 5cd439fa20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 59 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/ppcp-api-client/src/Entity/PurchaseUnit.php
View file

@ -175,6 +175,15 @@ class PurchaseUnit {
return $this->shipping; return $this->shipping;
} }
/**
* Sets shipping info.
*
* @param Shipping|null $shipping The value to set.
*/
public function set_shipping( ?Shipping $shipping ): void {
$this->shipping = $shipping;
}
/** /**
* Returns the reference id. * Returns the reference id.
* *

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

@ -119,4 +119,13 @@ class PayPalApiException extends RuntimeException {
public function issues(): array { public function issues(): array {
return $this->response->issues ?? array(); return $this->response->issues ?? array();
} }
/**
* The HTTP status code.
*
* @return int
*/
public function status_code(): int {
return $this->status_code;
}
} }

49
modules/ppcp-button/src/Endpoint/CreateOrderEndpoint.php
View file

@ -11,6 +11,7 @@ namespace WooCommerce\PayPalCommerce\Button\Endpoint;
use Exception; use Exception;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
use stdClass;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint; use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Amount; use WooCommerce\PayPalCommerce\ApiClient\Entity\Amount;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Money; use WooCommerce\PayPalCommerce\ApiClient\Entity\Money;
@ -317,19 +318,51 @@ class CreateOrderEndpoint implements EndpointInterface {
* @return Order Created PayPal order. * @return Order Created PayPal order.
* *
* @throws RuntimeException If create order request fails. * @throws RuntimeException If create order request fails.
* @throws PayPalApiException If create order request fails.
* phpcs:disable Squiz.Commenting.FunctionCommentThrowTag.WrongNumber
*/ */
private function create_paypal_order( \WC_Order $wc_order = null ): Order { private function create_paypal_order( \WC_Order $wc_order = null ): Order {
$needs_shipping = WC()->cart instanceof \WC_Cart && WC()->cart->needs_shipping(); $needs_shipping = WC()->cart instanceof \WC_Cart && WC()->cart->needs_shipping();
$shipping_address_is_fix = $needs_shipping && 'checkout' === $this->parsed_request_data['context']; $shipping_address_is_fix = $needs_shipping && 'checkout' === $this->parsed_request_data['context'];
return $this->api_endpoint->create( try {
$this->purchase_units, return $this->api_endpoint->create(
$this->payer( $this->parsed_request_data, $wc_order ), $this->purchase_units,
null, $this->payer( $this->parsed_request_data, $wc_order ),
$this->payment_method(), null,
'', $this->payment_method(),
$shipping_address_is_fix '',
); $shipping_address_is_fix
);
} catch ( PayPalApiException $exception ) {
// Looks like currently there is no proper way to validate the shipping address for PayPal,
// so we cannot make some invalid addresses null in PurchaseUnitFactory,
// which causes failure e.g. for guests using the button on products pages when the country does not have postal codes.
if ( 422 === $exception->status_code()
&& array_filter(
$exception->details(),
function ( stdClass $detail ): bool {
return isset( $detail->field ) && str_contains( (string) $detail->field, 'shipping/address' );
}
) ) {
$this->logger->info( 'Invalid shipping address for order creation, retrying without it.' );
foreach ( $this->purchase_units as $purchase_unit ) {
$purchase_unit->set_shipping( null );
}
return $this->api_endpoint->create(
$this->purchase_units,
$this->payer( $this->parsed_request_data, $wc_order ),
null,
$this->payment_method(),
'',
$shipping_address_is_fix
);
}
throw $exception;
}
} }
/** /**