← All changes | modules/promotions/module.php +35 -52 4.1.5 → 3.35.7 View file →

		@@ -3,10 +3,13 @@
3	3	namespace Elementor\Modules\Promotions;
4	4
5	5	use Elementor\Api;
6	6	use Elementor\Controls_Manager;
	7	+use Elementor\Core\Admin\Menu\Admin_Menu_Manager;
7	8	use Elementor\Core\Base\Module as Base_Module;
8		-use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager;
	9	+use Elementor\Modules\Promotions\AdminMenuItems\Custom_Code_Promotion_Item;
	10	+use Elementor\Modules\Promotions\AdminMenuItems\Custom_Fonts_Promotion_Item;
	11	+use Elementor\Modules\Promotions\AdminMenuItems\Custom_Icons_Promotion_Item;
9	12	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Code_Menu;
10	13	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Elements_Menu;
11	14	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Fonts_Menu;
12	15	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Icons_Menu;
		@@ -11,21 +14,20 @@
11	14	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Fonts_Menu;
12	15	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Icons_Menu;
13	16	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Popups_Menu;
14	17	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Submissions_Menu;
	18	+use Elementor\Modules\Promotions\AdminMenuItems\Form_Submissions_Promotion_Item;
15	19	use Elementor\Modules\Promotions\AdminMenuItems\Go_Pro_Promotion_Item;
	20	+use Elementor\Modules\Promotions\AdminMenuItems\Popups_Promotion_Item;
16	21	use Elementor\Modules\Promotions\Controls\Atomic_Promotion_Control;
17		-use Elementor\Modules\Promotions\Conversion_Banner;
18	22	use Elementor\Modules\Promotions\Pointers\Birthday;
19	23	use Elementor\Modules\Promotions\Pointers\Black_Friday;
20	24	use Elementor\Modules\Promotions\PropTypes\Promotion_Prop_Type;
21	25	use Elementor\Modules\Promotions\Widgets\Ally_Dashboard_Widget;
22		-use Elementor\Modules\Promotions\Widgets\Atomic_Form_Widget_Promotion;
23	26	use Elementor\Widgets_Manager;
24	27	use Elementor\Utils;
25	28	use Elementor\Includes\EditorAssetsAPI;
26	29	use Elementor\Plugin;
27		-use Elementor\Modules\EditorOne\Classes\Menu_Config;
28	30	use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
29	31
30	32	if ( ! defined( 'ABSPATH' ) ) {
31	33	exit; // Exit if accessed directly.
		@@ -37,9 +39,9 @@
37	39
38	40	const ADMIN_MENU_PROMOTIONS_PRIORITY = 120;
39	41
40	42	public static function is_active() {
41		- return ! Utils::has_pro() || ! Utils::is_license_active();
	43	+ return ! Utils::has_pro();
42	44	}
43	45
44	46	public function get_name() {
45	47	return 'promotions';
		@@ -47,28 +49,23 @@
47	49
48	50	public function __construct() {
49	51	parent::__construct();
50	52
51		- add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
52		-
53		- if ( Utils::has_pro() ) {
54		- add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_react_data' ] );
55		- $this->register_atomic_promotions();
56		-
57		- return;
58		- }
59		-
60	53	add_action( 'admin_init', function () {
61	54	$this->handle_external_redirects();
62	55	} );
63	56
	57	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	58	+ $this->register_menu_items( $admin_menu );
	59	+ }, static::ADMIN_MENU_PRIORITY );
	60	+
64	61	add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
65	62	$this->register_editor_one_menu_items( $menu_data_provider );
66	63	} );
67	64
68		- if ( Utils::is_sale_time() ) {
69		- add_filter( 'add_menu_classes', [ $this, 'override_one_menu_upgrade_label_during_sale' ] );
70		- }
	65	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	66	+ $this->register_promotion_menu_item( $admin_menu );
	67	+ }, static::ADMIN_MENU_PROMOTIONS_PRIORITY );
