From 5a4b1a835962f63df89965d1056e5fe7b363addf Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 3 Feb 2025 15:45:01 +0300 Subject: [PATCH 01/21] Add banner about updating default email address to email action --- .../views/frm-form-actions/_action_inside.php | 16 ++++++++++++++++ css/frm_admin.css | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index bb74d1bde3..8112a01367 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -7,6 +7,22 @@ +post_excerpt === 'email') { + ?> +
+

+ + +

+

+ + +

+
+

- - + +

Date: Mon, 3 Feb 2025 16:19:40 +0300 Subject: [PATCH 03/21] Add actions to buttons --- classes/views/frm-form-actions/_action_inside.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index 23e4cf62d6..f25a097cf6 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -17,7 +17,7 @@

- +

Date: Mon, 10 Feb 2025 20:05:38 +0300 Subject: [PATCH 04/21] Store dismiss default email message status in user meta --- classes/controllers/FrmAppController.php | 5 +++++ classes/controllers/FrmHooksController.php | 2 ++ classes/views/frm-form-actions/_action_inside.php | 6 +++--- css/frm_admin.css | 2 +- js/admin/settings.js | 15 +++++++++++++++ 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index b00550a184..f3b85319e5 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -175,6 +175,11 @@ private static function is_white_page() { return $is_white_page; } + public static function dismiss_default_email_message() { + check_ajax_referer( 'frm_ajax', 'nonce' ); + update_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', 1 ); + } + /** * Add a grey bg instead of white. * diff --git a/classes/controllers/FrmHooksController.php b/classes/controllers/FrmHooksController.php index ec99052bff..47e357f6c4 100644 --- a/classes/controllers/FrmHooksController.php +++ b/classes/controllers/FrmHooksController.php @@ -300,6 +300,8 @@ public static function load_ajax_hooks() { // Reviews. add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' ); + + add_action( 'wp_ajax_frm_dismiss_default_email_message', 'FrmAppController::dismiss_default_email_message' ); } /** diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index f25a097cf6..e2df46151d 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -8,15 +8,15 @@ post_excerpt === 'email') { +if ( $form_action->post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ) ) { ?> -
+

- +

diff --git a/css/frm_admin.css b/css/frm_admin.css index 6d7b20cd5b..70f8d8b88c 100644 --- a/css/frm_admin.css +++ b/css/frm_admin.css @@ -5444,7 +5444,7 @@ h2.frm-h2, box-shadow: none; } -.frm_email_settings .frm_default_email_notice { +.frm_email_settings .frm_default_email_message { background-color: var(--primary-25); padding:var(--gap-sm) var(--gap-md); border-radius:var(--small-radius); diff --git a/js/admin/settings.js b/js/admin/settings.js index d725830e68..18d0c8c6ae 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -1,8 +1,11 @@ ( function() { + const { doJsonPost } = frmDom.ajax; + function addEventListeners() { document.addEventListener( 'change', handleChangeEvent ); document.addEventListener( 'keydown', handleKeyDownEvent ); + document.addEventListener( 'click', handleClickEvent ); } function handleChangeEvent( e ) { @@ -19,6 +22,18 @@ } } + function handleClickEvent( e ) { + if ( e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { + e.preventDefault(); + const formData = new FormData(); + formData.append( 'action', 'frm_dismiss_default_email_message' ); + formData.append( 'nonce', frmGlobal.nonce ); + doJsonPost( 'dismiss_default_email_message', formData ).then( + e.target.closest( '.frm_default_email_message' ).remove() + ); + } + } + function handleToggleChangeEvent( e ) { e.target.nextElementSibling.setAttribute( 'aria-checked', e.target.checked ? 'true' : 'false' ); } From d5a82af04d61424503ca2091f14ed0d129a84df9 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:25:00 +0300 Subject: [PATCH 05/21] Move function to a more related class --- classes/controllers/FrmAppController.php | 5 ----- classes/controllers/FrmFormsController.php | 12 ++++++++++++ classes/controllers/FrmHooksController.php | 3 +-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index f3b85319e5..b00550a184 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -175,11 +175,6 @@ private static function is_white_page() { return $is_white_page; } - public static function dismiss_default_email_message() { - check_ajax_referer( 'frm_ajax', 'nonce' ); - update_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', 1 ); - } - /** * Add a grey bg instead of white. * diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index c042050aeb..81b4ce0e33 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -2524,6 +2524,18 @@ public static function get_met_on_submit_actions( $args, $event = 'create' ) { return $met_actions; } + /** + * Handles the AJAX request to dismiss the default email message. + * + * @since x.x + * + * @return void + */ + public static function dismiss_default_email_message() { + check_ajax_referer( 'frm_ajax', 'nonce' ); + update_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', 1 ); + } + /** * Checks if a Confirmation action has the valid data. * diff --git a/classes/controllers/FrmHooksController.php b/classes/controllers/FrmHooksController.php index 47e357f6c4..3b2359f533 100644 --- a/classes/controllers/FrmHooksController.php +++ b/classes/controllers/FrmHooksController.php @@ -266,6 +266,7 @@ public static function load_ajax_hooks() { add_action( 'wp_ajax_frm_lite_settings_upgrade', 'FrmSettingsController::settings_cta_dismiss' ); add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' ); add_action( 'wp_ajax_frm_page_search', 'FrmSettingsController::page_search' ); + add_action( 'wp_ajax_frm_dismiss_default_email_message', 'FrmFormsController::dismiss_default_email_message' ); // Styles Controller. add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' ); @@ -300,8 +301,6 @@ public static function load_ajax_hooks() { // Reviews. add_action( 'wp_ajax_frm_dismiss_review', 'FrmAppController::dismiss_review' ); - - add_action( 'wp_ajax_frm_dismiss_default_email_message', 'FrmAppController::dismiss_default_email_message' ); } /** From 8426162743b05f783890356c374e99ab51bb207c Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:34:33 +0300 Subject: [PATCH 06/21] Remove extra space after comma --- classes/controllers/FrmFormsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 81b4ce0e33..caf952d7d0 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -2532,7 +2532,7 @@ public static function get_met_on_submit_actions( $args, $event = 'create' ) { * @return void */ public static function dismiss_default_email_message() { - check_ajax_referer( 'frm_ajax', 'nonce' ); + check_ajax_referer( 'frm_ajax', 'nonce' ); update_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', 1 ); } From 8b6d30fd7188ab94d336809ab2874929e31a9314 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Tue, 18 Feb 2025 10:42:54 +0300 Subject: [PATCH 07/21] Incorporate some review feedbacks --- classes/controllers/FrmFormsController.php | 2 +- .../views/frm-form-actions/_action_inside.php | 24 +++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index caf952d7d0..4b53c730d6 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -2533,7 +2533,7 @@ public static function get_met_on_submit_actions( $args, $event = 'create' ) { */ public static function dismiss_default_email_message() { check_ajax_referer( 'frm_ajax', 'nonce' ); - update_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', 1 ); + update_user_meta( get_current_user_id(), 'frm_dismiss_default_email_message', 1 ); } /** diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index e2df46151d..e16b06e746 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -10,19 +10,17 @@ post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ) ) { ?> -
-

