Merge branch 'try/dependabot-updates' into feature/cc-257-dependebot

Author: richaber

src/Plugin.php

@@ -300,11 +300,24 @@ public function do_deactivation_process() {
 
 		$this->clear_abandoned_checkouts_expiration_check();
 
-		if ( ! get_option( ConnectionStatus::CC_CONNECTION_ESTABLISHED_KEY ) ) {
-			return;
-		}
-
+		delete_option( CheckoutsTable::DB_VERSION_OPTION_NAME );
+		delete_option( ConnectionStatus::CC_CONNECTION_USER_ID );
+		delete_option( ConnectionStatus::CC_FIRST_CONNECTION );
 		delete_option( ConnectionStatus::CC_CONNECTION_ESTABLISHED_KEY );
+		
+
+		// WooCommerce Options
+		delete_option( 'cc_woo_store_information_first_name' );
+		delete_option( 'cc_woo_store_information_last_name' );
+		delete_option( 'cc_woo_store_information_phone_number' );
+		delete_option( 'cc_woo_store_information_store_name' );
+		delete_option( 'cc_woo_store_information_currency' );
+		delete_option( 'cc_woo_store_information_currency' );
+		delete_option( 'cc_woo_store_information_contact_email');
+		delete_option( 'cc_woo_store_information_alt_login_url' );
+		delete_option( 'constant_contact_for_woo_has_setup' );
+		delete_option( 'cc_woo_customer_data_allow_import' );
+
 	}
 
 	/**

src/View/Admin/WooTab.php

@@ -76,6 +76,20 @@ class WooTab extends WC_Settings_Page implements Hookable {
 	 */
 	const EMAIL_FIELD = 'cc_woo_store_information_contact_email';
 
+	/**
+	 * Alternative Login URL.
+	 *
+	 * @since 2021-06-02
+	 */
+	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.
 	 *
@@ -365,7 +379,13 @@ private function get_connection_established_options() {
 	 * @since  2019-03-21
 	 */
 	public function render_cta_button() {
-		$url = 'https://login.constantcontact.com/login/?goto=https%3A%2F%2Fapp.constantcontact.com%2Fpages%2Fecomm%2Fdashboard%23woocommerce';
+
+		$url = get_option( self::ALT_LOGIN_URL, '' );
+
+		if ( '' === $url ) {
+			$url = 'https://login.constantcontact.com/login/?goto=https%3A%2F%2Fapp.constantcontact.com%2Fpages%2Fecomm%2Fdashboard%23woocommerce';
+		}
+
 		?>
 		<a
 			class="button button-primary"
@@ -474,6 +494,23 @@ private function get_store_information_settings() {
 					'true'  => esc_html__( 'Yes - check this box by default', 'cc-woo' ),
 				],
 			],
+			[
+				'title'             => esc_html__( 'Alternative Login Url', 'cc-woo' ),
+				'desc'              => esc_html__( 'Only use if directed to by Pro Support.', 'cc-woo' ),
+				'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',
@@ -643,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' ] );