Fix form submission [TMZ-142] (#78)

elementor · Nov 24, 2024 · 551a1da · 551a1da
1 parent 1997302
commit 551a1da
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/modules/forms/actions/email.php b/modules/forms/actions/email.php
@@ -3,10 +3,10 @@
 
 use Elementor\Controls_Manager;
 
-use HelloPlus\Includes\Utils;
 use HelloPlus\Modules\Forms\Classes\Ajax_Handler;
 use HelloPlus\Modules\Forms\Classes\Action_Base;
 use HelloPlus\Modules\Forms\Classes\Form_Record;
+use HelloPlus\Modules\Forms\Module;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly.
@@ -96,7 +96,7 @@ public function register_settings_section( $widget ) {
 			]
 		);
 
-		$site_domain = Utils::get_site_domain();
+		$site_domain = Module::get_site_domain();
 
 		$widget->add_control(
 			$this->get_control_id( 'email_from' ),
@@ -256,7 +256,7 @@ public function run( $record, $ajax_handler ) {
 			'email_content' => '[all-fields]',
 			'email_from_name' => get_bloginfo( 'name' ),
 			'email_from' => get_bloginfo( 'admin_email' ),
-			'email_reply_to' => 'noreply@' . Utils::get_site_domain(),
+			'email_reply_to' => 'noreply@' . Module::get_site_domain(),
 			'email_to_cc' => '',
 			'email_to_bcc' => '',
 		];

diff --git a/modules/forms/assets/js/frontend/frontend.js b/modules/forms/assets/js/frontend/frontend.js
@@ -1,6 +1,7 @@
 export default class Forms extends elementorModules.Module {
 	constructor() {
 		super();
+
 		elementorFrontend.elementsHandler.attachHandler( 'ehp-form', [
 			() => import( /* webpackChunkName: 'form-lite' */ './handlers/form-sender' ),
 			() => import( /* webpackChunkName: 'form-lite' */ './handlers/form-redirect' ),

diff --git a/modules/forms/assets/js/frontend/handlers/form-redirect.js b/modules/forms/assets/js/frontend/handlers/form-redirect.js
@@ -2,7 +2,7 @@ export default elementorModules.frontend.handlers.Base.extend( {
 	getDefaultSettings() {
 		return {
 			selectors: {
-				form: '.elementor-form-lite',
+				form: '.ehp-form',
 			},
 		};
 	},

diff --git a/modules/forms/module.php b/modules/forms/module.php
@@ -108,6 +108,14 @@ public function register_scripts() {
 		);
 	}
 
+	protected function get_component_ids(): array {
+		return [];
+	}
+
+	public static function get_site_domain() {
+		return str_ireplace( 'www.', '', wp_parse_url( home_url(), PHP_URL_HOST ) );
+	}
+
 	/**
 	 * Module constructor.
 	 */
@@ -123,6 +131,7 @@ public function __construct() {
 		$this->actions_registrar = new Form_Actions_Registrar();
 		$this->fields_registrar = new Form_Fields_Registrar();
 
+		// TODO: refactor & move to components:
 		// Ajax Handler
 		if ( Classes\Ajax_Handler::is_form_submitted() ) {
 			$this->add_component( 'ajax_handler', new Classes\Ajax_Handler() );
@@ -141,8 +150,4 @@ public function __construct() {
 			do_action( 'hello_plus/forms/form_submitted', $this );
 		}
 	}
-
-	protected function get_component_ids(): array {
-		return [];
-	}
 }
diff --git a/modules/forms/widgets/form.php b/modules/forms/widgets/form.php
@@ -5,7 +5,6 @@
 use Elementor\Core\Kits\Documents\Tabs\Global_Colors;
 use Elementor\Core\Kits\Documents\Tabs\Global_Typography;
 use Elementor\Group_Control_Background;
-use Elementor\Group_Control_Border;
 use Elementor\Group_Control_Typography;
 use Elementor\Modules\DynamicTags\Module as TagsModule;
 use Elementor\Repeater;
@@ -15,6 +14,7 @@
 use HelloPlus\Modules\Forms\Classes\Render\Widget_Form_Render;
 use HelloPlus\Modules\Forms\Controls\Fields_Repeater;
 use HelloPlus\Includes\Utils;
+use HelloPlus\Modules\Forms\Module;
 
 if ( ! defined( 'ABSPATH' ) ) {
 	exit; // Exit if accessed directly
@@ -42,7 +42,7 @@ protected function is_dynamic_content(): bool {
 		return false;
 	}
 
-	protected function get_upsale_data() {
+	protected function get_upsale_data(): array {
 		return [
 			'condition' => ! Utils::has_pro(),
 			'image' => esc_url( HELLO_PLUS_URL . '/assets/images/go-pro.svg' ),
@@ -68,10 +68,6 @@ public function get_style_depends(): array {
 		return [ 'ehp-form' ];
 	}
 
-	public static function get_site_domain() {
-		return str_ireplace( 'www.', '', wp_parse_url( home_url(), PHP_URL_HOST ) );
-	}
-
 	protected function render(): void {
 		$render_strategy = new Widget_Form_Render( $this );
 
@@ -680,7 +676,7 @@ protected function add_content_actions_after_submit_section(): void {
 			]
 		);
 
-		$site_domain = $this->get_site_domain();
+		$site_domain = Module::get_site_domain();
 
 		$this->add_control(
 			'email_from',