← All changes | modules/promotions/module.php +55 -105 4.1.4 → 3.35.0-dev4 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,22 +14,17 @@
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;
16		-use Elementor\Modules\Promotions\Controls\Atomic_Promotion_Control;
17		-use Elementor\Modules\Promotions\Conversion_Banner;
	20	+use Elementor\Modules\Promotions\AdminMenuItems\Popups_Promotion_Item;
18	21	use Elementor\Modules\Promotions\Pointers\Birthday;
19	22	use Elementor\Modules\Promotions\Pointers\Black_Friday;
20		-use Elementor\Modules\Promotions\PropTypes\Promotion_Prop_Type;
21		-use Elementor\Modules\Promotions\Widgets\Ally_Dashboard_Widget;
22		-use Elementor\Modules\Promotions\Widgets\Atomic_Form_Widget_Promotion;
23		-use Elementor\Modules\Promotions\Widgets\Birthday_Easter_Egg_Promotion;
24	23	use Elementor\Widgets_Manager;
25	24	use Elementor\Utils;
26	25	use Elementor\Includes\EditorAssetsAPI;
27	26	use Elementor\Plugin;
28		-use Elementor\Modules\EditorOne\Classes\Menu_Config;
29	27	use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
30	28
31	29	if ( ! defined( 'ABSPATH' ) ) {
32	30	exit; // Exit if accessed directly.
		@@ -52,15 +50,19 @@
52	50	add_action( 'admin_init', function () {
53	51	$this->handle_external_redirects();
54	52	} );
55	53
	54	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	55	+ $this->register_menu_items( $admin_menu );
	56	+ }, static::ADMIN_MENU_PRIORITY );
	57	+
56	58	add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
57	59	$this->register_editor_one_menu_items( $menu_data_provider );
58	60	} );
59	61
60		- if ( Utils::is_sale_time() ) {
61		- add_filter( 'add_menu_classes', [ $this, 'override_one_menu_upgrade_label_during_sale' ] );
62		- }
	62	+ add_action( 'elementor/admin/menu/register', function ( Admin_Menu_Manager $admin_menu ) {
	63	+ $this->register_promotion_menu_item( $admin_menu );
	64	+ }, static::ADMIN_MENU_PROMOTIONS_PRIORITY );
