From 902fb6c19a156787ad70a524792690adcf7890c8 Mon Sep 17 00:00:00 2001
From: Pablo Pacheco <pablo.sg.pacheco@gmail.com>
Date: Tue, 22 Oct 2024 16:35:37 -0300
Subject: [PATCH] v2.9.0

---
 .distignore                                   |  15 +
 composer.json                                 |  10 +
 email-verification-for-woocommerce.php        |  56 +-
 includes/class-alg-wc-ev-admin.php            |  88 ++-
 includes/class-alg-wc-ev-core.php             | 115 ++--
 includes/class-alg-wc-ev-emails.php           |  49 +-
 .../class-alg-wc-ev-settings-email.php        | 155 +++--
 .../class-alg-wc-ev-settings-general.php      | 188 +++---
 .../class-alg-wc-ev-settings-messages.php     |  16 +-
 ...ails-verification-for-woocommerce-fr_FR.po | 461 ++++++-------
 ...ails-verification-for-woocommerce-pt_BR.po | 461 ++++++-------
 langs/emails-verification-for-woocommerce.pot | 639 +++++++++---------
 readme.txt                                    |  12 +-
 vendor/autoload.php                           |  18 +
 vendor/composer/ClassLoader.php               | 146 +++-
 vendor/composer/InstalledVersions.php         |  44 +-
 vendor/composer/autoload_classmap.php         |   9 +-
 vendor/composer/autoload_files.php            |   2 +-
 vendor/composer/autoload_namespaces.php       |   2 +-
 vendor/composer/autoload_psr4.php             |   2 +-
 vendor/composer/autoload_real.php             |  51 +-
 vendor/composer/autoload_static.php           |   7 +
 vendor/composer/installed.json                | 119 +++-
 vendor/composer/installed.php                 |  32 +-
 vendor/composer/platform_check.php            |  26 -
 .../langs/wpfactory-admin-menu.pot            |  22 +
 .../class-wc-settings-menu-item-swapper.php   | 218 ++++++
 .../src/php/class-wpfactory-admin-menu.php    | 411 +++++++++++
 .../src/php/trait-singleton.php               |  68 ++
 .../assets/css/admin.css                      | 145 ++++
 .../assets/css/admin.css.map                  |   1 +
 .../assets/css/admin.min.css                  |   1 +
 .../langs/wpfactory-cross-selling.pot         | 182 +++++
 .../src/img/wpfactory.png                     | Bin 0 -> 2757 bytes
 .../src/php/class-product-categories.php      |  66 ++
 .../src/php/class-products.php                | 250 +++++++
 .../src/php/class-wpfactory-cross-selling.php | 441 ++++++++++++
 .../src/php/trait-singleton.php               |  70 ++
 .../templates/product.php                     |  25 +
 .../src/php/class-core.php                    |  22 +-
 40 files changed, 3496 insertions(+), 1149 deletions(-)
 create mode 100644 .distignore
 delete mode 100644 vendor/composer/platform_check.php
 create mode 100644 vendor/wpfactory/wpfactory-admin-menu/langs/wpfactory-admin-menu.pot
 create mode 100644 vendor/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php
 create mode 100644 vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php
 create mode 100644 vendor/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css.map
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.min.css
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/langs/wpfactory-cross-selling.pot
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/img/wpfactory.png
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/php/class-products.php
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php
 create mode 100644 vendor/wpfactory/wpfactory-cross-selling/templates/product.php