- - -

-

- - -

-
- +
+

+ + +

+

+ + +

+
+

-

+

- +

From fa99e4ae4b1cacd0458deb5d36bb46481aea33e8 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Wed, 26 Feb 2025 11:14:46 +0300 Subject: [PATCH 09/21] Prevent buttons from wrapping to new line --- classes/views/frm-form-actions/_action_inside.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index d901ca0ca6..3bf21892aa 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -11,12 +11,12 @@ if ( $form_action->post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ) ) { ?>
-

+

-

- +

+

From 3f667c856374f609856a0323da8f5660f41e7100 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 3 Mar 2025 12:14:20 +0300 Subject: [PATCH 10/21] Make default similar email message container style responsive --- classes/views/frm-form-actions/_action_inside.php | 6 +++--- css/frm_admin.css | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index 3bf21892aa..66a3e9d836 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -10,12 +10,12 @@ post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ) ) { ?> -
-

+

+

-

+

diff --git a/css/frm_admin.css b/css/frm_admin.css index 70f8d8b88c..b54f1fe900 100644 --- a/css/frm_admin.css +++ b/css/frm_admin.css @@ -8651,6 +8651,9 @@ Responsive Design .frm_actions_list { margin-left: 0; } + .frm_default_email_message { + flex-direction: column; + } } @media only screen and (max-width: 960px) { From fa882134813627e1d60796b69e47b2795d76c2e9 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:15:59 +0300 Subject: [PATCH 11/21] Center buttons --- classes/views/frm-form-actions/_action_inside.php | 2 +- css/frm_admin.css | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index 66a3e9d836..564427bcc5 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -15,7 +15,7 @@

-

+

diff --git a/css/frm_admin.css b/css/frm_admin.css index b54f1fe900..ec61907e03 100644 --- a/css/frm_admin.css +++ b/css/frm_admin.css @@ -8654,6 +8654,10 @@ Responsive Design .frm_default_email_message { flex-direction: column; } + + .frm_default_email_message p { + justify-content: start; + } } @media only screen and (max-width: 960px) { From 333a11cf480e0f79d047ef23b63f930060a96b6a Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:18:30 +0300 Subject: [PATCH 12/21] Merge similar css classes style definitions --- css/frm_admin.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/css/frm_admin.css b/css/frm_admin.css index ec61907e03..15518350c7 100644 --- a/css/frm_admin.css +++ b/css/frm_admin.css @@ -8653,9 +8653,6 @@ Responsive Design } .frm_default_email_message { flex-direction: column; - } - - .frm_default_email_message p { justify-content: start; } } From 479fd1868e599c2fca944ad512a56ad95b7ae431 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Wed, 5 Mar 2025 12:05:05 +0300 Subject: [PATCH 13/21] Align buttons left on small screens --- css/frm_admin.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/css/frm_admin.css b/css/frm_admin.css index 15518350c7..0450836201 100644 --- a/css/frm_admin.css +++ b/css/frm_admin.css @@ -8653,6 +8653,8 @@ Responsive Design } .frm_default_email_message { flex-direction: column; + } + .frm_default_email_message .frm-flex-box.frm-flex-center { justify-content: start; } } From 7c5367f11b97f8ed1238141ec20fe6b336e9cc3d Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Thu, 6 Mar 2025 16:43:57 +0300 Subject: [PATCH 14/21] Update color of the message --- classes/views/frm-form-actions/_action_inside.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index 564427bcc5..da3680352a 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -12,8 +12,8 @@ ?>

