Merge pull request #68 from wirecard/TPWDCEE-1258

#67 set email from billing address for guest checkout
qenta-cee · May 3, 2018 · 6eca796 · 6eca796
2 parents c41c177 + 8d0c9dd
commit 6eca796
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+.idea/*
diff --git a/woocommerce-wirecard-checkout-seamless/classes/class-wirecard-config.php b/woocommerce-wirecard-checkout-seamless/classes/class-wirecard-config.php
@@ -238,21 +238,26 @@ public function get_consumer_data( $order, $gateway, $checkout_data ) {
 		$consumerData->setUserAgent( $_SERVER['HTTP_USER_AGENT'] );
 
 		$user_data = get_userdata( $order->get_user_id() );
-		$consumerData->setEmail( isset( $user_data->user_email ) ? $user_data->user_email : '' );
+		$email = isset( $user_data->user_email ) ? $user_data->user_email : '';
 
 		if ( $gateway->get_option( 'woo_wcs_forwardconsumerbillingdata' ) || $this->force_consumer_data( $checkout_data['wcs_payment_method'] ) ) {
 			$billing_address = $this->get_address_data( $order, 'billing' );
 			$consumerData->addAddressInformation( $billing_address );
+
+			if (!strlen($email)) {
+				$email = $order->get_billing_email();
+			}
 		}
 		if ( $gateway->get_option( 'woo_wcs_forwardconsumershippingdata' ) || $this->force_consumer_data( $checkout_data['wcs_payment_method'] ) ) {
 			$shipping_address = $this->get_address_data( $order, 'shipping' );
 			$consumerData->addAddressInformation( $shipping_address );
 		}
-        if ($checkout_data['wcs_payment_method'] == WirecardCEE_Stdlib_PaymentTypeAbstract::INVOICE ||
+		if ($checkout_data['wcs_payment_method'] == WirecardCEE_Stdlib_PaymentTypeAbstract::INVOICE ||
             $checkout_data['wcs_payment_method'] == WirecardCEE_Stdlib_PaymentTypeAbstract::INSTALLMENT) {
-            $birth_date = new DateTime( $checkout_data['dob_year'] . '-' . $checkout_data['dob_month'] . '-' . $checkout_data['dob_day'] );
-            $consumerData->setBirthDate($birth_date);
-        }
+			$birth_date = new DateTime( $checkout_data['dob_year'] . '-' . $checkout_data['dob_month'] . '-' . $checkout_data['dob_day'] );
+			$consumerData->setBirthDate($birth_date);
+		}
+		$consumerData->setEmail( $email );
 
 		return $consumerData;
 	}

diff --git a/woocommerce-wirecard-checkout-seamless/woocommerce-wirecard-checkout-seamless.php b/woocommerce-wirecard-checkout-seamless/woocommerce-wirecard-checkout-seamless.php
@@ -3,7 +3,7 @@
  * Plugin Name: Wirecard Checkout Seamless
  * Plugin URI: https://github.com/wirecard/woocommerce-wcs
  * Description: Wirecard Checkout Seamless plugin for WooCommerce
- * Version: 1.0.16
+ * Version: 1.0.17
  * Author: Wirecard
  * Author URI: https://www.wirecard.at/
  * License: GPL2