← All changes | modules/promotions/module.php +18 -58 4.3.0-beta3 → 4.0.0-dev3 View file →

		@@ -4,9 +4,8 @@
4	4
5	5	use Elementor\Api;
6	6	use Elementor\Controls_Manager;
7	7	use Elementor\Core\Base\Module as Base_Module;
8		-use Elementor\Core\Utils\Promotions\Filtered_Promotions_Manager;
9	8	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Code_Menu;
10	9	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Elements_Menu;
11	10	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Fonts_Menu;
12	11	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Icons_Menu;
		@@ -13,19 +12,16 @@
13	12	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Popups_Menu;
14	13	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Submissions_Menu;
15	14	use Elementor\Modules\Promotions\AdminMenuItems\Go_Pro_Promotion_Item;
16	15	use Elementor\Modules\Promotions\Controls\Atomic_Promotion_Control;
17		-use Elementor\Modules\Promotions\Conversion_Banner;
18	16	use Elementor\Modules\Promotions\Pointers\Birthday;
19	17	use Elementor\Modules\Promotions\Pointers\Black_Friday;
20	18	use Elementor\Modules\Promotions\PropTypes\Promotion_Prop_Type;
21		-use Elementor\Modules\Promotions\Widgets\Atomic_Form_Widget_Promotion;
22		-use Elementor\Modules\Promotions\Widgets\Collection_Loop_Widget_Promotion;
	19	+use Elementor\Modules\Promotions\Widgets\Ally_Dashboard_Widget;
