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

Fix Psalm problems

Browse source
This commit is contained in:
Narek Zakarian 2024-05-14 19:26:05 +04:00
parent 9ed934e9bb
commit 26ae2d0ad0
No known key found for this signature in database
GPG key ID: 07AFD7E7A9C164A7
1 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

75
modules/ppcp-button/src/Helper/WooCommerceOrderCreator.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace WooCommerce\PayPalCommerce\Button\Helper; namespace WooCommerce\PayPalCommerce\Button\Helper;
use RuntimeException;
use WC_Order; use WC_Order;
use WC_Order_Item_Shipping; use WC_Order_Item_Shipping;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Order; use WooCommerce\PayPalCommerce\ApiClient\Entity\Order;
@ -61,6 +62,10 @@ class WooCommerceOrderCreator {
public function create_from_paypal_order( Order $order, array $line_items ): WC_Order { public function create_from_paypal_order( Order $order, array $line_items ): WC_Order {
$wc_order = wc_create_order(); $wc_order = wc_create_order();
if ( ! $wc_order instanceof WC_Order ) {
throw new RuntimeException( 'Problem creating WC order.' );
}
$this->configure_line_items( $wc_order, $line_items ); $this->configure_line_items( $wc_order, $line_items );
$this->configure_shipping( $wc_order, $order->payer(), $order->purchase_units()[0]->shipping() ); $this->configure_shipping( $wc_order, $order->payer(), $order->purchase_units()[0]->shipping() );
$this->configure_payment_source( $wc_order ); $this->configure_payment_source( $wc_order );
@ -86,7 +91,13 @@ class WooCommerceOrderCreator {
$args = $variation_id > 0 ? array( 'variation_id' => $variation_id ) : array(); $args = $variation_id > 0 ? array( 'variation_id' => $variation_id ) : array();
$quantity = $line_item['quantity'] ?? 0; $quantity = $line_item['quantity'] ?? 0;
$wc_order->add_product( wc_get_product( $product_id ), $quantity, $args ); $item = wc_get_product( $product_id );
if ( ! $item ) {
return;
}
$wc_order->add_product( $item, $quantity, $args );
} }
} }
@ -94,51 +105,60 @@ class WooCommerceOrderCreator {
* Configures the shipping & billing addresses for WC order from given payer. * Configures the shipping & billing addresses for WC order from given payer.
* *
* @param WC_Order $wc_order The WC order. * @param WC_Order $wc_order The WC order.
* @param Payer $payer The payer. * @param Payer|null $payer The payer.
* @param Shipping|null $shipping The shipping. * @param Shipping|null $shipping The shipping.
* @return void * @return void
*/ */
protected function configure_shipping( WC_Order $wc_order, Payer $payer, ?Shipping $shipping ): void { protected function configure_shipping( WC_Order $wc_order, ?Payer $payer, ?Shipping $shipping ): void {
$shipping_address = null; $shipping_address = null;
$billing_address = null;
$shipping_options = null;
$address = $payer->address(); if ( $payer && $address = $payer->address() ) {
$payerName = $payer->name();
$billing_address = array( $billing_address = array(
'first_name' => $payer->name()->given_name() ?? '', 'first_name' => $payerName ? $payerName->given_name() : '',
'last_name' => $payer->name()->surname() ?? '', 'last_name' => $payerName ? $payerName->surname() : '',
'address_1' => $address->address_line_1() ?? '', 'address_1' => $address->address_line_1(),
'address_2' => $address->address_line_2() ?? '', 'address_2' => $address->address_line_2(),
'city' => $address->admin_area_2() ?? '', 'city' => $address->admin_area_2(),
'state' => $address->admin_area_1() ?? '', 'state' => $address->admin_area_1(),
'postcode' => $address->postal_code() ?? '', 'postcode' => $address->postal_code(),
'country' => $address->country_code() ?? '', 'country' => $address->country_code(),
); );
}
if ( $shipping ) { if ( $shipping ) {
$address = $shipping->address(); $address = $shipping->address();
$shipping_address = array( $shipping_address = array(
'first_name' => $shipping->name() ?? '', 'first_name' => $shipping->name(),
'last_name' => '', 'last_name' => '',
'address_1' => $address->address_line_1() ?? '', 'address_1' => $address->address_line_1(),
'address_2' => $address->address_line_2() ?? '', 'address_2' => $address->address_line_2(),
'city' => $address->admin_area_2() ?? '', 'city' => $address->admin_area_2(),
'state' => $address->admin_area_1() ?? '', 'state' => $address->admin_area_1(),
'postcode' => $address->postal_code() ?? '', 'postcode' => $address->postal_code(),
'country' => $address->country_code() ?? '', 'country' => $address->country_code(),
); );
$shipping_options = $shipping->options()[0] ?? '';
} }
$wc_order->set_shipping_address( $shipping_address ?? $billing_address ); if ( $shipping_address ) {
$wc_order->set_billing_address( $billing_address ); $wc_order->set_shipping_address( $shipping_address );
}
$shipping_options = $shipping->options()[0] ?? ''; if ( $billing_address || $shipping_address ) {
$wc_order->set_billing_address( $billing_address ?: $shipping_address );
}
if ( $shipping_options ) { if ( $shipping_options ) {
$shipping = new WC_Order_Item_Shipping(); $shipping = new WC_Order_Item_Shipping();
$shipping->set_method_title( $shipping_options->label() ); $shipping->set_method_title( $shipping_options->label() );
$shipping->set_method_id( $shipping_options->id() ); $shipping->set_method_id( $shipping_options->id() );
$shipping->set_total( $shipping_options->amount()->value() ); $shipping->set_total( $shipping_options->amount()->value_str() );
$wc_order->add_item( $shipping ); $wc_order->add_item( $shipping );
} }
@ -153,7 +173,10 @@ class WooCommerceOrderCreator {
protected function configure_payment_source( WC_Order $wc_order ): void { protected function configure_payment_source( WC_Order $wc_order ): void {
$funding_source = $this->session_handler->funding_source(); $funding_source = $this->session_handler->funding_source();
$wc_order->set_payment_method( PayPalGateway::ID ); $wc_order->set_payment_method( PayPalGateway::ID );
$wc_order->set_payment_method_title( $this->funding_source_renderer->render_name( $funding_source ) );
if ( $funding_source ) {
$wc_order->set_payment_method_title( $this->funding_source_renderer->render_name( $funding_source ) );
}
} }
/** /**