- - + +

From aebe6d40b980501d6f4d15871e81f2a9210df0e7 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Fri, 7 Mar 2025 10:05:18 +0300 Subject: [PATCH 15/21] Add permission check --- classes/controllers/FrmFormsController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 4b53c730d6..033e541e25 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -2532,7 +2532,11 @@ public static function get_met_on_submit_actions( $args, $event = 'create' ) { * @return void */ public static function dismiss_default_email_message() { - check_ajax_referer( 'frm_ajax', 'nonce' ); + $permission_error = FrmAppHelper::permission_nonce_error( 'frm_edit_forms', 'nonce', 'frm_ajax' ); + + if ( $permission_error !== false ) { + wp_send_json_error( $permission_error, 403 ); + } update_user_meta( get_current_user_id(), 'frm_dismiss_default_email_message', 1 ); } From ffce5eb106c49517d101073ef775eccaa8f9ee7b Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:58:14 +0300 Subject: [PATCH 16/21] Avoid showing message if to/from address are the same --- classes/controllers/FrmFormActionsController.php | 15 +++++++++++++++ classes/controllers/FrmFormsController.php | 1 + classes/views/frm-form-actions/_action_inside.php | 2 +- js/admin/settings.js | 10 +++++++--- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/classes/controllers/FrmFormActionsController.php b/classes/controllers/FrmFormActionsController.php index 9aeeb64472..49da42824e 100644 --- a/classes/controllers/FrmFormActionsController.php +++ b/classes/controllers/FrmFormActionsController.php @@ -429,6 +429,21 @@ private static function should_show_log_message( $action_type ) { return in_array( $action_type, $logging, true ) && ! function_exists( 'frm_log_autoloader' ); } + /** + * @since x.x + * + * @param object $form_action + * + * @return bool + */ + public static function should_show_notice_about_using_the_same_to_from_email( $form_action ) { + $settings = new FrmSettings(); + if ( ! empty( $settings->default_email ) && $settings->default_email !== $settings->from_email ) { + return false; + } + return $form_action->post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ); + } + private static function fields_to_values( $form_id, array &$values ) { $form = FrmForm::getOne( $form_id ); diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 033e541e25..7bcebea431 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -2538,6 +2538,7 @@ public static function dismiss_default_email_message() { wp_send_json_error( $permission_error, 403 ); } update_user_meta( get_current_user_id(), 'frm_dismiss_default_email_message', 1 ); + wp_send_json_success(); } /** diff --git a/classes/views/frm-form-actions/_action_inside.php b/classes/views/frm-form-actions/_action_inside.php index da3680352a..d77af8be12 100644 --- a/classes/views/frm-form-actions/_action_inside.php +++ b/classes/views/frm-form-actions/_action_inside.php @@ -8,7 +8,7 @@ post_excerpt === 'email' && ! get_user_meta( wp_get_current_user()->ID, 'frm_dismiss_default_email_message', true ) ) { +if ( FrmFormActionsController::should_show_notice_about_using_the_same_to_from_email( $form_action ) ) { ?>

diff --git a/js/admin/settings.js b/js/admin/settings.js index 18d0c8c6ae..47a1e17618 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -28,9 +28,13 @@ const formData = new FormData(); formData.append( 'action', 'frm_dismiss_default_email_message' ); formData.append( 'nonce', frmGlobal.nonce ); - doJsonPost( 'dismiss_default_email_message', formData ).then( - e.target.closest( '.frm_default_email_message' ).remove() - ); + doJsonPost( 'dismiss_default_email_message', formData ).then( () => { + e.target.closest( '.frm_default_email_message' ).remove(); + } + ) + .catch( ( error ) => { + console.error( error ); + } ); } } From 8257807712e79d24c94f1199abe6e81cae94535f Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Mon, 10 Mar 2025 12:02:20 +0300 Subject: [PATCH 17/21] Cleanup js code --- js/admin/settings.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/admin/settings.js b/js/admin/settings.js index 47a1e17618..72b9b58a62 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -28,13 +28,13 @@ const formData = new FormData(); formData.append( 'action', 'frm_dismiss_default_email_message' ); formData.append( 'nonce', frmGlobal.nonce ); - doJsonPost( 'dismiss_default_email_message', formData ).then( () => { - e.target.closest( '.frm_default_email_message' ).remove(); - } - ) - .catch( ( error ) => { + doJsonPost( 'dismiss_default_email_message', formData ) + .then( () => { + e.target.closest( '.frm_default_email_message' ).remove(); + }) + .catch( error => { console.error( error ); - } ); + }); } } From 0d04ad1ac8ad20455d4aa51af631d7ae4ae17c0a Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Sun, 27 Jul 2025 22:58:15 +0300 Subject: [PATCH 18/21] Improve code clarity --- js/admin/settings.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/js/admin/settings.js b/js/admin/settings.js index 72b9b58a62..6648fc556b 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -23,19 +23,20 @@ } function handleClickEvent( e ) { - if ( e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { - e.preventDefault(); - const formData = new FormData(); - formData.append( 'action', 'frm_dismiss_default_email_message' ); - formData.append( 'nonce', frmGlobal.nonce ); - doJsonPost( 'dismiss_default_email_message', formData ) - .then( () => { - e.target.closest( '.frm_default_email_message' ).remove(); - }) - .catch( error => { - console.error( error ); - }); + if ( ! e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { + return; } + e.preventDefault(); + const formData = new FormData(); + formData.append( 'action', 'frm_dismiss_default_email_message' ); + formData.append( 'nonce', frmGlobal.nonce ); + doJsonPost( 'dismiss_default_email_message', formData ) + .then( () => { + e.target.closest( '.frm_default_email_message' ).remove(); + }) + .catch( error => { + console.error( error ); + }); } function handleToggleChangeEvent( e ) { From 0d9d969423e54be1f1d5aae6197a3fab252ba9af Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Sun, 27 Jul 2025 23:11:20 +0300 Subject: [PATCH 19/21] Add EOL --- resources/scss/admin/media-queries/_screen-desktop.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/scss/admin/media-queries/_screen-desktop.scss b/resources/scss/admin/media-queries/_screen-desktop.scss index 1016c34bd3..86a8ae630f 100644 --- a/resources/scss/admin/media-queries/_screen-desktop.scss +++ b/resources/scss/admin/media-queries/_screen-desktop.scss @@ -36,4 +36,4 @@ .frm_default_email_message .frm-flex-box.frm-flex-center { justify-content: start; } -} \ No newline at end of file +} From d297f0a8c99c4feb5397bcc7e856c14f382a64e5 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Thu, 27 Nov 2025 16:58:39 +0300 Subject: [PATCH 20/21] Fix conflicting function name --- js/admin/settings.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/js/admin/settings.js b/js/admin/settings.js index c0d218e95e..0181eeb9a1 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -31,7 +31,7 @@ } } - function handleClickEvent( e ) { + function handleClickDismissDefaultEmailMessage( e ) { if ( ! e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { return; } @@ -66,6 +66,10 @@ if ( 'frm-send-test-email-btn' === e.target.id ) { handleClickSendTestEmailBtn( e ); } + if ( e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { + handleClickDismissDefaultEmailMessage( e ); + return; + } } function handleClickChooseEmailStyle( e ) { From 2224ba3f96713dbcc3010a62879f63d2e6ef1764 Mon Sep 17 00:00:00 2001 From: Abdi Tolessa <41271840+AbdiTolesa@users.noreply.github.com> Date: Thu, 27 Nov 2025 17:08:36 +0300 Subject: [PATCH 21/21] Fix js code styling --- js/admin/settings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/js/admin/settings.js b/js/admin/settings.js index 0181eeb9a1..c77fdb8771 100644 --- a/js/admin/settings.js +++ b/js/admin/settings.js @@ -40,12 +40,12 @@ formData.append( 'action', 'frm_dismiss_default_email_message' ); formData.append( 'nonce', frmGlobal.nonce ); doJsonPost( 'dismiss_default_email_message', formData ) - .then( () => { - e.target.closest( '.frm_default_email_message' ).remove(); - }) - .catch( error => { - console.error( error ); - }); + .then( () => { + e.target.closest( '.frm_default_email_message' ).remove(); + } ) + .catch( error => { + console.error( error ); + } ); } function handleToggleChangeEvent( e ) { @@ -66,9 +66,9 @@ if ( 'frm-send-test-email-btn' === e.target.id ) { handleClickSendTestEmailBtn( e ); } + if ( e.target.classList.contains( 'frm_dismiss_default_email_message' ) ) { handleClickDismissDefaultEmailMessage( e ); - return; } }