Fix api_subject option being set even when reroute_requests unchecked

alexminza · Dec 22, 2017 · a871835 · a871835
1 parent 2f1c00b
commit a871835
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/assets/css/wc-setup.scss b/assets/css/wc-setup.scss
@@ -1036,10 +1036,10 @@ p.jetpack-terms {
 	}
 }
 
-.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_api_subject {
+.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email {
 	margin-top: 0.75em;
 
-	label.stripe_email, label.ppec_paypal_api_subject {
+	label.stripe_email, label.ppec_paypal_email {
 		position: absolute;
 		margin: -1px;
 		padding: 0;

diff --git a/assets/js/admin/wc-setup.js b/assets/js/admin/wc-setup.js
@@ -130,14 +130,14 @@ jQuery( function( $ ) {
 				.find( 'input.payment-email-input' )
 				.prop( 'required', true );
 			$( this ).closest( '.wc-wizard-service-settings' )
-				.find( '.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_api_subject' )
+				.find( '.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email' )
 				.show();
 		} else {
 			$( this ).closest( '.wc-wizard-service-settings' )
 				.find( 'input.payment-email-input' )
 				.prop( 'required', false );
 			$( this ).closest( '.wc-wizard-service-settings' )
-				.find( '.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_api_subject' )
+				.find( '.wc-wizard-service-setting-stripe_email, .wc-wizard-service-setting-ppec_paypal_email' )
 				.hide();
 		}
 	} ).find( 'input#stripe_create_account, input#ppec_paypal_reroute_requests' ).change();

diff --git a/includes/admin/class-wc-admin-setup-wizard.php b/includes/admin/class-wc-admin-setup-wizard.php
@@ -1155,7 +1155,7 @@ protected function get_wizard_available_in_cart_payment_gateways() {
 						'placeholder' => '',
 						'required'    => false,
 					),
-					'api_subject' => array(
+					'email' => array(
 						'label'       => __( 'Direct payments to email address:', 'woocommerce' ),
 						'type'        => 'email',
 						'value'       => $user_email,