Merge pull request #482 from woocommerce/update/store-checkout-form-data-in-customer-session

Store checkout form data in customer session, for pre-filling PayPal form

Author: dechov

includes/class-wc-gateway-ppec-cart-handler.php

@@ -147,7 +147,7 @@ public function wc_ajax_start_checkout() {
 	}
 
 	/**
-	 * Report validation errors if any, or else proceed with checkout flow.
+	 * Report validation errors if any, or else save form data in session and proceed with checkout flow.
 	 *
 	 * @since 1.6.4
 	 */
@@ -161,6 +161,7 @@ public function maybe_start_checkout( $data, $errors = null ) {
 		}
 
 		if ( empty( $error_messages ) ) {
+			$this->set_customer_data( $_POST );
 			$this->start_checkout();
 		} else {
 			wp_send_json_error( array( 'messages' => $error_messages ) );
@@ -182,6 +183,72 @@ protected function start_checkout() {
 		}
 	}
 
+	/**
+	 * Store checkout form data in customer session.
+	 *
+	 * @since 1.6.4
+	 */
+	protected function set_customer_data( $data ) {
+		$customer = WC()->customer;
+
+		$billing_first_name = empty( $data[ 'billing_first_name' ] ) ? '' : wc_clean( $data[ 'billing_first_name' ] );
+		$billing_last_name  = empty( $data[ 'billing_last_name' ] )  ? '' : wc_clean( $data[ 'billing_last_name' ] );
+		$billing_address_1  = empty( $data[ 'billing_address_1' ] )  ? '' : wc_clean( $data[ 'billing_address_1' ] );
+		$billing_address_2  = empty( $data[ 'billing_address_2' ] )  ? '' : wc_clean( $data[ 'billing_address_2' ] );
+		$billing_city       = empty( $data[ 'billing_city' ] )       ? '' : wc_clean( $data[ 'billing_city' ] );
+		$billing_state      = empty( $data[ 'billing_state' ] )      ? '' : wc_clean( $data[ 'billing_state' ] );
+		$billing_postcode   = empty( $data[ 'billing_postcode' ] )   ? '' : wc_clean( $data[ 'billing_postcode' ] );
+		$billing_country    = empty( $data[ 'billing_country' ] )    ? '' : wc_clean( $data[ 'billing_country' ] );
+
+		if ( isset( $data['ship_to_different_address'] ) ) {
+			$shipping_first_name = empty( $data[ 'shipping_first_name' ] ) ? '' : wc_clean( $data[ 'shipping_first_name' ] );
+			$shipping_last_name  = empty( $data[ 'shipping_last_name' ] )  ? '' : wc_clean( $data[ 'shipping_last_name' ] );
+			$shipping_address_1  = empty( $data[ 'shipping_address_1' ] )  ? '' : wc_clean( $data[ 'shipping_address_1' ] );
+			$shipping_address_2  = empty( $data[ 'shipping_address_2' ] )  ? '' : wc_clean( $data[ 'shipping_address_2' ] );
+			$shipping_city       = empty( $data[ 'shipping_city' ] )       ? '' : wc_clean( $data[ 'shipping_city' ] );
+			$shipping_state      = empty( $data[ 'shipping_state' ] )      ? '' : wc_clean( $data[ 'shipping_state' ] );
+			$shipping_postcode   = empty( $data[ 'shipping_postcode' ] )   ? '' : wc_clean( $data[ 'shipping_postcode' ] );
+			$shipping_country    = empty( $data[ 'shipping_country' ] )    ? '' : wc_clean( $data[ 'shipping_country' ] );
+		} else {
+			$shipping_first_name = $billing_first_name;
+			$shipping_last_name  = $billing_last_name;
+			$shipping_address_1  = $billing_address_1;
+			$shipping_address_2  = $billing_address_2;
+			$shipping_city       = $billing_city;
+			$shipping_state      = $billing_state;
+			$shipping_postcode   = $billing_postcode;
+			$shipping_country    = $billing_country;
+		}
+
+		$customer->set_shipping_address( $shipping_address_1 );
+		$customer->set_shipping_address_2( $shipping_address_2 );
+		$customer->set_shipping_city( $shipping_city );
+		$customer->set_shipping_state( $shipping_state );
+		$customer->set_shipping_postcode( $shipping_postcode );
+		$customer->set_shipping_country( $shipping_country );
+
+		if ( version_compare( WC_VERSION, '3.0', '<' ) ) {
+			$customer->set_address( $billing_address_1 );
+			$customer->set_address_2( $billing_address_2 );
+			$customer->set_city( $billing_city );
+			$customer->set_state( $billing_state );
+			$customer->set_postcode( $billing_postcode );
+			$customer->set_country( $billing_country );
+		} else {
+			$customer->set_shipping_first_name( $shipping_first_name );
+			$customer->set_shipping_last_name( $shipping_last_name );
+			$customer->set_billing_first_name( $billing_first_name );
+			$customer->set_billing_last_name( $billing_last_name );
+
+			$customer->set_billing_address_1( $billing_address_1 );
+			$customer->set_billing_address_2( $billing_address_2 );
+			$customer->set_billing_city( $billing_city );
+			$customer->set_billing_state( $billing_state );
+			$customer->set_billing_postcode( $billing_postcode );
+			$customer->set_billing_country( $billing_country );
+		}
+	}
+
 	/**
 	 * Display paypal button on the product page.
 	 *