v2.8.3

wpcodefactory · May 30, 2024 · 73892ac · 73892ac
1 parent 6abab14
commit 73892ac
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 74 deletions.
diff --git a/email-verification-for-woocommerce.php b/email-verification-for-woocommerce.php
@@ -3,7 +3,7 @@
 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.2
+Version: 2.8.3
 Author: WPFactory
 Author URI: https://wpfactory.com
 Text Domain: emails-verification-for-woocommerce
@@ -62,7 +62,7 @@ final class Alg_WC_Email_Verification {
 	 * @var   string
 	 * @since 1.0.0
 	 */
-	public $version = '2.8.2';
+	public $version = '2.8.3';
 
 	/**
 	 * @var   Alg_WC_Email_Verification The single instance of the class

diff --git a/includes/class-alg-wc-ev-emails.php b/includes/class-alg-wc-ev-emails.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Emails Class.
  *
- * @version 2.8.2
+ * @version 2.8.3
  * @since   1.6.0
  * @author  WPFactory
  */
@@ -399,7 +399,7 @@ function get_default_email_content( $email_type ) {
 	/**
 	 * append_verification_link.
 	 *
-	 * @version 2.4.0
+	 * @version 2.8.3
 	 * @since   2.0.4
 	 *
 	 * @param $user
@@ -408,9 +408,12 @@ function customer_new_account_reset_and_append_verification_link_fine_tune( $use
 		if ( 'no' === get_option( 'alg_wc_ev_fine_tune_activation_email_placement', 'no' ) ) {
 			return;
 		}
-		$code = alg_wc_ev_generate_user_code();
-		$this->update_all_user_meta( $user->ID, $code );
 		if ( ! alg_wc_ev()->core->is_user_verified( $user ) ) {
+			$code = ! empty( $activation_code = get_user_meta( $user->ID, 'alg_wc_ev_activation_code', true ) ) ? $activation_code : false;
+			if ( empty( $code ) ) {
+				$code = alg_wc_ev_generate_user_code();
+				$this->update_all_user_meta( $user->ID, $code );
+			}
 			update_user_meta( $user->ID, 'alg_wc_ev_activation_email_sent', time() );
 			echo wp_kses_post( wpautop( wptexturize( $this->get_email_content( array(
 				'user_id' => $user->ID,

diff --git a/includes/settings/class-alg-wc-ev-settings-compatibility.php b/includes/settings/class-alg-wc-ev-settings-compatibility.php
@@ -2,7 +2,7 @@
 /**
  * Email Verification for WooCommerce - Compatibility Section Settings.
  *
- * @version 2.8.1
+ * @version 2.8.3
  * @since   2.1.3
  * @author  WPFactory
  */
@@ -43,7 +43,7 @@ function get_villatheme_email_customizer_placeholders() {
 		/**
 		 * get_settings.
 		 *
-		 * @version 2.8.1
+		 * @version 2.8.3
 		 * @since   2.1.3
 		 * @todo    (maybe) remove `alg_wc_ev_prevent_login_after_checkout_notice` (i.e. make it always enabled)
 		 */
@@ -230,7 +230,7 @@ function get_settings() {
 					'id'    => 'alg_wc_ev_comp_email_customizer_vt_options',
 				),
 				array(
-					'title'             => __( 'Activation email content', 'emails-verification-for-woocommerce' ),
+					'title'             => __( 'New account template', 'emails-verification-for-woocommerce' ),
 					'desc'              => sprintf( __( 'Display the activation email content on the %s template using the %s special text', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'New account', 'emails-verification-for-woocommerce' ) . '</strong>', '<code>{alg_wc_ev_viwec}</code>' ),
 					'desc_tip'          => sprintf( __( 'The action hook should be used in a %s from the Email Customizer plugin.', 'emails-verification-for-woocommerce' ), sprintf( '<a href="https://docs.villatheme.com/woocommerce-email-template-customizer/#configuration_child_menu_4653" target="_blank">%s</a>', __( 'Text element', 'emails-verification-for-woocommerce' ) ) ) . '<br />' .
 					                       sprintf( __( 'It\'s necessary to enable %s option.', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Emails > Activation email > Fine tune activation email placement', 'emails-verification-for-woocommerce' ) . '</strong>', '<strong>' . __( 'Emails > Activation email > Email template', 'emails-verification-for-woocommerce' ) . '</strong>' ) . '<br />' .

diff --git 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.7.8
+ * @version 2.8.3
  * @since   1.3.0
  * @author  WPFactory
  */
@@ -28,7 +28,7 @@ function __construct() {
 	/**
 	 * get_settings.
 	 *
-	 * @version 2.7.8
+	 * @version 2.8.3
 	 * @since   1.3.0
 	 */
 	function get_settings() {
@@ -132,7 +132,8 @@ function get_settings() {
 			array(
 				'title'    => __( 'Send as a separate email', 'emails-verification-for-woocommerce' ),
 				'desc'     => __( 'Send verification as a separate email', 'emails-verification-for-woocommerce' ),
-				'desc_tip' => __( 'Disable it if you want to append it to the standard WooCommerce "Customer new account" email.', 'emails-verification-for-woocommerce' ),
+				'desc_tip' => __( 'Disable it if you want to append it to the standard WooCommerce "Customer new account" email.', 'emails-verification-for-woocommerce' ) . ' ' .
+				              sprintf( __( 'If the %s email is not being sent, try to change the option %s.', 'emails-verification-for-woocommerce' ), __( 'New account', 'emails-verification-for-woocommerce' ), '<strong>' . __( 'Email sending trigger', 'emails-verification-for-woocommerce' ) . '</strong>' ),
 				'type'     => 'checkbox',
 				'id'       => 'alg_wc_ev_send_as_separate_email',
 				'default'  => 'yes',