63	65
64	66	add_action( 'elementor/widgets/register', function( Widgets_Manager $manager ) {
65	67	foreach ( Api::get_promotion_widgets() as $widget_data ) {
66	68	$manager->register( new Widgets\Pro_Widget_Promotion( [], [
		@@ -77,20 +79,12 @@
77	79	if ( Black_Friday::should_display_notice() ) {
78	80	new Black_Friday();
79	81	}
80	82
81		- if ( Conversion_Banner::should_display_banner() ) {
82		- new Conversion_Banner();
83		- }
84		-
85		- add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
86		-
87	83	if ( Utils::has_pro() ) {
88	84	return;
89	85	}
90	86
91		- add_filter( 'elementor/editor/localize_settings', [ $this, 'add_editing_panel_sticky_promotion' ] );
92		-
93	87	add_action( 'elementor/controls/register', function ( Controls_Manager $controls_manager ) {
94	88	$controls_manager->register( new Controls\Promotion_Control() );
95	89	} );
96	90
		@@ -95,24 +89,13 @@
95	89	} );
96	90
97	91	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_react_data' ] );
98	92	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_editor_v4_alphachip' ] );
	93	+ add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
99	94
100		- // Add Ally promo
101		- Ally_Dashboard_Widget::init();
102		-
103		- $this->register_atomic_promotions();
	95	+ $this->register_display_conditions_promo_hooks();
104	96	}
105	97
106		- /**
107		- * Get Ally Scanner URL
108		- *
109		- * @return string
110		- */
111		- public static function get_ally_external_scanner_url(): string {
112		- return apply_filters( 'elementor/ally_external_scanner_url', 'https://go.elementor.com/acc-checker-dashboard-plg' );
113		- }
114		-
115	98	private function handle_external_redirects() {
116	99	$page = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
117	100	if ( empty( $page ) ) {
118	101	return;
		@@ -123,26 +106,16 @@
123	106	die;
124	107	}
125	108	}
126	109
127		- public function override_one_menu_upgrade_label_during_sale( $menu ) {
128		- global $submenu;
129		-
130		- $parent_slug = Menu_Config::ELEMENTOR_HOME_MENU_SLUG;
131		- $upgrade_slug = 'elementor-one-upgrade';
132		-
133		- if ( empty( $submenu[ $parent_slug ] ) ) {
134		- return $menu;
	110	+ private function register_menu_items( Admin_Menu_Manager $admin_menu ) {
	111	+ if ( ! $this->is_editor_one_active() ) {
	112	+ $admin_menu->register( 'e-form-submissions', new Form_Submissions_Promotion_Item() );
	113	+ $admin_menu->register( 'elementor_custom_fonts', new Custom_Fonts_Promotion_Item() );
	114	+ $admin_menu->register( 'elementor_custom_icons', new Custom_Icons_Promotion_Item() );
	115	+ $admin_menu->register( 'elementor_custom_code', new Custom_Code_Promotion_Item() );
	116	+ $admin_menu->register( 'popup_templates', new Popups_Promotion_Item() );
135	117	}
136		-
137		- foreach ( $submenu[ $parent_slug ] as &$item ) {
138		- if ( isset( $item[2] ) && $upgrade_slug === $item[2] ) {
139		- $item[0] = esc_html__( 'Sale!', 'elementor' ) . '<br />' . esc_html__( 'Upgrade Now', 'elementor' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
140		- break;
141		- }
142		- }
143		-
144		- return $menu;
145	118	}
146	119
147	120	private function register_editor_one_menu_items( Menu_Data_Provider $menu_data_provider ) {
148	121	$menu_data_provider->register_menu( new Editor_One_Custom_Elements_Menu() );
		@@ -152,8 +125,14 @@
152	125	$menu_data_provider->register_menu( new Editor_One_Custom_Code_Menu() );
153	126	$menu_data_provider->register_menu( new Editor_One_Popups_Menu() );
154	127	}
155	128
	129	+ private function register_promotion_menu_item( Admin_Menu_Manager $admin_menu ) {
	130	+ if ( ! $this->is_editor_one_active() ) {
	131	+ $admin_menu->register( 'go_elementor_pro', new Go_Pro_Promotion_Item() );
	132	+ }
	133	+ }
	134	+
156	135	public function enqueue_react_data(): void {
157	136	if ( ! current_user_can( 'manage_options' ) ) {
158	137	return;
159	138	}
		@@ -168,9 +147,8 @@
168	147	'react-dom',
169	148	'backbone-marionette',
170	149	'elementor-editor-modules',
171	150	'elementor-v2-ui',
172		- 'elementor-v2-icons',
173	151	],
174	152	ELEMENTOR_VERSION,
175	153	true
176	154	);
		@@ -219,18 +197,8 @@
219	197	EditorAssetsAPI::ASSETS_DATA_KEY => 'free-to-pro-upsell',
220	198	];
221	199	}
222	200
223		- public function add_editing_panel_sticky_promotion( array $settings ): array {
224		- if ( ! Plugin::$instance->experiments->is_feature_active( 'e_panel_promotions' ) ) {
225		- return $settings;
226		- }
227		-
228		- $settings['editingPanelStickyPromotion'] = Filtered_Promotions_Manager::get_editor_panel_sticky_promotion();
229		-
230		- return $settings;
231		- }
232		-
233	201	public function add_v4_promotions_data( array $settings ): array {
234	202	if ( ! current_user_can( 'manage_options' ) ) {
235	203	return $settings;
236	204	}
		@@ -250,74 +218,56 @@
250	218	EditorAssetsAPI::ASSETS_DATA_KEY => 'promotions',
251	219	];
252	220	}
253	221
	222	+ private function is_editor_one_active(): bool {
	223	+ return (bool) Plugin::instance()->modules_manager->get_modules( 'editor-one' );
	224	+ }
	225	+
254	226	private function is_atomic_widgets_active(): bool {
255	227	return Plugin::$instance->experiments->is_feature_active( 'e_atomic_elements' );
256	228	}
257	229
258		- private function get_atomic_promotion_configs(): array {
259		- return [
260		- [
261		- 'key' => 'attributes',
262		- 'label' => __( 'Attributes', 'elementor' ),
263		- 'section' => 'settings',
264		- 'priority' => 40,
265		- ],
266		- [
267		- 'key' => 'display-conditions',
268		- 'label' => __( 'Display Conditions', 'elementor' ),
269		- 'section' => 'settings',
270		- 'priority' => 50,
271		- ],
272		- ];
273		- }
274		-
275		- private function register_atomic_promotions(): void {
	230	+ private function register_display_conditions_promo_hooks(): void {
276	231	add_action( 'elementor/init', function() {
277	232	if ( ! $this->is_atomic_widgets_active() ) {
278	233	return;
279	234	}
280	235
	236	+ require_once __DIR__ . '/prop-types/display-conditions-prop-type.php';
	237	+ require_once __DIR__ . '/controls/display-conditions-promotion-control.php';
	238	+
281	239	add_filter(
282	240	'elementor/atomic-widgets/props-schema',
283		- [ $this, 'inject_atomic_promotion_props' ]
	241	+ [ $this, 'inject_display_conditions_promo_prop' ]
284	242	);
285	243
286		- foreach ( $this->get_atomic_promotion_configs() as $config ) {
287		- add_filter(
288		- 'elementor/atomic-widgets/controls',
289		- fn( array $controls, $element ) => $this->inject_atomic_promotion_control( $controls, $element, $config ),
290		- $config['priority'],
291		- 2
292		- );
293		- }
294		-
295		- ( new Birthday_Easter_Egg_Promotion() )->register();
	244	+ add_filter(
	245	+ 'elementor/atomic-widgets/controls',
	246	+ [ $this, 'inject_display_conditions_promo_control' ],
	247	+ 50,
	248	+ 2
	249	+ );
296	250	} );
297		-
298		- ( new Atomic_Form_Widget_Promotion() )->register();
299	251	}
300	252
301		- public function inject_atomic_promotion_props( array $schema ): array {
302		- foreach ( $this->get_atomic_promotion_configs() as $config ) {
303		- $key = $config['key'];
	253	+ public function inject_display_conditions_promo_prop( array $schema ): array {
	254	+ $prop_key = PropTypes\Display_Conditions_Prop_Type::get_key();
304	255
305		- if ( isset( $schema[ $key ] ) ) {
306		- continue;
307		- }
	256	+ if ( isset( $schema[ $prop_key ] ) ) {
	257	+ return $schema;
	258	+ }
308	259
309		- $schema[ $key ] = Promotion_Prop_Type::make( $key );
310		- }
	260	+ $schema[ $prop_key ] = PropTypes\Display_Conditions_Prop_Type::make();
311	261
312	262	return $schema;
313	263	}
314	264
315		- protected function inject_atomic_promotion_control( array $element_controls, $atomic_element, array $config ): array {
316		- $key = $config['key'];
	265	+ public function inject_display_conditions_promo_control( array $element_controls, $atomic_element ): array {
	266	+ $prop_key = PropTypes\Display_Conditions_Prop_Type::get_key();
317	267	$schema = $atomic_element::get_props_schema();
318	268
319		- if ( ! array_key_exists( $key, $schema ) ) {
	269	+ if ( ! array_key_exists( $prop_key, $schema ) ) {
320	270	return $element_controls;
321	271	}
322	272
323	273	foreach ( $element_controls as $item ) {
		@@ -324,14 +274,14 @@
324	274	if ( ! ( $item instanceof \Elementor\Modules\AtomicWidgets\Controls\Section ) ) {
325	275	continue;
326	276	}
327	277
328		- if ( $item->get_id() !== $config['section'] ) {
	278	+ if ( $item->get_id() !== 'settings' ) {
329	279	continue;
330	280	}
331	281
332		- $control = Atomic_Promotion_Control::make( $key )
333		- ->set_label( $config['label'] )
	282	+ $control = Controls\Display_Conditions_Promotion_Control::bind_to( $prop_key )
	283	+ ->set_label( __( 'Display Conditions', 'elementor' ) )
334	284	->set_meta( [
335	285	'topDivider' => true,
336	286	] );
337	287