diff --git a/.distignore b/.distignore
new file mode 100644
index 0000000..3d25d61
--- /dev/null
+++ b/.distignore
@@ -0,0 +1,15 @@
+/.git
+/.github
+/node_modules
+/.wordpress-org
+.idea
+.distignore
+.eslintrc.js
+.gitignore
+Makefile
+package.json
+package-lock.json
+readme.md
+vendor/wpfactory/wpf-settings-exporter
+vendor/wpfactory/wpf-documentor
+git-tag.sh
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 06e4fef..d1d48a4 100644
--- a/composer.json
+++ b/composer.json
@@ -3,10 +3,20 @@
     {
       "type": "vcs",
       "url": "https://github.com/wpcodefactory/wpfactory-promoting-notice"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/wpcodefactory/wpfactory-cross-selling"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/wpcodefactory/wpfactory-admin-menu"
     }
   ],
   "require": {
     "wpfactory/wpfactory-promoting-notice": "*",
+    "wpfactory/wpfactory-cross-selling": "*",
+    "wpfactory/wpfactory-admin-menu": "*",
     "hashids/hashids": "4.*"
   },
   "config": {
diff --git a/email-verification-for-woocommerce.php b/email-verification-for-woocommerce.php
index 909b3e7..b9fbb33 100644
--- a/email-verification-for-woocommerce.php
+++ b/email-verification-for-woocommerce.php
@@ -3,13 +3,13 @@
 Plugin Name: Email Verification for WooCommerce
 Plugin URI: https://wpfactory.com/item/email-verification-for-woocommerce/
 Description: Verify user emails in WooCommerce. Beautifully.
-Version: 2.8.10
+Version: 2.9.0
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: emails-verification-for-woocommerce
 Domain Path: /langs
 Copyright: © 2024 WPFactory
-WC tested up to: 9.2
+WC tested up to: 9.3
 Requires Plugins: woocommerce
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
@@ -52,7 +52,7 @@ function alg_wc_ev_is_plugin_active( $plugin ) {
  * Main Alg_WC_Email_Verification Class
  *
  * @class   Alg_WC_Email_Verification
- * @version 2.8.10
+ * @version 2.8.11
  * @since   1.0.0
  */
 final class Alg_WC_Email_Verification {
@@ -63,7 +63,7 @@ final class Alg_WC_Email_Verification {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	public $version = '2.8.10';
+	public $version = '2.9.0';
 
 	/**
 	 * @var   Alg_WC_Email_Verification The single instance of the class
@@ -100,11 +100,16 @@ public static function instance() {
 	/**
 	 * Initializes the plugin.
 	 *
-	 * @version 2.8.10
+	 * @version 2.9.0
 	 * @since   1.0.0
 	 * @access  public
 	 */
 	function init() {
+		// Adds cross-selling library.
+		$this->add_cross_selling_library();
+
+		// Move WC Settings tab to WPFactory menu.
+		$this->move_wc_settings_tab_to_wpfactory_menu();
 
 		// Localization.
 		add_action( 'init', array( $this, 'localize' ) );
@@ -114,7 +119,6 @@ function init() {
 			require_once( 'includes/pro/class-alg-wc-ev-pro.php' );
 		}
 
-
 		// Include required files.
 		$this->includes();
 
@@ -123,10 +127,48 @@ function init() {
 			$this->admin();
 		}
 
-		// Generate documentation
+		// Generate documentation.
 		add_filter( 'wpfpdh_documentation_params_' . plugin_basename( $this->get_filesystem_path() ), array( $this, 'handle_documentation_params' ), 10 );
 	}
 
+	/**
+	 * add_cross_selling_library.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 *
+	 * @return void
+	 */
+	function add_cross_selling_library(){
+		if ( ! is_admin() ) {
+			return;
+		}
+		// Cross-selling library.
+		$cross_selling = new \WPFactory\WPFactory_Cross_Selling\WPFactory_Cross_Selling();
+		$cross_selling->setup( array( 'plugin_file_path'   => $this->get_filesystem_path() ) );
+		$cross_selling->init();
+	}
+
+	/**
+	 * move_wc_settings_tab_to_wpfactory_submenu.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 *
+	 * @return void
+	 */
+	function move_wc_settings_tab_to_wpfactory_menu() {
+		if ( ! is_admin() ) {
+			return;
+		}
+		// WC Settings tab as WPFactory submenu item.
+		$wpf_admin_menu = \WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu::get_instance();
+		$wpf_admin_menu->move_wc_settings_tab_to_wpfactory_menu( array(
+			'wc_settings_tab_id' => 'alg_wc_ev',
+			'menu_title'         => __( 'Email Verification', 'order-minimum-amount-for-woocommerce' ),
+			'page_title'         => __( 'Email Verification', 'order-minimum-amount-for-woocommerce' ),
+		) );
+	}
 
 	/**
 	 * Handle documentation params managed by the WP Factory
diff --git a/includes/class-alg-wc-ev-admin.php b/includes/class-alg-wc-ev-admin.php
index 4c862e6..495f89a 100644
--- a/includes/class-alg-wc-ev-admin.php
+++ b/includes/class-alg-wc-ev-admin.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Admin Class.
  *
- * @version 2.8.6
+ * @version 2.9.0
  * @since   1.5.0
  * @author  WPFactory
  */
@@ -65,7 +65,7 @@ class Alg_WC_Email_Verification_Admin {
 	/**
 	 * Constructor.
 	 *
-	 * @version 2.5.8
+	 * @version 2.9.0
 	 * @since   1.5.0
 	 * @todo    (maybe) move more stuff here, e.g. settings, action links etc.
 	 */
@@ -104,6 +104,13 @@ function __construct() {
         }
 
 		add_filter( 'pre_update_option_alg_wc_ev_verify_guest_email', array( $this, 'create_guest_verification_table' ), 10, 2 );
+
+		// Hooks the Rich Text Editor field into WooCommerce settings API.
+		add_action( 'woocommerce_admin_field_alg_wc_ev_editor', array( $this, 'generate_editor_html' ) );
+
+		// Hooks the custom script into the 'admin_footer' for the editor field.
+		add_action( 'admin_footer', array( $this, 'enqueue_ev_setting_style_and_script' ) );
+
 	}
 
 	/**
@@ -656,6 +663,83 @@ function render_verified_email_column( $output, $column_name, $user_id ) {
 		return $output;
 	}
 
+	/**
+	 * Generate Rich Text Editor HTML.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 */
+	function generate_editor_html( $value ) {
+		$option_value = $value['value'];
+
+		// Get the description and tooltip HTML for the field.
+		$field_description = WC_Admin_Settings::get_field_description( $value );
+		$description       = $field_description['description'];
+		$tooltip_html      = $field_description['tooltip_html'];
+		?>
+		<tr class="<?php echo esc_attr( $value['row_class'] ); ?>">
+			<th scope="row" class="titledesc">
+				<label for="<?php echo esc_attr( $value['id'] ); ?>"><?php echo esc_html( $value['title'] ); ?><?php echo $tooltip_html; ?></label>
+			</th>
+			<td class="forminp forminp-<?php echo esc_attr( sanitize_title( $value['type'] ) ); ?> alg-wc-editor">
+				<?php echo $description; ?>
+				<?php
+				$editor_id = esc_attr( $value['id'] );
+				$settings  = array(
+					'textarea_name' => esc_attr( $value['field_name'] ),
+					'editor_class'  => esc_attr( $value['class'] ),
+					'editor_height' => '',
+				);
+				wp_editor( htmlspecialchars_decode( $option_value, ENT_QUOTES ), $editor_id, $settings );
+				?>
+			</td>
+		</tr>
+
+		<?php
+	}
+
+	/**
+	 * Enqueue styles and scripts for settings page.
+	 *
+	 * @version 2.9.0
+	 * @since   2.9.0
+	 */
+	function enqueue_ev_setting_style_and_script() {
+		if (
+			isset( $_GET['page'], $_GET['tab'], $_GET['section'] ) &&
+			'wc-settings' === wc_clean( $_GET['page'] ) && 'alg_wc_ev' === wc_clean( $_GET['tab'] ) && in_array( wc_clean( $_GET['section'] ), array( 'emails', 'messages' ), true )
+		) {
+			?>
+			<style>
+				.woocommerce table.form-table .alg-wc-editor textarea {
+					width: 100%;
+				}
+			</style>
+			<script>
+				jQuery( document ).ready( function ( $ ) {
+
+					// Listen for changes in TinyMCE editor (Visual Editor).
+					if ( typeof tinyMCE !== "undefined" ) {
+
+						$( '.alg-wc-editor' ).each( function () {
+							const editor_container = $( this );
+							const editor_id = editor_container.find( '.wp-editor-area' ).attr( 'id' );
+
+							const editor = tinyMCE.get( editor_id );
+
+							if ( editor ) {
+								editor.on( 'Change', function () {
+									$( `#${editor_id}` ).trigger( 'input' );
+								} );
+							}
+						} );
+					}
+				} );
+			</script>
+			<?php
+		}
+	}
+
 }
 
 endif;
diff --git a/includes/class-alg-wc-ev-core.php b/includes/class-alg-wc-ev-core.php
index 8462c56..2b99e29 100644
--- a/includes/class-alg-wc-ev-core.php
+++ b/includes/class-alg-wc-ev-core.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Core Class.
  *
- * @version 2.8.6
+ * @version 2.9.0
  * @since   1.0.0
  * @author  WPFactory
  */
@@ -145,35 +145,13 @@ function __construct() {
 				'initialize_options'
 			), PHP_INT_MAX );
 
-			if ( 'yes' === get_option( 'alg_wc_ev_verify_guest_email', 'no' ) ) {
-				if ( ! is_user_logged_in() ) {
-					add_action( 'wp_footer', array( $this, 'verify_guest_at_checkout_script_footer' ), PHP_INT_MAX );
-					add_action( 'wp_ajax_alg_wc_ev_send_guest_verification_email_action', array(
-						$this,
-						'alg_wc_ev_send_guest_verification_email_action'
-					) );
-					add_action( 'wp_ajax_nopriv_alg_wc_ev_send_guest_verification_email_action', array(
-						$this,
-						'alg_wc_ev_send_guest_verification_email_action'
-					) );
-					add_action( 'woocommerce_after_checkout_validation', array(
-						$this,
-						'checkout_validate_guest_email'
-					), PHP_INT_MAX );
-					add_action( 'template_redirect', array( $this, 'checkout_validate_guest_email_message' ) );
-					
-					$wc_ev_options = array(
-						'send'    			=> __( '<a href="javascript:;" id="alg_wc_ev_send_verify">Send Verify Email</a>', 'emails-verification-for-woocommerce' ),
-						'resend'  			=> __( 'Resending....', 'emails-verification-for-woocommerce' ),
-						'sent'  		=> __( 'Verification mail sent successfully to billing email, please check inbox and verify ! <a href="javascript:;" id="alg_wc_ev_resend_verify">Resend</a>', 'emails-verification-for-woocommerce' ),
-						'already_verified'  => __( 'Email id verified !', 'emails-verification-for-woocommerce' )
-					);
-					
-					wp_enqueue_script(  'alg-wc-ev-guest-verify',
-					trailingslashit( alg_wc_ev()->plugin_url() ) . 'includes/js/alg-wc-ev-guest-verify.js', array( 'jquery' ), alg_wc_ev()->version, true );
-					wp_localize_script( 'alg-wc-ev-guest-verify', 'email_verification_options', $wc_ev_options );
-				}
-			}
+			// Verify Guest feature.
+			add_action( 'wp_footer', array( $this, 'verify_guest_at_checkout_script_footer' ), PHP_INT_MAX );
+			add_action( 'wp_ajax_alg_wc_ev_send_guest_verification_email_action', array( $this, 'alg_wc_ev_send_guest_verification_email_action' ) );
+			add_action( 'wp_ajax_nopriv_alg_wc_ev_send_guest_verification_email_action', array( $this, 'alg_wc_ev_send_guest_verification_email_action' ) );
+			add_action( 'woocommerce_after_checkout_validation', array( $this, 'checkout_validate_guest_email' ), PHP_INT_MAX );
+			add_action( 'template_redirect', array( $this, 'checkout_validate_guest_email_message' ) );
+			add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_guest_feature_scripts' ) );
 		}
 
 		/**
@@ -1213,20 +1191,53 @@ function get_default_hashids_salt_opt() {
 			return $this->default_hashids_salt_opt;
 		}
 
+		/**
+		 * enqueue_guest_feature_scripts.
+		 *
+		 * @version 2.9.0
+		 * @since   2.9.0
+		 *
+		 * @return void
+		 */
+		function enqueue_guest_feature_scripts() {
+			if (
+				is_user_logged_in() ||
+				'yes' !== get_option( 'alg_wc_ev_verify_guest_email', 'no' ) ||
+				! is_checkout()
+			) {
+				return;
+			}
+
+			$wc_ev_options = array(
+				'send'             => __( '<a href="javascript:;" id="alg_wc_ev_send_verify">Send Verify Email</a>', 'emails-verification-for-woocommerce' ),
+				'resend'           => __( 'Resending....', 'emails-verification-for-woocommerce' ),
+				'sent'             => __( 'Verification mail sent successfully to billing email, please check inbox and verify ! <a href="javascript:;" id="alg_wc_ev_resend_verify">Resend</a>', 'emails-verification-for-woocommerce' ),
+				'already_verified' => __( 'Email id verified !', 'emails-verification-for-woocommerce' )
+			);
+
+			wp_enqueue_script( 'alg-wc-ev-guest-verify', trailingslashit( alg_wc_ev()->plugin_url() ) . 'includes/js/alg-wc-ev-guest-verify.js', array( 'jquery' ), alg_wc_ev()->version, true );
+			wp_localize_script( 'alg-wc-ev-guest-verify', 'email_verification_options', $wc_ev_options );
+		}
+
 		/**
 		 * verify_guest_at_checkout_script_footer.
 		 *
-		 * @version 2.7.4
+		 * @version 2.9.0
 		 * @since   2.5.8
 		 *
 		 * @return string
 		 */
 		function verify_guest_at_checkout_script_footer() {
+			if (
+				is_user_logged_in() ||
+				'yes' !== get_option( 'alg_wc_ev_verify_guest_email', 'no' )
+			) {
+				return;
+			}
 			?>
             <script>
                 jQuery(function ($) {
                     var billing_email_input = $('input[name="billing_email"]');
-					
 
 					<?php
 					if ( is_checkout() && ! is_wc_endpoint_url() ) {
@@ -1263,12 +1274,18 @@ function verify_guest_at_checkout_script_footer() {
 		/**
 		 * alg_wc_ev_send_guest_verification_email_action.
 		 *
-		 * @version 2.5.8
+		 * @version 2.9.0
 		 * @since   2.5.8
 		 *
 		 * @return string
 		 */
 		function alg_wc_ev_send_guest_verification_email_action( $param ) {
+			if (
+				is_user_logged_in() ||
+				'yes' !== get_option( 'alg_wc_ev_verify_guest_email', 'no' )
+			) {
+				return;
+			}
 			if ( isset( $_POST['alg_wc_ev_email'] ) && '' != $_POST['alg_wc_ev_email'] ) {
 				$email = $_POST['alg_wc_ev_email'];
 				$send  = $_POST['send'];
@@ -1391,7 +1408,7 @@ function is_guest_user_verified_by_email( $email, $code ) {
 		/**
 		 * is_guest_email_already_verified.
 		 *
-		 * @version 2.5.8
+		 * @version 2.9.0
 		 * @since   2.5.8
 		 *
 		 * @return string
@@ -1402,9 +1419,17 @@ function is_guest_email_already_verified( $email ) {
 			$table_name        = $wpdb->prefix . 'alg_wc_ev_guest_verify';
 			$current_date_time = date( "Y-m-d H:i:s" );
 
-			if ( $wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name ) {
+			if (
+				$wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name &&
+				filter_var( $email, FILTER_VALIDATE_EMAIL )
+			) {
 
-				$result_arr = $wpdb->get_row( "SELECT * FROM " . $table_name . " WHERE email = '" . $email . "'" );
+				$result_arr = $wpdb->get_row(
+					$wpdb->prepare(
+						"SELECT * FROM {$table_name} WHERE email = %s",
+						$email // email as a string
+					)
+				);
 
 				if ( ! empty( $result_arr ) ) {
 					$result_status = $result_arr->status;
@@ -1422,12 +1447,19 @@ function is_guest_email_already_verified( $email ) {
 		/**
 		 * checkout_validate_guest_email.
 		 *
-		 * @version 2.5.8
+		 * @version 2.9.0
 		 * @since   2.5.8
 		 *
 		 * @return string
 		 */
 		function checkout_validate_guest_email( $_posted ) {
+			if (
+				is_user_logged_in() ||
+				'yes' !== get_option( 'alg_wc_ev_verify_guest_email', 'no' )
+			) {
+				return false;
+			}
+
 			if ( isset( $_posted['billing_email'] ) && ! empty( $_posted['billing_email'] ) ) {
 				if ( ! $this->is_guest_email_already_verified( $_posted['billing_email'] ) ) {
 					alg_wc_ev_add_notice( $this->messages->get_guest_unverified_message(), 'error' );
@@ -1458,12 +1490,19 @@ function get_hashids() {
 		/**
 		 * checkout_validate_guest_email_message.
 		 *
-		 * @version 2.6.0
+		 * @version 2.9.0
 		 * @since   2.5.8
 		 *
 		 * @return string
 		 */
 		function checkout_validate_guest_email_message() {
+			if (
+				is_user_logged_in() ||
+				'yes' !== get_option( 'alg_wc_ev_verify_guest_email', 'no' )
+			) {
+				return;
+			}
+
 			if ( is_checkout() && ! is_wc_endpoint_url() ) {
 				$args = wp_parse_args( null, array(
 					'verify_code' => isset( $_GET[ alg_wc_ev_get_verification_param() ] ) ? $_GET[ alg_wc_ev_get_verification_param() ] : '',
diff --git a/includes/class-alg-wc-ev-emails.php b/includes/class-alg-wc-ev-emails.php
index 3b4374a..2d73f4b 100644
--- a/includes/class-alg-wc-ev-emails.php
+++ b/includes/class-alg-wc-ev-emails.php
@@ -611,40 +611,39 @@ function send_guest_verify_email( $email, $code ) {
 	 *
 	 * @see sync_verification_if_guest()
 	 *
-	 * @version 2.6.9
+	 * @version 2.9.0
 	 * @since   2.6.9
 	 */
 	function sync_verification_if_guest( $user_id ) {
-		
 		global $wpdb;
-		
 		$user_obj = get_user_by( 'id', $user_id );
-		if( $user_obj ) {
-			$email 	= $user_obj->user_email;
-			$code 	= '';
+		if ( $user_obj ) {
+			$email      = $user_obj->user_email;
+			$code       = '';
 			$table_name = $wpdb->prefix . 'alg_wc_ev_guest_verify';
-			
-			if ( $wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name ) {
-
-					$result_arr = $wpdb->get_row( "SELECT * FROM " . $table_name . " WHERE email = '" . $email . "' AND status = '1'" );
 
-					if ( ! empty( $result_arr ) ) {
-						
-						$code = $result_arr->code;
-					}
-					
-					if ( alg_wc_ev()->core->is_guest_email_already_verified( $email ) ) {
-				
-						update_user_meta( $user_id, 'alg_wc_ev_is_activated', '1' );
-						update_user_meta( $user_id, 'alg_wc_ev_activation_code',      $code );
-						update_user_meta( $user_id, 'alg_wc_ev_activation_code_time', time() );
-						if ( ! empty( $code ) ) {
-							alg_wc_ev()->core->save_activation_info( $code, $user_id );
-						}
-						
+			if (
+				$wpdb->get_var( "SHOW TABLES LIKE '$table_name'" ) == $table_name &&
+				filter_var( $email, FILTER_VALIDATE_EMAIL )
+			) {
+				$prepared_sql = $wpdb->prepare(
+					"SELECT * FROM {$table_name} WHERE email = %s AND status = %d",
+					$email,
+					1       //
+				);
+				$result_arr   = $wpdb->get_row( $prepared_sql );
+				if ( ! empty( $result_arr ) ) {
+					$code = $result_arr->code;
+				}
+				if ( alg_wc_ev()->core->is_guest_email_already_verified( $email ) && ! empty( $code ) ) {
+					update_user_meta( $user_id, 'alg_wc_ev_is_activated', '1' );
+					update_user_meta( $user_id, 'alg_wc_ev_activation_code', $code );
+					update_user_meta( $user_id, 'alg_wc_ev_activation_code_time', time() );
+					if ( ! empty( $code ) ) {
+						alg_wc_ev()->core->save_activation_info( $code, $user_id );
 					}
+				}
 			}
-			
 		}
 	}
 
diff --git a/includes/settings/class-alg-wc-ev-settings-email.php b/includes/settings/class-alg-wc-ev-settings-email.php
index 1e94472..92dee65 100644
--- a/includes/settings/class-alg-wc-ev-settings-email.php
+++ b/includes/settings/class-alg-wc-ev-settings-email.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Email Section Settings.
  *
- * @version 2.8.6
+ * @version 2.9.0
  * @since   1.3.0
  * @author  WPFactory
  */
@@ -28,7 +28,7 @@ function __construct() {
 	/**
 	 * get_settings.
 	 *
-	 * @version 2.8.6
+	 * @version 2.9.0
 	 * @since   1.3.0
 	 */
 	function get_settings() {
@@ -38,29 +38,6 @@ function get_settings() {
 				'type'  => 'title',
 				'id'    => 'alg_wc_ev_email_options',
 			),
-			array(
-				'title'    => __( 'Mail function', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'Function used for sending the plugin\'s emails.', 'emails-verification-for-woocommerce' ) . ' ' .
-				              __( 'Leave the default value if unsure.', 'emails-verification-for-woocommerce' ),
-				'type'     => 'select',
-				'class'    => 'chosen_select',
-				'id'       => 'alg_wc_ev_mail_function',
-				'default'  => 'wc_mail',
-				'options'  => array(
-					'mail'    => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'PHP "mail()"' ),
-					'wc_mail' => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'WooCommerce "wc_mail()"' ),
-					'wp_mail' => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'WordPress "wp_mail()"' ),
-				),
-			),
-			array(
-				'title'    => __( 'Customer new account email', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Delay WooCommerce "Customer new account" email', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( '"Customer new account" email is only sent on successful verification.', 'emails-verification-for-woocommerce' ) . ' ' .
-				              $this->separate_email_option_msg(),
-				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_delay_wc_email',
-				'default'  => 'no',
-			),
 			array(
 				'title'             => __( 'Email template', 'emails-verification-for-woocommerce' ),
 				'desc'              => sprintf( __( 'Possible values: %s, %s, %s.', 'emails-verification-for-woocommerce' ), __( 'Plain', 'emails-verification-for-woocommerce' ), __( 'WooCommerce', 'emails-verification-for-woocommerce' ), __( 'Smart', 'emails-verification-for-woocommerce' ) ),
@@ -90,17 +67,6 @@ function get_settings() {
 					'real_wc_email' => __( 'WooCommerce > Emails', 'emails-verification-for-woocommerce' ),
 				),
 			),
-			array(
-				'title'    => __( 'Email wrap method', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => sprintf( __( 'If "%s" option is selected as "%s" or "%s", set the email wrap method here.', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Email template', 'emails-verification-for-woocommerce' ) . '</strong>', '<strong>' . __( 'WooCommerce', 'emails-verification-for-woocommerce' ) . '</strong>', '<strong>' . __( 'Smart', 'emails-verification-for-woocommerce' ) . '</strong>' ),
-				'id'       => 'alg_wc_ev_email_template_wc_wrap_method',
-				'type'     => 'radio',
-				'default'  => 'manual', // Maybe put default as native?
-				'options'  => array(
-					'manual' => __( 'Manual - Adding WooCommerce header and footer manually', 'emails-verification-for-woocommerce' ),
-					'native' => sprintf( __( 'Native - Using %s function', 'emails-verification-for-woocommerce' ), 'WC_Emails::wrap_message()' )
-				)
-			),
 			array(
 				'type' => 'sectionend',
 				'id'   => 'alg_wc_ev_email_options',
@@ -139,26 +105,12 @@ function get_settings() {
 				'default'  => 'yes',
 			),
 			array(
-				'title'    => __( 'Email sending trigger', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'Leave the default value if unsure.', 'emails-verification-for-woocommerce' ) . ' ' .
-				              $this->separate_email_option_msg(),
-				'type'     => 'select',
-				'class'    => 'chosen_select',
-				'id'       => 'alg_wc_ev_new_user_action',
-				'default'  => 'user_register',
-				'options'  => array(
-					'user_register'                => __( 'On "user register"', 'emails-verification-for-woocommerce' ),
-					'woocommerce_created_customer' => __( 'On "WooCommerce created customer"', 'emails-verification-for-woocommerce' ),
-					//'on_order_payment'             => __( 'On order payment', 'emails-verification-for-woocommerce' ),
-				),
-			),
-			array(
-				'title'    => __( 'Activation email delay', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Delay the activation email', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'Try to enable it if the activation emails are getting sent to authenticated users.', 'emails-verification-for-woocommerce' ) . '<br />' .
+				'title'    => __( 'Customer new account email', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Delay WooCommerce "Customer new account" email', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( '"Customer new account" email is only sent on successful verification.', 'emails-verification-for-woocommerce' ) . ' ' .
 				              $this->separate_email_option_msg(),
 				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_delay_activation_email',
+				'id'       => 'alg_wc_ev_delay_wc_email',
 				'default'  => 'no',
 			),
 			array(
@@ -174,7 +126,7 @@ function get_settings() {
 				'title'             => __( 'Email content', 'emails-verification-for-woocommerce' ),
 				'desc'              => '',
 				'desc_tip'          => '',
-				'type'              => 'textarea',
+				'type'              => 'alg_wc_ev_editor',
 				'id'                => 'alg_wc_ev_email_content',
 				'default'           => alg_wc_ev()->core->emails->get_default_email_content('activation'),
 				'css'               => 'width:100%;height:150px;',
@@ -200,6 +152,29 @@ function get_settings() {
 				'id'       => 'alg_wc_ev_fine_tune_activation_email_placement',
 				'default'  => 'no',
 			),
+			array(
+				'title'    => __( 'Email sending trigger', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'Leave the default value if unsure.', 'emails-verification-for-woocommerce' ) . ' ' .
+				              $this->separate_email_option_msg(),
+				'type'     => 'select',
+				'class'    => 'chosen_select',
+				'id'       => 'alg_wc_ev_new_user_action',
+				'default'  => 'user_register',
+				'options'  => array(
+					'user_register'                => __( 'On "user register"', 'emails-verification-for-woocommerce' ),
+					'woocommerce_created_customer' => __( 'On "WooCommerce created customer"', 'emails-verification-for-woocommerce' ),
+					//'on_order_payment'             => __( 'On order payment', 'emails-verification-for-woocommerce' ),
+				),
+			),
+			array(
+				'title'    => __( 'Activation email delay', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Delay the activation email', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'Try to enable it if the activation emails are getting sent to authenticated users.', 'emails-verification-for-woocommerce' ) . '<br />' .
+				              $this->separate_email_option_msg(),
+				'type'     => 'checkbox',
+				'id'       => 'alg_wc_ev_delay_activation_email',
+				'default'  => 'no',
+			),
 			array(
 				'title'             => __( 'Automatic resending', 'emails-verification-for-woocommerce' ),
 				'desc'              => __( 'Resend the activation email automatically if the user has not yet been verified', 'emails-verification-for-woocommerce' ),
@@ -275,20 +250,20 @@ function get_settings() {
 				'alg_wc_ev_raw'     => true,
 			),
 			array(
-				'title'             => __( 'Email Heading', 'emails-verification-for-woocommerce' ),
-				'type'              => 'textarea',
-				'id'                => 'alg_wc_ev_confirmation_email_heading',
-				'default'           => __( 'Your account has been activated', 'emails-verification-for-woocommerce' ),
-				'css'               => 'width:100%;',
+				'title'             => __( 'Email content', 'emails-verification-for-woocommerce' ),
+				'type'              => 'alg_wc_ev_editor',
+				'id'                => 'alg_wc_ev_confirmation_email_content',
+				'default'           => alg_wc_ev()->core->emails->get_default_email_content('confirmation'),
+				'css'               => 'width:100%;height:150px;',
 				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ) ),
 				'alg_wc_ev_raw'     => true,
 			),
 			array(
-				'title'             => __( 'Email content', 'emails-verification-for-woocommerce' ),
+				'title'             => __( 'Email Heading', 'emails-verification-for-woocommerce' ),
 				'type'              => 'textarea',
-				'id'                => 'alg_wc_ev_confirmation_email_content',
-				'default'           => alg_wc_ev()->core->emails->get_default_email_content('confirmation'),
-				'css'               => 'width:100%;height:150px;',
+				'id'                => 'alg_wc_ev_confirmation_email_heading',
+				'default'           => __( 'Your account has been activated', 'emails-verification-for-woocommerce' ),
+				'css'               => 'width:100%;',
 				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ) ),
 				'alg_wc_ev_raw'     => true,
 			),
@@ -362,6 +337,14 @@ function get_settings() {
 				'default' => '[%site_title%]: ' . __( 'User email has been verified', 'emails-verification-for-woocommerce' ),
 				'css'     => 'width:100%;',
 			),
+			array(
+				'title'         => __( 'Content', 'emails-verification-for-woocommerce' ),
+				'type'          => 'textarea',
+				'id'            => 'alg_wc_ev_admin_email_content',
+				'default'       => alg_wc_ev()->core->emails->get_default_email_content('admin'),
+				'css'           => 'width:100%;height:100px;',
+				'alg_wc_ev_raw' => true,
+			),
 			array(
 				'title'         => __( 'Heading', 'emails-verification-for-woocommerce' ),
 				'type'          => 'textarea',
@@ -371,19 +354,47 @@ function get_settings() {
 				'alg_wc_ev_raw' => true,
 			),
 			array(
-				'title'         => __( 'Content', 'emails-verification-for-woocommerce' ),
-				'type'          => 'textarea',
-				'id'            => 'alg_wc_ev_admin_email_content',
-				'default'       => alg_wc_ev()->core->emails->get_default_email_content('admin'),
-				'css'           => 'width:100%;height:100px;',
-				'alg_wc_ev_raw' => true,
+				'type' => 'sectionend',
+				'id'   => 'alg_wc_ev_email_options',
+			),
+		);
+		$advance_opts = array(
+			array(
+				'title' => __( 'Advanced', 'emails-verification-for-woocommerce' ),
+				'type'  => 'title',
+				'id'    => 'alg_wc_ev_advance_options',
+			),
+			array(
+				'title'    => __( 'Mail function', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'Function used for sending the plugin\'s emails.', 'emails-verification-for-woocommerce' ) . ' ' .
+				              __( 'Leave the default value if unsure.', 'emails-verification-for-woocommerce' ),
+				'type'     => 'select',
+				'class'    => 'chosen_select',
+				'id'       => 'alg_wc_ev_mail_function',
+				'default'  => 'wc_mail',
+				'options'  => array(
+					'mail'    => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'PHP "mail()"' ),
+					'wc_mail' => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'WooCommerce "wc_mail()"' ),
+					'wp_mail' => sprintf( __( '%s function', 'emails-verification-for-woocommerce' ), 'WordPress "wp_mail()"' ),
+				),
+			),
+			array(
+				'title'    => __( 'Email wrap method', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => sprintf( __( 'If "%s" option is selected as "%s" or "%s", set the email wrap method here.', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Email template', 'emails-verification-for-woocommerce' ) . '</strong>', '<strong>' . __( 'WooCommerce', 'emails-verification-for-woocommerce' ) . '</strong>', '<strong>' . __( 'Smart', 'emails-verification-for-woocommerce' ) . '</strong>' ),
+				'id'       => 'alg_wc_ev_email_template_wc_wrap_method',
+				'type'     => 'radio',
+				'default'  => 'manual', // Maybe put default as native?
+				'options'  => array(
+					'manual' => __( 'Manual - Adding WooCommerce header and footer manually', 'emails-verification-for-woocommerce' ),
+					'native' => sprintf( __( 'Native - Using %s function', 'emails-verification-for-woocommerce' ), 'WC_Emails::wrap_message()' )
+				)
 			),
 			array(
 				'type' => 'sectionend',
-				'id'   => 'alg_wc_ev_email_options',
+				'id'   => 'alg_wc_ev_advance_options',
 			),
 		);
-		return array_merge( $general_opts, $email_placeholder_opts, $activation_email_opts, $confirmation_email_opts, $admin_email_opts );
+		return array_merge( $general_opts, $email_placeholder_opts, $activation_email_opts, $confirmation_email_opts, $admin_email_opts, $advance_opts );
 	}
 
 	/**
diff --git a/includes/settings/class-alg-wc-ev-settings-general.php b/includes/settings/class-alg-wc-ev-settings-general.php
index 03655d3..17c7b8a 100644
--- a/includes/settings/class-alg-wc-ev-settings-general.php
+++ b/includes/settings/class-alg-wc-ev-settings-general.php
@@ -43,13 +43,6 @@ function get_settings() {
 				'type'     => 'title',
 				'id'       => 'alg_wc_ev_general_options',
 			),
-			array(
-				'title'    => __( 'Login on activation', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Login the user automatically after the account is verified', 'emails-verification-for-woocommerce' ),
-				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_login_automatically_on_activation',
-				'default'  => 'yes',
-			),
 			array(
 				'title'    => __( 'Block unverified login', 'emails-verification-for-woocommerce' ),
 				'desc'     => __( 'Block login from unverified users', 'emails-verification-for-woocommerce' ),
@@ -61,6 +54,21 @@ function get_settings() {
 				'id'       => 'alg_wc_ev_block_unverified_login',
 				'default'  => 'yes',
 			),
+			array(
+				'title'    => __( 'Login on activation', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Login the user automatically after the account is verified', 'emails-verification-for-woocommerce' ),
+				'type'     => 'checkbox',
+				'id'       => 'alg_wc_ev_login_automatically_on_activation',
+				'default'  => 'yes',
+			),
+			array(
+				'title'    => __( 'Guest users', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Verify guest users', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'If enabled, checkout as guest user billing address will be verified.', 'emails-verification-for-woocommerce' ),
+				'type'     => 'checkbox',
+				'id'       => 'alg_wc_ev_verify_guest_email',
+				'default'  => 'no',
+			),
 			array(
 				'type'     => 'sectionend',
 				'id'       => 'alg_wc_ev_general_options',
@@ -70,6 +78,14 @@ function get_settings() {
 				'type'     => 'title',
 				'id'       => 'alg_wc_ev_account_verification',
 			),
+			array(
+				'title'    => __( 'Current registered users', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Verify account for current users', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'If enabled, all your current unverified users will have to verify their accounts.', 'emails-verification-for-woocommerce' ),
+				'type'     => 'checkbox',
+				'id'       => 'alg_wc_ev_verify_already_registered',
+				'default'  => 'no',
+			),
 			array(
 				'title'    => __( 'Ignore user roles', 'emails-verification-for-woocommerce' ),
 				'desc_tip' => __( 'The following user roles won\'t need to be berified', 'emails-verification-for-woocommerce' ),
@@ -81,20 +97,31 @@ function get_settings() {
 				'class'    => 'chosen_select',
 			),
 			array(
-				'title'    => __( 'Guest users', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Verify guest users', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'If enabled, checkout as guest user billing address will be verified.', 'emails-verification-for-woocommerce' ),
-				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_verify_guest_email',
-				'default'  => 'no',
+				'desc'              => 'Message displayed after the email has been changed.',
+				'custom_attributes' => '',
+				'type'              => 'text',
+				'id'                => 'alg_wc_ev_unverify_email_changing_msg',
+				'default'           => __( 'Your email has been changed. In order to verify your account please check the activation email that was sent to your new email.', 'emails-verification-for-woocommerce' ),
 			),
 			array(
-				'title'    => __( 'Current registered users', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Verify account for current users', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'If enabled, all your current unverified users will have to verify their accounts.', 'emails-verification-for-woocommerce' ),
-				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_verify_already_registered',
-				'default'  => 'no',
+				'title'             => __( 'Verification parameter', 'emails-verification-for-woocommerce' ),
+				'desc'              => sprintf( __( 'Ex: <code>%s</code>', 'emails-verification-for-woocommerce' ), alg_wc_ev()->core->emails->get_verification_url( array( 'user_id' => get_current_user_id(), 'code' => 'a' ) ) ),
+				'desc_tip'          => __( 'The parameter used on the URL to verify the user account.', 'emails-verification-for-woocommerce' ),
+				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'disabled' => 'disabled' ) ),
+				'type'              => 'text',
+				'id'                => 'alg_wc_ev_verification_parameter',
+				'default'           => 'alg_wc_ev_verify_email',
+			),
+			array(
+				'type'     => 'sectionend',
+				'id'       => 'alg_wc_ev_account_verification',
+			),
+			array(
+				'title'    => __( 'Verification info', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Prepare verification information to users, including the verification status and a link to resend the verification email.', 'emails-verification-for-woocommerce' ).' '.
+				$this->get_block_unverify_login_option_warning(),
+				'type'     => 'title',
+				'id'       => 'alg_wc_ev_verification_info',
 			),
 			array(
 				'title'             => __( 'Password reset', 'emails-verification-for-woocommerce' ),
@@ -123,33 +150,6 @@ function get_settings() {
 				'id'                => 'alg_wc_ev_unverify_email_changing',
 				'default'           => 'no',
 			),
-			array(
-				'desc'              => 'Message displayed after the email has been changed.',
-				'custom_attributes' => '',
-				'type'              => 'text',
-				'id'                => 'alg_wc_ev_unverify_email_changing_msg',
-				'default'           => __( 'Your email has been changed. In order to verify your account please check the activation email that was sent to your new email.', 'emails-verification-for-woocommerce' ),
-			),
-			array(
-				'title'             => __( 'Verification parameter', 'emails-verification-for-woocommerce' ),
-				'desc'              => sprintf( __( 'Ex: <code>%s</code>', 'emails-verification-for-woocommerce' ), alg_wc_ev()->core->emails->get_verification_url( array( 'user_id' => get_current_user_id(), 'code' => 'a' ) ) ),
-				'desc_tip'          => __( 'The parameter used on the URL to verify the user account.', 'emails-verification-for-woocommerce' ),
-				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'disabled' => 'disabled' ) ),
-				'type'              => 'text',
-				'id'                => 'alg_wc_ev_verification_parameter',
-				'default'           => 'alg_wc_ev_verify_email',
-			),
-			array(
-				'type'     => 'sectionend',
-				'id'       => 'alg_wc_ev_account_verification',
-			),
-			array(
-				'title'    => __( 'Verification info', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Prepare verification information to users, including the verification status and a link to resend the verification email.', 'emails-verification-for-woocommerce' ).' '.
-				$this->get_block_unverify_login_option_warning(),
-				'type'     => 'title',
-				'id'       => 'alg_wc_ev_verification_info',
-			),
 			array(
 				'title'    => __( 'My Account page', 'emails-verification-for-woocommerce' ),
 				'desc'     => sprintf( __( 'Show account verification info on <a href="%s">%s</a> page', 'emails-verification-for-woocommerce' ), wc_get_page_permalink( 'myaccount' ), __( 'My Account', 'emails-verification-for-woocommerce' ) ),
@@ -179,6 +179,54 @@ function get_settings() {
 				'type'     => 'sectionend',
 				'id'       => 'alg_wc_ev_verification_info',
 			),
+			array(
+				'title'    => __( 'Activation link', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'A link sent via email where users can verify their accounts.', 'emails-verification-for-woocommerce' ),
+				'type'     => 'title',
+				'id'       => 'alg_wc_ev_activation_link_options',
+			),
+			array(
+				'title'    => __( 'One-time activation link', 'emails-verification-for-woocommerce' ),
+				'desc'     => __( 'Prevent activation link from working after the first use', 'emails-verification-for-woocommerce' ),
+				'type'     => 'checkbox',
+				'id'       => 'alg_wc_ev_one_time_activation_link',
+				'default'  => 'yes',
+			),
+			array(
+				'title'    => __( 'Expire time', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'Ignored if set to zero.', 'emails-verification-for-woocommerce' ) . ' ' .
+				              __( 'Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired.', 'emails-verification-for-woocommerce' ),
+				'desc'     => sprintf( __( 'Expiration time based on the %s option below.', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Expire time unit', 'emails-verification-for-woocommerce' ) . '</strong>' ),
+				'type'     => 'number',
+				'id'       => 'alg_wc_ev_expiration_time',
+				'default'  => 0,
+				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ), 'min', array( 0 ) ),
+			),
+			array(
+				'title'   => __( 'Expire time unit', 'emails-verification-for-woocommerce' ),
+				'type'    => 'select',
+				'options' => array(
+					'seconds' => __( 'Seconds', 'emails-verification-for-woocommerce' ),
+					'days'    => __( 'Days', 'emails-verification-for-woocommerce' ),
+				),
+				'id'      => 'alg_wc_ev_expiration_time_unit',
+				'default' => 'seconds',
+			),
+			array(
+				'title'    => __( 'Expire notice', 'emails-verification-for-woocommerce' ),
+				'desc'     => $this->available_placeholders_desc( array( '%resend_verification_url%' ) ),
+				'desc_tip' => __( 'Notice will appear when user will try to verify his email by clicking the email activation link.', 'emails-verification-for-woocommerce' ),
+				'type'     => 'textarea',
+				'id'       => 'alg_wc_ev_activation_code_expired_message',
+				'default'  => __( 'Link has expired. You can resend the email with verification link by clicking <a href="%resend_verification_url%">here</a>.', 'emails-verification-for-woocommerce' ),
+				'css'      => 'width:100%;',
+				'alg_wc_ev_raw' => true,
+				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ) ),
+			),
+			array(
+				'type'     => 'sectionend',
+				'id'       => 'alg_wc_ev_activation_link_options',
+			),
 			array(
 				'title'    => __( 'Redirect on success', 'emails-verification-for-woocommerce' ),
 				'type'     => 'title',
@@ -242,54 +290,6 @@ function get_settings() {
 				'type'     => 'sectionend',
 				'id'       => 'alg_wc_ev_redirect_on_failure_options',
 			),
-			array(
-				'title'    => __( 'Activation link', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'A link sent via email where users can verify their accounts.', 'emails-verification-for-woocommerce' ),
-				'type'     => 'title',
-				'id'       => 'alg_wc_ev_activation_link_options',
-			),
-			array(
-				'title'    => __( 'One-time activation link', 'emails-verification-for-woocommerce' ),
-				'desc'     => __( 'Prevent activation link from working after the first use', 'emails-verification-for-woocommerce' ),
-				'type'     => 'checkbox',
-				'id'       => 'alg_wc_ev_one_time_activation_link',
-				'default'  => 'yes',
-			),
-			array(
-				'title'    => __( 'Expire time', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'Ignored if set to zero.', 'emails-verification-for-woocommerce' ) . ' ' .
-				              __( 'Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired.', 'emails-verification-for-woocommerce' ),
-				'desc'     => sprintf( __( 'Expiration time based on the %s option below.', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Expire time unit', 'emails-verification-for-woocommerce' ) . '</strong>' ),
-				'type'     => 'number',
-				'id'       => 'alg_wc_ev_expiration_time',
-				'default'  => 0,
-				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ), 'min', array( 0 ) ),
-			),
-			array(
-				'title'   => __( 'Expire time unit', 'emails-verification-for-woocommerce' ),
-				'type'    => 'select',
-				'options' => array(
-					'seconds' => __( 'Seconds', 'emails-verification-for-woocommerce' ),
-					'days'    => __( 'Days', 'emails-verification-for-woocommerce' ),
-				),
-				'id'      => 'alg_wc_ev_expiration_time_unit',
-				'default' => 'seconds',
-			),
-			array(
-				'title'    => __( 'Expire notice', 'emails-verification-for-woocommerce' ),
-				'desc'     => $this->available_placeholders_desc( array( '%resend_verification_url%' ) ),
-				'desc_tip' => __( 'Notice will appear when user will try to verify his email by clicking the email activation link.', 'emails-verification-for-woocommerce' ),
-				'type'     => 'textarea',
-				'id'       => 'alg_wc_ev_activation_code_expired_message',
-				'default'  => __( 'Link has expired. You can resend the email with verification link by clicking <a href="%resend_verification_url%">here</a>.', 'emails-verification-for-woocommerce' ),
-				'css'      => 'width:100%;',
-				'alg_wc_ev_raw' => true,
-				'custom_attributes' => apply_filters( 'alg_wc_ev_settings', array( 'readonly' => 'readonly' ) ),
-			),
-			array(
-				'type'     => 'sectionend',
-				'id'       => 'alg_wc_ev_activation_link_options',
-			),
 		);
 	}
 
diff --git a/includes/settings/class-alg-wc-ev-settings-messages.php b/includes/settings/class-alg-wc-ev-settings-messages.php
index 0f8b7a0..c6db9bd 100644
--- a/includes/settings/class-alg-wc-ev-settings-messages.php
+++ b/includes/settings/class-alg-wc-ev-settings-messages.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Messages Section Settings.
  *
- * @version 2.7.8
+ * @version 2.9.0
  * @since   1.3.0
  * @author  WPFactory
  */
@@ -28,7 +28,7 @@ function __construct() {
 	/**
 	 * get_settings.
 	 *
-	 * @version 2.7.8
+	 * @version 2.9.0
 	 * @since   1.3.0
 	 */
 	function get_settings() {
@@ -58,7 +58,7 @@ function get_settings() {
 			),
 			array(
 				'title'    => __( 'Success', 'emails-verification-for-woocommerce' ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_success_message',
 				'default'  => __( '<strong>Success:</strong> Your account has been activated!', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
@@ -67,7 +67,7 @@ function get_settings() {
 			array(
 				'title'    => __( 'Error', 'emails-verification-for-woocommerce' ),
 				'desc'     => $this->available_placeholders_desc( array_merge( array( '%resend_verification_url%' ), $this->get_default_user_placeholders() ) ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_error_message',
 				'default'  => __( 'Your account has to be activated before you can login. You can resend the email with verification link by clicking <a href="%resend_verification_url%">here</a>.', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
@@ -76,7 +76,7 @@ function get_settings() {
 			array(
 				'title'    => __( 'Failed', 'emails-verification-for-woocommerce' ),
 				'desc'     => $this->available_placeholders_desc( array_merge( array( '%resend_verification_url%' ), $this->get_default_user_placeholders() ) ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_failed_message',
 				'default'  => __( '<strong>Error:</strong> Activation failed, please contact our administrator. You can resend the email with verification link by clicking <a href="%resend_verification_url%">here</a>.', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
@@ -85,7 +85,7 @@ function get_settings() {
 			array(
 				'title'    => __( 'Already verified', 'emails-verification-for-woocommerce' ),
 				'desc'     => $this->available_placeholders_desc( $this->get_default_user_placeholders() ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_already_verified_message',
 				'default'  => __( 'Your account is already verified.', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
@@ -94,7 +94,7 @@ function get_settings() {
 			array(
 				'title'    => __( 'Activate', 'emails-verification-for-woocommerce' ),
 				'desc'     => $this->available_placeholders_desc( array_merge( array( '%resend_verification_url%' ), $this->get_default_user_placeholders() ) ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_activation_message',
 				'default'  => __( 'Thank you for your registration. Your account has to be activated before you can login. Please check your email.', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
@@ -102,7 +102,7 @@ function get_settings() {
 			),
 			array(
 				'title'    => __( 'Resend', 'emails-verification-for-woocommerce' ),
-				'type'     => 'textarea',
+				'type'     => 'alg_wc_ev_editor',
 				'id'       => 'alg_wc_ev_email_resend_message',
 				'default'  => __( '<strong>Success:</strong> Your activation email has been resent. Please check your email.', 'emails-verification-for-woocommerce' ),
 				'css'      => 'width:100%;',
diff --git a/langs/emails-verification-for-woocommerce-fr_FR.po b/langs/emails-verification-for-woocommerce-fr_FR.po
index 0e4dfda..5de5ea9 100644
--- a/langs/emails-verification-for-woocommerce-fr_FR.po
+++ b/langs/emails-verification-for-woocommerce-fr_FR.po
@@ -15,53 +15,53 @@ msgstr ""
 "X-Loco-Parser: loco_parse_po\n"
 "X-Generator: Loco https://localise.biz/\n"
 
-#: email-verification-for-woocommerce-pro.php:202
+#: email-verification-for-woocommerce-pro.php:244
 msgid "Go Pro"
 msgstr "Passez en version Pro"
 
-#: includes/class-alg-wc-ev-admin.php:491
+#: includes/class-alg-wc-ev-admin.php:498
 msgid "Nonce not found or not verified."
 msgstr "Nonce introuvable ou non vérifié."
 
-#: includes/class-alg-wc-ev-admin.php:565
+#: includes/class-alg-wc-ev-admin.php:572
 #, php-format
 msgid "User %s: verified."
 msgstr "Utilisateur %s: vérifié."
 
-#: includes/class-alg-wc-ev-admin.php:569
+#: includes/class-alg-wc-ev-admin.php:576
 #, php-format
 msgid "User %s: unverified."
 msgstr "Utilisateur %s: non vérifié."
 
-#: includes/class-alg-wc-ev-admin.php:573
+#: includes/class-alg-wc-ev-admin.php:580
 #, php-format
 msgid "User %s: activation link resent."
 msgstr "Utilisateur %s: lien d'activation renvoyé."
 
-#: includes/class-alg-wc-ev-admin.php:602
-#: includes/class-alg-wc-ev-core.php:1092
+#: includes/class-alg-wc-ev-admin.php:609
+#: includes/class-alg-wc-ev-core.php:1070
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:83
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:128
 msgid "Verified"
 msgstr "Vérifié"
 
-#: includes/class-alg-wc-ev-admin.php:618
+#: includes/class-alg-wc-ev-admin.php:625
 msgid "Are you sure?"
 msgstr "Êtes-vous sûr?"
 
-#: includes/class-alg-wc-ev-admin.php:637
+#: includes/class-alg-wc-ev-admin.php:644
 msgid "Email not verified"
 msgstr "E-mail non vérifié"
 
-#: includes/class-alg-wc-ev-admin.php:646
+#: includes/class-alg-wc-ev-admin.php:653
 msgid "Email verified"
 msgstr "Email vérifié"
 
 #: includes/class-alg-wc-ev-emails.php:453
 #: includes/class-alg-wc-ev-emails.php:602
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:157
-#: includes/pro/class-alg-wc-ev-pro.php:836
-#: includes/settings/class-alg-wc-ev-settings-email.php:168
+#: includes/pro/class-alg-wc-ev-pro.php:844
+#: includes/settings/class-alg-wc-ev-settings-email.php:120
 msgid "Please activate your account"
 msgstr "Veuillez activer votre compte"
 
@@ -99,32 +99,32 @@ msgstr "Administrateur"
 msgid "Email"
 msgstr "Email"
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:352
+#: includes/settings/class-alg-wc-ev-settings-email.php:327
 #, php-format
 msgid "Leave empty to send to %s."
 msgstr "Laissez vide pour envoyer à %s."
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:165
-#: includes/settings/class-alg-wc-ev-settings-email.php:269
+#: includes/settings/class-alg-wc-ev-settings-email.php:117
+#: includes/settings/class-alg-wc-ev-settings-email.php:244
 msgid "Email subject"
 msgstr "Sujet de l'email"
 
-#: includes/pro/class-alg-wc-ev-pro.php:821
-#: includes/settings/class-alg-wc-ev-settings-email.php:362
+#: includes/pro/class-alg-wc-ev-pro.php:829
+#: includes/settings/class-alg-wc-ev-settings-email.php:337
 msgid "User email has been verified"
 msgstr "L'adresse email de l'utilisateur a été vérifiée"
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:186
+#: includes/settings/class-alg-wc-ev-settings-email.php:138
 msgid "Email heading"
 msgstr "En-tête de l'email"
 
-#: includes/pro/class-alg-wc-ev-pro.php:815
-#: includes/settings/class-alg-wc-ev-settings-email.php:369
+#: includes/pro/class-alg-wc-ev-pro.php:823
+#: includes/settings/class-alg-wc-ev-settings-email.php:352
 msgid "User account has been activated"
 msgstr "Le compte utilisateur a été activé"
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:174
-#: includes/settings/class-alg-wc-ev-settings-email.php:287
+#: includes/settings/class-alg-wc-ev-settings-email.php:126
+#: includes/settings/class-alg-wc-ev-settings-email.php:253
 msgid "Email content"
 msgstr "Contenu de l'e-mail"
 
@@ -153,7 +153,8 @@ msgid "Delete users automatically"
 msgstr "Supprimer automatiquement les utilisateurs"
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:32
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:363
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Advanced"
 msgstr "Avancé"
 
@@ -166,16 +167,16 @@ msgid "Custom \"logout\" function"
 msgstr "Fonction \"déconnexion\" personnalisée"
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:232
-#: includes/settings/class-alg-wc-ev-settings-email.php:44
-#: includes/settings/class-alg-wc-ev-settings-email.php:143
+#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:370
 msgid "Leave the default value if unsure."
 msgstr "Laissez la valeur par défaut en cas de doute."
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:150
+#: includes/settings/class-alg-wc-ev-settings-email.php:164
 msgid "On \"user register\""
 msgstr "Sur \"utilisateur enregistré\""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:151
+#: includes/settings/class-alg-wc-ev-settings-email.php:165
 msgid "On \"WooCommerce created customer\""
 msgstr "Sur \"Client créé par WooCommerce\""
 
@@ -195,33 +196,33 @@ msgstr "Sur la page \"avant 'merci'\""
 msgid "On \"'thank you' page\""
 msgstr "Sur la page \"merci\""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:65
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:42
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Email template"
 msgstr "Modèle de l'email"
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:115
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:73
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:50
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Plain"
 msgstr "Plain"
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:74
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:51
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "WooCommerce"
 msgstr "WooCommerce"
 
 #: includes/class-alg-wc-ev-emails.php:297
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:198
-#: includes/pro/class-alg-wc-ev-pro.php:675
-#: includes/pro/class-alg-wc-ev-pro.php:867
-#: includes/settings/class-alg-wc-ev-settings-email.php:189
+#: includes/pro/class-alg-wc-ev-pro.php:683
+#: includes/pro/class-alg-wc-ev-pro.php:875
+#: includes/settings/class-alg-wc-ev-settings-email.php:141
 msgid "Activate your account"
 msgstr "Activez votre compte"
 
@@ -229,30 +230,30 @@ msgstr "Activez votre compte"
 msgid "General Options"
 msgstr "Options générales"
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:296
+#: includes/settings/class-alg-wc-ev-settings-email.php:271
 msgid "Delay"
 msgstr "Retard (délais)"
 
-#: includes/pro/class-alg-wc-ev-pro.php:610
+#: includes/pro/class-alg-wc-ev-pro.php:618
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:227
 msgid "You need to <a href=\"%myaccount_url%\" target=\"_blank\">register</a> and verify your email before adding products to the cart."
 msgstr "Vous devez <a href=\"%myaccount_url%\" target=\"_blank\"> vous inscrire </a> et vérifier votre email avant d'ajouter des produits au panier."
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:260
+#: includes/settings/class-alg-wc-ev-settings-general.php:197
 msgid "Ignored if set to zero."
 msgstr "Ignoré si défini sur zéro."
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:261
+#: includes/settings/class-alg-wc-ev-settings-general.php:198
 msgid "Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired."
 msgstr "Veuillez noter que tous les codes d'activation générés avant l'installation du plugin v1.7.0 expireront automatiquement."
 
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:339
-#: includes/settings/class-alg-wc-ev-settings-general.php:281
+#: includes/settings/class-alg-wc-ev-settings-general.php:218
 msgid "Notice will appear when user will try to verify his email by clicking the email activation link."
 msgstr "Une notification apparaîtra lorsque l'utilisateur tentera de vérifier son email en cliquant sur le lien d'activation de l'email."
 
-#: includes/pro/class-alg-wc-ev-pro.php:486
-#: includes/settings/class-alg-wc-ev-settings-general.php:284
+#: includes/pro/class-alg-wc-ev-pro.php:494
+#: includes/settings/class-alg-wc-ev-settings-general.php:221
 msgid "Link has expired. You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr "Le lien a expiré. Vous pouvez renvoyer l'email avec le lien de vérification en cliquant <a href=\"%resend_verification_url%\"> ici </a>."
 
@@ -260,7 +261,7 @@ msgstr "Le lien a expiré. Vous pouvez renvoyer l'email avec le lien de vérific
 msgid "Ignored if empty."
 msgstr "Ignoré si vide."
 
-#: includes/pro/class-alg-wc-ev-pro.php:528
+#: includes/pro/class-alg-wc-ev-pro.php:536
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:342
 msgid "Your email is denied."
 msgstr "Votre email est sur liste noire."
@@ -286,7 +287,7 @@ msgstr "Échoué"
 msgid "Activate"
 msgstr "Activer"
 
-#: includes/class-alg-wc-ev-admin.php:642
+#: includes/class-alg-wc-ev-admin.php:649
 #: includes/settings/class-alg-wc-ev-settings-messages.php:104
 msgid "Resend"
 msgstr "Renvoyer"
@@ -366,139 +367,139 @@ msgstr ""
 msgid "User verified manually: %d."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:229
+#: includes/class-alg-wc-ev-admin.php:236
 msgid "All Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:230
+#: includes/class-alg-wc-ev-admin.php:237
 msgid "Verified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:231
+#: includes/class-alg-wc-ev-admin.php:238
 msgid "Unverified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:236
+#: includes/class-alg-wc-ev-admin.php:243
 msgid "Filter"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:285
+#: includes/class-alg-wc-ev-admin.php:292
 msgid "Verification email sent to %d user successfully."
 msgid_plural "Verification email sent to %d users successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:292
+#: includes/class-alg-wc-ev-admin.php:299
 msgid "%d unverified users are going to be verified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:296
+#: includes/class-alg-wc-ev-admin.php:303
 msgid "%d user verified successfully."
 msgid_plural "%d users verified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:304
+#: includes/class-alg-wc-ev-admin.php:311
 msgid "%d verified users are going to be unverified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:308
+#: includes/class-alg-wc-ev-admin.php:315
 msgid "%d user unverified successfully."
 msgid_plural "%d users unverified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:432
+#: includes/class-alg-wc-ev-admin.php:439
 #: includes/settings/class-alg-wc-ev-settings-admin.php:121
 #: includes/settings/class-alg-wc-ev-settings-admin.php:122
 msgid "Resend verification email"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:435
+#: includes/class-alg-wc-ev-admin.php:442
 #: includes/settings/class-alg-wc-ev-settings-admin.php:128
 #: includes/settings/class-alg-wc-ev-settings-admin.php:129
 msgid "Verify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:438
+#: includes/class-alg-wc-ev-admin.php:445
 #: includes/settings/class-alg-wc-ev-settings-admin.php:135
 #: includes/settings/class-alg-wc-ev-settings-admin.php:136
 msgid "Unverify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:640
+#: includes/class-alg-wc-ev-admin.php:647
 msgid "Verify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:649
+#: includes/class-alg-wc-ev-admin.php:656
 msgid "Unverify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:166
+#: includes/class-alg-wc-ev-core.php:1212
 msgid "<a href=\"javascript:;\" id=\"alg_wc_ev_send_verify\">Send Verify Email</a>"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:167
+#: includes/class-alg-wc-ev-core.php:1213
 msgid "Resending...."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:168
+#: includes/class-alg-wc-ev-core.php:1214
 msgid "Verification mail sent successfully to billing email, please check inbox and verify ! <a href=\"javascript:;\" id=\"alg_wc_ev_resend_verify\">Resend</a>"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:169
+#: includes/class-alg-wc-ev-core.php:1215
 msgid "Email id verified !"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:275
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:253
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:162
 msgid "You need to <a href=\"%myaccount_url%\">verify your account</a> to access this content."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 msgid "You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:965
+#: includes/class-alg-wc-ev-core.php:943
 msgid "Submit"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:976
+#: includes/class-alg-wc-ev-core.php:954
 msgid "Email address"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1022
+#: includes/class-alg-wc-ev-core.php:1000
 msgid "User data not found."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1039
+#: includes/class-alg-wc-ev-core.php:1017
 msgid "You can resend the email with verification link by clicking <a href=\"{resend_verification_url}\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1091
+#: includes/class-alg-wc-ev-core.php:1069
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:102
 msgid "Verification status: "
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1093
+#: includes/class-alg-wc-ev-core.php:1071
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:87
 msgid "Unverified"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:77
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:176
-#: includes/pro/class-alg-wc-ev-pro.php:149
-#: includes/settings/class-alg-wc-ev-settings-email.php:281
+#: includes/pro/class-alg-wc-ev-pro.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:265
 msgid "Your account has been activated"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:82
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:164
-#: includes/pro/class-alg-wc-ev-pro.php:162
-#: includes/settings/class-alg-wc-ev-settings-email.php:272
+#: includes/pro/class-alg-wc-ev-pro.php:170
+#: includes/settings/class-alg-wc-ev-settings-email.php:247
 msgid "Your account has been activated successfully"
 msgstr ""
 
@@ -565,7 +566,7 @@ msgid "Total unverified users deleted: %d."
 msgstr ""
 
 #: includes/class-alg-wc-ev-verification-info-widget.php:24
-#: includes/settings/class-alg-wc-ev-settings-general.php:147
+#: includes/settings/class-alg-wc-ev-settings-general.php:120
 msgid "Verification info"
 msgstr ""
 
@@ -580,33 +581,33 @@ msgstr ""
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:32
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:381
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:253
-#: includes/settings/class-alg-wc-ev-settings-email.php:125
+#: includes/settings/class-alg-wc-ev-settings-email.php:91
 msgid "Activation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:33
-#: includes/settings/class-alg-wc-ev-settings-email.php:128
+#: includes/settings/class-alg-wc-ev-settings-email.php:94
 msgid "An email sent to the user with an activation link."
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:382
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:31
-#: includes/settings/class-alg-wc-ev-settings-email.php:247
-#: includes/settings/class-alg-wc-ev-settings-email.php:253
+#: includes/settings/class-alg-wc-ev-settings-email.php:222
+#: includes/settings/class-alg-wc-ev-settings-email.php:228
 msgid "Confirmation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:32
-#: includes/settings/class-alg-wc-ev-settings-email.php:250
+#: includes/settings/class-alg-wc-ev-settings-email.php:225
 msgid "An email sent to the user when the account is verified."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:362
-#: includes/settings/class-alg-wc-ev-settings-general.php:131
+#: includes/pro/class-alg-wc-ev-pro.php:370
+#: includes/settings/class-alg-wc-ev-settings-general.php:104
 msgid "Your email has been changed. In order to verify your account please check the activation email that was sent to your new email."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:437
+#: includes/pro/class-alg-wc-ev-pro.php:445
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:189
 msgid "You need to log in and verify your email to place an order."
 msgstr ""
@@ -663,8 +664,8 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-admin.php:82
 #: includes/settings/class-alg-wc-ev-settings-admin.php:88
 #: includes/settings/class-alg-wc-ev-settings-admin.php:103
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Verified column"
 msgstr ""
 
@@ -685,8 +686,8 @@ msgid "The position of the column."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-admin.php:102
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Actions"
 msgstr ""
 
@@ -878,13 +879,13 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:188
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:213
-#: includes/settings/class-alg-wc-ev-settings-general.php:205
-#: includes/settings/class-alg-wc-ev-settings-general.php:233
+#: includes/settings/class-alg-wc-ev-settings-general.php:253
+#: includes/settings/class-alg-wc-ev-settings-general.php:281
 msgid "Custom redirect URL"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:206
+#: includes/settings/class-alg-wc-ev-settings-general.php:254
 msgid "\"%s\" must be selected for the \"%s\" option above."
 msgstr ""
 
@@ -1015,7 +1016,7 @@ msgid "If the %s option is set it will only delete unverified users whose activa
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:327
-#: includes/settings/class-alg-wc-ev-settings-general.php:259
+#: includes/settings/class-alg-wc-ev-settings-general.php:196
 msgid "Expire time"
 msgstr ""
 
@@ -1418,7 +1419,7 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:236
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Emails > Activation email > Email template"
 msgstr ""
 
@@ -1487,7 +1488,7 @@ msgid "Polylang"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:246
+#: includes/settings/class-alg-wc-ev-settings-general.php:183
 msgid "Activation link"
 msgstr ""
 
@@ -1536,7 +1537,7 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:234
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:245
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "New account"
 msgstr ""
 
@@ -1565,12 +1566,12 @@ msgid "In order to enable the %s and %s email types, it's necessary to set the o
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Activation"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Confirmation"
 msgstr ""
 
@@ -1579,8 +1580,8 @@ msgid "Email > WC email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
+#: includes/settings/class-alg-wc-ev-settings-email.php:67
 msgid "WooCommerce > Emails"
 msgstr ""
 
@@ -1620,7 +1621,7 @@ msgid "Paid Memberships Pro"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:288
-#: includes/settings/class-alg-wc-ev-settings-general.php:69
+#: includes/settings/class-alg-wc-ev-settings-general.php:77
 msgid "Account verification"
 msgstr ""
 
@@ -1638,7 +1639,7 @@ msgid "YayMail - WooCommerce Email Customizer"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:317
-#: includes/settings/class-alg-wc-ev-settings-email.php:56
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "Customer new account email"
 msgstr ""
 
@@ -1675,359 +1676,359 @@ msgstr ""
 msgid "Email options"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:42
+#: includes/settings/class-alg-wc-ev-settings-email.php:368
 msgid "Mail function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:369
 msgid "Function used for sending the plugin's emails."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:50
-#: includes/settings/class-alg-wc-ev-settings-email.php:51
-#: includes/settings/class-alg-wc-ev-settings-email.php:52
+#: includes/settings/class-alg-wc-ev-settings-email.php:376
+#: includes/settings/class-alg-wc-ev-settings-email.php:377
+#: includes/settings/class-alg-wc-ev-settings-email.php:378
 msgid "%s function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:57
+#: includes/settings/class-alg-wc-ev-settings-email.php:109
 msgid "Delay WooCommerce \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:110
 msgid "\"Customer new account\" email is only sent on successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
 msgid "Possible values: %s, %s, %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:75
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:52
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Smart"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:67
+#: includes/settings/class-alg-wc-ev-settings-email.php:44
 msgid "\"Smart\" will automatically send a \"Plain\" email when appended to other email, like the \"Customer new account\" email, and will send a \"WooCommerce\" email when sending it as a separate email. Most probably \"Smart\" will be the best choice."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:80
+#: includes/settings/class-alg-wc-ev-settings-email.php:57
 msgid "WC email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
 msgid "%s will use the template options from this page."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
-#: includes/settings/class-alg-wc-ev-settings-email.php:89
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:66
 msgid "Email Verification plugin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "%s option will create new emails (%s) on %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:83
+#: includes/settings/class-alg-wc-ev-settings-email.php:60
 msgid "This option will only be useful if the Email Template option is set as <code>WooCommerce</code> or <code>Smart</code>."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:94
+#: includes/settings/class-alg-wc-ev-settings-email.php:382
 msgid "Email wrap method"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "If \"%s\" option is selected as \"%s\" or \"%s\", set the email wrap method here."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:100
+#: includes/settings/class-alg-wc-ev-settings-email.php:388
 msgid "Manual - Adding WooCommerce header and footer manually"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:101
+#: includes/settings/class-alg-wc-ev-settings-email.php:389
 msgid "Native - Using %s function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:111
+#: includes/settings/class-alg-wc-ev-settings-email.php:77
 msgid "Common placeholders"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:112
+#: includes/settings/class-alg-wc-ev-settings-email.php:78
 msgid "These placeholders can be used on the Email Subject or Content options: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:113
+#: includes/settings/class-alg-wc-ev-settings-email.php:79
 msgid "If you're having deliverability problems or emails being sent to Spam, try using the placeholders %s and %s on the Email Content or subject."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:129
+#: includes/settings/class-alg-wc-ev-settings-email.php:95
 msgid "Additional placeholders: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:133
+#: includes/settings/class-alg-wc-ev-settings-email.php:99
 #: includes/settings/class-alg-wc-ev-settings-section.php:156
 msgid "Send as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:134
+#: includes/settings/class-alg-wc-ev-settings-email.php:100
 msgid "Send verification as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:135
+#: includes/settings/class-alg-wc-ev-settings-email.php:101
 msgid "Disable it if you want to append it to the standard WooCommerce \"Customer new account\" email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "If the %s email is not being sent, try to change the option %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
-#: includes/settings/class-alg-wc-ev-settings-email.php:142
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
+#: includes/settings/class-alg-wc-ev-settings-email.php:156
 msgid "Email sending trigger"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:156
+#: includes/settings/class-alg-wc-ev-settings-email.php:170
 msgid "Activation email delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:171
 msgid "Delay the activation email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:158
+#: includes/settings/class-alg-wc-ev-settings-email.php:172
 msgid "Try to enable it if the activation emails are getting sent to authenticated users."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:195
+#: includes/settings/class-alg-wc-ev-settings-email.php:147
 msgid "Fine tune placement"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:196
+#: includes/settings/class-alg-wc-ev-settings-email.php:148
 msgid "Choose precisely where the activation email will be appended to the \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:149
 msgid "It's necessary to add %s to the %s email template."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:204
+#: includes/settings/class-alg-wc-ev-settings-email.php:179
 msgid "Automatic resending"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:205
+#: includes/settings/class-alg-wc-ev-settings-email.php:180
 msgid "Resend the activation email automatically if the user has not yet been verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:206
+#: includes/settings/class-alg-wc-ev-settings-email.php:181
 msgid "Works for future users, or if a current unverified user receives the activation email manually."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:213
+#: includes/settings/class-alg-wc-ev-settings-email.php:188
 msgid "Frequency."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:222
-#: includes/settings/class-alg-wc-ev-settings-email.php:303
+#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:278
 msgid "Unit of time."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:226
-#: includes/settings/class-alg-wc-ev-settings-email.php:309
+#: includes/settings/class-alg-wc-ev-settings-email.php:201
+#: includes/settings/class-alg-wc-ev-settings-email.php:284
 msgid "Hours"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:227
-#: includes/settings/class-alg-wc-ev-settings-email.php:310
-#: includes/settings/class-alg-wc-ev-settings-general.php:273
+#: includes/settings/class-alg-wc-ev-settings-email.php:202
+#: includes/settings/class-alg-wc-ev-settings-email.php:285
+#: includes/settings/class-alg-wc-ev-settings-general.php:210
 msgid "Days"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:234
+#: includes/settings/class-alg-wc-ev-settings-email.php:209
 msgid "Max attempts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:254
+#: includes/settings/class-alg-wc-ev-settings-email.php:229
 msgid "Send confirmation email to users who have just verified their accounts"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:261
+#: includes/settings/class-alg-wc-ev-settings-email.php:236
 msgid "Send confirmation email to the user manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Only useful if the options %s, %s are enabled."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:278
+#: includes/settings/class-alg-wc-ev-settings-email.php:262
 msgid "Email Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:297
+#: includes/settings/class-alg-wc-ev-settings-email.php:272
 msgid "Wait for some time before sending the email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:314
+#: includes/settings/class-alg-wc-ev-settings-email.php:289
 msgid "Delay value."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:327
-#: includes/settings/class-alg-wc-ev-settings-email.php:333
+#: includes/settings/class-alg-wc-ev-settings-email.php:302
+#: includes/settings/class-alg-wc-ev-settings-email.php:308
 msgid "Admin email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:329
+#: includes/settings/class-alg-wc-ev-settings-email.php:304
 msgid "An email sent to the admin when a user verifies his email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:335
+#: includes/settings/class-alg-wc-ev-settings-email.php:310
 msgid "Send email to the admin when a user verifies his email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:343
+#: includes/settings/class-alg-wc-ev-settings-email.php:318
 msgid "Send admin email when a user has been manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:351
+#: includes/settings/class-alg-wc-ev-settings-email.php:326
 msgid "Recipient"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:359
+#: includes/settings/class-alg-wc-ev-settings-email.php:334
 msgid "Subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:366
+#: includes/settings/class-alg-wc-ev-settings-email.php:349
 msgid "Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:374
+#: includes/settings/class-alg-wc-ev-settings-email.php:341
 msgid "Content"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:401
+#: includes/settings/class-alg-wc-ev-settings-email.php:412
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:402
+#: includes/settings/class-alg-wc-ev-settings-email.php:413
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:405
+#: includes/settings/class-alg-wc-ev-settings-email.php:416
 msgid "Send email every %s %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:47
+#: includes/settings/class-alg-wc-ev-settings-general.php:58
 msgid "Login on activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:48
+#: includes/settings/class-alg-wc-ev-settings-general.php:59
 msgid "Login the user automatically after the account is verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:54
+#: includes/settings/class-alg-wc-ev-settings-general.php:47
 #: includes/settings/class-alg-wc-ev-settings-section.php:92
 msgid "Block unverified login"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:55
+#: includes/settings/class-alg-wc-ev-settings-general.php:48
 msgid "Block login from unverified users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:56
+#: includes/settings/class-alg-wc-ev-settings-general.php:49
 msgid "If disabled, account verification will be optional. In that case you'll probably want to:"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Change your %s option"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Message > Activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Disable login options on the %s section"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:74
+#: includes/settings/class-alg-wc-ev-settings-general.php:90
 msgid "Ignore user roles"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:75
+#: includes/settings/class-alg-wc-ev-settings-general.php:91
 msgid "The following user roles won't need to be berified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:76
+#: includes/settings/class-alg-wc-ev-settings-general.php:92
 msgid "Skipped user roles"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:84
+#: includes/settings/class-alg-wc-ev-settings-general.php:65
 msgid "Guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:85
+#: includes/settings/class-alg-wc-ev-settings-general.php:66
 msgid "Verify guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:86
+#: includes/settings/class-alg-wc-ev-settings-general.php:67
 msgid "If enabled, checkout as guest user billing address will be verified."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:92
+#: includes/settings/class-alg-wc-ev-settings-general.php:82
 msgid "Current registered users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:93
+#: includes/settings/class-alg-wc-ev-settings-general.php:83
 msgid "Verify account for current users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:94
+#: includes/settings/class-alg-wc-ev-settings-general.php:84
 msgid "If enabled, all your current unverified users will have to verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:100
+#: includes/settings/class-alg-wc-ev-settings-general.php:127
 msgid "Password reset"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:101
+#: includes/settings/class-alg-wc-ev-settings-general.php:128
 msgid "Verify the user on password reset"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:108
+#: includes/settings/class-alg-wc-ev-settings-general.php:135
 msgid "Paying customers"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:109
+#: includes/settings/class-alg-wc-ev-settings-general.php:136
 msgid "Verify customers as soon as any of their non-free orders are considered paid"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:119
+#: includes/settings/class-alg-wc-ev-settings-general.php:146
 msgid "Email changing"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:120
+#: includes/settings/class-alg-wc-ev-settings-general.php:147
 msgid "Unverify, logout and resend activation link to accounts that changed the emails"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:134
+#: includes/settings/class-alg-wc-ev-settings-general.php:107
 msgid "Verification parameter"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:135
+#: includes/settings/class-alg-wc-ev-settings-general.php:108
 msgid "Ex: <code>%s</code>"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:136
+#: includes/settings/class-alg-wc-ev-settings-general.php:109
 msgid "The parameter used on the URL to verify the user account."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:148
+#: includes/settings/class-alg-wc-ev-settings-general.php:121
 msgid "Prepare verification information to users, including the verification status and a link to resend the verification email."
 msgstr ""
 
@@ -2063,92 +2064,92 @@ msgstr ""
 msgid "You can use %s and %s shortcodes here and any other one you'd like."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:183
-#: includes/settings/class-alg-wc-ev-settings-general.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
+#: includes/settings/class-alg-wc-ev-settings-general.php:231
+#: includes/settings/class-alg-wc-ev-settings-general.php:237
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
 msgid "Redirect on success"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:185
+#: includes/settings/class-alg-wc-ev-settings-general.php:233
 msgid "Redirects customers after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:190
+#: includes/settings/class-alg-wc-ev-settings-general.php:238
 msgid "Redirects customers to the selected page after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:196
+#: includes/settings/class-alg-wc-ev-settings-general.php:244
 msgid "Do not redirect"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:197
+#: includes/settings/class-alg-wc-ev-settings-general.php:245
 msgid "Redirect to \"My account\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:198
+#: includes/settings/class-alg-wc-ev-settings-general.php:246
 msgid "Redirect to \"Shop\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:199
+#: includes/settings/class-alg-wc-ev-settings-general.php:247
 msgid "Redirect to home page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:200
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
+#: includes/settings/class-alg-wc-ev-settings-general.php:248
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
 msgid "Redirect to custom URL"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:201
+#: includes/settings/class-alg-wc-ev-settings-general.php:249
 msgid "Redirect to the previous url before \"my account\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:219
-#: includes/settings/class-alg-wc-ev-settings-general.php:226
+#: includes/settings/class-alg-wc-ev-settings-general.php:267
+#: includes/settings/class-alg-wc-ev-settings-general.php:274
 msgid "Redirect on failure"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:221
+#: includes/settings/class-alg-wc-ev-settings-general.php:269
 msgid "Redirects customers after unsuccessful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:222
+#: includes/settings/class-alg-wc-ev-settings-general.php:270
 msgid "This will also append a %s argument to the URL that could help you displaying the error message in case you have issues with that."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:227
+#: includes/settings/class-alg-wc-ev-settings-general.php:275
 msgid "Redirects to a custom URL if an unverified user tries to login"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:234
+#: includes/settings/class-alg-wc-ev-settings-general.php:282
 msgid "If empty will redirect to the same page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:247
+#: includes/settings/class-alg-wc-ev-settings-general.php:184
 msgid "A link sent via email where users can verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:252
+#: includes/settings/class-alg-wc-ev-settings-general.php:189
 msgid "One-time activation link"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:253
+#: includes/settings/class-alg-wc-ev-settings-general.php:190
 msgid "Prevent activation link from working after the first use"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
+#: includes/settings/class-alg-wc-ev-settings-general.php:199
 msgid "Expiration time based on the %s option below."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
-#: includes/settings/class-alg-wc-ev-settings-general.php:269
+#: includes/settings/class-alg-wc-ev-settings-general.php:199
+#: includes/settings/class-alg-wc-ev-settings-general.php:206
 msgid "Expire time unit"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:272
+#: includes/settings/class-alg-wc-ev-settings-general.php:209
 msgid "Seconds"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:279
+#: includes/settings/class-alg-wc-ev-settings-general.php:216
 msgid "Expire notice"
 msgstr ""
 
diff --git a/langs/emails-verification-for-woocommerce-pt_BR.po b/langs/emails-verification-for-woocommerce-pt_BR.po
index 4aadf98..a600d24 100644
--- a/langs/emails-verification-for-woocommerce-pt_BR.po
+++ b/langs/emails-verification-for-woocommerce-pt_BR.po
@@ -30,7 +30,7 @@ msgstr ""
 msgid "https://wpfactory.com"
 msgstr ""
 
-#: email-verification-for-woocommerce-pro.php:202
+#: email-verification-for-woocommerce-pro.php:244
 msgid "Go Pro"
 msgstr ""
 
@@ -38,13 +38,13 @@ msgstr ""
 msgid "Email Verification for WooCommerce - Delete users tool"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:285
+#: includes/class-alg-wc-ev-admin.php:292
 msgid "Verification email sent to %d user successfully."
 msgid_plural "Verification email sent to %d users successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:432
+#: includes/class-alg-wc-ev-admin.php:439
 #: includes/settings/class-alg-wc-ev-settings-admin.php:121
 #: includes/settings/class-alg-wc-ev-settings-admin.php:122
 msgid "Resend verification email"
@@ -54,69 +54,69 @@ msgstr ""
 msgid "Total unverified users deleted: %d."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:491
+#: includes/class-alg-wc-ev-admin.php:498
 msgid "Nonce not found or not verified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:565
+#: includes/class-alg-wc-ev-admin.php:572
 msgid "User %s: verified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:569
+#: includes/class-alg-wc-ev-admin.php:576
 msgid "User %s: unverified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:573
+#: includes/class-alg-wc-ev-admin.php:580
 msgid "User %s: activation link resent."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:602
-#: includes/class-alg-wc-ev-core.php:1092
+#: includes/class-alg-wc-ev-admin.php:609
+#: includes/class-alg-wc-ev-core.php:1070
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:83
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:128
 msgid "Verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:618
+#: includes/class-alg-wc-ev-admin.php:625
 msgid "Are you sure?"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:637
+#: includes/class-alg-wc-ev-admin.php:644
 msgid "Email not verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:640
+#: includes/class-alg-wc-ev-admin.php:647
 msgid "Verify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:642
+#: includes/class-alg-wc-ev-admin.php:649
 #: includes/settings/class-alg-wc-ev-settings-messages.php:104
 msgid "Resend"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:646
+#: includes/class-alg-wc-ev-admin.php:653
 msgid "Email verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:649
+#: includes/class-alg-wc-ev-admin.php:656
 msgid "Unverify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 msgid "You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1091
+#: includes/class-alg-wc-ev-core.php:1069
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:102
 msgid "Verification status: "
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1039
+#: includes/class-alg-wc-ev-core.php:1017
 msgid "You can resend the email with verification link by clicking <a href=\"{resend_verification_url}\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1093
+#: includes/class-alg-wc-ev-core.php:1071
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:87
 msgid "Unverified"
 msgstr ""
@@ -124,8 +124,8 @@ msgstr ""
 #: includes/class-alg-wc-ev-emails.php:453
 #: includes/class-alg-wc-ev-emails.php:602
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:157
-#: includes/pro/class-alg-wc-ev-pro.php:836
-#: includes/settings/class-alg-wc-ev-settings-email.php:168
+#: includes/pro/class-alg-wc-ev-pro.php:844
+#: includes/settings/class-alg-wc-ev-settings-email.php:120
 msgid "Please activate your account"
 msgstr "Por favor, ative sua conta"
 
@@ -172,7 +172,7 @@ msgid "You need to become a paying customer in order to activate your account."
 msgstr ""
 
 #: includes/class-alg-wc-ev-verification-info-widget.php:24
-#: includes/settings/class-alg-wc-ev-settings-general.php:147
+#: includes/settings/class-alg-wc-ev-settings-general.php:120
 msgid "Verification info"
 msgstr ""
 
@@ -191,8 +191,8 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-admin.php:82
 #: includes/settings/class-alg-wc-ev-settings-admin.php:88
 #: includes/settings/class-alg-wc-ev-settings-admin.php:103
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Verified column"
 msgstr ""
 
@@ -213,8 +213,8 @@ msgid "The position of the column."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-admin.php:102
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Actions"
 msgstr ""
 
@@ -241,7 +241,8 @@ msgid "Add %s bulk option"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:32
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:363
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Advanced"
 msgstr "Avançado"
 
@@ -350,13 +351,13 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:188
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:213
-#: includes/settings/class-alg-wc-ev-settings-general.php:205
-#: includes/settings/class-alg-wc-ev-settings-general.php:233
+#: includes/settings/class-alg-wc-ev-settings-general.php:253
+#: includes/settings/class-alg-wc-ev-settings-general.php:281
 msgid "Custom redirect URL"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:206
+#: includes/settings/class-alg-wc-ev-settings-general.php:254
 msgid "\"%s\" must be selected for the \"%s\" option above."
 msgstr ""
 
@@ -399,8 +400,8 @@ msgid "Change this if you are having issues with \"Prevent automatic user login
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:232
-#: includes/settings/class-alg-wc-ev-settings-email.php:44
-#: includes/settings/class-alg-wc-ev-settings-email.php:143
+#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:370
 msgid "Leave the default value if unsure."
 msgstr ""
 
@@ -536,7 +537,7 @@ msgid "If the %s option is set it will only delete unverified users whose activa
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:327
-#: includes/settings/class-alg-wc-ev-settings-general.php:259
+#: includes/settings/class-alg-wc-ev-settings-general.php:196
 msgid "Expire time"
 msgstr ""
 
@@ -652,8 +653,8 @@ msgstr ""
 msgid "Error for guest users."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:275
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:253
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:162
 msgid "You need to <a href=\"%myaccount_url%\">verify your account</a> to access this content."
@@ -672,7 +673,7 @@ msgstr ""
 msgid "Blocks checkout process for unverified users (including guests)."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:437
+#: includes/pro/class-alg-wc-ev-pro.php:445
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:189
 msgid "You need to log in and verify your email to place an order."
 msgstr ""
@@ -698,7 +699,7 @@ msgstr ""
 msgid "Leave it empty if you don't want to redirect."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:610
+#: includes/pro/class-alg-wc-ev-pro.php:618
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:227
 msgid "You need to <a href=\"%myaccount_url%\" target=\"_blank\">register</a> and verify your email before adding products to the cart."
 msgstr ""
@@ -771,11 +772,11 @@ msgid "Separate emails with a comma and/or with a new line. You can also use wil
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:339
-#: includes/settings/class-alg-wc-ev-settings-general.php:281
+#: includes/settings/class-alg-wc-ev-settings-general.php:218
 msgid "Notice will appear when user will try to verify his email by clicking the email activation link."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:528
+#: includes/pro/class-alg-wc-ev-pro.php:536
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:342
 msgid "Your email is denied."
 msgstr ""
@@ -905,16 +906,16 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:236
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Emails > Activation email > Email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:115
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:73
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:50
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Plain"
 msgstr ""
 
@@ -927,181 +928,181 @@ msgstr ""
 msgid "Email options"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:42
+#: includes/settings/class-alg-wc-ev-settings-email.php:368
 msgid "Mail function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:369
 msgid "Function used for sending the plugin's emails."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:50
-#: includes/settings/class-alg-wc-ev-settings-email.php:51
-#: includes/settings/class-alg-wc-ev-settings-email.php:52
+#: includes/settings/class-alg-wc-ev-settings-email.php:376
+#: includes/settings/class-alg-wc-ev-settings-email.php:377
+#: includes/settings/class-alg-wc-ev-settings-email.php:378
 msgid "%s function"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:317
-#: includes/settings/class-alg-wc-ev-settings-email.php:56
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "Customer new account email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:57
+#: includes/settings/class-alg-wc-ev-settings-email.php:109
 msgid "Delay WooCommerce \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:110
 msgid "\"Customer new account\" email is only sent on successful verification."
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:32
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:381
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:253
-#: includes/settings/class-alg-wc-ev-settings-email.php:125
+#: includes/settings/class-alg-wc-ev-settings-email.php:91
 msgid "Activation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:33
-#: includes/settings/class-alg-wc-ev-settings-email.php:128
+#: includes/settings/class-alg-wc-ev-settings-email.php:94
 msgid "An email sent to the user with an activation link."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:133
+#: includes/settings/class-alg-wc-ev-settings-email.php:99
 #: includes/settings/class-alg-wc-ev-settings-section.php:156
 msgid "Send as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:134
+#: includes/settings/class-alg-wc-ev-settings-email.php:100
 msgid "Send verification as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:135
+#: includes/settings/class-alg-wc-ev-settings-email.php:101
 msgid "Disable it if you want to append it to the standard WooCommerce \"Customer new account\" email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
-#: includes/settings/class-alg-wc-ev-settings-email.php:142
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
+#: includes/settings/class-alg-wc-ev-settings-email.php:156
 msgid "Email sending trigger"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:150
+#: includes/settings/class-alg-wc-ev-settings-email.php:164
 msgid "On \"user register\""
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:151
+#: includes/settings/class-alg-wc-ev-settings-email.php:165
 msgid "On \"WooCommerce created customer\""
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:156
+#: includes/settings/class-alg-wc-ev-settings-email.php:170
 msgid "Activation email delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:171
 msgid "Delay the activation email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:158
+#: includes/settings/class-alg-wc-ev-settings-email.php:172
 msgid "Try to enable it if the activation emails are getting sent to authenticated users."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:165
-#: includes/settings/class-alg-wc-ev-settings-email.php:269
+#: includes/settings/class-alg-wc-ev-settings-email.php:117
+#: includes/settings/class-alg-wc-ev-settings-email.php:244
 msgid "Email subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:174
-#: includes/settings/class-alg-wc-ev-settings-email.php:287
+#: includes/settings/class-alg-wc-ev-settings-email.php:126
+#: includes/settings/class-alg-wc-ev-settings-email.php:253
 msgid "Email content"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:65
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:42
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
 msgid "Possible values: %s, %s, %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:74
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:51
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "WooCommerce"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:75
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:52
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Smart"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:186
+#: includes/settings/class-alg-wc-ev-settings-email.php:138
 msgid "Email heading"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:297
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:198
-#: includes/pro/class-alg-wc-ev-pro.php:675
-#: includes/pro/class-alg-wc-ev-pro.php:867
-#: includes/settings/class-alg-wc-ev-settings-email.php:189
+#: includes/pro/class-alg-wc-ev-pro.php:683
+#: includes/pro/class-alg-wc-ev-pro.php:875
+#: includes/settings/class-alg-wc-ev-settings-email.php:141
 msgid "Activate your account"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:94
+#: includes/settings/class-alg-wc-ev-settings-email.php:382
 msgid "Email wrap method"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:100
+#: includes/settings/class-alg-wc-ev-settings-email.php:388
 msgid "Manual - Adding WooCommerce header and footer manually"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:101
+#: includes/settings/class-alg-wc-ev-settings-email.php:389
 msgid "Native - Using %s function"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:196
+#: includes/settings/class-alg-wc-ev-settings-email.php:148
 msgid "Choose precisely where the activation email will be appended to the \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:149
 msgid "It's necessary to add %s to the %s email template."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:327
-#: includes/settings/class-alg-wc-ev-settings-email.php:333
+#: includes/settings/class-alg-wc-ev-settings-email.php:302
+#: includes/settings/class-alg-wc-ev-settings-email.php:308
 msgid "Admin email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:351
+#: includes/settings/class-alg-wc-ev-settings-email.php:326
 msgid "Recipient"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:352
+#: includes/settings/class-alg-wc-ev-settings-email.php:327
 msgid "Leave empty to send to %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:359
+#: includes/settings/class-alg-wc-ev-settings-email.php:334
 msgid "Subject"
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:821
-#: includes/settings/class-alg-wc-ev-settings-email.php:362
+#: includes/pro/class-alg-wc-ev-pro.php:829
+#: includes/settings/class-alg-wc-ev-settings-email.php:337
 msgid "User email has been verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:366
+#: includes/settings/class-alg-wc-ev-settings-email.php:349
 msgid "Heading"
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:815
-#: includes/settings/class-alg-wc-ev-settings-email.php:369
+#: includes/pro/class-alg-wc-ev-pro.php:823
+#: includes/settings/class-alg-wc-ev-settings-email.php:352
 msgid "User account has been activated"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:374
+#: includes/settings/class-alg-wc-ev-settings-email.php:341
 msgid "Content"
 msgstr ""
 
@@ -1113,77 +1114,77 @@ msgstr ""
 msgid "General Options"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:47
+#: includes/settings/class-alg-wc-ev-settings-general.php:58
 msgid "Login on activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:48
+#: includes/settings/class-alg-wc-ev-settings-general.php:59
 msgid "Login the user automatically after the account is verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:54
+#: includes/settings/class-alg-wc-ev-settings-general.php:47
 #: includes/settings/class-alg-wc-ev-settings-section.php:92
 msgid "Block unverified login"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:55
+#: includes/settings/class-alg-wc-ev-settings-general.php:48
 msgid "Block login from unverified users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:56
+#: includes/settings/class-alg-wc-ev-settings-general.php:49
 msgid "If disabled, account verification will be optional. In that case you'll probably want to:"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Change your %s option"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Message > Activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Disable login options on the %s section"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:288
-#: includes/settings/class-alg-wc-ev-settings-general.php:69
+#: includes/settings/class-alg-wc-ev-settings-general.php:77
 msgid "Account verification"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:74
+#: includes/settings/class-alg-wc-ev-settings-general.php:90
 msgid "Ignore user roles"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:75
+#: includes/settings/class-alg-wc-ev-settings-general.php:91
 msgid "The following user roles won't need to be berified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:76
+#: includes/settings/class-alg-wc-ev-settings-general.php:92
 msgid "Skipped user roles"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:92
+#: includes/settings/class-alg-wc-ev-settings-general.php:82
 msgid "Current registered users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:93
+#: includes/settings/class-alg-wc-ev-settings-general.php:83
 msgid "Verify account for current users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:94
+#: includes/settings/class-alg-wc-ev-settings-general.php:84
 msgid "If enabled, all your current unverified users will have to verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:119
+#: includes/settings/class-alg-wc-ev-settings-general.php:146
 msgid "Email changing"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:120
+#: includes/settings/class-alg-wc-ev-settings-general.php:147
 msgid "Unverify, logout and resend activation link to accounts that changed the emails"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:100
+#: includes/settings/class-alg-wc-ev-settings-general.php:127
 msgid "Password reset"
 msgstr ""
 
@@ -1215,112 +1216,112 @@ msgstr ""
 msgid "You can use %s and %s shortcodes here and any other one you'd like."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:183
-#: includes/settings/class-alg-wc-ev-settings-general.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
+#: includes/settings/class-alg-wc-ev-settings-general.php:231
+#: includes/settings/class-alg-wc-ev-settings-general.php:237
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
 msgid "Redirect on success"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:185
+#: includes/settings/class-alg-wc-ev-settings-general.php:233
 msgid "Redirects customers after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:190
+#: includes/settings/class-alg-wc-ev-settings-general.php:238
 msgid "Redirects customers to the selected page after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:196
+#: includes/settings/class-alg-wc-ev-settings-general.php:244
 msgid "Do not redirect"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:197
+#: includes/settings/class-alg-wc-ev-settings-general.php:245
 msgid "Redirect to \"My account\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:198
+#: includes/settings/class-alg-wc-ev-settings-general.php:246
 msgid "Redirect to \"Shop\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:199
+#: includes/settings/class-alg-wc-ev-settings-general.php:247
 msgid "Redirect to home page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:200
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
+#: includes/settings/class-alg-wc-ev-settings-general.php:248
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
 msgid "Redirect to custom URL"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:219
-#: includes/settings/class-alg-wc-ev-settings-general.php:226
+#: includes/settings/class-alg-wc-ev-settings-general.php:267
+#: includes/settings/class-alg-wc-ev-settings-general.php:274
 msgid "Redirect on failure"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:221
+#: includes/settings/class-alg-wc-ev-settings-general.php:269
 msgid "Redirects customers after unsuccessful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:222
+#: includes/settings/class-alg-wc-ev-settings-general.php:270
 msgid "This will also append a %s argument to the URL that could help you displaying the error message in case you have issues with that."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:227
+#: includes/settings/class-alg-wc-ev-settings-general.php:275
 msgid "Redirects to a custom URL if an unverified user tries to login"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:234
+#: includes/settings/class-alg-wc-ev-settings-general.php:282
 msgid "If empty will redirect to the same page"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:246
+#: includes/settings/class-alg-wc-ev-settings-general.php:183
 msgid "Activation link"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:247
+#: includes/settings/class-alg-wc-ev-settings-general.php:184
 msgid "A link sent via email where users can verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:252
+#: includes/settings/class-alg-wc-ev-settings-general.php:189
 msgid "One-time activation link"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:253
+#: includes/settings/class-alg-wc-ev-settings-general.php:190
 msgid "Prevent activation link from working after the first use"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:260
+#: includes/settings/class-alg-wc-ev-settings-general.php:197
 msgid "Ignored if set to zero."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:261
+#: includes/settings/class-alg-wc-ev-settings-general.php:198
 msgid "Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
+#: includes/settings/class-alg-wc-ev-settings-general.php:199
 msgid "Expiration time based on the %s option below."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
-#: includes/settings/class-alg-wc-ev-settings-general.php:269
+#: includes/settings/class-alg-wc-ev-settings-general.php:199
+#: includes/settings/class-alg-wc-ev-settings-general.php:206
 msgid "Expire time unit"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:272
+#: includes/settings/class-alg-wc-ev-settings-general.php:209
 msgid "Seconds"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:227
-#: includes/settings/class-alg-wc-ev-settings-email.php:310
-#: includes/settings/class-alg-wc-ev-settings-general.php:273
+#: includes/settings/class-alg-wc-ev-settings-email.php:202
+#: includes/settings/class-alg-wc-ev-settings-email.php:285
+#: includes/settings/class-alg-wc-ev-settings-general.php:210
 msgid "Days"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:279
+#: includes/settings/class-alg-wc-ev-settings-general.php:216
 msgid "Expire notice"
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:486
-#: includes/settings/class-alg-wc-ev-settings-general.php:284
+#: includes/pro/class-alg-wc-ev-pro.php:494
+#: includes/settings/class-alg-wc-ev-settings-general.php:221
 msgid "Link has expired. You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr ""
 
@@ -1453,93 +1454,93 @@ msgstr ""
 msgid "User verified manually: %d."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:229
+#: includes/class-alg-wc-ev-admin.php:236
 msgid "All Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:230
+#: includes/class-alg-wc-ev-admin.php:237
 msgid "Verified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:231
+#: includes/class-alg-wc-ev-admin.php:238
 msgid "Unverified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:236
+#: includes/class-alg-wc-ev-admin.php:243
 msgid "Filter"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:292
+#: includes/class-alg-wc-ev-admin.php:299
 msgid "%d unverified users are going to be verified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:296
+#: includes/class-alg-wc-ev-admin.php:303
 msgid "%d user verified successfully."
 msgid_plural "%d users verified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:304
+#: includes/class-alg-wc-ev-admin.php:311
 msgid "%d verified users are going to be unverified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:308
+#: includes/class-alg-wc-ev-admin.php:315
 msgid "%d user unverified successfully."
 msgid_plural "%d users unverified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:435
+#: includes/class-alg-wc-ev-admin.php:442
 #: includes/settings/class-alg-wc-ev-settings-admin.php:128
 #: includes/settings/class-alg-wc-ev-settings-admin.php:129
 msgid "Verify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:438
+#: includes/class-alg-wc-ev-admin.php:445
 #: includes/settings/class-alg-wc-ev-settings-admin.php:135
 #: includes/settings/class-alg-wc-ev-settings-admin.php:136
 msgid "Unverify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:166
+#: includes/class-alg-wc-ev-core.php:1212
 msgid "<a href=\"javascript:;\" id=\"alg_wc_ev_send_verify\">Send Verify Email</a>"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:167
+#: includes/class-alg-wc-ev-core.php:1213
 msgid "Resending...."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:168
+#: includes/class-alg-wc-ev-core.php:1214
 msgid "Verification mail sent successfully to billing email, please check inbox and verify ! <a href=\"javascript:;\" id=\"alg_wc_ev_resend_verify\">Resend</a>"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:169
+#: includes/class-alg-wc-ev-core.php:1215
 msgid "Email id verified !"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:965
+#: includes/class-alg-wc-ev-core.php:943
 msgid "Submit"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:976
+#: includes/class-alg-wc-ev-core.php:954
 msgid "Email address"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1022
+#: includes/class-alg-wc-ev-core.php:1000
 msgid "User data not found."
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:77
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:176
-#: includes/pro/class-alg-wc-ev-pro.php:149
-#: includes/settings/class-alg-wc-ev-settings-email.php:281
+#: includes/pro/class-alg-wc-ev-pro.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:265
 msgid "Your account has been activated"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:82
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:164
-#: includes/pro/class-alg-wc-ev-pro.php:162
-#: includes/settings/class-alg-wc-ev-settings-email.php:272
+#: includes/pro/class-alg-wc-ev-pro.php:170
+#: includes/settings/class-alg-wc-ev-settings-email.php:247
 msgid "Your account has been activated successfully"
 msgstr ""
 
@@ -1586,18 +1587,18 @@ msgstr ""
 
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:382
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:31
-#: includes/settings/class-alg-wc-ev-settings-email.php:247
-#: includes/settings/class-alg-wc-ev-settings-email.php:253
+#: includes/settings/class-alg-wc-ev-settings-email.php:222
+#: includes/settings/class-alg-wc-ev-settings-email.php:228
 msgid "Confirmation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:32
-#: includes/settings/class-alg-wc-ev-settings-email.php:250
+#: includes/settings/class-alg-wc-ev-settings-email.php:225
 msgid "An email sent to the user when the account is verified."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:362
-#: includes/settings/class-alg-wc-ev-settings-general.php:131
+#: includes/pro/class-alg-wc-ev-pro.php:370
+#: includes/settings/class-alg-wc-ev-settings-general.php:104
 msgid "Your email has been changed. In order to verify your account please check the activation email that was sent to your new email."
 msgstr ""
 
@@ -1886,7 +1887,7 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:234
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:245
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "New account"
 msgstr ""
 
@@ -1915,12 +1916,12 @@ msgid "In order to enable the %s and %s email types, it's necessary to set the o
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Activation"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Confirmation"
 msgstr ""
 
@@ -1929,8 +1930,8 @@ msgid "Email > WC email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
+#: includes/settings/class-alg-wc-ev-settings-email.php:67
 msgid "WooCommerce > Emails"
 msgstr ""
 
@@ -2011,184 +2012,184 @@ msgstr ""
 msgid "Send auth cookies"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:67
+#: includes/settings/class-alg-wc-ev-settings-email.php:44
 msgid "\"Smart\" will automatically send a \"Plain\" email when appended to other email, like the \"Customer new account\" email, and will send a \"WooCommerce\" email when sending it as a separate email. Most probably \"Smart\" will be the best choice."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:80
+#: includes/settings/class-alg-wc-ev-settings-email.php:57
 msgid "WC email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
 msgid "%s will use the template options from this page."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
-#: includes/settings/class-alg-wc-ev-settings-email.php:89
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:66
 msgid "Email Verification plugin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "%s option will create new emails (%s) on %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:83
+#: includes/settings/class-alg-wc-ev-settings-email.php:60
 msgid "This option will only be useful if the Email Template option is set as <code>WooCommerce</code> or <code>Smart</code>."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "If \"%s\" option is selected as \"%s\" or \"%s\", set the email wrap method here."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:111
+#: includes/settings/class-alg-wc-ev-settings-email.php:77
 msgid "Common placeholders"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:112
+#: includes/settings/class-alg-wc-ev-settings-email.php:78
 msgid "These placeholders can be used on the Email Subject or Content options: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:113
+#: includes/settings/class-alg-wc-ev-settings-email.php:79
 msgid "If you're having deliverability problems or emails being sent to Spam, try using the placeholders %s and %s on the Email Content or subject."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:129
+#: includes/settings/class-alg-wc-ev-settings-email.php:95
 msgid "Additional placeholders: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "If the %s email is not being sent, try to change the option %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:195
+#: includes/settings/class-alg-wc-ev-settings-email.php:147
 msgid "Fine tune placement"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:204
+#: includes/settings/class-alg-wc-ev-settings-email.php:179
 msgid "Automatic resending"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:205
+#: includes/settings/class-alg-wc-ev-settings-email.php:180
 msgid "Resend the activation email automatically if the user has not yet been verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:206
+#: includes/settings/class-alg-wc-ev-settings-email.php:181
 msgid "Works for future users, or if a current unverified user receives the activation email manually."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:213
+#: includes/settings/class-alg-wc-ev-settings-email.php:188
 msgid "Frequency."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:222
-#: includes/settings/class-alg-wc-ev-settings-email.php:303
+#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:278
 msgid "Unit of time."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:226
-#: includes/settings/class-alg-wc-ev-settings-email.php:309
+#: includes/settings/class-alg-wc-ev-settings-email.php:201
+#: includes/settings/class-alg-wc-ev-settings-email.php:284
 msgid "Hours"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:234
+#: includes/settings/class-alg-wc-ev-settings-email.php:209
 msgid "Max attempts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:254
+#: includes/settings/class-alg-wc-ev-settings-email.php:229
 msgid "Send confirmation email to users who have just verified their accounts"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:261
+#: includes/settings/class-alg-wc-ev-settings-email.php:236
 msgid "Send confirmation email to the user manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Only useful if the options %s, %s are enabled."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:278
+#: includes/settings/class-alg-wc-ev-settings-email.php:262
 msgid "Email Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:296
+#: includes/settings/class-alg-wc-ev-settings-email.php:271
 msgid "Delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:297
+#: includes/settings/class-alg-wc-ev-settings-email.php:272
 msgid "Wait for some time before sending the email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:314
+#: includes/settings/class-alg-wc-ev-settings-email.php:289
 msgid "Delay value."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:329
+#: includes/settings/class-alg-wc-ev-settings-email.php:304
 msgid "An email sent to the admin when a user verifies his email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:335
+#: includes/settings/class-alg-wc-ev-settings-email.php:310
 msgid "Send email to the admin when a user verifies his email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:343
+#: includes/settings/class-alg-wc-ev-settings-email.php:318
 msgid "Send admin email when a user has been manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:401
+#: includes/settings/class-alg-wc-ev-settings-email.php:412
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:402
+#: includes/settings/class-alg-wc-ev-settings-email.php:413
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:405
+#: includes/settings/class-alg-wc-ev-settings-email.php:416
 msgid "Send email every %s %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:84
+#: includes/settings/class-alg-wc-ev-settings-general.php:65
 msgid "Guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:85
+#: includes/settings/class-alg-wc-ev-settings-general.php:66
 msgid "Verify guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:86
+#: includes/settings/class-alg-wc-ev-settings-general.php:67
 msgid "If enabled, checkout as guest user billing address will be verified."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:101
+#: includes/settings/class-alg-wc-ev-settings-general.php:128
 msgid "Verify the user on password reset"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:108
+#: includes/settings/class-alg-wc-ev-settings-general.php:135
 msgid "Paying customers"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:109
+#: includes/settings/class-alg-wc-ev-settings-general.php:136
 msgid "Verify customers as soon as any of their non-free orders are considered paid"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:134
+#: includes/settings/class-alg-wc-ev-settings-general.php:107
 msgid "Verification parameter"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:135
+#: includes/settings/class-alg-wc-ev-settings-general.php:108
 msgid "Ex: <code>%s</code>"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:136
+#: includes/settings/class-alg-wc-ev-settings-general.php:109
 msgid "The parameter used on the URL to verify the user account."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:148
+#: includes/settings/class-alg-wc-ev-settings-general.php:121
 msgid "Prepare verification information to users, including the verification status and a link to resend the verification email."
 msgstr ""
 
@@ -2196,7 +2197,7 @@ msgstr ""
 msgid "Documentation on <a href=\"%s\">shortcodes</a> section."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:201
+#: includes/settings/class-alg-wc-ev-settings-general.php:249
 msgid "Redirect to the previous url before \"my account\" page"
 msgstr ""
 
diff --git a/langs/emails-verification-for-woocommerce.pot b/langs/emails-verification-for-woocommerce.pot
index 48aca3a..0a466bb 100644
--- a/langs/emails-verification-for-woocommerce.pot
+++ b/langs/emails-verification-for-woocommerce.pot
@@ -2,16 +2,16 @@
 # This file is distributed under the GNU General Public License v3.0.
 msgid ""
 msgstr ""
-"Project-Id-Version: emails-verification-for-woocommerce 2.8.10\n"
+"Project-Id-Version: emails-verification-for-woocommerce 2.9.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/emails-verification-for-woocommerce\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-09-07T14:48:00+02:00\n"
+"POT-Creation-Date: 2024-10-22T21:34:39+02:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.9.0\n"
+"X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: emails-verification-for-woocommerce\n"
 
 #. Plugin Name of the plugin
@@ -35,7 +35,7 @@ msgstr ""
 msgid "https://wpfactory.com"
 msgstr ""
 
-#: email-verification-for-woocommerce-pro.php:202
+#: email-verification-for-woocommerce-pro.php:244
 msgid "Go Pro"
 msgstr ""
 
@@ -63,187 +63,187 @@ msgstr ""
 msgid "User verified manually: %d."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:229
+#: includes/class-alg-wc-ev-admin.php:236
 msgid "All Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:230
+#: includes/class-alg-wc-ev-admin.php:237
 msgid "Verified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:231
+#: includes/class-alg-wc-ev-admin.php:238
 msgid "Unverified Users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:236
+#: includes/class-alg-wc-ev-admin.php:243
 msgid "Filter"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:285
+#: includes/class-alg-wc-ev-admin.php:292
 msgid "Verification email sent to %d user successfully."
 msgid_plural "Verification email sent to %d users successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:292
+#: includes/class-alg-wc-ev-admin.php:299
 msgid "%d unverified users are going to be verified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:296
+#: includes/class-alg-wc-ev-admin.php:303
 msgid "%d user verified successfully."
 msgid_plural "%d users verified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:304
+#: includes/class-alg-wc-ev-admin.php:311
 msgid "%d verified users are going to be unverified manually in background processing."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:308
+#: includes/class-alg-wc-ev-admin.php:315
 msgid "%d user unverified successfully."
 msgid_plural "%d users unverified successfully."
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/class-alg-wc-ev-admin.php:432
+#: includes/class-alg-wc-ev-admin.php:439
 #: includes/settings/class-alg-wc-ev-settings-admin.php:121
 #: includes/settings/class-alg-wc-ev-settings-admin.php:122
 msgid "Resend verification email"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:435
+#: includes/class-alg-wc-ev-admin.php:442
 #: includes/settings/class-alg-wc-ev-settings-admin.php:128
 #: includes/settings/class-alg-wc-ev-settings-admin.php:129
 msgid "Verify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:438
+#: includes/class-alg-wc-ev-admin.php:445
 #: includes/settings/class-alg-wc-ev-settings-admin.php:135
 #: includes/settings/class-alg-wc-ev-settings-admin.php:136
 msgid "Unverify users"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:491
+#: includes/class-alg-wc-ev-admin.php:498
 msgid "Nonce not found or not verified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:565
+#: includes/class-alg-wc-ev-admin.php:572
 msgid "User %s: verified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:569
+#: includes/class-alg-wc-ev-admin.php:576
 msgid "User %s: unverified."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:573
+#: includes/class-alg-wc-ev-admin.php:580
 msgid "User %s: activation link resent."
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:602
-#: includes/class-alg-wc-ev-core.php:1092
+#: includes/class-alg-wc-ev-admin.php:609
+#: includes/class-alg-wc-ev-core.php:1070
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:83
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:128
 msgid "Verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:618
+#: includes/class-alg-wc-ev-admin.php:625
 msgid "Are you sure?"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:637
+#: includes/class-alg-wc-ev-admin.php:644
 msgid "Email not verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:640
+#: includes/class-alg-wc-ev-admin.php:647
 msgid "Verify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:642
+#: includes/class-alg-wc-ev-admin.php:649
 #: includes/settings/class-alg-wc-ev-settings-messages.php:104
 msgid "Resend"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:646
+#: includes/class-alg-wc-ev-admin.php:653
 msgid "Email verified"
 msgstr ""
 
-#: includes/class-alg-wc-ev-admin.php:649
+#: includes/class-alg-wc-ev-admin.php:656
 msgid "Unverify"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:166
-msgid "<a href=\"javascript:;\" id=\"alg_wc_ev_send_verify\">Send Verify Email</a>"
-msgstr ""
-
-#: includes/class-alg-wc-ev-core.php:167
-msgid "Resending...."
-msgstr ""
-
-#: includes/class-alg-wc-ev-core.php:168
-msgid "Verification mail sent successfully to billing email, please check inbox and verify ! <a href=\"javascript:;\" id=\"alg_wc_ev_resend_verify\">Resend</a>"
-msgstr ""
-
-#: includes/class-alg-wc-ev-core.php:169
-msgid "Email id verified !"
-msgstr ""
-
-#: includes/class-alg-wc-ev-core.php:275
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:253
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:162
 msgid "You need to <a href=\"%myaccount_url%\">verify your account</a> to access this content."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:276
+#: includes/class-alg-wc-ev-core.php:254
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:153
 msgid "You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:965
+#: includes/class-alg-wc-ev-core.php:943
 msgid "Submit"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:976
+#: includes/class-alg-wc-ev-core.php:954
 msgid "Email address"
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1022
+#: includes/class-alg-wc-ev-core.php:1000
 msgid "User data not found."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1039
+#: includes/class-alg-wc-ev-core.php:1017
 msgid "You can resend the email with verification link by clicking <a href=\"{resend_verification_url}\">here</a>."
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1091
+#: includes/class-alg-wc-ev-core.php:1069
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:102
 msgid "Verification status: "
 msgstr ""
 
-#: includes/class-alg-wc-ev-core.php:1093
+#: includes/class-alg-wc-ev-core.php:1071
 #: includes/settings/class-alg-wc-ev-settings-shortcodes.php:87
 msgid "Unverified"
 msgstr ""
 
+#: includes/class-alg-wc-ev-core.php:1212
+msgid "<a href=\"javascript:;\" id=\"alg_wc_ev_send_verify\">Send Verify Email</a>"
+msgstr ""
+
+#: includes/class-alg-wc-ev-core.php:1213
+msgid "Resending...."
+msgstr ""
+
+#: includes/class-alg-wc-ev-core.php:1214
+msgid "Verification mail sent successfully to billing email, please check inbox and verify ! <a href=\"javascript:;\" id=\"alg_wc_ev_resend_verify\">Resend</a>"
+msgstr ""
+
+#: includes/class-alg-wc-ev-core.php:1215
+msgid "Email id verified !"
+msgstr ""
+
 #: includes/class-alg-wc-ev-emails.php:77
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:176
-#: includes/pro/class-alg-wc-ev-pro.php:149
-#: includes/settings/class-alg-wc-ev-settings-email.php:281
+#: includes/pro/class-alg-wc-ev-pro.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:265
 msgid "Your account has been activated"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:82
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:164
-#: includes/pro/class-alg-wc-ev-pro.php:162
-#: includes/settings/class-alg-wc-ev-settings-email.php:272
+#: includes/pro/class-alg-wc-ev-pro.php:170
+#: includes/settings/class-alg-wc-ev-settings-email.php:247
 msgid "Your account has been activated successfully"
 msgstr ""
 
 #: includes/class-alg-wc-ev-emails.php:297
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:198
-#: includes/pro/class-alg-wc-ev-pro.php:675
-#: includes/pro/class-alg-wc-ev-pro.php:867
-#: includes/settings/class-alg-wc-ev-settings-email.php:189
+#: includes/pro/class-alg-wc-ev-pro.php:683
+#: includes/pro/class-alg-wc-ev-pro.php:875
+#: includes/settings/class-alg-wc-ev-settings-email.php:141
 msgid "Activate your account"
 msgstr ""
 
@@ -262,8 +262,8 @@ msgstr ""
 #: includes/class-alg-wc-ev-emails.php:453
 #: includes/class-alg-wc-ev-emails.php:602
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:157
-#: includes/pro/class-alg-wc-ev-pro.php:836
-#: includes/settings/class-alg-wc-ev-settings-email.php:168
+#: includes/pro/class-alg-wc-ev-pro.php:844
+#: includes/settings/class-alg-wc-ev-settings-email.php:120
 msgid "Please activate your account"
 msgstr ""
 
@@ -343,7 +343,7 @@ msgid "Total unverified users deleted: %d."
 msgstr ""
 
 #: includes/class-alg-wc-ev-verification-info-widget.php:24
-#: includes/settings/class-alg-wc-ev-settings-general.php:147
+#: includes/settings/class-alg-wc-ev-settings-general.php:120
 msgid "Verification info"
 msgstr ""
 
@@ -358,59 +358,59 @@ msgstr ""
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:32
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:381
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:253
-#: includes/settings/class-alg-wc-ev-settings-email.php:125
+#: includes/settings/class-alg-wc-ev-settings-email.php:91
 msgid "Activation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-activation-wc-email-pro.php:33
-#: includes/settings/class-alg-wc-ev-settings-email.php:128
+#: includes/settings/class-alg-wc-ev-settings-email.php:94
 msgid "An email sent to the user with an activation link."
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-compatibility-pro.php:382
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:31
-#: includes/settings/class-alg-wc-ev-settings-email.php:247
-#: includes/settings/class-alg-wc-ev-settings-email.php:253
+#: includes/settings/class-alg-wc-ev-settings-email.php:222
+#: includes/settings/class-alg-wc-ev-settings-email.php:228
 msgid "Confirmation email"
 msgstr ""
 
 #: includes/pro/class-alg-wc-ev-confirmation-wc-email-pro.php:32
-#: includes/settings/class-alg-wc-ev-settings-email.php:250
+#: includes/settings/class-alg-wc-ev-settings-email.php:225
 msgid "An email sent to the user when the account is verified."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:362
-#: includes/settings/class-alg-wc-ev-settings-general.php:131
+#: includes/pro/class-alg-wc-ev-pro.php:370
+#: includes/settings/class-alg-wc-ev-settings-general.php:104
 msgid "Your email has been changed. In order to verify your account please check the activation email that was sent to your new email."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:437
+#: includes/pro/class-alg-wc-ev-pro.php:445
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:189
 msgid "You need to log in and verify your email to place an order."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:486
-#: includes/settings/class-alg-wc-ev-settings-general.php:284
+#: includes/pro/class-alg-wc-ev-pro.php:494
+#: includes/settings/class-alg-wc-ev-settings-general.php:221
 msgid "Link has expired. You can resend the email with verification link by clicking <a href=\"%resend_verification_url%\">here</a>."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:528
+#: includes/pro/class-alg-wc-ev-pro.php:536
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:342
 msgid "Your email is denied."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:610
+#: includes/pro/class-alg-wc-ev-pro.php:618
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:227
 msgid "You need to <a href=\"%myaccount_url%\" target=\"_blank\">register</a> and verify your email before adding products to the cart."
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:815
-#: includes/settings/class-alg-wc-ev-settings-email.php:369
+#: includes/pro/class-alg-wc-ev-pro.php:823
+#: includes/settings/class-alg-wc-ev-settings-email.php:352
 msgid "User account has been activated"
 msgstr ""
 
-#: includes/pro/class-alg-wc-ev-pro.php:821
-#: includes/settings/class-alg-wc-ev-settings-email.php:362
+#: includes/pro/class-alg-wc-ev-pro.php:829
+#: includes/settings/class-alg-wc-ev-settings-email.php:337
 msgid "User email has been verified"
 msgstr ""
 
@@ -470,8 +470,8 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-admin.php:82
 #: includes/settings/class-alg-wc-ev-settings-admin.php:88
 #: includes/settings/class-alg-wc-ev-settings-admin.php:103
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Verified column"
 msgstr ""
 
@@ -492,8 +492,8 @@ msgid "The position of the column."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-admin.php:102
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Actions"
 msgstr ""
 
@@ -520,7 +520,8 @@ msgid "Add %s bulk option"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:32
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:363
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Advanced"
 msgstr ""
 
@@ -698,13 +699,13 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:188
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:213
-#: includes/settings/class-alg-wc-ev-settings-general.php:205
-#: includes/settings/class-alg-wc-ev-settings-general.php:233
+#: includes/settings/class-alg-wc-ev-settings-general.php:253
+#: includes/settings/class-alg-wc-ev-settings-general.php:281
 msgid "Custom redirect URL"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:206
+#: includes/settings/class-alg-wc-ev-settings-general.php:254
 msgid "\"%s\" must be selected for the \"%s\" option above."
 msgstr ""
 
@@ -747,8 +748,8 @@ msgid "Change this if you are having issues with \"Prevent automatic user login
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:232
-#: includes/settings/class-alg-wc-ev-settings-email.php:44
-#: includes/settings/class-alg-wc-ev-settings-email.php:143
+#: includes/settings/class-alg-wc-ev-settings-email.php:157
+#: includes/settings/class-alg-wc-ev-settings-email.php:370
 msgid "Leave the default value if unsure."
 msgstr ""
 
@@ -861,7 +862,7 @@ msgid "If the %s option is set it will only delete unverified users whose activa
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-advanced.php:327
-#: includes/settings/class-alg-wc-ev-settings-general.php:259
+#: includes/settings/class-alg-wc-ev-settings-general.php:196
 msgid "Expire time"
 msgstr ""
 
@@ -1150,7 +1151,7 @@ msgid "Separate emails with a comma and/or with a new line. You can also use wil
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-blocking.php:339
-#: includes/settings/class-alg-wc-ev-settings-general.php:281
+#: includes/settings/class-alg-wc-ev-settings-general.php:218
 msgid "Notice will appear when user will try to verify his email by clicking the email activation link."
 msgstr ""
 
@@ -1289,16 +1290,16 @@ msgstr ""
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:236
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Emails > Activation email > Email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:115
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:213
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:320
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:73
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:50
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Plain"
 msgstr ""
 
@@ -1367,7 +1368,7 @@ msgid "Polylang"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:246
+#: includes/settings/class-alg-wc-ev-settings-general.php:183
 msgid "Activation link"
 msgstr ""
 
@@ -1416,7 +1417,7 @@ msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:234
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:245
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "New account"
 msgstr ""
 
@@ -1445,12 +1446,12 @@ msgid "In order to enable the %s and %s email types, it's necessary to set the o
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Activation"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "Confirmation"
 msgstr ""
 
@@ -1459,8 +1460,8 @@ msgid "Email > WC email template"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:246
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
-#: includes/settings/class-alg-wc-ev-settings-email.php:90
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
+#: includes/settings/class-alg-wc-ev-settings-email.php:67
 msgid "WooCommerce > Emails"
 msgstr ""
 
@@ -1500,7 +1501,7 @@ msgid "Paid Memberships Pro"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:288
-#: includes/settings/class-alg-wc-ev-settings-general.php:69
+#: includes/settings/class-alg-wc-ev-settings-general.php:77
 msgid "Account verification"
 msgstr ""
 
@@ -1518,7 +1519,7 @@ msgid "YayMail - WooCommerce Email Customizer"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-compatibility.php:317
-#: includes/settings/class-alg-wc-ev-settings-email.php:56
+#: includes/settings/class-alg-wc-ev-settings-email.php:108
 msgid "Customer new account email"
 msgstr ""
 
@@ -1561,292 +1562,292 @@ msgid "Email options"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-email.php:42
-msgid "Mail function"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:43
-msgid "Function used for sending the plugin's emails."
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:50
-#: includes/settings/class-alg-wc-ev-settings-email.php:51
-#: includes/settings/class-alg-wc-ev-settings-email.php:52
-msgid "%s function"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:57
-msgid "Delay WooCommerce \"Customer new account\" email"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:58
-msgid "\"Customer new account\" email is only sent on successful verification."
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:65
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
 msgid "Possible values: %s, %s, %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:74
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:51
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "WooCommerce"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:66
-#: includes/settings/class-alg-wc-ev-settings-email.php:75
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
+#: includes/settings/class-alg-wc-ev-settings-email.php:43
+#: includes/settings/class-alg-wc-ev-settings-email.php:52
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
 msgid "Smart"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:67
+#: includes/settings/class-alg-wc-ev-settings-email.php:44
 msgid "\"Smart\" will automatically send a \"Plain\" email when appended to other email, like the \"Customer new account\" email, and will send a \"WooCommerce\" email when sending it as a separate email. Most probably \"Smart\" will be the best choice."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:80
+#: includes/settings/class-alg-wc-ev-settings-email.php:57
 msgid "WC email template"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
 msgid "%s will use the template options from this page."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:81
-#: includes/settings/class-alg-wc-ev-settings-email.php:89
+#: includes/settings/class-alg-wc-ev-settings-email.php:58
+#: includes/settings/class-alg-wc-ev-settings-email.php:66
 msgid "Email Verification plugin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:82
+#: includes/settings/class-alg-wc-ev-settings-email.php:59
 msgid "%s option will create new emails (%s) on %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:83
+#: includes/settings/class-alg-wc-ev-settings-email.php:60
 msgid "This option will only be useful if the Email Template option is set as <code>WooCommerce</code> or <code>Smart</code>."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:94
-msgid "Email wrap method"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:95
-#: includes/settings/class-alg-wc-ev-settings-email.php:185
-msgid "If \"%s\" option is selected as \"%s\" or \"%s\", set the email wrap method here."
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:100
-msgid "Manual - Adding WooCommerce header and footer manually"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:101
-msgid "Native - Using %s function"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:111
+#: includes/settings/class-alg-wc-ev-settings-email.php:77
 msgid "Common placeholders"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:112
+#: includes/settings/class-alg-wc-ev-settings-email.php:78
 msgid "These placeholders can be used on the Email Subject or Content options: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:113
+#: includes/settings/class-alg-wc-ev-settings-email.php:79
 msgid "If you're having deliverability problems or emails being sent to Spam, try using the placeholders %s and %s on the Email Content or subject."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:129
+#: includes/settings/class-alg-wc-ev-settings-email.php:95
 msgid "Additional placeholders: %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:133
+#: includes/settings/class-alg-wc-ev-settings-email.php:99
 #: includes/settings/class-alg-wc-ev-settings-section.php:156
 msgid "Send as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:134
+#: includes/settings/class-alg-wc-ev-settings-email.php:100
 msgid "Send verification as a separate email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:135
+#: includes/settings/class-alg-wc-ev-settings-email.php:101
 msgid "Disable it if you want to append it to the standard WooCommerce \"Customer new account\" email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 msgid "If the %s email is not being sent, try to change the option %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:136
-#: includes/settings/class-alg-wc-ev-settings-email.php:142
-msgid "Email sending trigger"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:150
-msgid "On \"user register\""
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-email.php:151
-msgid "On \"WooCommerce created customer\""
-msgstr ""
-
+#: includes/settings/class-alg-wc-ev-settings-email.php:102
 #: includes/settings/class-alg-wc-ev-settings-email.php:156
-msgid "Activation email delay"
+msgid "Email sending trigger"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:157
-msgid "Delay the activation email"
+#: includes/settings/class-alg-wc-ev-settings-email.php:109
+msgid "Delay WooCommerce \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:158
-msgid "Try to enable it if the activation emails are getting sent to authenticated users."
+#: includes/settings/class-alg-wc-ev-settings-email.php:110
+msgid "\"Customer new account\" email is only sent on successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:165
-#: includes/settings/class-alg-wc-ev-settings-email.php:269
+#: includes/settings/class-alg-wc-ev-settings-email.php:117
+#: includes/settings/class-alg-wc-ev-settings-email.php:244
 msgid "Email subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:174
-#: includes/settings/class-alg-wc-ev-settings-email.php:287
+#: includes/settings/class-alg-wc-ev-settings-email.php:126
+#: includes/settings/class-alg-wc-ev-settings-email.php:253
 msgid "Email content"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:186
+#: includes/settings/class-alg-wc-ev-settings-email.php:137
+#: includes/settings/class-alg-wc-ev-settings-email.php:383
+msgid "If \"%s\" option is selected as \"%s\" or \"%s\", set the email wrap method here."
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:138
 msgid "Email heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:195
+#: includes/settings/class-alg-wc-ev-settings-email.php:147
 msgid "Fine tune placement"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:196
+#: includes/settings/class-alg-wc-ev-settings-email.php:148
 msgid "Choose precisely where the activation email will be appended to the \"Customer new account\" email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:149
 msgid "It's necessary to add %s to the %s email template."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:204
+#: includes/settings/class-alg-wc-ev-settings-email.php:164
+msgid "On \"user register\""
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:165
+msgid "On \"WooCommerce created customer\""
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:170
+msgid "Activation email delay"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:171
+msgid "Delay the activation email"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:172
+msgid "Try to enable it if the activation emails are getting sent to authenticated users."
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:179
 msgid "Automatic resending"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:205
+#: includes/settings/class-alg-wc-ev-settings-email.php:180
 msgid "Resend the activation email automatically if the user has not yet been verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:206
+#: includes/settings/class-alg-wc-ev-settings-email.php:181
 msgid "Works for future users, or if a current unverified user receives the activation email manually."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:213
+#: includes/settings/class-alg-wc-ev-settings-email.php:188
 msgid "Frequency."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:222
-#: includes/settings/class-alg-wc-ev-settings-email.php:303
+#: includes/settings/class-alg-wc-ev-settings-email.php:197
+#: includes/settings/class-alg-wc-ev-settings-email.php:278
 msgid "Unit of time."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:226
-#: includes/settings/class-alg-wc-ev-settings-email.php:309
+#: includes/settings/class-alg-wc-ev-settings-email.php:201
+#: includes/settings/class-alg-wc-ev-settings-email.php:284
 msgid "Hours"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:227
-#: includes/settings/class-alg-wc-ev-settings-email.php:310
-#: includes/settings/class-alg-wc-ev-settings-general.php:273
+#: includes/settings/class-alg-wc-ev-settings-email.php:202
+#: includes/settings/class-alg-wc-ev-settings-email.php:285
+#: includes/settings/class-alg-wc-ev-settings-general.php:210
 msgid "Days"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:234
+#: includes/settings/class-alg-wc-ev-settings-email.php:209
 msgid "Max attempts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:254
+#: includes/settings/class-alg-wc-ev-settings-email.php:229
 msgid "Send confirmation email to users who have just verified their accounts"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:261
+#: includes/settings/class-alg-wc-ev-settings-email.php:236
 msgid "Send confirmation email to the user manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:262
-#: includes/settings/class-alg-wc-ev-settings-email.php:344
+#: includes/settings/class-alg-wc-ev-settings-email.php:237
+#: includes/settings/class-alg-wc-ev-settings-email.php:319
 msgid "Only useful if the options %s, %s are enabled."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:278
+#: includes/settings/class-alg-wc-ev-settings-email.php:262
 msgid "Email Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:296
+#: includes/settings/class-alg-wc-ev-settings-email.php:271
 msgid "Delay"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:297
+#: includes/settings/class-alg-wc-ev-settings-email.php:272
 msgid "Wait for some time before sending the email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:314
+#: includes/settings/class-alg-wc-ev-settings-email.php:289
 msgid "Delay value."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:327
-#: includes/settings/class-alg-wc-ev-settings-email.php:333
+#: includes/settings/class-alg-wc-ev-settings-email.php:302
+#: includes/settings/class-alg-wc-ev-settings-email.php:308
 msgid "Admin email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:329
+#: includes/settings/class-alg-wc-ev-settings-email.php:304
 msgid "An email sent to the admin when a user verifies his email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:335
+#: includes/settings/class-alg-wc-ev-settings-email.php:310
 msgid "Send email to the admin when a user verifies his email"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:343
+#: includes/settings/class-alg-wc-ev-settings-email.php:318
 msgid "Send admin email when a user has been manually verified by admin"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:351
+#: includes/settings/class-alg-wc-ev-settings-email.php:326
 msgid "Recipient"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:352
+#: includes/settings/class-alg-wc-ev-settings-email.php:327
 msgid "Leave empty to send to %s."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:359
+#: includes/settings/class-alg-wc-ev-settings-email.php:334
 msgid "Subject"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:366
+#: includes/settings/class-alg-wc-ev-settings-email.php:341
+msgid "Content"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:349
 msgid "Heading"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:374
-msgid "Content"
+#: includes/settings/class-alg-wc-ev-settings-email.php:368
+msgid "Mail function"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:369
+msgid "Function used for sending the plugin's emails."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:401
+#: includes/settings/class-alg-wc-ev-settings-email.php:376
+#: includes/settings/class-alg-wc-ev-settings-email.php:377
+#: includes/settings/class-alg-wc-ev-settings-email.php:378
+msgid "%s function"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:382
+msgid "Email wrap method"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:388
+msgid "Manual - Adding WooCommerce header and footer manually"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:389
+msgid "Native - Using %s function"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-email.php:412
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:402
+#: includes/settings/class-alg-wc-ev-settings-email.php:413
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: includes/settings/class-alg-wc-ev-settings-email.php:405
+#: includes/settings/class-alg-wc-ev-settings-email.php:416
 msgid "Send email every %s %s."
 msgstr ""
 
@@ -1859,112 +1860,112 @@ msgid "General Options"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:47
-msgid "Login on activation"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-general.php:48
-msgid "Login the user automatically after the account is verified"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-general.php:54
 #: includes/settings/class-alg-wc-ev-settings-section.php:92
 msgid "Block unverified login"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:55
+#: includes/settings/class-alg-wc-ev-settings-general.php:48
 msgid "Block login from unverified users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:56
+#: includes/settings/class-alg-wc-ev-settings-general.php:49
 msgid "If disabled, account verification will be optional. In that case you'll probably want to:"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Change your %s option"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:57
+#: includes/settings/class-alg-wc-ev-settings-general.php:50
 msgid "Message > Activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:58
+#: includes/settings/class-alg-wc-ev-settings-general.php:51
 msgid "Disable login options on the %s section"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:74
-msgid "Ignore user roles"
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-general.php:75
-msgid "The following user roles won't need to be berified"
+#: includes/settings/class-alg-wc-ev-settings-general.php:58
+msgid "Login on activation"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:76
-msgid "Skipped user roles"
+#: includes/settings/class-alg-wc-ev-settings-general.php:59
+msgid "Login the user automatically after the account is verified"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:84
+#: includes/settings/class-alg-wc-ev-settings-general.php:65
 msgid "Guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:85
+#: includes/settings/class-alg-wc-ev-settings-general.php:66
 msgid "Verify guest users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:86
+#: includes/settings/class-alg-wc-ev-settings-general.php:67
 msgid "If enabled, checkout as guest user billing address will be verified."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:92
+#: includes/settings/class-alg-wc-ev-settings-general.php:82
 msgid "Current registered users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:93
+#: includes/settings/class-alg-wc-ev-settings-general.php:83
 msgid "Verify account for current users"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:94
+#: includes/settings/class-alg-wc-ev-settings-general.php:84
 msgid "If enabled, all your current unverified users will have to verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:100
-msgid "Password reset"
+#: includes/settings/class-alg-wc-ev-settings-general.php:90
+msgid "Ignore user roles"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:101
-msgid "Verify the user on password reset"
+#: includes/settings/class-alg-wc-ev-settings-general.php:91
+msgid "The following user roles won't need to be berified"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-general.php:92
+msgid "Skipped user roles"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-general.php:107
+msgid "Verification parameter"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:108
-msgid "Paying customers"
+msgid "Ex: <code>%s</code>"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:109
-msgid "Verify customers as soon as any of their non-free orders are considered paid"
+msgid "The parameter used on the URL to verify the user account."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:119
-msgid "Email changing"
+#: includes/settings/class-alg-wc-ev-settings-general.php:121
+msgid "Prepare verification information to users, including the verification status and a link to resend the verification email."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:120
-msgid "Unverify, logout and resend activation link to accounts that changed the emails"
+#: includes/settings/class-alg-wc-ev-settings-general.php:127
+msgid "Password reset"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:134
-msgid "Verification parameter"
+#: includes/settings/class-alg-wc-ev-settings-general.php:128
+msgid "Verify the user on password reset"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:135
-msgid "Ex: <code>%s</code>"
+msgid "Paying customers"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:136
-msgid "The parameter used on the URL to verify the user account."
+msgid "Verify customers as soon as any of their non-free orders are considered paid"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:148
-msgid "Prepare verification information to users, including the verification status and a link to resend the verification email."
+#: includes/settings/class-alg-wc-ev-settings-general.php:146
+msgid "Email changing"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-general.php:147
+msgid "Unverify, logout and resend activation link to accounts that changed the emails"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:154
@@ -1999,101 +2000,101 @@ msgstr ""
 msgid "You can use %s and %s shortcodes here and any other one you'd like."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:183
-#: includes/settings/class-alg-wc-ev-settings-general.php:189
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
-msgid "Redirect on success"
+#: includes/settings/class-alg-wc-ev-settings-general.php:184
+msgid "A link sent via email where users can verify their accounts."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:185
-msgid "Redirects customers after successful verification."
+#: includes/settings/class-alg-wc-ev-settings-general.php:189
+msgid "One-time activation link"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:190
-msgid "Redirects customers to the selected page after successful verification."
-msgstr ""
-
-#: includes/settings/class-alg-wc-ev-settings-general.php:196
-msgid "Do not redirect"
+msgid "Prevent activation link from working after the first use"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:197
-msgid "Redirect to \"My account\" page"
+msgid "Ignored if set to zero."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:198
-msgid "Redirect to \"Shop\" page"
+msgid "Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired."
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-general.php:199
-msgid "Redirect to home page"
+msgid "Expiration time based on the %s option below."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:200
-#: includes/settings/class-alg-wc-ev-settings-general.php:207
-msgid "Redirect to custom URL"
+#: includes/settings/class-alg-wc-ev-settings-general.php:199
+#: includes/settings/class-alg-wc-ev-settings-general.php:206
+msgid "Expire time unit"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:201
-msgid "Redirect to the previous url before \"my account\" page"
+#: includes/settings/class-alg-wc-ev-settings-general.php:209
+msgid "Seconds"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:219
-#: includes/settings/class-alg-wc-ev-settings-general.php:226
-msgid "Redirect on failure"
+#: includes/settings/class-alg-wc-ev-settings-general.php:216
+msgid "Expire notice"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:221
-msgid "Redirects customers after unsuccessful verification."
+#: includes/settings/class-alg-wc-ev-settings-general.php:231
+#: includes/settings/class-alg-wc-ev-settings-general.php:237
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
+msgid "Redirect on success"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:222
-msgid "This will also append a %s argument to the URL that could help you displaying the error message in case you have issues with that."
+#: includes/settings/class-alg-wc-ev-settings-general.php:233
+msgid "Redirects customers after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:227
-msgid "Redirects to a custom URL if an unverified user tries to login"
+#: includes/settings/class-alg-wc-ev-settings-general.php:238
+msgid "Redirects customers to the selected page after successful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:234
-msgid "If empty will redirect to the same page"
+#: includes/settings/class-alg-wc-ev-settings-general.php:244
+msgid "Do not redirect"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:247
-msgid "A link sent via email where users can verify their accounts."
+#: includes/settings/class-alg-wc-ev-settings-general.php:245
+msgid "Redirect to \"My account\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:252
-msgid "One-time activation link"
+#: includes/settings/class-alg-wc-ev-settings-general.php:246
+msgid "Redirect to \"Shop\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:253
-msgid "Prevent activation link from working after the first use"
+#: includes/settings/class-alg-wc-ev-settings-general.php:247
+msgid "Redirect to home page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:260
-msgid "Ignored if set to zero."
+#: includes/settings/class-alg-wc-ev-settings-general.php:248
+#: includes/settings/class-alg-wc-ev-settings-general.php:255
+msgid "Redirect to custom URL"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:261
-msgid "Please note that all activation codes generated before installing the plugin v1.7.0 will be automatically expired."
+#: includes/settings/class-alg-wc-ev-settings-general.php:249
+msgid "Redirect to the previous url before \"my account\" page"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
-msgid "Expiration time based on the %s option below."
+#: includes/settings/class-alg-wc-ev-settings-general.php:267
+#: includes/settings/class-alg-wc-ev-settings-general.php:274
+msgid "Redirect on failure"
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:262
 #: includes/settings/class-alg-wc-ev-settings-general.php:269
-msgid "Expire time unit"
+msgid "Redirects customers after unsuccessful verification."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:272
-msgid "Seconds"
+#: includes/settings/class-alg-wc-ev-settings-general.php:270
+msgid "This will also append a %s argument to the URL that could help you displaying the error message in case you have issues with that."
 msgstr ""
 
-#: includes/settings/class-alg-wc-ev-settings-general.php:279
-msgid "Expire notice"
+#: includes/settings/class-alg-wc-ev-settings-general.php:275
+msgid "Redirects to a custom URL if an unverified user tries to login"
+msgstr ""
+
+#: includes/settings/class-alg-wc-ev-settings-general.php:282
+msgid "If empty will redirect to the same page"
 msgstr ""
 
 #: includes/settings/class-alg-wc-ev-settings-messages.php:24
diff --git a/readme.txt b/readme.txt
index 9618bc8..20b7602 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: wpcodefactory, omardabbas, karzin, anbinder, algoritmika, kousikmu
 Tags: woocommerce, email, verification, email verification, woo commerce
 Requires at least: 4.4
 Tested up to: 6.6
-Stable tag: 2.8.10
+Stable tag: 2.9.0
 License: GNU General Public License v3.0
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -356,6 +356,16 @@ Once activated, access the plugin's settings by navigating to “WooCommerce > S
 
 == Changelog ==
 
+= 2.9.0 - 22/10/2024 =
+* Fix - Vulnerability issue fixed.
+* Fix - Function wp_enqueue_script was called incorrectly.
+* Dev - Email content / Messages options - Integrated a rich text editor.
+* Dev - Reorder General and Email setting options.
+* Dev - Add Cross-selling library.
+* Dev - Move settings to WPFactory menu.
+* Dev - Added the License Key Manager library.
+* WC tested up to: 9.3.
+
 = 2.8.10 - 07/09/2024 =
 * Fix - completely delete duplicate code.
 
diff --git a/vendor/autoload.php b/vendor/autoload.php
index e57482f..2665b88 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit365338cb4b7dc88b2ccda0d9e2eddbb6::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 6d0c3f2..a72151c 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,30 +42,79 @@
  */
 class ClassLoader
 {
+    /** @var \Closure(string):void */
+    private static $includeFile;
+
+    /** @var ?string */
     private $vendorDir;
 
     // PSR-4
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, int>>
+     */
     private $prefixLengthsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<int, string>>
+     */
     private $prefixDirsPsr4 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr4 = array();
 
     // PSR-0
+    /**
+     * @var array[]
+     * @psalm-var array<string, array<string, string[]>>
+     */
     private $prefixesPsr0 = array();
+    /**
+     * @var array[]
+     * @psalm-var array<string, string>
+     */
     private $fallbackDirsPsr0 = array();
 
+    /** @var bool */
     private $useIncludePath = false;
+
+    /**
+     * @var string[]
+     * @psalm-var array<string, string>
+     */
     private $classMap = array();
+
+    /** @var bool */
     private $classMapAuthoritative = false;
+
+    /**
+     * @var bool[]
+     * @psalm-var array<string, bool>
+     */
     private $missingClasses = array();
+
+    /** @var ?string */
     private $apcuPrefix;
 
+    /**
+     * @var self[]
+     */
     private static $registeredLoaders = array();
 
+    /**
+     * @param ?string $vendorDir
+     */
     public function __construct($vendorDir = null)
     {
         $this->vendorDir = $vendorDir;
+        self::initializeIncludeClosure();
     }
 
+    /**
+     * @return string[]
+     */
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
@@ -75,28 +124,47 @@ public function getPrefixes()
         return array();
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, array<int, string>>
+     */
     public function getPrefixesPsr4()
     {
         return $this->prefixDirsPsr4;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirs()
     {
         return $this->fallbackDirsPsr0;
     }
 
+    /**
+     * @return array[]
+     * @psalm-return array<string, string>
+     */
     public function getFallbackDirsPsr4()
     {
         return $this->fallbackDirsPsr4;
     }
 
+    /**
+     * @return string[] Array of classname => path
+     * @psalm-return array<string, string>
+     */
     public function getClassMap()
     {
         return $this->classMap;
     }
 
     /**
-     * @param array $classMap Class to filename map
+     * @param string[] $classMap Class to filename map
+     * @psalm-param array<string, string> $classMap
+     *
+     * @return void
      */
     public function addClassMap(array $classMap)
     {
@@ -111,9 +179,11 @@ public function addClassMap(array $classMap)
      * Registers a set of PSR-0 directories for a given prefix, either
      * appending or prepending to the ones previously set for this prefix.
      *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix
+     * @param string[]|string $paths   The PSR-0 root directories
+     * @param bool            $prepend Whether to prepend the directories
+     *
+     * @return void
      */
     public function add($prefix, $paths, $prepend = false)
     {
@@ -156,11 +226,13 @@ public function add($prefix, $paths, $prepend = false)
      * Registers a set of PSR-4 directories for a given namespace, either
      * appending or prepending to the ones previously set for this namespace.
      *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
+     * @param string          $prefix  The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths   The PSR-4 base directories
+     * @param bool            $prepend Whether to prepend the directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function addPsr4($prefix, $paths, $prepend = false)
     {
@@ -204,8 +276,10 @@ public function addPsr4($prefix, $paths, $prepend = false)
      * Registers a set of PSR-0 directories for a given prefix,
      * replacing any others previously set for this prefix.
      *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
+     * @param string          $prefix The prefix
+     * @param string[]|string $paths  The PSR-0 base directories
+     *
+     * @return void
      */
     public function set($prefix, $paths)
     {
@@ -220,10 +294,12 @@ public function set($prefix, $paths)
      * Registers a set of PSR-4 directories for a given namespace,
      * replacing any others previously set for this namespace.
      *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
+     * @param string          $prefix The prefix/namespace, with trailing '\\'
+     * @param string[]|string $paths  The PSR-4 base directories
      *
      * @throws \InvalidArgumentException
+     *
+     * @return void
      */
     public function setPsr4($prefix, $paths)
     {
@@ -243,6 +319,8 @@ public function setPsr4($prefix, $paths)
      * Turns on searching the include path for class files.
      *
      * @param bool $useIncludePath
+     *
+     * @return void
      */
     public function setUseIncludePath($useIncludePath)
     {
@@ -265,6 +343,8 @@ public function getUseIncludePath()
      * that have not been registered with the class map.
      *
      * @param bool $classMapAuthoritative
+     *
+     * @return void
      */
     public function setClassMapAuthoritative($classMapAuthoritative)
     {
@@ -285,6 +365,8 @@ public function isClassMapAuthoritative()
      * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
      *
      * @param string|null $apcuPrefix
+     *
+     * @return void
      */
     public function setApcuPrefix($apcuPrefix)
     {
@@ -305,6 +387,8 @@ public function getApcuPrefix()
      * Registers this instance as an autoloader.
      *
      * @param bool $prepend Whether to prepend the autoloader or not
+     *
+     * @return void
      */
     public function register($prepend = false)
     {
@@ -324,6 +408,8 @@ public function register($prepend = false)
 
     /**
      * Unregisters this instance as an autoloader.
+     *
+     * @return void
      */
     public function unregister()
     {
@@ -343,7 +429,8 @@ public function unregister()
     public function loadClass($class)
     {
         if ($file = $this->findFile($class)) {
-            includeFile($file);
+            $includeFile = self::$includeFile;
+            $includeFile($file);
 
             return true;
         }
@@ -403,6 +490,11 @@ public static function getRegisteredLoaders()
         return self::$registeredLoaders;
     }
 
+    /**
+     * @param  string       $class
+     * @param  string       $ext
+     * @return string|false
+     */
     private function findFileWithExtension($class, $ext)
     {
         // PSR-4 lookup
@@ -468,14 +560,26 @@ private function findFileWithExtension($class, $ext)
 
         return false;
     }
-}
 
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
+    /**
+     * @return void
+     */
+    private static function initializeIncludeClosure()
+    {
+        if (self::$includeFile !== null) {
+            return;
+        }
+
+        /**
+         * Scope isolated include.
+         *
+         * Prevents access to $this/self from included files.
+         *
+         * @param  string $file
+         * @return void
+         */
+        self::$includeFile = \Closure::bind(static function($file) {
+            include $file;
+        }, null, null);
+    }
 }
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index b3a4e16..51e734a 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -20,12 +20,27 @@
  *
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
- * To require it's presence, you can require `composer-runtime-api ^2.0`
+ * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
+     */
     private static $installedByVendor = array();
 
     /**
@@ -83,7 +98,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
     {
         foreach (self::getInstalled() as $installed) {
             if (isset($installed['versions'][$packageName])) {
-                return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']);
+                return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false;
             }
         }
 
@@ -104,7 +119,7 @@ public static function isInstalled($packageName, $includeDevRequirements = true)
      */
     public static function satisfies(VersionParser $parser, $packageName, $constraint)
     {
-        $constraint = $parser->parseConstraints($constraint);
+        $constraint = $parser->parseConstraints((string) $constraint);
         $provided = $parser->parseConstraints(self::getVersionRanges($packageName));
 
         return $provided->matches($constraint);
@@ -228,7 +243,7 @@ public static function getInstallPath($packageName)
 
     /**
      * @return array
-     * @psalm-return array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}
+     * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}
      */
     public static function getRootPackage()
     {
@@ -242,7 +257,7 @@ public static function getRootPackage()
      *
      * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect.
      * @return array[]
-     * @psalm-return array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}
+     * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}
      */
     public static function getRawData()
     {
@@ -265,7 +280,7 @@ public static function getRawData()
      * Returns the raw data of all installed.php which are currently loaded for custom implementations
      *
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     public static function getAllRawData()
     {
@@ -288,7 +303,7 @@ public static function getAllRawData()
      * @param  array[] $data A vendor/composer/installed.php data set
      * @return void
      *
-     * @psalm-param array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>} $data
+     * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $data
      */
     public static function reload($data)
     {
@@ -298,7 +313,7 @@ public static function reload($data)
 
     /**
      * @return array[]
-     * @psalm-return list<array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string}>}>
+     * @psalm-return list<array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}>
      */
     private static function getInstalled()
     {
@@ -313,7 +328,9 @@ private static function getInstalled()
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
-                    $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
+                    /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                    $required = require $vendorDir.'/composer/installed.php';
+                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
                     if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
                         self::$installed = $installed[count($installed) - 1];
                     }
@@ -325,12 +342,17 @@ private static function getInstalled()
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
             if (substr(__DIR__, -8, 1) !== 'C') {
-                self::$installed = require __DIR__ . '/installed.php';
+                /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
+                $required = require __DIR__ . '/installed.php';
+                self::$installed = $required;
             } else {
                 self::$installed = array();
             }
         }
-        $installed[] = self::$installed;
+
+        if (self::$installed !== array()) {
+            $installed[] = self::$installed;
+        }
 
         return $installed;
     }
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index dee7469..49907aa 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -2,10 +2,17 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
     'WPFactory\\Promoting_Notice\\Core' => $vendorDir . '/wpfactory/wpfactory-promoting-notice/src/php/class-core.php',
+    'WPFactory\\WPFactory_Admin_Menu\\Singleton' => $vendorDir . '/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php',
+    'WPFactory\\WPFactory_Admin_Menu\\WC_Settings_Menu_Item_Swapper' => $vendorDir . '/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php',
+    'WPFactory\\WPFactory_Admin_Menu\\WPFactory_Admin_Menu' => $vendorDir . '/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php',
+    'WPFactory\\WPFactory_Cross_Selling\\Product_Categories' => $vendorDir . '/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php',
+    'WPFactory\\WPFactory_Cross_Selling\\Products' => $vendorDir . '/wpfactory/wpfactory-cross-selling/src/php/class-products.php',
+    'WPFactory\\WPFactory_Cross_Selling\\Singleton' => $vendorDir . '/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php',
+    'WPFactory\\WPFactory_Cross_Selling\\WPFactory_Cross_Selling' => $vendorDir . '/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php',
 );
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 491dd66..3bea4a8 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -2,7 +2,7 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index b7fc012..15a2ff3 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
index 559e100..7cf67e2 100644
--- a/vendor/composer/autoload_psr4.php
+++ b/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 0ab7bca..4e95979 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -22,54 +22,27 @@ public static function getLoader()
             return self::$loader;
         }
 
-        require __DIR__ . '/platform_check.php';
-
         spl_autoload_register(array('ComposerAutoloaderInit365338cb4b7dc88b2ccda0d9e2eddbb6', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit365338cb4b7dc88b2ccda0d9e2eddbb6', 'loadClassLoader'));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit365338cb4b7dc88b2ccda0d9e2eddbb6::getInitializer($loader));
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit365338cb4b7dc88b2ccda0d9e2eddbb6::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
+        $loader->register(true);
 
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
+        $filesToLoad = \Composer\Autoload\ComposerStaticInit365338cb4b7dc88b2ccda0d9e2eddbb6::$files;
+        $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
 
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
+                require $file;
             }
-        }
-
-        $loader->register(true);
-
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit365338cb4b7dc88b2ccda0d9e2eddbb6::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire365338cb4b7dc88b2ccda0d9e2eddbb6($fileIdentifier, $file);
+        }, null, null);
+        foreach ($filesToLoad as $fileIdentifier => $file) {
+            $requireFile($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
-
-function composerRequire365338cb4b7dc88b2ccda0d9e2eddbb6($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index b9b19ee..9d5e3cf 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -27,6 +27,13 @@ class ComposerStaticInit365338cb4b7dc88b2ccda0d9e2eddbb6
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
         'WPFactory\\Promoting_Notice\\Core' => __DIR__ . '/..' . '/wpfactory/wpfactory-promoting-notice/src/php/class-core.php',
+        'WPFactory\\WPFactory_Admin_Menu\\Singleton' => __DIR__ . '/..' . '/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php',
+        'WPFactory\\WPFactory_Admin_Menu\\WC_Settings_Menu_Item_Swapper' => __DIR__ . '/..' . '/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php',
+        'WPFactory\\WPFactory_Admin_Menu\\WPFactory_Admin_Menu' => __DIR__ . '/..' . '/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php',
+        'WPFactory\\WPFactory_Cross_Selling\\Product_Categories' => __DIR__ . '/..' . '/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php',
+        'WPFactory\\WPFactory_Cross_Selling\\Products' => __DIR__ . '/..' . '/wpfactory/wpfactory-cross-selling/src/php/class-products.php',
+        'WPFactory\\WPFactory_Cross_Selling\\Singleton' => __DIR__ . '/..' . '/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php',
+        'WPFactory\\WPFactory_Cross_Selling\\WPFactory_Cross_Selling' => __DIR__ . '/..' . '/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index eadfc87..5ce48eb 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -73,22 +73,127 @@
             },
             "install-path": "../hashids/hashids"
         },
+        {
+            "name": "wpfactory/wpfactory-admin-menu",
+            "version": "v1.0.3",
+            "version_normalized": "1.0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wpcodefactory/wpfactory-admin-menu.git",
+                "reference": "fe48c4100a6b436a3dd39308814887119063c140"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wpcodefactory/wpfactory-admin-menu/zipball/fe48c4100a6b436a3dd39308814887119063c140",
+                "reference": "fe48c4100a6b436a3dd39308814887119063c140",
+                "shasum": ""
+            },
+            "require-dev": {
+                "wp-cli/wp-cli-bundle": "*"
+            },
+            "time": "2024-10-14T14:01:02+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "src/php/"
+                ]
+            },
+            "scripts": {
+                "wp": [
+                    "vendor/bin/wp"
+                ],
+                "wp-create-pot": [
+                    "wp i18n make-pot src/php ./langs/wpfactory-admin-menu.pot --domain=wpfactory-admin-menu"
+                ],
+                "wp-update-po": [
+                    "wp i18n update-po ./langs/wpfactory-admin-menu.pot"
+                ],
+                "wp-make-mo": [
+                    "wp i18n make-mo ./langs/"
+                ],
+                "translate": [
+                    "@composer run wp-create-pot",
+                    "@composer run wp-update-po",
+                    "@composer run wp-make-mo"
+                ]
+            },
+            "support": {
+                "source": "https://github.com/wpcodefactory/wpfactory-admin-menu/tree/v1.0.3",
+                "issues": "https://github.com/wpcodefactory/wpfactory-admin-menu/issues"
+            },
+            "install-path": "../wpfactory/wpfactory-admin-menu"
+        },
+        {
+            "name": "wpfactory/wpfactory-cross-selling",
+            "version": "v1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wpcodefactory/wpfactory-cross-selling.git",
+                "reference": "6637ce11b91ee75922c6e7a63c8c5f69429c1990"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wpcodefactory/wpfactory-cross-selling/zipball/6637ce11b91ee75922c6e7a63c8c5f69429c1990",
+                "reference": "6637ce11b91ee75922c6e7a63c8c5f69429c1990",
+                "shasum": ""
+            },
+            "require": {
+                "wpfactory/wpfactory-admin-menu": "*"
+            },
+            "require-dev": {
+                "wp-cli/wp-cli-bundle": "*"
+            },
+            "time": "2024-10-14T15:28:57+00:00",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "src/php/"
+                ]
+            },
+            "scripts": {
+                "wp": [
+                    "vendor/bin/wp"
+                ],
+                "wp-create-pot": [
+                    "wp i18n make-pot src/php ./langs/wpfactory-cross-selling.pot --domain=wpfactory-cross-selling"
+                ],
+                "wp-update-po": [
+                    "wp i18n update-po ./langs/wpfactory-cross-selling.pot"
+                ],
+                "wp-make-mo": [
+                    "wp i18n make-mo ./langs/"
+                ],
+                "translate": [
+                    "@composer run wp-create-pot",
+                    "@composer run wp-update-po",
+                    "@composer run wp-make-mo"
+                ]
+            },
+            "support": {
+                "source": "https://github.com/wpcodefactory/wpfactory-cross-selling/tree/v1.0.2",
+                "issues": "https://github.com/wpcodefactory/wpfactory-cross-selling/issues"
+            },
+            "install-path": "../wpfactory/wpfactory-cross-selling"
+        },
         {
             "name": "wpfactory/wpfactory-promoting-notice",
-            "version": "1.0.5",
-            "version_normalized": "1.0.5.0",
+            "version": "v1.0.6",
+            "version_normalized": "1.0.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wpcodefactory/wpfactory-promoting-notice.git",
-                "reference": "4d248f9ec4755fe6a8fc5ac0e67a098ac6e01f37"
+                "reference": "9b0dc91c32662ce9040b36a4b40827454e806856"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wpcodefactory/wpfactory-promoting-notice/zipball/4d248f9ec4755fe6a8fc5ac0e67a098ac6e01f37",
-                "reference": "4d248f9ec4755fe6a8fc5ac0e67a098ac6e01f37",
+                "url": "https://api.github.com/repos/wpcodefactory/wpfactory-promoting-notice/zipball/9b0dc91c32662ce9040b36a4b40827454e806856",
+                "reference": "9b0dc91c32662ce9040b36a4b40827454e806856",
                 "shasum": ""
             },
-            "time": "2021-06-07T20:53:39+00:00",
+            "time": "2023-03-09T14:03:49+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -100,7 +205,7 @@
                 ]
             },
             "support": {
-                "source": "https://github.com/wpcodefactory/wpfactory-promoting-notice/tree/1.0.5",
+                "source": "https://github.com/wpcodefactory/wpfactory-promoting-notice/tree/v1.0.6",
                 "issues": "https://github.com/wpcodefactory/wpfactory-promoting-notice/issues"
             },
             "install-path": "../wpfactory/wpfactory-promoting-notice"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 0350a13..f750fb9 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -1,40 +1,58 @@
 <?php return array(
     'root' => array(
+        'name' => '__root__',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
+        'reference' => '88c0101b70594232864871b5cdf79492dec3b524',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'ff1ac340dffc8b4ed4710432dfa94d36f7b42d68',
-        'name' => '__root__',
         'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
+            'reference' => '88c0101b70594232864871b5cdf79492dec3b524',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'ff1ac340dffc8b4ed4710432dfa94d36f7b42d68',
             'dev_requirement' => false,
         ),
         'hashids/hashids' => array(
             'pretty_version' => '4.1.0',
             'version' => '4.1.0.0',
+            'reference' => '8cab111f78e0bd9c76953b082919fc9e251761be',
             'type' => 'library',
             'install_path' => __DIR__ . '/../hashids/hashids',
             'aliases' => array(),
-            'reference' => '8cab111f78e0bd9c76953b082919fc9e251761be',
+            'dev_requirement' => false,
+        ),
+        'wpfactory/wpfactory-admin-menu' => array(
+            'pretty_version' => 'v1.0.3',
+            'version' => '1.0.3.0',
+            'reference' => 'fe48c4100a6b436a3dd39308814887119063c140',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../wpfactory/wpfactory-admin-menu',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
+        'wpfactory/wpfactory-cross-selling' => array(
+            'pretty_version' => 'v1.0.2',
+            'version' => '1.0.2.0',
+            'reference' => '6637ce11b91ee75922c6e7a63c8c5f69429c1990',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../wpfactory/wpfactory-cross-selling',
+            'aliases' => array(),
             'dev_requirement' => false,
         ),
         'wpfactory/wpfactory-promoting-notice' => array(
-            'pretty_version' => '1.0.5',
-            'version' => '1.0.5.0',
+            'pretty_version' => 'v1.0.6',
+            'version' => '1.0.6.0',
+            'reference' => '9b0dc91c32662ce9040b36a4b40827454e806856',
             'type' => 'library',
             'install_path' => __DIR__ . '/../wpfactory/wpfactory-promoting-notice',
             'aliases' => array(),
-            'reference' => '4d248f9ec4755fe6a8fc5ac0e67a098ac6e01f37',
             'dev_requirement' => false,
         ),
     ),
diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
deleted file mode 100644
index 589e9e7..0000000
--- a/vendor/composer/platform_check.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// platform_check.php @generated by Composer
-
-$issues = array();
-
-if (!(PHP_VERSION_ID >= 70200)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
-}
-
-if ($issues) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
-        } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
-        }
-    }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
-    );
-}
diff --git a/vendor/wpfactory/wpfactory-admin-menu/langs/wpfactory-admin-menu.pot b/vendor/wpfactory/wpfactory-admin-menu/langs/wpfactory-admin-menu.pot
new file mode 100644
index 0000000..5a740cd
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-admin-menu/langs/wpfactory-admin-menu.pot
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2024-10-08T23:53:07+02:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.11.0\n"
+"X-Domain: wpfactory-admin-menu\n"
+
+#: class-wpfactory-admin-menu.php:108
+#: class-wpfactory-admin-menu.php:109
+msgid "WPFactory"
+msgstr ""
+
+#: class-wpfactory-admin-menu.php:132
+msgid "WPFactory plugins settings"
+msgstr ""
diff --git a/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php
new file mode 100644
index 0000000..4f7f171
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wc-settings-menu-item-swapper.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * WPFactory Admin Menu - WooCommerce Settings Menu Item Swapper.
+ *
+ * @version 1.0.2
+ * @since   1.0.1
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Admin_Menu;
+
+defined( 'ABSPATH' ) || exit;
+
+if ( ! class_exists( 'WPFactory\WPFactory_Admin_Menu\WC_Settings_Menu_Item_Swapper' ) ) {
+
+	/**
+	 * WPFactory Admin Menu.
+	 *
+	 * @version 1.0.1
+	 * @since   1.0.1
+	 */
+	class WC_Settings_Menu_Item_Swapper {
+
+		/**
+		 * $args.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @var array
+		 */
+		protected $args = array();
+
+		/**
+		 * Initialized.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @var bool
+		 */
+		protected $initialized = false;
+
+		function swap( $args = null ) {
+			$args = wp_parse_args( $args, array(
+				'wc_settings_tab_id'         => '',
+				'replacement_menu_item_slug' => '',
+				'page_title'                 => ''
+			) );
+			$this->args[ $args['replacement_menu_item_slug'] ] = $args;
+		}
+
+		/**
+		 * Initializes.
+		 *
+		 * @version 1.0.1
+		 * @since   1.0.1
+		 *
+		 * @return void
+		 */
+		function init() {
+			if ( $this->initialized ) {
+				return;
+			}
+			$this->initialized = true;
+
+			// Replaces WC Settings Menu Item.
+			add_filter( 'parent_file', array( $this, 'replace_wc_settings_menu_item' ) );
+
+			// Hide Current plugin Settings tab.
+			add_action( 'admin_head', array( $this, 'hide_plugin_settings_tab' ) );
+
+			// Hides WC Settings tabs.
+			add_action( 'admin_head', array( $this, 'hide_wc_settings_tabs' ) );
+
+			// Add page title.
+			add_action( 'all_admin_notices', array( $this, 'add_page_title' ) );
+		}
+
+		/**
+		 * Adds page title.
+		 *
+		 * @version 1.0.1
+		 * @since   1.0.1
+		 *
+		 * @return void
+		 */
+		function add_page_title() {
+			if (
+				isset( $_GET['page'] ) &&
+				'wc-settings' === $_GET['page'] &&
+				isset( $_GET['tab'] ) &&
+				! empty( $found_items = wp_list_filter( $this->args, array( 'wc_settings_tab_id' => $_GET['tab'] ) ) )
+			) {
+				$first_item = reset( $found_items );
+				$page_title = $first_item['page_title'];
+				if ( ! empty( $page_title ) ) {
+					echo '<div class="wrap"><h1>' . esc_html( $page_title ) . '</h1></div>';
+				}
+			}
+		}
+
+		/**
+		 * replace_wc_settings_menu_item.
+		 *
+		 * @version 1.0.1
+		 * @since   1.0.1
+		 *
+		 * @param $file
+		 *
+		 * @return mixed
+		 */
+		function replace_wc_settings_menu_item( $file ) {
+			global $plugin_page;
+			if (
+				'wc-settings' === $plugin_page &&
+				isset( $_GET['tab'] ) &&
+				! empty( $found_items = wp_list_filter( $this->args, array( 'wc_settings_tab_id' => $_GET['tab'] ) ) )
+			) {
+				$first_item                 = reset( $found_items );
+				$replacement_menu_item_slug = $first_item['replacement_menu_item_slug'];
+				$plugin_page                = $replacement_menu_item_slug;
+			}
+
+			return $file;
+		}
+
+		/**
+		 * Hides plugin settings tab from WooCommerce settings page.
+		 *
+		 * @version 1.0.1
+		 * @since   1.0.1
+		 *
+		 * @return void
+		 */
+		function hide_plugin_settings_tab() {
+			global $plugin_page;
+			if (
+				'wc-settings' === $plugin_page &&
+				(
+					! isset( $_GET['tab'] ) ||
+					( isset( $_GET['tab'] ) && empty( $found_items = wp_list_filter( $this->args, array( 'wc_settings_tab_id' => $_GET['tab'] ) ) ) )
+				)
+			) {
+				$tab_ids          = array_column( $this->args, 'wc_settings_tab_id' );
+				$css_selector_arr = array();
+				foreach ( $tab_ids as $tab ) {
+					$css_selector_arr[] = '.wrap.woocommerce .nav-tab-wrapper a[href*="tab=' . $tab . '"]';
+				}
+
+				?>
+				<style>
+					<?php echo implode(', ', $css_selector_arr)?>
+					{
+						display: none;
+					}
+				</style>
+				<?php
+			}
+		}
+
+		/**
+		 * Hides WooCommerce settings tabs when accessing the plugin settings page.
+		 *
+		 * @version 1.0.2
+		 * @since   1.0.1
+		 *
+		 * @return void
+		 */
+		function hide_wc_settings_tabs() {
+			global $plugin_page;
+			if (
+				'wc-settings' === $plugin_page &&
+				isset( $_GET['tab'] ) &&
+				! empty( $found_items = wp_list_filter( $this->args, array( 'wc_settings_tab_id' => $_GET['tab'] ) ) )
+			) {
+				$show_current_plugin_tab = false;
+				$tab_ids          = array_column( $this->args, 'wc_settings_tab_id' );
+				$css_selector_arr = array();
+				if ( $show_current_plugin_tab ) {
+					foreach ( $tab_ids as $tab ) {
+						$css_selector_arr[] = '.wrap.woocommerce .nav-tab-wrapper a[href*="tab=' . $tab . '"]';
+					}
+				}
+				?>
+				<style>
+					<?php if($show_current_plugin_tab): ?>
+					.wrap.woocommerce .nav-tab-wrapper a {
+						display: none;
+					}
+
+					<?php else: ?>
+					.nav-tab-wrapper.woo-nav-tab-wrapper{
+						display: none;
+					}
+					.wrap.woocommerce .subsubsub{
+						border-top: 1px solid #c3c4c7;
+						margin: 7px 0 7px 0;
+						padding: 6px 0 0 0;
+					}
+
+					<?php endif; ?>
+					<?php echo implode(', ', $css_selector_arr)?>
+					{
+						display: block
+					}
+
+					#wpbody {
+						margin-top: 0
+					}
+
+					.woocommerce-layout {
+						display: none
+					}
+				</style>
+				<?php
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php
new file mode 100644
index 0000000..13f9314
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-admin-menu/src/php/class-wpfactory-admin-menu.php
@@ -0,0 +1,411 @@
+<?php
+/**
+ * WPFactory Admin Menu
+ *
+ * @version 1.0.3
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Admin_Menu;
+
+defined( 'ABSPATH' ) || exit;
+
+if ( ! class_exists( 'WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu' ) ) {
+
+	/**
+	 * WPFactory Admin Menu.
+	 *
+	 * @version 1.0.0
+	 * @since   1.0.0
+	 */
+	class WPFactory_Admin_Menu {
+
+		use Singleton;
+
+		/**
+		 * Version.
+		 *
+		 * @since   1.0.1
+		 *
+		 * @var string
+		 */
+		protected $version = '1.0.3';
+
+		/**
+		 * Menu slug.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $menu_slug = 'wpfactory';
+
+		/**
+		 * Page title.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $page_title = '';
+
+		/**
+		 * Menu title.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $menu_title = '';
+
+		/**
+		 * Capability.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $capability = '';
+
+		/**
+		 * Icon URL.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $icon_url = '';
+
+		/**
+		 * Position.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $position = 64;
+
+		/**
+		 * $wc_settings_menu_item_swapper.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @var WC_Settings_Menu_Item_Swapper
+		 */
+		protected $wc_settings_menu_item_swapper = null;
+
+		/**
+		 * Constructor.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 */
+		protected function __construct() {
+			$this->localize();
+
+			// Setups add_menu_page params.
+			$this->set_menu_title( __( 'WPFactory', 'wpfactory-admin-menu' ) );
+			$this->set_page_title( __( 'WPFactory', 'wpfactory-admin-menu' ) );
+			$this->set_icon_url( 'data:image/svg+xml;base64,PHN2ZyBpZD0iU3ZnanNTdmcxMDAxIiB3aWR0aD0iMjg4IiBoZWlnaHQ9IjI4OCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWxuczpzdmdqcz0iaHR0cDovL3N2Z2pzLmNvbS9zdmdqcyI+PGRlZnMgaWQ9IlN2Z2pzRGVmczEwMDIiPjwvZGVmcz48ZyBpZD0iU3ZnanNHMTAwOCI+PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGZpbGw9Im5vbmUiIHZpZXdCb3g9IjAgMCA2MyA0OCIgd2lkdGg9IjI4OCIgaGVpZ2h0PSIyODgiPjxwYXRoIGZpbGw9InVybCgjYSkiIGQ9Ik0wIDQwLjYwMjRDMCAzOC42ODEzIDMuMDc4NjMgMzYuOTMxIDguMTI2MjEgMzUuNjE1N1YzNy41MjA3QzguMTI2MjEgMzkuOTc5OSAxMC4wMzE3IDQwLjMzNTMgMTEuOTAyNSA0MC45MjU0QzIxLjcyOTcgNDQuMDI1OSAzOS4zNTU4IDQzLjc3OTUgNTEuNTkyNSA0MC45MjU0QzUyLjczODMgNDAuNjU4MyA1NC4wODE0IDQwLjM4NDkgNTQuMDgxNCAzOC43NlYzNS42MTZDNTkuMTI4NiAzNi45MzEgNjIuMjA2NyAzOC42ODE2IDYyLjIwNjcgNDAuNjAyN0M2Mi4yMDY3IDQ0LjY4ODIgNDguMjgxNCA0Ny45OTk5IDMxLjEwMzggNDcuOTk5OUMxMy45MjU1IDQ3Ljk5OTMgMCA0NC42ODc5IDAgNDAuNjAyNFoiPjwvcGF0aD48cGF0aCBmaWxsPSJ1cmwoI2IpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik00NC44MDggMjUuNTMwOEwzMy4zOTQ0IDE5LjU1MzRMMzMuMjA5NCAxOS40NTU2TDMwLjEyNSA0My4xNTA4QzM1LjYxOTkgNDMuMTc3IDQxLjMzOCA0Mi43NjE2IDQ2LjUxNzIgNDEuOTQ1OUw0NC44MDggMjUuNTMwOFoiIGNsaXAtcnVsZT0iZXZlbm9kZCI+PC9wYXRoPjxwYXRoIGZpbGw9IiM5ODk4OTgiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTMzLjIxNzQgMTkuMDI2TDMzLjE5MjIgMTkuMjM3N0wyMy44NDI2IDE0LjI2MTRDMjMuMTU0MSAxMy44OTc3IDIwLjgzNjYgMTMuNzM1OCAyMC44MzY2IDE2LjE4OTVWMTkuNDI1OEwxMS45NzI3IDE0Ljc0NzJDMTAuNzk5NSAxNC4xODA2IDguMTI1IDE0LjU4NTMgOC4xMjUgMTcuMjAxNVYzNS42MTZDMTMuODEzMSAzNC4xMzQzIDIyLjAwMSAzMy4yMDQzIDMxLjEwMjYgMzMuMjA0M0MzMS4yMDQ3IDMzLjIwNDMgMzEuMzA2MiAzMy4yMDU1IDMxLjQwODMgMzMuMjA1NUwzMy4xNjcyIDE5LjU4MTRMMzMuMjE3NCAxOS4wMjZaIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGNsYXNzPSJjb2xvcjhBNjNDRCBzdmdTaGFwZSI+PC9wYXRoPjxwYXRoIGZpbGw9InVybCgjYykiIGQ9Ik01Mi4xNzYyIDI5LjI2OThMNDQuNzkwOCAyNS4zNjQ0TDQ0Ljc4NzEgMjUuMzI4OUw0NC44MDg3IDI1LjUzMDNMNDUuNjk3OCAzNC4wNjg0QzQ4Ljg1NTcgMzQuNDY4MiA1MS42OSAzNC45OTI5IDU0LjA4MTkgMzUuNjE2VjMyLjI3ODVDNTQuMDgxOSAzMC4xMzYzIDUyLjM3MzQgMjkuMzc0MyA1Mi4xNzYyIDI5LjI2OThaIj48L3BhdGg+PHBhdGggZmlsbD0idXJsKCNkKSIgZD0iTTQ0LjgwNzkgMjUuNTMwNEw0NC43ODYzIDI1LjMyODlMNDIuMTQ3MSAwLjg3Mjg4OEM0Mi4xMDUyIDAuNDI5MzA0IDQxLjY3NjQgMCA0MS4yNzYzIDBIMzYuMjQxN0MzNS44NjU2IDAgMzUuNDI5MiAwLjQxOTI3OCAzNS4zNzUxIDAuODM0NjA2TDMzLjIxODEgMTkuMDI1OEwzMy4xNjggMTkuNTgxNVYxOS41ODNMNDQuODE0IDI1LjU4NzJMNDQuODA3OSAyNS41MzA0WiI+PC9wYXRoPjxwYXRoIGZpbGw9InVybCgjZSkiIGZpbGwtcnVsZT0iZXZlbm9kZCIgZD0iTTQ1LjY5NzMgMzQuMDY1N0w0Ni41MTQzIDQxLjkxMDdDNDguMjc5NyA0MS42Mjc2IDQ5Ljk4MjggNDEuMjk3NiA1MS41OTIzIDQwLjkyMjFDNTIuNzM4MSA0MC42NTUgNTQuMDgxMSA0MC4zODIyIDU0LjA4MTEgMzguNzU2N1YzNS42MTM0QzUxLjY4OTUgMzQuOTkwMiA0OC44NTUyIDM0LjQ2NDkgNDUuNjk3MyAzNC4wNjU3WiIgY2xpcC1ydWxlPSJldmVub2RkIj48L3BhdGg+PHBhdGggZmlsbD0idXJsKCNmKSIgZD0iTTMxLjQwODMgMzMuMjA2OEMzMS4zMDYyIDMzLjIwNjIgMzEuMjA0NyAzMy4yMDU2IDMxLjEwMjYgMzMuMjA1NkMyMi4wMDEgMzMuMjA1NiAxMy44MTMxIDM0LjEzNTYgOC4xMjUgMzUuNjE2N1YzNy41MjJDOC4xMjUgMzkuOTgxMiAxMC4wMzA1IDQwLjMzNjYgMTEuOTAxMyA0MC45MjY3QzE2LjY0OTYgNDIuNDI0NSAyMy4yMTk0IDQzLjE0MDYgMzAuMTIyNCA0My4xNTk1Ij48L3BhdGg+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iMCIgeDI9IjYyLjIwNyIgeTE9IjQxLjgwNyIgeTI9IjQxLjgwNyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIHN0b3AtY29sb3I9IiM5MTkxOTEiIGNsYXNzPSJzdG9wQ29sb3I0OERCRDcgc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM3YTdhN2EiIGNsYXNzPSJzdG9wQ29sb3IwMUY0QTAgc3ZnU2hhcGUiPjwvc3RvcD48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjI0LjE4MSIgeDI9IjQyLjgxNCIgeTE9IjI5LjMyNiIgeTI9IjM0LjI0OSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIHN0b3AtY29sb3I9IiM3YTdhN2EiIGNsYXNzPSJzdG9wQ29sb3IyQjQyQzkgc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9Ii4xOTEiIHN0b3AtY29sb3I9IiM3OTc5NzkiIGNsYXNzPSJzdG9wQ29sb3IyOTQ3Q0Egc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9Ii40MTQiIHN0b3AtY29sb3I9IiM3ODc4NzgiIGNsYXNzPSJzdG9wQ29sb3IyMjU1Q0Ugc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9Ii42NTQiIHN0b3AtY29sb3I9IiM3Njc2NzYiIGNsYXNzPSJzdG9wQ29sb3IxNzZERDUgc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9Ii45MDMiIHN0b3AtY29sb3I9IiM3MjcyNzIiIGNsYXNzPSJzdG9wQ29sb3IwNzhEREUgc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM3MTcxNzEiIGNsYXNzPSJzdG9wQ29sb3IwMDlDRTIgc3ZnU2hhcGUiPjwvc3RvcD48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYyIgeDE9IjMyLjMxMyIgeDI9IjU0LjQxMSIgeTE9IjMwLjQ3MiIgeTI9IjMwLjQ3MiIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIHN0b3AtY29sb3I9IiM5OTk5OTkiIGNsYXNzPSJzdG9wQ29sb3I4QzYzQ0Ygc3ZnU2hhcGUiPjwvc3RvcD48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM4NTg1ODUiIGNsYXNzPSJzdG9wQ29sb3IzODQ3RDMgc3ZnU2hhcGUiPjwvc3RvcD48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iZCIgeDE9IjMxLjgyNCIgeDI9IjUxLjc2NiIgeTE9IjEyLjc5NCIgeTI9IjEyLjc5NCIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iLjA0NiIgc3RvcC1jb2xvcj0iIzk5OTk5OSIgY2xhc3M9InN0b3BDb2xvcjhDNjNDRiBzdmdTaGFwZSI+PC9zdG9wPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzg1ODU4NSIgY2xhc3M9InN0b3BDb2xvcjM4NDdEMyBzdmdTaGFwZSI+PC9zdG9wPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJlIiB4MT0iNDUuNjk3IiB4Mj0iNTQuMDgxIiB5MT0iMzcuOTg4IiB5Mj0iMzcuOTg4IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHN0b3Agc3RvcC1jb2xvcj0iIzc1NzU3NSIgY2xhc3M9InN0b3BDb2xvcjA1OUFFNSBzdmdTaGFwZSI+PC9zdG9wPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzc0NzQ3NCIgY2xhc3M9InN0b3BDb2xvcjAxQUNFNyBzdmdTaGFwZSI+PC9zdG9wPjwvbGluZWFyR3JhZGllbnQ+PGxpbmVhckdyYWRpZW50IGlkPSJmIiB4MT0iOC4xMjUiIHgyPSIzMS40MDgiIHkxPSIzOC4xODMiIHkyPSIzOC4xODMiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBzdG9wLWNvbG9yPSIjNzY3Njc2IiBjbGFzcz0ic3RvcENvbG9yMUMzN0QxIHN2Z1NoYXBlIj48L3N0b3A+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNzU3NTc1IiBjbGFzcz0ic3RvcENvbG9yMEU3MEREIHN2Z1NoYXBlIj48L3N0b3A+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PC9zdmc+PC9nPjwvc3ZnPg==' );
+
+			// WPFactory admin page.
+			add_action( 'admin_menu', array( $this, 'create_wpfactory_admin_menu' ), 9 );
+		}
+
+		/**
+		 * Moves WooCommerce Settings tab to WPFactory menu as a submenu item.
+		 *
+		 * @version 1.0.2
+		 * @since   1.0.0
+		 *
+		 * @param $args
+		 *
+		 * @return void
+		 */
+		public function move_wc_settings_tab_to_wpfactory_menu( $args = null ) {
+			if ( is_null( $this->wc_settings_menu_item_swapper ) ) {
+				$this->wc_settings_menu_item_swapper = new WC_Settings_Menu_Item_Swapper();
+			}
+			$args                       = wp_parse_args( $args, array(
+				'wc_settings_tab_id' => '',
+				'page_title'         => '',
+				'menu_title'         => '',
+				'capability'         => class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options',
+				'position'           => 30,
+			) );
+			if ( empty( $args['page_title'] ) ) {
+				$args['page_title'] = $args['menu_title'];
+			}
+			$replacement_menu_item_slug = 'admin.php?page=wc-settings&tab=' . $args['wc_settings_tab_id'];
+			add_action( 'admin_menu', function () use ( $args, $replacement_menu_item_slug ) {
+				\add_submenu_page(
+					$this->menu_slug,
+					$args['menu_title'],
+					$args['menu_title'],
+					$args['capability'],
+					$replacement_menu_item_slug,
+					'',
+					$args['position']
+				);
+			} );
+			$this->wc_settings_menu_item_swapper->swap( array(
+				'wc_settings_tab_id'         => $args['wc_settings_tab_id'],
+				'replacement_menu_item_slug' => $replacement_menu_item_slug,
+				'page_title'                 => $args['page_title']
+			) );
+			$this->wc_settings_menu_item_swapper->init();
+		}
+
+		/**
+		 * add_submenu_page.
+		 *
+		 * @version 1.0.2
+		 * @since   1.0.2
+		 *
+		 * @param $page_title
+		 * @param $menu_title
+		 * @param $capability
+		 * @param $menu_slug
+		 * @param $callback
+		 * @param $position
+		 *
+		 * @return void
+		 */
+		function add_submenu_page( $page_title, $menu_title, $capability, $menu_slug, $callback = '', $position = null ) {
+			\add_submenu_page(
+				$this->menu_slug,
+				$page_title,
+				$menu_title,
+				$capability,
+				$menu_slug,
+				$callback,
+				$position
+			);
+		}
+
+		/**
+		 * Creates WPFactory admin menu.
+		 *
+		 * @version 1.0.3
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function create_wpfactory_admin_menu() {
+			// Set capability.
+			$this->set_capability( class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options' );
+
+			// Menu page.
+			\add_menu_page(
+				$this->get_page_title(),
+				$this->get_menu_title(),
+				$this->get_capability(),
+				$this->get_menu_slug(),
+				array( $this, 'render_page' ),
+				$this->get_icon_url(),
+				$this->get_position()
+			);
+
+			// Removes submenu page.
+			add_action( 'admin_head', function () {
+				remove_submenu_page( $this->menu_slug, $this->menu_slug );
+			} );
+		}
+
+		/**
+		 * Renders page.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function render_page() {
+
+		}
+
+		/**
+		 * Localizes the plugin.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		public function localize() {
+			$domain = 'wpfactory-admin-menu';
+			$locale = get_locale();
+			$mofile = dirname( $this->get_library_file_path() ) . '/langs/' . $domain . '-' . $locale . '.mo';
+			load_textdomain( $domain, $mofile );
+		}
+
+		/**
+		 * get_menu_slug.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_menu_slug() {
+			return $this->menu_slug;
+		}
+
+		/**
+		 * set_menu_slug.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   string  $menu_slug
+		 */
+		public function set_menu_slug( $menu_slug ) {
+			$this->menu_slug = $menu_slug;
+		}
+
+		/**
+		 * get_page_title.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_page_title() {
+			return $this->page_title;
+		}
+
+		/**
+		 * set_page_title
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   string  $page_title
+		 */
+		public function set_page_title( $page_title ) {
+			$this->page_title = $page_title;
+		}
+
+		/**
+		 * get_menu_title.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_menu_title() {
+			return $this->menu_title;
+		}
+
+		/**
+		 * set_menu_title.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   string  $menu_title
+		 */
+		public function set_menu_title( $menu_title ) {
+			$this->menu_title = $menu_title;
+		}
+
+		/**
+		 * get_capability.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_capability() {
+			return $this->capability;
+		}
+
+		/**
+		 * set_capability.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   string  $capability
+		 */
+		public function set_capability( $capability ) {
+			$this->capability = $capability;
+		}
+
+		/**
+		 * get_icon_url.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_icon_url() {
+			return $this->icon_url;
+		}
+
+		/**
+		 * set_icon_url
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   string  $icon_url
+		 */
+		public function set_icon_url( $icon_url ) {
+			$this->icon_url = $icon_url;
+		}
+
+		/**
+		 * get_position.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return int|string
+		 */
+		public function get_position() {
+			return $this->position;
+		}
+
+		/**
+		 * set_position.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param   int|string  $position
+		 */
+		public function set_position( $position ) {
+			$this->position = $position;
+		}
+
+		/**
+		 * get_version.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_version() {
+			return $this->version;
+		}
+
+		/**
+		 * get_file_path.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		function get_library_file_path() {
+			return dirname( __FILE__, 2 );
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php b/vendor/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php
new file mode 100644
index 0000000..ffebdcb
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-admin-menu/src/php/trait-singleton.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * WPFactory Cross-Selling - Singleton.
+ *
+ * @version 1.0.0
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Admin_Menu;
+
+defined( 'ABSPATH' ) || exit;
+
+if ( ! trait_exists( 'WPFactory\WPFactory_Admin_Menu\Singleton' ) ) {
+
+	trait Singleton {
+
+		/**
+		 * Instances.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @var array
+		 */
+		private static $instances = [];
+
+		/**
+		 * Constructor.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 */
+		protected function __construct() {
+			// Prevent creating a new instance externally
+		}
+
+		/**
+		 * Clone.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		protected function __clone() {
+			// Prevent cloning the instance
+		}
+
+		/**
+		 * get_instance.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return mixed|static
+		 */
+		public static function get_instance() {
+			$class = static::class;
+			if ( ! isset( self::$instances[ $class ] ) ) {
+				self::$instances[ $class ] = new static();
+			}
+
+			return self::$instances[ $class ];
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css
new file mode 100644
index 0000000..82b29ee
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css
@@ -0,0 +1,145 @@
+/*!****************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[0].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[0].use[2]!./node_modules/sass-loader/dist/cjs.js!./src/scss/admin.scss ***!
+  \****************************************************************************************************************************************************************************************************************/
+/**
+ * WPFactory Cross-Selling - Admin.
+ *
+ * @version 1.0.0
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+.wpfcs-product.disabled, .wpfcs-button.disabled {
+  pointer-events: none;
+  opacity: 0.5; /* Safari 6.0 - 9.0 */
+  filter: grayscale(100%);
+}
+
+.wpfcs-product.readonly {
+  opacity: 0.5; /* Safari 6.0 - 9.0 */
+  filter: grayscale(100%);
+}
+
+.wpfcs-category {
+  margin: 33px 0 17px 0;
+  font-size: 18px;
+  font-weight: 700;
+}
+@media (max-width: 800px) {
+  .wpfcs-category {
+    text-align: center;
+  }
+}
+
+.wpfcs-button {
+  border-radius: 100px;
+  font-size: 14px;
+  padding: 7px 18px;
+  cursor: pointer;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: flex;
+  align-items: center; /* Centers items vertically */
+  justify-content: center;
+  font-weight: 700;
+}
+.wpfcs-button i {
+  margin: 0 8px 0 -3px;
+}
+.wpfcs-button-1 {
+  color: #fff;
+  background: #14243B;
+}
+.wpfcs-button-1 i {
+  color: #02AAF2;
+}
+.wpfcs-button-1:hover {
+  background: #204677;
+  color: #fff;
+}
+
+.wpfcs-button-2 {
+  color: #14243B;
+  border: 1px solid #DCDCDE;
+}
+.wpfcs-button-2 i {
+  color: #1A2DC9;
+}
+.wpfcs-button-2:hover {
+  background: #f5f5f5;
+  color: #14243B;
+}
+
+.wpfcs-product {
+  background: #FFFFFF;
+  padding: 18px 24px;
+  border: 1px solid #F2F2F2;
+  display: flex;
+  justify-content: flex-start; /* Aligns items horizontally (in a row) */
+  align-items: center; /* Centers items vertically */
+  gap: 18px;
+  flex-wrap: nowrap;
+}
+@media (max-width: 800px) {
+  .wpfcs-product {
+    flex-wrap: wrap;
+    justify-content: center;
+  }
+}
+
+.wpfcs-product-title {
+  margin: 0 0 7px;
+}
+.wpfcs-product-title a {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  color: inherit;
+}
+.wpfcs-product-title a:hover {
+  color: #135e96;
+}
+
+.wpfcs-product-desc {
+  margin: 0;
+  color: #878787;
+}
+
+.wpfcs-product-actions {
+  margin-left: auto;
+  border-left: 1px solid #F2F2F2;
+  padding: 10px 0 10px 24px;
+  display: flex;
+  justify-content: flex-start; /* Aligns items horizontally (in a row) */
+  align-items: center;
+  gap: 10px;
+  min-width: 239px;
+}
+@media (max-width: 800px) {
+  .wpfcs-product-actions {
+    margin-left: 0;
+    margin-left: initial;
+    padding-left: 0;
+    border-left: none;
+  }
+}
+
+.wpfcs-product-img-wrapper {
+  width: 60px;
+  height: 60px;
+  min-width: 60px;
+  background: rgb(255, 255, 255);
+  background: linear-gradient(180deg, rgb(255, 255, 255) 0%, rgb(190, 233, 252) 100%);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.wpfcs-product-img-wrapper * {
+  font-size: 0;
+  display: flex;
+}
+
+.wpfcs-product-img-wrapper img {
+  max-width: 100%;
+  max-height: 100%;
+  height: auto;
+  width: auto;
+}
diff --git a/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css.map b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css.map
new file mode 100644
index 0000000..ab69754
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.css.map
@@ -0,0 +1 @@
+{"version":3,"file":"css/admin.css","mappings":";;;AAAA;;;;;;EAAA;ACAA;EACC;EACA,cACA;EACA;ADQD;;AEZA;EACC;EACA;EACA;AFeD;;AGlBA;EACC;EACA;EACA;EACA;EACA;EAAA;EACA;EACA;EACA;EACA;AHqBD;AGnBC;EACC;AHqBF;AGbA;EACC;EACA;AHeD;AGbC;EACC;AHeF;AGZC;EACC;EACA;AHcF;;AGVA;EACC;EACA;AHaD;AGXC;EACC;AHaF;AGVC;EACC;EACA;AHYF;;AIxDA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;EACA;AJ2DD;AIrDC;EAdD;IAeE;EJwDA;AACF;;AIrDA;EACC;AJwDD;;AIrDA;EACC;EACA;AJwDD;;AIrDA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;AJwDD;AItDC;EACC;IACC;IAAA;IACA;IACA;EJwDD;AACF;;AIpDA;EACC;EACA;EACA;EACA;EACA;EACA;EACA;AJuDD;;AIpDA;EACC;EACA;EACA;EACA;AJuDD,C","sources":["webpack://wpfactory-cross-selling/./src/scss/admin.scss","webpack://wpfactory-cross-selling/./src/scss/modules/_general.scss","webpack://wpfactory-cross-selling/./src/scss/modules/_categories.scss","webpack://wpfactory-cross-selling/./src/scss/modules/_buttons.scss","webpack://wpfactory-cross-selling/./src/scss/modules/_products.scss"],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.min.css b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.min.css
new file mode 100644
index 0000000..c628393
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/assets/css/admin.min.css
@@ -0,0 +1 @@
+.wpfcs-product.disabled,.wpfcs-button.disabled{pointer-events:none;opacity:.5;filter:grayscale(100%)}.wpfcs-product.readonly{opacity:.5;filter:grayscale(100%)}.wpfcs-category{margin:33px 0 17px 0;font-size:18px;font-weight:700}@media(max-width: 800px){.wpfcs-category{text-align:center}}.wpfcs-button{border-radius:100px;font-size:14px;padding:7px 18px;cursor:pointer;-webkit-text-decoration:none;text-decoration:none;display:flex;align-items:center;justify-content:center;font-weight:700}.wpfcs-button i{margin:0 8px 0 -3px}.wpfcs-button-1{color:#fff;background:#14243b}.wpfcs-button-1 i{color:#02aaf2}.wpfcs-button-1:hover{background:#204677;color:#fff}.wpfcs-button-2{color:#14243b;border:1px solid #dcdcde}.wpfcs-button-2 i{color:#1a2dc9}.wpfcs-button-2:hover{background:#f5f5f5;color:#14243b}.wpfcs-product{background:#fff;padding:18px 24px;border:1px solid #f2f2f2;display:flex;justify-content:flex-start;align-items:center;gap:18px;flex-wrap:nowrap}@media(max-width: 800px){.wpfcs-product{flex-wrap:wrap;justify-content:center}}.wpfcs-product-title{margin:0 0 7px}.wpfcs-product-title a{-webkit-text-decoration:none;text-decoration:none;color:inherit}.wpfcs-product-title a:hover{color:#135e96}.wpfcs-product-desc{margin:0;color:#878787}.wpfcs-product-actions{margin-left:auto;border-left:1px solid #f2f2f2;padding:10px 0 10px 24px;display:flex;justify-content:flex-start;align-items:center;gap:10px;min-width:239px}@media(max-width: 800px){.wpfcs-product-actions{margin-left:0;margin-left:initial;padding-left:0;border-left:none}}.wpfcs-product-img-wrapper{width:60px;height:60px;min-width:60px;background:#fff;background:linear-gradient(180deg, rgb(255, 255, 255) 0%, rgb(190, 233, 252) 100%);display:flex;justify-content:center;align-items:center}.wpfcs-product-img-wrapper *{font-size:0;display:flex}.wpfcs-product-img-wrapper img{max-width:100%;max-height:100%;height:auto;width:auto}
diff --git a/vendor/wpfactory/wpfactory-cross-selling/langs/wpfactory-cross-selling.pot b/vendor/wpfactory/wpfactory-cross-selling/langs/wpfactory-cross-selling.pot
new file mode 100644
index 0000000..d1821fe
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/langs/wpfactory-cross-selling.pot
@@ -0,0 +1,182 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2024-09-23T03:49:09+02:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.11.0\n"
+"X-Domain: wpfactory-cross-selling\n"
+
+#: class-products.php:46
+msgid "Wishlist for WooCommerce"
+msgstr ""
+
+#: class-products.php:47
+msgid "Encourage More Purchases by Offering Easy Multi-Wishlist Creation and Sharing Features."
+msgstr ""
+
+#: class-products.php:56
+msgid "Min Max Default Quantity for WooCommerce"
+msgstr ""
+
+#: class-products.php:57
+msgid "Control Product Quantities and make shopping perfectly tailored to your store's needs."
+msgstr ""
+
+#: class-products.php:66
+msgid "Cost of Goods Sold (COGS): Cost & Profit Calculator for WooCommerce"
+msgstr ""
+
+#: class-products.php:67
+msgid "Understand your profits by accurately tracking costs. Make smarter decisions for your business and maximize your store's profitability with ease."
+msgstr ""
+
+#: class-products.php:76
+msgid "Maximum Products per User for WooCommerce"
+msgstr ""
+
+#: class-products.php:77
+msgid "Set maximum quantities based on your store's needs. Keep things fair, control stock, and manage sales your way!"
+msgstr ""
+
+#: class-products.php:86
+msgid "Order Minimum/Maximum Amount for WooCommerce"
+msgstr ""
+
+#: class-products.php:87
+msgid "Control every order with customizable limits to optimize your sales strategy."
+msgstr ""
+
+#: class-products.php:96
+msgid "EU VAT Manager for WooCommerce"
+msgstr ""
+
+#: class-products.php:97
+msgid "Validate VAT Numbers Automatically and Stay Compliant Across Europe. ensuring your customers have a seamless experience while you handle VAT like a pro."
+msgstr ""
+
+#: class-products.php:106
+msgid "Email Verification for WooCommerce"
+msgstr ""
+
+#: class-products.php:107
+msgid "Secure Your WooCommerce Store by preventing fake accounts, and ensuring real customers with user-friendly email verification."
+msgstr ""
+
+#: class-products.php:116
+msgid "Free Shipping Over Amount: Amount Left Tracker for WooCommerce"
+msgstr ""
+
+#: class-products.php:117
+msgid "Unlock Higher Sales with Free Shipping Incentives."
+msgstr ""
+
+#: class-products.php:126
+msgid "Payment Methods by Product & Country for WooCommerce"
+msgstr ""
+
+#: class-products.php:127
+msgid "Control payment methods to keep higher profit, boost conversions, and offer a better checkout experience."
+msgstr ""
+
+#: class-products.php:136
+msgid "Product XML Feeds for WooCommerce"
+msgstr ""
+
+#: class-products.php:137
+msgid "Create unlimited product XML feeds using this feature-rich plugin, enabling you to generate, customize, and manage XML feeds based on merchant needs. Compatible with various platforms."
+msgstr ""
+
+#: class-products.php:146
+msgid "Popup Notices: Added to Cart, Checkout Popups & More"
+msgstr ""
+
+#: class-products.php:147
+msgid "Capture customer attention with eye-catching, customizable popups messages."
+msgstr ""
+
+#: class-products.php:156
+msgid "EAN and Barcodes for WooCommerce"
+msgstr ""
+
+#: class-products.php:157
+msgid "Make Inventory Control a Breeze and Manage Your Products Seamlessly."
+msgstr ""
+
+#: class-products.php:166
+msgid "MSRP (RRP) Pricing for WooCommerce"
+msgstr ""
+
+#: class-products.php:167
+msgid "Encourage Purchases by Displaying MSRP and Proving Your Prices Beat the Market."
+msgstr ""
+
+#: class-products.php:176
+msgid "File Renaming on Upload – WordPress Plugin"
+msgstr ""
+
+#: class-products.php:177
+msgid "Elevate your WP media management with \"Rename Media Files on Upload for WordPress\" plugin.  Automatically rename media images & files based on rules, sanitizes filenames, and enriches SEO through smart naming conventions."
+msgstr ""
+
+#: class-products.php:186
+msgid "Coupons & Add to Cart by URL for WooCommerce"
+msgstr ""
+
+#: class-products.php:187
+msgid "Simplify Shopping with One-Click Coupons and Turn Links into Sales!"
+msgstr ""
+
+#: class-products.php:196
+msgid "Dynamic Pricing & Bulk Quantity Discounts"
+msgstr ""
+
+#: class-products.php:197
+msgid "Boost Larger Orders and Maximize Revenue with Dynamic Pricing."
+msgstr ""
+
+#: class-products.php:206
+msgid "Download Plugins and Themes from Dashboard"
+msgstr ""
+
+#: class-products.php:207
+msgid "Download your WordPress plugins and themes in ZIP files directly from admin dashboard, get any or all plugins & themes without FTP or cPanel access in a single click."
+msgstr ""
+
+#: class-products.php:216
+msgid "Back Button Widget - WordPress Plugin"
+msgstr ""
+
+#: class-products.php:217
+msgid "Simplify navigation on your WordPress site with the \"Back Button Widget\" plugin, a light-weight & user-friendly tool to show a \"Back\" button anywhere on your website."
+msgstr ""
+
+#: class-products.php:226
+msgid "Slugs Manager: Delete Old Permalinks "
+msgstr ""
+
+#: class-products.php:227
+msgid "Optimize Your Site Performance by Cleaning Up Old and Unused Permalinks Effortlessly."
+msgstr ""
+
+#: class-products.php:236
+msgid "Name Your Price: Make a Price Offer for WooCommerce"
+msgstr ""
+
+#: class-products.php:237
+msgid "A great way to engage shoppers and drive sales through customer-driven pricing."
+msgstr ""
+
+#: class-wpfactory-cross-selling.php:104
+#: class-wpfactory-cross-selling.php:110
+msgid "Recommendations"
+msgstr ""
+
+#: class-wpfactory-cross-selling.php:109
+msgid "WPFactory Recommendations"
+msgstr ""
diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/img/wpfactory.png b/vendor/wpfactory/wpfactory-cross-selling/src/img/wpfactory.png
new file mode 100644
index 0000000000000000000000000000000000000000..6453bab9e8fb214833db772a72acfc166d61dda3
GIT binary patch
literal 2757
zcmV;$3Oe<PP)<h;3K|Lk000e1NJLTq002J#001xu1^@s6rU{}700009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH3R+1-K~#7F-C9j-
zTvru7=e~LViHSXiL<k`@(+#b<!9{>XB$N@VNK^^Ml@K6A6o+)djv%o?EL>Jm3L<64
z2E`E)J5)<Z*}7enN|4~BlvFe{GZ8J75>k&HyPkP(-aVXq&b{wFn<gHIN5{$?&Aj{m
z?{|K_bI!eku!q|GiRCkWz+a{oFe8A(BK3Kj5w?>g`@+KF(;cX=8Q4qBz;OUVME>Pn
zL_&9%fF6e!8c=cDQ{WM>?tY1!1pF~CfC%HyL&a@xX&$KIei=9tA;}SvFMqN+RNVFq
z`1!eIr}Z2l>z_5Q0&uEl4roBdZO?!o0SAs0DX7nb8iDwOA$oK*Zvn*L18QxQ?~=ho
zP;uKsK5qh{si}(vAOzy0N7?Kdah*ua9);sP;pGkS(KY)BXh!^9-QL;%79U^&oSvIq
zu2cYfO7nT2N|{dSSOV3W{vHCaG2VqYiE)fJ2q5G;wOUju>FpWtC|YGdci274c@6;Q
z{~GJ*(KGwAbIT34)x^dr+sbiKyd?Rg;l5(VuMKk1&!7Kuli%+`Q74VlSAX*Bue2X@
z{ki9_oG}FRtg*I1`_hkp^Tmts;88T7uQaE)wQp4hx%!PUAFtV;JAHYU$SiS{`4WE@
zqI6{G7pE_uyx;ZbIZb5^ofiT_nsN8Mc=}4~LHDqB>jk@!#5&v(<E;;W*)&wxb_8$8
z%x^o?co3j&iM2oKp0jL4|8<t2RI#CmfkJZU1i{Iz%X2N^3{=>51Wz9g#<j*ETHSt6
z#8!0f^p%&-{^0dSF$k1CS@$~c<VebXMq|EkA3~*shdW*H;`jg3;xRN}=hkKoo$2@C
zS`^t94AvI1IQf}L$1kKAHQlUDY7zR3HDxvPj1IVCyf51{16a3qda<GzohsSB!M?c|
z8G3ma_slVewC<#w-Fb6&jf#>^V|{3B4*SgL6jaoz4|Pbp_RCA_wti`oXq_~_4YN0{
zNvwA%kWOu|g!+~F{m|ol!k~J*eV<MI_kDoZ*vU7%w$Xc~^1m7end%aqf#UrCv#n;(
zk&4aH8mr<T5yFia;js+psUE?ob=FT9=&8!mcIe<YESIuQt41hZlN<it97nt{Rf9u`
zg(p`sh<g$V+yxD&s10B9<TTF$Frkn|sc1;_jr7iBgnvIULXWLy_~gG5h`ZH=yP^C1
zy3@QHg*SVb#XHa<gh&ECA#Ym;WB9|DCu#Yq@#c5Fx!i;b+R(w@%}{E0@>)kP2nSqJ
zd$$!~@cD>|@j$JP)+~Mdxi^+(XSE=D*fxB&2L~>gyYC18k7VLft$`B=w_Trz<UURY
zn+BrR@#Ak^n4NvA0T0oJ4*uUxy%@}$`wpxT(9ZN7`H{K<pH;Vjjq%9M^^nea(8(lA
zTSvd~#)V_Yc4rAg1>aM$6TmVO<BJ;S2JGri021s)AS?)@lbUG_byWu_pWNoUU@nbn
zt>&}WUKsTKLj}+NUU&YiW-n%)3ql0|7(jbclwiLy70LXTiw_1NPYX#BK{Nl=qi>!c
z<o!bhzX_sw^mUtRUdYXm7XXR&-ErshMiZSx0yGw7FK8kp%R3~+;oKnaA1ZjxUFsen
zV5AwnRaR%>Gvs|g_<P89ozFw40W{~wy!Q7yQ-`0uzT>P<B}q<?$Hx8(tJXk=N8jT?
z_BdvBd9+<`${iDtXK_;hW)S^^k!2WGsdB>eq0SQ>_f7D3$@-HR!7pm$i<vI}r&1a`
zNZS?oHJ)et=O)4$k9UoM-p&kXXh>ZKN)ZV$@j|+1Yw&%Yg_e301hn`uMMzWBlVpxi
zwJv6D+;fb=kbUuag(-ebc<ZyHaBqK%V?Cm=57~U~q!@Fayl<uNXMVOX_dEpnW^1{*
z{8OB|c^lw%;xsCQR!~0a;J#mAdccGHoUC?&#u&1tkkb=+qoxq*crSBg=$T&5ldtso
zTxY6ALD2BIaUBZ_dh$*R6Cd=k`?dBAT!LG$8}QHE_-oVF=s1sSj$c-P{T@R4At-1u
zy5c`0T3?4D`3d&W2c)pxpmba`El~wL*Z?30EzFJ%nD}|HqEO|6BsgUJ`yh7)7x@TR
zKOMvBXJQz8Vs&wR?RV^j^a@Y1TudfUEZ!IVF$Ud_aGpUQ@nSAaM_0++tTL$=qE54c
z5i-hUf@PPZd~MwllzdcW5%;-PH9oNk>8%$4pW*Q5LtW&B5pMK>O^Vx~fM8jLlu57Q
zB8Xs?r`KlVwcoZ`z%Qhq_};}ZLc^wA|N7h47nog__;E*2V@PhOwSz%hxeVmdKB{<i
z7zHPvt?m~7UxQe%wLrB>PdRXj^TPb-$S&uG(i}GBKjAT6z~lu&5H58>4U<3`5)luv
z1uU5Li!Io^&=Bxr+1Po$^rSan^g5&9#RpCh)DC!s=dV?yIY51L37%f$m4IcN4bP1-
zt6|Lq_9xHo;L}=-@z$rhu)S$gvt?h8@n*bBIM#*S8ladK<DoYU7e>-QcH_E0&Nwx2
zgyDyzIW_+}n8{tBjmv=d{un{;T?_*jlhlw@DnfFW_uEJl7vN|hyrJ0|Gj#$ZX$p44
zK*s5+Y)25XQ3HMH^LLE<yiajyO3%ZoIctlI6oNL=L<mRvV5aY_#!uX=)8su0DiR#t
zD8rU{<7uW$c!j@BDJ!Y8GMw`-Qv4~xsbfU@k0zMjHMIFQ$L|{kl6MXE-Z$V24Afah
z<L!B?b$BE2voVHP^BNi@wkxSwuW>%ECU1PGESRK_!bqQL(_Jw24dO4DPp%+LbRD#M
z_-h9h*+Z^(&sl9qsa?Z<?-a$OOMLVY6hTQ{Tm)isw{o5MfW_KDf{DXkf}Epv-{TcI
z&TNwRSRkvctq&qzOy|UekELrhjol6*1{WyY%liMGIFj>;4Z4Xtv!5sFCoI(JDdMOl
zvyaoJeLaZkn}l&6aiWJdr<kDIl8A`HKU+!*VL}ZnlxEMt^r=oRm1o}h8!s$!c;f{M
zeW+)4F%j!!NS^U+{$l;=6tgwX0907kS6t+{kdO6OBYlcI!%3m9Wo&pZUk8(kCOi7H
z&@Wt2ua&;_seNHzZ2sY#JHpSiq;Cj#EQh=-%YNj5Z!sg+nr|&POcXV_octl5nX$Q#
zC}{_uu_aQs`fv&)Xq7852OsV+N~jbDv&9EN1uUM&_ZmM-U-DJ!m64B0$KjXm%g@xe
zhp^1Y+uT`5Z1SrB8n*k;_T~fuF*LKt{T~*N@MEXTgpuigBa2t7wsVqkrHS=A3>IQN
zI4>q2Rkmx<_kvJ!p{syI2=1I)xs}w}mb5F^t?=(PKDtQ8UhVGx?yL91IB*qkxb>$Q
zh~h)+rA>|uGeRu9I+I%l27@eV)tjqo&B~ly*%g8t1Zyaw3>EAwK(|;)*#+8s-&KoQ
z+eC0R&G6dB^tY}KifLf*_iJBjy*2~2cq+xL!Q|YqSypGZu4iBynmbr$F?Fi~Y7|CW
za-+O7r(1;vsl!`W@3&dY9oBLuGnT<ZCxhBm=-giIJbvnbTCn^Nig;Al>80EB00000
LNkvXXu0mjf98FMw

literal 0
HcmV?d00001

diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php
new file mode 100644
index 0000000..cc949b5
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-product-categories.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * WPFactory Cross-Selling - Product Categories
+ *
+ * @version 1.0.0
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Cross_Selling;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! class_exists( 'WPFactory\WPFactory_Cross_Selling\Product_Categories' ) ) {
+
+	/**
+	 * WPF_Cross_Selling.
+	 *
+	 * @version 1.0.0
+	 * @since   1.0.0
+	 */
+	class Product_Categories {
+
+		/**
+		 * Product categories.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var array
+		 */
+		protected $product_categories = array();
+
+		/**
+		 * get_product_categories.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return array|array[]
+		 */
+		function get_product_categories() {
+			$this->product_categories = array(
+				array(
+					'name' => 'Admin & Reporting',
+					'slug' => 'admin-&-reporting',
+				),
+				array(
+					'name' => 'Marketing & Promotion',
+					'slug' => 'marketing-&-promotion',
+				),
+				array(
+					'name' => 'Orders Restrictions',
+					'slug' => 'orders-restrictions',
+				),
+				array(
+					'name' => 'WordPress Utilities',
+					'slug' => 'wordpress-utilities',
+				),
+			);
+
+			return $this->product_categories;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/php/class-products.php b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-products.php
new file mode 100644
index 0000000..6dc7e84
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-products.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * WPFactory Cross-Selling - Products
+ *
+ * @version 1.0.0
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Cross_Selling;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! class_exists( 'WPFactory\WPFactory_Cross_Selling\Products' ) ) {
+
+	/**
+	 * WPF_Cross_Selling.
+	 *
+	 * @version 1.0.0
+	 * @since   1.0.0
+	 */
+	class Products {
+
+		/**
+		 * Products.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var array
+		 */
+		protected $products = array();
+
+		/**
+		 * get_products.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return array[]
+		 */
+		function get_products() {
+			$this->products = array(
+				array(
+					'name'             => __('Wishlist for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Encourage More Purchases by Offering Easy Multi-Wishlist Creation and Sharing Features.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/wish-list-for-woocommerce/assets/icon.svg?rev=3078494',
+					'free_plugin_path' => 'wish-list-for-woocommerce/wish-list-for-woocommerce.php',
+					'free_plugin_slug' => 'wish-list-for-woocommerce',
+					'pro_plugin_path'  => 'wish-list-for-woocommerce-pro/wish-list-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/wish-list-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory',
+				),
+				array(
+					'name'             => __('Min Max Default Quantity for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Control Product Quantities and make shopping perfectly tailored to your store\'s needs.','wpfactory-cross-selling'),
+					'category_slug'    => 'orders-restrictions',
+					'icon_url'         => 'https://ps.w.org/product-quantity-for-woocommerce/assets/icon.svg?rev=2970983',
+					'free_plugin_path' => 'product-quantity-for-woocommerce/product-quantity-for-woocommerce.php',
+					'free_plugin_slug' => 'product-quantity-for-woocommerce',
+					'pro_plugin_path'  => 'product-quantity-for-woocommerce-pro/product-quantity-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/product-quantity-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Cost of Goods Sold (COGS): Cost & Profit Calculator for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Understand your profits by accurately tracking costs. Make smarter decisions for your business and maximize your store\'s profitability with ease.','wpfactory-cross-selling'),
+					'category_slug'    => 'admin-&-reporting',
+					'icon_url'         => 'https://ps.w.org/cost-of-goods-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'cost-of-goods-for-woocommerce/cost-of-goods-for-woocommerce.php',
+					'free_plugin_slug' => 'cost-of-goods-for-woocommerce',
+					'pro_plugin_path'  => 'cost-of-goods-for-woocommerce-pro/cost-of-goods-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/cost-of-goods-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Maximum Products per User for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Set maximum quantities based on your store\'s needs. Keep things fair, control stock, and manage sales your way!','wpfactory-cross-selling'),
+					'category_slug'    => 'orders-restrictions',
+					'icon_url'         => 'https://ps.w.org/maximum-products-per-user-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'maximum-products-per-user-for-woocommerce/maximum-products-per-user-for-woocommerce.php',
+					'free_plugin_slug' => 'maximum-products-per-user-for-woocommerce',
+					'pro_plugin_path'  => 'maximum-products-per-user-for-woocommerce-pro/maximum-products-per-user-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/maximum-products-per-user-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Order Minimum/Maximum Amount for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Control every order with customizable limits to optimize your sales strategy.','wpfactory-cross-selling'),
+					'category_slug'    => 'orders-restrictions',
+					'icon_url'         => 'https://ps.w.org/order-minimum-amount-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'order-minimum-amount-for-woocommerce/order-minimum-amount-for-woocommerce.php',
+					'free_plugin_slug' => 'order-minimum-amount-for-woocommerce',
+					'pro_plugin_path'  => 'order-minimum-amount-for-woocommerce-pro/order-minimum-amount-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/order-minimum-maximum-amount-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('EU VAT Manager for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Validate VAT Numbers Automatically and Stay Compliant Across Europe. ensuring your customers have a seamless experience while you handle VAT like a pro.','wpfactory-cross-selling'),
+					'category_slug'    => 'admin-&-reporting',
+					'icon_url'         => 'https://ps.w.org/eu-vat-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'eu-vat-for-woocommerce/eu-vat-for-woocommerce.php',
+					'free_plugin_slug' => 'eu-vat-for-woocommerce',
+					'pro_plugin_path'  => 'eu-vat-for-woocommerce-pro/eu-vat-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/eu-vat-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Email Verification for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Secure Your WooCommerce Store by preventing fake accounts, and ensuring real customers with user-friendly email verification.','wpfactory-cross-selling'),
+					'category_slug'    => 'admin-&-reporting',
+					'icon_url'         => 'https://ps.w.org/emails-verification-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'emails-verification-for-woocommerce/email-verification-for-woocommerce.php',
+					'free_plugin_slug' => 'emails-verification-for-woocommerce',
+					'pro_plugin_path'  => 'email-verification-for-woocommerce-pro/email-verification-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/email-verification-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Free Shipping Over Amount: Amount Left Tracker for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Unlock Higher Sales with Free Shipping Incentives.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/amount-left-free-shipping-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'amount-left-free-shipping-woocommerce/left-to-free-shipping-for-woocommerce.php',
+					'free_plugin_slug' => 'amount-left-free-shipping-woocommerce',
+					'pro_plugin_path'  => 'left-to-free-shipping-for-woocommerce-pro/left-to-free-shipping-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/amount-left-free-shipping-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Payment Methods by Product & Country for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Control payment methods to keep higher profit, boost conversions, and offer a better checkout experience.','wpfactory-cross-selling'),
+					'category_slug'    => 'orders-restrictions',
+					'icon_url'         => 'https://ps.w.org/payment-gateways-per-product-categories-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'payment-gateways-per-product-categories-for-woocommerce/payment-gateways-per-product-for-woocommerce.php',
+					'free_plugin_slug' => 'payment-gateways-per-product-categories-for-woocommerce',
+					'pro_plugin_path'  => 'payment-gateways-per-product-for-woocommerce-pro/payment-gateways-per-product-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/payment-gateways-per-product-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Product XML Feeds for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Create unlimited product XML feeds using this feature-rich plugin, enabling you to generate, customize, and manage XML feeds based on merchant needs. Compatible with various platforms.','wpfactory-cross-selling'),
+					'category_slug'    => 'admin-&-reporting',
+					'icon_url'         => 'https://ps.w.org/product-xml-feeds-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'product-xml-feeds-for-woocommerce/product-xml-feeds-for-woocommerce.php.php',
+					'free_plugin_slug' => 'product-xml-feeds-for-woocommerce',
+					'pro_plugin_path'  => 'product-xml-feeds-for-woocommerce-pro/product-xml-feeds-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/product-xml-feeds-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Popup Notices: Added to Cart, Checkout Popups & More','wpfactory-cross-selling'),
+					'desc'             => __('Capture customer attention with eye-catching, customizable popups messages.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/popup-notices-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'popup-notices-for-woocommerce/popup-notices-for-woocommerce.php',
+					'free_plugin_slug' => 'popup-notices-for-woocommerce',
+					'pro_plugin_path'  => 'popup-notices-for-woocommerce-pro/popup-notices-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/popup-notices-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('EAN and Barcodes for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Make Inventory Control a Breeze and Manage Your Products Seamlessly.','wpfactory-cross-selling'),
+					'category_slug'    => 'admin-&-reporting',
+					'icon_url'         => 'https://ps.w.org/ean-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'ean-for-woocommerce/ean-for-woocommerce.php',
+					'free_plugin_slug' => 'ean-for-woocommerce',
+					'pro_plugin_path'  => 'ean-for-woocommerce-pro/ean-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/ean-barcodes-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('MSRP (RRP) Pricing for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Encourage Purchases by Displaying MSRP and Proving Your Prices Beat the Market.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/msrp-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'msrp-for-woocommerce/msrp-for-woocommerce.php',
+					'free_plugin_slug' => 'msrp-for-woocommerce',
+					'pro_plugin_path'  => 'msrp-for-woocommerce-pro/msrp-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/msrp-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('File Renaming on Upload – WordPress Plugin','wpfactory-cross-selling'),
+					'desc'             => __('Elevate your WP media management with "Rename Media Files on Upload for WordPress" plugin.  Automatically rename media images & files based on rules, sanitizes filenames, and enriches SEO through smart naming conventions.','wpfactory-cross-selling'),
+					'category_slug'    => 'wordpress-utilities',
+					'icon_url'         => 'https://ps.w.org/file-renaming-on-upload/assets/icon.svg',
+					'free_plugin_path' => 'file-renaming-on-upload/file-renaming-on-upload.php',
+					'free_plugin_slug' => 'file-renaming-on-upload',
+					'pro_plugin_path'  => 'file-renaming-on-upload-pro/file-renaming-on-upload-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/file-renaming-on-upload-wordpress-plugin/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Coupons & Add to Cart by URL for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('Simplify Shopping with One-Click Coupons and Turn Links into Sales!','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/url-coupons-for-woocommerce-by-algoritmika/assets/icon.svg',
+					'free_plugin_path' => 'url-coupons-for-woocommerce-by-algoritmika/url-coupons-woocommerce.php',
+					'free_plugin_slug' => 'url-coupons-for-woocommerce-by-algoritmika',
+					'pro_plugin_path'  => 'url-coupons-woocommerce-pro/url-coupons-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/url-coupons-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Dynamic Pricing & Bulk Quantity Discounts','wpfactory-cross-selling'),
+					'desc'             => __('Boost Larger Orders and Maximize Revenue with Dynamic Pricing.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/wholesale-pricing-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'wholesale-pricing-woocommerce/wholesale-pricing-woocommerce.php',
+					'free_plugin_slug' => 'wholesale-pricing-woocommerce',
+					'pro_plugin_path'  => 'wholesale-pricing-woocommerce-pro/wholesale-pricing-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/product-price-by-quantity-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Download Plugins and Themes from Dashboard','wpfactory-cross-selling'),
+					'desc'             => __('Download your WordPress plugins and themes in ZIP files directly from admin dashboard, get any or all plugins & themes without FTP or cPanel access in a single click.','wpfactory-cross-selling'),
+					'category_slug'    => 'wordpress-utilities',
+					'icon_url'         => 'https://ps.w.org/download-plugins-dashboard/assets/icon.svg',
+					'free_plugin_path' => 'download-plugins-dashboard/download-plugins-from-dashboard.php',
+					'free_plugin_slug' => 'download-plugins-dashboard',
+					'pro_plugin_path'  => 'download-plugins-from-dashboard-pro/download-plugins-from-dashboard-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/download-plugins-and-themes-from-dashboard/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Back Button Widget - WordPress Plugin','wpfactory-cross-selling'),
+					'desc'             => __('Simplify navigation on your WordPress site with the "Back Button Widget" plugin, a light-weight & user-friendly tool to show a "Back" button anywhere on your website.','wpfactory-cross-selling'),
+					'category_slug'    => 'wordpress-utilities',
+					'icon_url'         => 'https://ps.w.org/back-button-widget/assets/icon.svg',
+					'free_plugin_path' => 'back-button-widget/back-button-widget.php',
+					'free_plugin_slug' => 'back-button-widget',
+					'pro_plugin_path'  => 'back-button-widget-pro/back-button-widget-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/back-button-widget-wordpress-plugin/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Slugs Manager: Delete Old Permalinks ','wpfactory-cross-selling'),
+					'desc'             => __('Optimize Your Site Performance by Cleaning Up Old and Unused Permalinks Effortlessly.','wpfactory-cross-selling'),
+					'category_slug'    => 'wordpress-utilities',
+					'icon_url'         => 'https://ps.w.org/remove-old-slugspermalinks/assets/icon.svg',
+					'free_plugin_path' => 'remove-old-slugspermalinks/remove-old-slugs.php',
+					'free_plugin_slug' => 'remove-old-slugspermalinks',
+					'pro_plugin_path'  => 'remove-old-slugs-pro/remove-old-slugs-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/slugs-manager-wordpress-plugin/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+				array(
+					'name'             => __('Name Your Price: Make a Price Offer for WooCommerce','wpfactory-cross-selling'),
+					'desc'             => __('A great way to engage shoppers and drive sales through customer-driven pricing.','wpfactory-cross-selling'),
+					'category_slug'    => 'marketing-&-promotion',
+					'icon_url'         => 'https://ps.w.org/price-offerings-for-woocommerce/assets/icon.svg',
+					'free_plugin_path' => 'price-offerings-for-woocommerce/price-offerings-for-woocommerce.php',
+					'free_plugin_slug' => 'price-offerings-for-woocommerce',
+					'pro_plugin_path'  => 'price-offerings-for-woocommerce-pro/price-offerings-for-woocommerce-pro.php',
+					'pro_plugin_url'   => 'https://wpfactory.com/item/price-offers-for-woocommerce/?utm_source=plugin&utm_medium=cross-selling&utm_campaign=wpfactory'
+				),
+			);
+
+			return $this->products;
+		}
+	}
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php
new file mode 100644
index 0000000..ab61d71
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/src/php/class-wpfactory-cross-selling.php
@@ -0,0 +1,441 @@
+<?php
+/**
+ * WPFactory Cross-Selling
+ *
+ * @version 1.0.2
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Cross_Selling;
+
+use WPFactory\WPFactory_Admin_Menu\WPFactory_Admin_Menu;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! class_exists( 'WPFactory\WPFactory_Cross_Selling\WPFactory_Cross_Selling' ) ) {
+
+	/**
+	 * WPF_Cross_Selling.
+	 *
+	 * @version 1.0.0
+	 * @since   1.0.0
+	 */
+	class WPFactory_Cross_Selling {
+
+		/**
+		 * Version.
+		 *
+		 * @since   1.0.1
+		 *
+		 * @var string
+		 */
+		protected $version = '1.0.2';
+
+		/**
+		 * Setup args.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @var array
+		 */
+		protected $setup_args = array();
+
+		/**
+		 * Admin page slug.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var string
+		 */
+		protected $submenu_page_slug = 'wpfactory-cross-selling';
+
+		/**
+		 * Products.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var Products
+		 */
+		protected $products;
+
+		/**
+		 * Product categories.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var Product_Categories
+		 */
+		protected $product_categories;
+
+		/**
+		 * Initialized.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var bool
+		 */
+		protected $initialized = false;
+
+		/**
+		 * Submenu initialized.
+		 *
+		 * @since   1.0.0
+		 *
+		 * @var bool
+		 */
+		protected static $submenu_initialized = false;
+
+		/**
+		 * Setups the class.
+		 *
+		 * @version 1.0.2
+		 * @since   1.0.0
+		 *
+		 * @param $args
+		 *
+		 * @return void
+		 */
+		function setup( $args = null ) {
+			$this->localize();
+
+			$args = wp_parse_args( $args, array(
+				'plugin_file_path'   => '',
+				'plugin_action_link' => array(),
+				'admin_page'         => array()
+			) );
+
+			// Plugin action link.
+			$args['plugin_action_link'] = wp_parse_args( $args['plugin_action_link'], array(
+				'enabled' => true,
+				'label'   => __( 'Recommendations', 'wpfactory-cross-selling' ),
+			) );
+
+			// Menu page.
+			$args['admin_page'] = wp_parse_args( $args['admin_page'], array(
+				'page_title' => __( 'WPFactory Recommendations', 'wpfactory-cross-selling' ),
+				'menu_title' => __( 'Recommendations', 'wpfactory-cross-selling' ),
+				'capability' => '',
+				'position'   => 2
+			) );
+
+			$this->setup_args = $args;
+		}
+
+		/**
+		 * Initializes the class.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function init() {
+			if ( $this->initialized ) {
+				return;
+			}
+			$this->initialized = true;
+
+			// Products.
+			$this->products = new Products();
+
+			// Product Categories.
+			$this->product_categories = new Product_Categories();
+
+			// WPFactory admin menu.
+			WPFactory_Admin_Menu::get_instance();
+
+			// Action links.
+			if ( $this->get_setup_args()['plugin_action_link']['enabled'] ) {
+				add_filter( 'plugin_action_links_' . $this->get_plugin_basename(), array( $this, 'add_action_links' ) );
+			}
+
+			// Cross-selling submenu.
+			add_action( 'admin_menu', array( $this, 'create_cross_selling_submenu' ) );
+
+			// Enqueues admin syles.
+			add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
+		}
+
+		/**
+		 * Localizes the plugin.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		public function localize() {
+			$domain = 'wpfactory-cross-selling';
+			$locale = get_locale();
+			$mofile = dirname( $this->get_library_file_path() ) . '/langs/' . $domain . '-' . $locale . '.mo';
+			load_textdomain( $domain, $mofile );
+		}
+
+		/**
+		 * Runs the add_action() callback if the hook_name is the current_filter.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param $hook_name
+		 * @param $callback
+		 * @param $priority
+		 * @param $accepted_args
+		 *
+		 * @return void
+		 */
+		function add_action( $hook_name, $callback, $priority = 10, $accepted_args = 1 ) {
+			if ( $hook_name === current_filter() ) {
+				$callback();
+			} else {
+				add_action( $hook_name, $callback, $priority, $accepted_args );
+			}
+		}
+
+		/**
+		 * Enqueues admin syles.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function enqueue_admin_styles() {
+			if ( ! isset( $_GET['page'] ) || $_GET['page'] !== $this->submenu_page_slug ) {
+				return;
+			}
+			$suffix        = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
+			$css_file_path = untrailingslashit( plugin_dir_path( $this->get_library_file_path() ) ) . '/assets/css/admin' . $suffix . '.css';
+			$css_file_url  = untrailingslashit( plugin_dir_url( $this->get_library_file_path() ) ) . '/assets/css/admin' . $suffix . '.css';
+			$version       = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? current_time( 'timestamp' ) : filemtime( $css_file_path );
+			wp_enqueue_style( 'wpfactory-cross-selling', $css_file_url, array(), $version );
+		}
+
+		/**
+		 * Creates cross-selling submenu.
+		 *
+		 * @version 1.0.2
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function create_cross_selling_submenu() {
+			if ( self::$submenu_initialized ) {
+				return;
+			}
+			self::$submenu_initialized = true;
+
+			// Gets params.
+			$setup_args = $this->get_setup_args();
+			$admin_page = $setup_args['admin_page'] ?? '';
+			$page_title = $admin_page['page_title'] ?? '';
+			$menu_title = $admin_page['menu_title'] ?? '';
+			$capability = $admin_page['capability'] ?? '';
+			$position   = $admin_page['position'] ?? '';
+
+			if ( empty( $capability ) ) {
+				$capability = class_exists( 'WooCommerce' ) ? 'manage_woocommerce' : 'manage_options';
+			}
+
+			// Creates the submenu page.
+			\add_submenu_page(
+				WPFactory_Admin_Menu::get_instance()->get_menu_slug(),
+				$page_title,
+				$menu_title,
+				$capability,
+				$this->submenu_page_slug,
+				array( $this, 'render_cross_selling_page' ),
+				$position
+			);
+		}
+
+		/**
+		 * Renders cross-selling page.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		function render_cross_selling_page() {
+			$setup_args = $this->get_setup_args();
+			$admin_page = $setup_args['admin_page'] ?? '';
+			$page_title = $admin_page['page_title'] ?? '';
+			$categories = $this->product_categories->get_product_categories();
+			$products   = $this->products->get_products();
+			?>
+			<div class="wrap wpfcs">
+				<h1><?php echo esc_html( $page_title ); ?></h1>
+				<?php foreach ( $categories as $category_data ): ?>
+					<h2 class="wpfcs-category"><?php echo esc_html( $category_data['name'] ); ?></h2>
+					<?php foreach ( wp_list_filter( $products, array( 'category_slug' => $category_data['slug'] ) ) as $product_data ): ?>
+						<?php echo $this->get_template( 'product.php', array(
+							'product_data'            => $product_data,
+							'free_version_installed'  => $this->is_plugin_installed( $product_data['free_plugin_path'] ),
+							'pro_version_installed'   => $this->is_plugin_installed( $product_data['pro_plugin_path'] ),
+							'free_plugin_install_url' => $this->generate_free_plugin_install_url( $product_data['free_plugin_slug'] ),
+							'pro_plugin_url'          => $product_data['pro_plugin_url']
+						) ); ?>
+					<?php endforeach; ?>
+				<?php endforeach; ?>
+			</div>
+			<?php
+		}
+
+		/**
+		 * Generates plugin install url.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param $plugin_slug
+		 *
+		 * @return string
+		 */
+		function generate_free_plugin_install_url( $plugin_slug ) {
+			$nonce       = wp_create_nonce( 'install-plugin_' . $plugin_slug );
+			$install_url = add_query_arg(
+				array(
+					'action'   => 'install-plugin',
+					'plugin'   => $plugin_slug,
+					'_wpnonce' => $nonce
+				),
+				admin_url( 'update.php' )
+			);
+
+			return $install_url;
+		}
+
+		/**
+		 * get_template
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param $template_name
+		 * @param $args
+		 *
+		 * @return false|string
+		 */
+		function get_template( $template_name, $args = array() ) {
+			$template_path = plugin_dir_path( $this->get_library_file_path() ) . 'templates/' . $template_name;
+			if ( file_exists( $template_path ) ) {
+				ob_start();
+				foreach ( $args as $key => $value ) {
+					$$key = $value;
+				}
+				include $template_path;
+				$content = ob_get_clean();
+
+				return $content;
+			} else {
+				return '<p>Template not found.</p>';
+			}
+		}
+
+		/**
+		 * is_plugin_installed.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @param $plugin_slug
+		 *
+		 * @return bool
+		 */
+		function is_plugin_installed( $plugin_slug ) {
+			$all_plugins = get_plugins();
+
+			return isset( $all_plugins[ $plugin_slug ] );
+		}
+
+
+		/**
+		 * Adds action links.
+		 *
+		 * @param $links
+		 *
+		 * @return array
+		 */
+		function add_action_links( $links ) {
+			$this->localize();
+			$setup_args  = $this->get_setup_args();
+			$action_link = $setup_args['plugin_action_link'] ?? '';
+			$label       = $action_link['label'] ?? '';
+			$link           = admin_url( 'admin.php?page=' . $this->submenu_page_slug );
+			$target         = '_self';
+			$custom_links[] = sprintf( '<a href="%s" target="%s">%s</a>', esc_url( $link ), sanitize_text_field( $target ), sanitize_text_field( $label ) );
+			$links          = array_merge( $links, $custom_links );
+
+			return $links;
+		}
+
+		/**
+		 * get_setup_args.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return array
+		 */
+		public function get_setup_args() {
+			return $this->setup_args;
+		}
+
+		/**
+		 * get_file_path.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		function get_plugin_file_path() {
+			$setup_args = $this->get_setup_args();
+
+			return $setup_args['plugin_file_path'];
+		}
+
+		/**
+		 * get_file_path.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		function get_library_file_path() {
+			return dirname( __FILE__, 2 );
+		}
+
+		/**
+		 * get_basename.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		function get_plugin_basename() {
+			$file_path = $this->get_plugin_file_path();
+
+			return plugin_basename( $file_path );
+		}
+
+		/**
+		 * get_version.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return string
+		 */
+		public function get_version() {
+			return $this->version;
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php b/vendor/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php
new file mode 100644
index 0000000..ae28a03
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/src/php/trait-singleton.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * WPFactory Cross-Selling - Singleton.
+ *
+ * @version 1.0.0
+ * @since   1.0.0
+ * @author  WPFactory
+ */
+
+namespace WPFactory\WPFactory_Cross_Selling;
+
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+} // Exit if accessed directly
+
+if ( ! trait_exists( 'WPFactory\WPFactory_Cross_Selling\Singleton' ) ) {
+
+	trait Singleton {
+
+		/**
+		 * Instances.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @var array
+		 */
+		private static $instances = [];
+
+		/**
+		 * Constructor.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 */
+		protected function __construct() {
+			// Prevent creating a new instance externally
+		}
+
+		/**
+		 * Clone.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return void
+		 */
+		protected function __clone() {
+			// Prevent cloning the instance
+		}
+
+		/**
+		 * get_instance.
+		 *
+		 * @version 1.0.0
+		 * @since   1.0.0
+		 *
+		 * @return mixed|static
+		 */
+		public static function get_instance() {
+			$class = static::class;
+			if ( ! isset( self::$instances[ $class ] ) ) {
+				self::$instances[ $class ] = new static();
+			}
+
+			return self::$instances[ $class ];
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-cross-selling/templates/product.php b/vendor/wpfactory/wpfactory-cross-selling/templates/product.php
new file mode 100644
index 0000000..0a46100
--- /dev/null
+++ b/vendor/wpfactory/wpfactory-cross-selling/templates/product.php
@@ -0,0 +1,25 @@
+<?php
+$free_version_installed_class = $free_version_installed || $pro_version_installed ? 'disabled' : '';
+$pro_version_installed_class  = $pro_version_installed ? 'disabled' : '';
+$product_class  = $pro_version_installed ? 'readonly' : '';
+?>
+
+<div class="wpfcs-product <?php echo esc_attr( $product_class ) ?>">
+	<?php if ( isset( $product_data['icon_url'] ) ): ?>
+		<div class="wpfcs-product-img-wrapper">
+			<a href="<?php echo esc_url( $pro_plugin_url ) ?>" target="_blank"><img src="<?php echo esc_attr( $product_data['icon_url'] ) ?>"/></a>
+		</div>
+	<?php endif; ?>
+	<div class="wpfcs-product-middle">
+		<h3 class="wpfcs-product-title"><a href="<?php echo esc_url( $pro_plugin_url ) ?>" target="_blank"><?php echo esc_html( $product_data['name'] ) ?></a></h3>
+		<p class="wpfcs-product-desc"><?php echo esc_html( $product_data['desc'] ) ?></p>
+	</div>
+	<div class="wpfcs-product-actions">
+		<a href="<?php echo esc_url( $free_plugin_install_url ) ?>" class="wpfcs-button wpfcs-button-1 <?php echo esc_attr( $free_version_installed_class ) ?>"><i class="dashicons-before dashicons dashicons-download"></i>
+			Get free
+		</a>
+		<a href="<?php echo esc_url( $pro_plugin_url ) ?>" target="_blank" class="wpfcs-button wpfcs-button-2 <?php echo esc_attr( $pro_version_installed_class ) ?>"><i class="dashicons-before dashicons dashicons-external"></i>
+			Buy Pro
+		</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/vendor/wpfactory/wpfactory-promoting-notice/src/php/class-core.php b/vendor/wpfactory/wpfactory-promoting-notice/src/php/class-core.php
index 0c90b49..1f4cb9f 100644
--- a/vendor/wpfactory/wpfactory-promoting-notice/src/php/class-core.php
+++ b/vendor/wpfactory/wpfactory-promoting-notice/src/php/class-core.php
@@ -2,7 +2,7 @@
 /**
  * WPFactory Promoting Notice - Functions.
  *
- * @version 1.0.5
+ * @version 1.0.6
  * @since   1.0.0
  * @author  WPFactory
  */
@@ -89,7 +89,7 @@ function get_default_display_action( $args ) {
 		/**
 		 * init.
 		 *
-		 * @version 1.0.4
+		 * @version 1.0.6
 		 * @since   1.0.0
 		 */
 		function init() {
@@ -99,12 +99,18 @@ function init() {
 			}
 			global $pagenow;
 			if (
-				! empty( $args['url_requirements'] )
-				&& ! empty( $page_filename = $args['url_requirements']['page_filename'] )
-				&& ! empty( $url_params = $args['url_requirements']['params'] )
-				&& ! empty( $pagenow )
-				&& $pagenow == $page_filename
-				&& array_intersect_assoc( $url_params, $_GET ) === $url_params
+				! empty( $args['url_requirements'] ) &&
+				! empty( $page_filename = $args['url_requirements']['page_filename'] ) &&
+				(
+					(
+						isset( $args['url_requirements']['params'] ) &&
+						! empty( $url_params = $args['url_requirements']['params'] ) &&
+						array_intersect_assoc( $url_params, $_GET ) === $url_params
+					) ||
+					! isset( $args['url_requirements']['params'] )
+				) &&
+				! empty( $pagenow ) &&
+				$pagenow == $page_filename
 			) {
 				add_action( 'admin_head', array( $this, 'create_style' ) );
 				add_action( 'admin_head', array( $this, 'highlight_notice_on_disabled_setting_click' ) );