Merge pull request #130 from WebDevStudios/feature/cc-223-checkout-configuration

Added support to change opt-in location.

Author: richaber

src/View/Admin/WooTab.php

@@ -83,6 +83,13 @@ class WooTab extends WC_Settings_Page implements Hookable {
 	 */
 	const ALT_LOGIN_URL = 'cc_woo_store_information_alt_login_url';
 
+	/**
+	 * Store checkbox location.
+	 *
+	 * @since 2021-07-26
+	 */
+	const CHECKBOX_LOCATION = 'cc_woo_store_information_checkbox_location';
+
 	/**
 	 * Settings section ID.
 	 *
@@ -493,6 +500,17 @@ private function get_store_information_settings() {
 				'id'                => self::ALT_LOGIN_URL,
 				'type'              => 'text',
 			],
+			[
+				'title'   => esc_html__( 'Checkbox Filter Location', 'cc-woo' ),
+				'desc'    => esc_html__( 'Change filter location where checkbox is rendered.', 'cc-woo' ),
+				'type'    => 'select',
+				'id'      => self::CHECKBOX_LOCATION,
+				'default' => 'false',
+				'options' => [
+					'woocommerce_after_checkout_billing_form' => esc_html__( 'After checkout billing form', 'cc-woo' ),
+					'woocommerce_review_order_before_submit'  => esc_html__( 'Before order submit button', 'cc-woo' ),
+				],
+			],
 			[
 				'type' => 'sectionend',
 				'id'   => 'cc_woo_store_information_settings',
@@ -662,7 +680,8 @@ private function meets_connect_requirements() {
 			get_option( self::STORE_NAME_FIELD, '' ),
 			get_option( self::CURRENCY_FIELD, '' ),
 			get_option( self::COUNTRY_CODE_FIELD ),
-			get_option( self::EMAIL_FIELD )
+			get_option( self::EMAIL_FIELD ),
+			get_option( self::CHECKBOX_LOCATION, 'woocommerce_after_checkout_billing_form' )
 		);
 
 		$validator = new SettingsValidator( $model );

src/View/Checkout/NewsletterPreferenceCheckbox.php

@@ -61,7 +61,9 @@ public function __construct() {
 	 * @since 2019-03-13
 	 */
 	public function register_hooks() {
-		add_action( 'woocommerce_after_checkout_billing_form', [ $this, 'add_field_to_billing_form' ] );
+
+		$checkbox_location = get_option( 'cc_woo_store_information_checkbox_location', 'woocommerce_after_checkout_billing_form' );
+		add_action( $checkbox_location, [ $this, 'add_field_to_billing_form' ] );
 		add_action( 'woocommerce_checkout_update_user_meta', [ $this, 'save_user_preference' ] );
 		add_action( 'woocommerce_created_customer', [ $this, 'save_user_preference' ] );
 		add_action( 'woocommerce_checkout_create_order', [ $this, 'save_user_preference_to_order' ] );