23	20	use Elementor\Widgets_Manager;
24	21	use Elementor\Utils;
25	22	use Elementor\Includes\EditorAssetsAPI;
26	23	use Elementor\Plugin;
27		-use Elementor\Modules\EditorOne\Classes\Menu_Config;
28	24	use Elementor\Modules\EditorOne\Classes\Menu_Data_Provider;
29	25
30	26	if ( ! defined( 'ABSPATH' ) ) {
31	27	exit; // Exit if accessed directly.
		@@ -37,9 +33,9 @@
37	33
38	34	const ADMIN_MENU_PROMOTIONS_PRIORITY = 120;
39	35
40	36	public static function is_active() {
41		- return ! Utils::has_pro() || ! Utils::is_license_active();
	37	+ return ! Utils::has_pro();
42	38	}
43	39
44	40	public function get_name() {
45	41	return 'promotions';
		@@ -47,17 +43,8 @@
47	43
48	44	public function __construct() {
49	45	parent::__construct();
50	46
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	47	add_action( 'admin_init', function () {
61	48	$this->handle_external_redirects();
62	49	} );
63	50
		@@ -64,12 +51,8 @@
64	51	add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
65	52	$this->register_editor_one_menu_items( $menu_data_provider );
66	53	} );
67	54
68		- if ( Utils::is_sale_time() ) {
69		- add_filter( 'add_menu_classes', [ $this, 'override_one_menu_upgrade_label_during_sale' ] );
70		- }
71		-
72	55	add_action( 'elementor/widgets/register', function( Widgets_Manager $manager ) {
73	56	foreach ( Api::get_promotion_widgets() as $widget_data ) {
74	57	$manager->register( new Widgets\Pro_Widget_Promotion( [], [
75	58	'widget_name' => $widget_data['name'],
		@@ -85,18 +68,12 @@
85	68	if ( Black_Friday::should_display_notice() ) {
86	69	new Black_Friday();
87	70	}
88	71
89		- if ( ! Utils::has_pro() ) {
90		- Conversion_Banner::register_cache_invalidation_hooks();
91		-
92		- if ( Conversion_Banner::should_display_banner() ) {
93		- new Conversion_Banner();
94		- }
	72	+ if ( Utils::has_pro() ) {
	73	+ return;
95	74	}
96	75
97		- add_filter( 'elementor/editor/localize_settings', [ $this, 'add_editing_panel_sticky_promotion' ] );
98		-
99	76	add_action( 'elementor/controls/register', function ( Controls_Manager $controls_manager ) {
100	77	$controls_manager->register( new Controls\Promotion_Control() );
101	78	} );
102	79
		@@ -101,12 +78,25 @@
101	78	} );
102	79
103	80	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_react_data' ] );
104	81	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_editor_v4_alphachip' ] );
	82	+ add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
105	83
	84	+ // Add Ally promo
	85	+ Ally_Dashboard_Widget::init();
	86	+
106	87	$this->register_atomic_promotions();
107	88	}
108	89
	90	+ /**
	91	+ * Get Ally Scanner URL
	92	+ *
	93	+ * @return string
	94	+ */
	95	+ public static function get_ally_external_scanner_url(): string {
	96	+ return apply_filters( 'elementor/ally_external_scanner_url', 'https://elementor.com/tools/ally-accessibility-checker/scanner' );
	97	+ }
	98	+
109	99	private function handle_external_redirects() {
110	100	$page = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
111	101	if ( empty( $page ) ) {
112	102	return;
		@@ -111,34 +101,14 @@
111	101	if ( empty( $page ) ) {
112	102	return;
113	103	}
114	104
115		- if ( in_array( $page, [ 'go_elementor_pro', 'elementor-one-upgrade' ], true ) ) {
	105	+ if ( 'go_elementor_pro' === $page ) {
116	106	wp_redirect( Go_Pro_Promotion_Item::get_url() ); // phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect
117	107	die;
118	108	}
119	109	}
120	110
121		- public function override_one_menu_upgrade_label_during_sale( $menu ) {
122		- global $submenu;
123		-
124		- $parent_slug = Menu_Config::ELEMENTOR_HOME_MENU_SLUG;
125		- $upgrade_slug = 'elementor-one-upgrade';
126		-
127		- if ( empty( $submenu[ $parent_slug ] ) ) {
128		- return $menu;
129		- }
130		-
131		- foreach ( $submenu[ $parent_slug ] as &$item ) {
132		- if ( isset( $item[2] ) && $upgrade_slug === $item[2] ) {
133		- $item[0] = esc_html__( 'Sale!', 'elementor' ) . '<br />' . esc_html__( 'Upgrade Now', 'elementor' ); // phpcs:ignore WordPress.WP.GlobalVariablesOverride.Prohibited
134		- break;
135		- }
136		- }
137		-
138		- return $menu;
139		- }
140		-
141	111	private function register_editor_one_menu_items( Menu_Data_Provider $menu_data_provider ) {
142	112	$menu_data_provider->register_menu( new Editor_One_Custom_Elements_Menu() );
143	113	$menu_data_provider->register_menu( new Editor_One_Submissions_Menu() );
144	114	$menu_data_provider->register_menu( new Editor_One_Fonts_Menu() );
		@@ -162,9 +132,8 @@
162	132	'react-dom',
163	133	'backbone-marionette',
164	134	'elementor-editor-modules',
165	135	'elementor-v2-ui',
166		- 'elementor-v2-icons',
167	136	],
168	137	ELEMENTOR_VERSION,
169	138	true
170	139	);
		@@ -213,14 +182,8 @@
213	182	EditorAssetsAPI::ASSETS_DATA_KEY => 'free-to-pro-upsell',
214	183	];
215	184	}
216	185
217		- public function add_editing_panel_sticky_promotion( array $settings ): array {
218		- $settings['editingPanelStickyPromotion'] = Filtered_Promotions_Manager::get_editor_panel_sticky_promotion();
219		-
220		- return $settings;
221		- }
222		-
223	186	public function add_v4_promotions_data( array $settings ): array {
224	187	if ( ! current_user_can( 'manage_options' ) ) {
225	188	return $settings;
226	189	}
		@@ -281,11 +244,8 @@
281	244	2
282	245	);
283	246	}
284	247	} );
285		-
286		- ( new Atomic_Form_Widget_Promotion() )->register();
287		- ( new Collection_Loop_Widget_Promotion() )->register();
288	248	}
289	249
290	250	public function inject_atomic_promotion_props( array $schema ): array {
291	251	foreach ( $this->get_atomic_promotion_configs() as $config ) {