71	68
72	69	add_action( 'elementor/widgets/register', function( Widgets_Manager $manager ) {
73	70	foreach ( Api::get_promotion_widgets() as $widget_data ) {
74	71	$manager->register( new Widgets\Pro_Widget_Promotion( [], [
		@@ -85,14 +82,12 @@
85	82	if ( Black_Friday::should_display_notice() ) {
86	83	new Black_Friday();
87	84	}
88	85
89		- if ( Conversion_Banner::should_display_banner() ) {
90		- new Conversion_Banner();
	86	+ if ( Utils::has_pro() ) {
	87	+ return;
91	88	}
92	89
93		- add_filter( 'elementor/editor/localize_settings', [ $this, 'add_editing_panel_sticky_promotion' ] );
94		-
95	90	add_action( 'elementor/controls/register', function ( Controls_Manager $controls_manager ) {
96	91	$controls_manager->register( new Controls\Promotion_Control() );
97	92	} );
98	93
		@@ -97,8 +92,9 @@
97	92	} );
98	93
99	94	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_react_data' ] );
100	95	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_editor_v4_alphachip' ] );
	96	+ add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
101	97
102	98	// Add Ally promo
103	99	Ally_Dashboard_Widget::init();
104	100
		@@ -110,9 +106,9 @@
110	106	*
111	107	* @return string
112	108	*/
113	109	public static function get_ally_external_scanner_url(): string {
114		- return apply_filters( 'elementor/ally_external_scanner_url', 'https://go.elementor.com/acc-checker-dashboard-plg' );
	110	+ return apply_filters( 'elementor/ally_external_scanner_url', 'https://elementor.com/tools/ally-accessibility-checker/scanner' );
115	111	}
116	112
117	113	private function handle_external_redirects() {
118	114	$page = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
		@@ -125,26 +121,16 @@
125	121	die;
126	122	}
127	123	}
128	124
129		- public function override_one_menu_upgrade_label_during_sale( $menu ) {
130		- global $submenu;
131		-
132		- $parent_slug = Menu_Config::ELEMENTOR_HOME_MENU_SLUG;
133		- $upgrade_slug = 'elementor-one-upgrade';
134		-
135		- if ( empty( $submenu[ $parent_slug ] ) ) {
136		- return $menu;
	125	+ private function register_menu_items( Admin_Menu_Manager $admin_menu ) {
	126	+ if ( ! $this->is_editor_one_active() ) {
	127	+ $admin_menu->register( 'e-form-submissions', new Form_Submissions_Promotion_Item() );
	128	+ $admin_menu->register( 'elementor_custom_fonts', new Custom_Fonts_Promotion_Item() );
	129	+ $admin_menu->register( 'elementor_custom_icons', new Custom_Icons_Promotion_Item() );
	130	+ $admin_menu->register( 'elementor_custom_code', new Custom_Code_Promotion_Item() );
	131	+ $admin_menu->register( 'popup_templates', new Popups_Promotion_Item() );
137	132	}
138		-
139		- foreach ( $submenu[ $parent_slug ] as &$item ) {
140		- if ( isset( $item[2] ) && $upgrade_slug === $item[2] ) {
141		- $item[0] = esc_html__( 'Sale!', 'elementor' ) . '<br />' . esc_html__( 'Upgrade Now', 'elementor' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
142		- break;
143		- }
144		- }
145		-
146		- return $menu;
147	133	}
148	134
149	135	private function register_editor_one_menu_items( Menu_Data_Provider $menu_data_provider ) {
150	136	$menu_data_provider->register_menu( new Editor_One_Custom_Elements_Menu() );
		@@ -154,8 +140,14 @@
154	140	$menu_data_provider->register_menu( new Editor_One_Custom_Code_Menu() );
155	141	$menu_data_provider->register_menu( new Editor_One_Popups_Menu() );
156	142	}
157	143
	144	+ private function register_promotion_menu_item( Admin_Menu_Manager $admin_menu ) {
	145	+ if ( ! $this->is_editor_one_active() ) {
	146	+ $admin_menu->register( 'go_elementor_pro', new Go_Pro_Promotion_Item() );
	147	+ }
	148	+ }
	149	+
158	150	public function enqueue_react_data(): void {
159	151	if ( ! current_user_can( 'manage_options' ) ) {
160	152	return;
161	153	}
		@@ -170,9 +162,8 @@
170	162	'react-dom',
171	163	'backbone-marionette',
172	164	'elementor-editor-modules',
173	165	'elementor-v2-ui',
174		- 'elementor-v2-icons',
175	166	],
176	167	ELEMENTOR_VERSION,
177	168	true
178	169	);
		@@ -221,18 +212,8 @@
221	212	EditorAssetsAPI::ASSETS_DATA_KEY => 'free-to-pro-upsell',
222	213	];
223	214	}
224	215
225		- public function add_editing_panel_sticky_promotion( array $settings ): array {
226		- if ( ! Plugin::$instance->experiments->is_feature_active( 'e_panel_promotions' ) ) {
227		- return $settings;
228		- }
229		-
230		- $settings['editingPanelStickyPromotion'] = Filtered_Promotions_Manager::get_editor_panel_sticky_promotion();
231		-
232		- return $settings;
233		- }
234		-
235	216	public function add_v4_promotions_data( array $settings ): array {
236	217	if ( ! current_user_can( 'manage_options' ) ) {
237	218	return $settings;
238	219	}
		@@ -252,8 +233,12 @@
252	233	EditorAssetsAPI::ASSETS_DATA_KEY => 'promotions',
253	234	];
254	235	}
255	236
	237	+ private function is_editor_one_active(): bool {
	238	+ return (bool) Plugin::instance()->modules_manager->get_modules( 'editor-one' );
	239	+ }
	240	+
256	241	private function is_atomic_widgets_active(): bool {
257	242	return Plugin::$instance->experiments->is_feature_active( 'e_atomic_elements' );
258	243	}
259	244
		@@ -293,10 +278,8 @@
293	278	2
294	279	);
295	280	}
296	281	} );
297		-
298		- ( new Atomic_Form_Widget_Promotion() )->register();
299	282	}
300	283
301	284	public function inject_atomic_promotion_props( array $schema ): array {
302	285	foreach ( $this->get_atomic_promotion_configs() as $config ) {