Resolving conflicts manually

Author: wjrosa

includes/Abstracts/WC_Stripe_Payment_Gateway.php

@@ -611,6 +611,9 @@ public function process_response( $response, $order ) {
 
 					/* translators: transaction id */
 					$message = sprintf( __( 'Stripe charge complete (Charge ID: %s)', 'woocommerce-gateway-stripe' ), $response->id );
+					if ( isset( $response->is_webhook_response ) ) {
+						$message .= ' (via webhook)';
+					}
 					$order->add_order_note( $message );
 				}
 			}

includes/WC_Stripe_Account.php

@@ -65,7 +65,7 @@ class WC_Stripe_Account {
 	 * Constructor
 	 *
 	 * @param WC_Stripe_Connect $connect Stripe connect
-	 * @param $stripe_api Stripe API class
+	 * @param string $stripe_api Stripe API class
 	 */
 	public function __construct( WC_Stripe_Connect $connect, $stripe_api ) {
 		$this->connect    = $connect;

includes/WC_Stripe_Customer.php

@@ -316,7 +316,7 @@ public function create_customer( $args = [] ) {
 		$args = $this->generate_customer_request( $args );
 
 		// For guest users, check if a customer already exists with the same email and name in Stripe account before creating a new one.
-		if ( ! $this->get_id() && 0 === $this->get_user_id() ) {
+		if ( ! $this->get_id() && 0 === $this->get_user_id() && ! empty( $args['email'] ) && ! empty( $args['name'] ) ) {
 			$response = $this->get_existing_customer( $args['email'], $args['name'] );
 		}