Google Apps: Fill out the registration for G Suite in cart

* Google Apps: Fill out the registration for G Suite in cart

This helps to preserve the data for when PayPal Express is used as
payment form and is more consistent with what G Suite uses.

client/lib/cart-values/cart-items.js

@@ -458,11 +458,18 @@ function googleAppsExtraLicenses( properties ) {
 	return assign( item, { extra: { google_apps_users: properties.users } } );
 }
 
+function fillGoogleAppsRegistrationData( cart, registrationData ) {
+	const googleAppsItems = filter( getAll( cart ), isGoogleApps );
+	return flow.apply( null, googleAppsItems.map( function( item ) {
+		item.extra = assign( item.extra, { google_apps_registration_data: registrationData } );
+		return add( item )
+	} ) );
+}
+
 function hasGoogleApps( cart ) {
 	return some( getAll( cart ), isGoogleApps );
 }
 
-
 function customDesignItem() {
 	return {
 		product_slug: 'custom-design'
@@ -769,6 +776,7 @@ module.exports = {
 	domainPrivacyProtection,
 	domainRedemption,
 	domainRegistration,
+	fillGoogleAppsRegistrationData,
 	findFreeTrial,
 	getAll,
 	getAllSorted,

client/lib/cart/store/index.js

@@ -119,6 +119,10 @@ CartStore.dispatchToken = Dispatcher.register( ( payload ) => {
 			update( cartItems.removePrivacyFromAllDomains( CartStore.get() ) );
 			break;
 
+		case UpgradesActionTypes.GOOGLE_APPS_REGISTRATION_DATA_ADD:
+			update( cartItems.fillGoogleAppsRegistrationData( CartStore.get(), action.registrationData ) );
+			break;
+
 		case UpgradesActionTypes.CART_ITEMS_ADD:
 			update( flow( ...action.cartItems.map( cartItem => cartItems.add( cartItem ) ) ) );
 			break;

client/lib/upgrades/actions/cart.js

@@ -76,6 +76,13 @@ function addDomainToCart( domainSuggestion ) {
 	} ) );
 }
 
+function addGoogleAppsRegistrationData( registrationData ) {
+	Dispatcher.handleViewAction( {
+		type: ActionTypes.GOOGLE_APPS_REGISTRATION_DATA_ADD,
+		registrationData: registrationData
+	} );
+}
+
 function removeDomainFromCart( domainSuggestion ) {
 	removeItem( cartItems.domainRegistration( {
 		domain: domainSuggestion.domain_name,
@@ -92,6 +99,7 @@ function applyCoupon( coupon ) {
 
 export {
 	addDomainToCart,
+	addGoogleAppsRegistrationData,
 	addItem,
 	addItems,
 	addPrivacyToAllDomains,

client/lib/upgrades/constants.js

@@ -33,6 +33,7 @@ module.exports.action = keyMirror( {
 	EMAIL_FORWARDING_FETCH_COMPLETED: null,
 	EMAIL_FORWARDING_FETCH_FAILED: null,
 	ICANN_VERIFICATION_RESEND_COMPLETED: null,
+	GOOGLE_APPS_REGISTRATION_DATA_ADD: null,
 	NAMESERVERS_FETCH: null,
 	NAMESERVERS_FETCH_COMPLETED: null,
 	NAMESERVERS_FETCH_FAILED: null,

client/my-sites/upgrades/checkout/domain-details-form.jsx

@@ -15,7 +15,7 @@ import { cartItems } from 'lib/cart-values';
 import { forDomainRegistrations as countriesListForDomainRegistrations } from 'lib/countries-list';
 import analytics from 'lib/analytics';
 import formState from 'lib/form-state';
-import { addPrivacyToAllDomains, removePrivacyFromAllDomains, setDomainDetails } from 'lib/upgrades/actions';
+import { addPrivacyToAllDomains, removePrivacyFromAllDomains, setDomainDetails, addGoogleAppsRegistrationData } from 'lib/upgrades/actions';
 import FormButton from 'components/forms/form-button';
 import { countries } from 'components/phone-input/data';
 import { toIcannFormat } from 'components/phone-input/phone-number';
@@ -401,6 +401,7 @@ export default React.createClass( {
 		const allFieldValues = Object.assign( {}, formState.getAllFieldValues( this.state.form ) );
 		allFieldValues.phone = toIcannFormat( allFieldValues.phone, countries[ this.state.phoneCountryCode ] );
 		setDomainDetails( allFieldValues );
+		addGoogleAppsRegistrationData( allFieldValues );
 	},
 
 	setPrivacyProtectionSubscriptions( enable ) {