← All changes | modules/promotions/module.php +58 -60 4.0.8 → 3.35.0-dev4 View file →

		@@ -3,9 +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;
	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;
8	12	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Code_Menu;
9	13	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Custom_Elements_Menu;
10	14	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Fonts_Menu;
11	15	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Icons_Menu;
		@@ -10,15 +14,13 @@
10	14	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Fonts_Menu;
11	15	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Icons_Menu;
12	16	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Popups_Menu;
13	17	use Elementor\Modules\Promotions\AdminMenuItems\Editor_One_Submissions_Menu;
	18	+use Elementor\Modules\Promotions\AdminMenuItems\Form_Submissions_Promotion_Item;
14	19	use Elementor\Modules\Promotions\AdminMenuItems\Go_Pro_Promotion_Item;
15		-use Elementor\Modules\Promotions\Controls\Atomic_Promotion_Control;
	20	+use Elementor\Modules\Promotions\AdminMenuItems\Popups_Promotion_Item;
16	21	use Elementor\Modules\Promotions\Pointers\Birthday;
17	22	use Elementor\Modules\Promotions\Pointers\Black_Friday;
18		-use Elementor\Modules\Promotions\PropTypes\Promotion_Prop_Type;
19		-use Elementor\Modules\Promotions\Widgets\Ally_Dashboard_Widget;
20		-use Elementor\Modules\Promotions\Widgets\Atomic_Form_Widget_Promotion;
21	23	use Elementor\Widgets_Manager;
22	24	use Elementor\Utils;
23	25	use Elementor\Includes\EditorAssetsAPI;
24	26	use Elementor\Plugin;
		@@ -48,12 +50,20 @@
48	50	add_action( 'admin_init', function () {
49	51	$this->handle_external_redirects();
50	52	} );
51	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	+
52	58	add_action( 'elementor/editor-one/menu/register', function ( Menu_Data_Provider $menu_data_provider ) {
53	59	$this->register_editor_one_menu_items( $menu_data_provider );
54	60	} );
55	61
	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 );
	65	+
56	66	add_action( 'elementor/widgets/register', function( Widgets_Manager $manager ) {
57	67	foreach ( Api::get_promotion_widgets() as $widget_data ) {
58	68	$manager->register( new Widgets\Pro_Widget_Promotion( [], [
59	69	'widget_name' => $widget_data['name'],
		@@ -81,23 +91,11 @@
81	91	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_react_data' ] );
82	92	add_action( 'elementor/editor/before_enqueue_scripts', [ $this, 'enqueue_editor_v4_alphachip' ] );
83	93	add_filter( 'elementor/editor/localize_settings', [ $this, 'add_v4_promotions_data' ] );
84	94
85		- // Add Ally promo
86		- Ally_Dashboard_Widget::init();
87		-
88		- $this->register_atomic_promotions();
	95	+ $this->register_display_conditions_promo_hooks();
89	96	}
90	97
91		- /**
92		- * Get Ally Scanner URL
93		- *
94		- * @return string
95		- */
96		- public static function get_ally_external_scanner_url(): string {
97		- return apply_filters( 'elementor/ally_external_scanner_url', 'https://go.elementor.com/acc-checker-dashboard-plg' );
98		- }
99		-
100	98	private function handle_external_redirects() {
101	99	$page = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
102	100	if ( empty( $page ) ) {
103	101	return;
		@@ -108,8 +106,18 @@
108	106	die;
109	107	}
110	108	}
111	109
	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() );
	117	+ }
	118	+ }
	119	+
112	120	private function register_editor_one_menu_items( Menu_Data_Provider $menu_data_provider ) {
113	121	$menu_data_provider->register_menu( new Editor_One_Custom_Elements_Menu() );
114	122	$menu_data_provider->register_menu( new Editor_One_Submissions_Menu() );
115	123	$menu_data_provider->register_menu( new Editor_One_Fonts_Menu() );
		@@ -117,8 +125,14 @@
117	125	$menu_data_provider->register_menu( new Editor_One_Custom_Code_Menu() );
118	126	$menu_data_provider->register_menu( new Editor_One_Popups_Menu() );
119	127	}
120	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	+
121	135	public function enqueue_react_data(): void {
122	136	if ( ! current_user_can( 'manage_options' ) ) {
123	137	return;
124	138	}
		@@ -204,72 +218,56 @@
204	218	EditorAssetsAPI::ASSETS_DATA_KEY => 'promotions',
205	219	];
206	220	}
207	221
	222	+ private function is_editor_one_active(): bool {
	223	+ return (bool) Plugin::instance()->modules_manager->get_modules( 'editor-one' );
	224	+ }
	225	+
208	226	private function is_atomic_widgets_active(): bool {
209	227	return Plugin::$instance->experiments->is_feature_active( 'e_atomic_elements' );
210	228	}
211	229
212		- private function get_atomic_promotion_configs(): array {
213		- return [
214		- [
215		- 'key' => 'attributes',
216		- 'label' => __( 'Attributes', 'elementor' ),
217		- 'section' => 'settings',
218		- 'priority' => 40,
219		- ],
220		- [
221		- 'key' => 'display-conditions',
222		- 'label' => __( 'Display Conditions', 'elementor' ),
223		- 'section' => 'settings',
224		- 'priority' => 50,
225		- ],
226		- ];
227		- }
228		-
229		- private function register_atomic_promotions(): void {
	230	+ private function register_display_conditions_promo_hooks(): void {
230	231	add_action( 'elementor/init', function() {
231	232	if ( ! $this->is_atomic_widgets_active() ) {
232	233	return;
233	234	}
234	235
	236	+ require_once __DIR__ . '/prop-types/display-conditions-prop-type.php';
	237	+ require_once __DIR__ . '/controls/display-conditions-promotion-control.php';
	238	+
235	239	add_filter(
236	240	'elementor/atomic-widgets/props-schema',
237		- [ $this, 'inject_atomic_promotion_props' ]
	241	+ [ $this, 'inject_display_conditions_promo_prop' ]
238	242	);
239	243
240		- foreach ( $this->get_atomic_promotion_configs() as $config ) {
241		- add_filter(
242		- 'elementor/atomic-widgets/controls',
243		- fn( array $controls, $element ) => $this->inject_atomic_promotion_control( $controls, $element, $config ),
244		- $config['priority'],
245		- 2
246		- );
247		- }
	244	+ add_filter(
	245	+ 'elementor/atomic-widgets/controls',
	246	+ [ $this, 'inject_display_conditions_promo_control' ],
	247	+ 50,
	248	+ 2
	249	+ );
248	250	} );
249		-
250		- ( new Atomic_Form_Widget_Promotion() )->register();
251	251	}
252	252
253		- public function inject_atomic_promotion_props( array $schema ): array {
254		- foreach ( $this->get_atomic_promotion_configs() as $config ) {
255		- $key = $config['key'];
	253	+ public function inject_display_conditions_promo_prop( array $schema ): array {
	254	+ $prop_key = PropTypes\Display_Conditions_Prop_Type::get_key();
256	255
257		- if ( isset( $schema[ $key ] ) ) {
258		- continue;
259		- }
	256	+ if ( isset( $schema[ $prop_key ] ) ) {
	257	+ return $schema;
	258	+ }
260	259
261		- $schema[ $key ] = Promotion_Prop_Type::make( $key );
262		- }
	260	+ $schema[ $prop_key ] = PropTypes\Display_Conditions_Prop_Type::make();
263	261
264	262	return $schema;
265	263	}
266	264
267		- protected function inject_atomic_promotion_control( array $element_controls, $atomic_element, array $config ): array {
268		- $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();
269	267	$schema = $atomic_element::get_props_schema();
270	268
271		- if ( ! array_key_exists( $key, $schema ) ) {
	269	+ if ( ! array_key_exists( $prop_key, $schema ) ) {
272	270	return $element_controls;
273	271	}
274	272
275	273	foreach ( $element_controls as $item ) {
		@@ -276,14 +274,14 @@
276	274	if ( ! ( $item instanceof \Elementor\Modules\AtomicWidgets\Controls\Section ) ) {
277	275	continue;
278	276	}
279	277
280		- if ( $item->get_id() !== $config['section'] ) {
	278	+ if ( $item->get_id() !== 'settings' ) {
281	279	continue;
282	280	}
283	281
284		- $control = Atomic_Promotion_Control::make( $key )
285		- ->set_label( $config['label'] )
	282	+ $control = Controls\Display_Conditions_Promotion_Control::bind_to( $prop_key )
	283	+ ->set_label( __( 'Display Conditions', 'elementor' ) )
286	284	->set_meta( [
287	285	'topDivider' => true,
288	286	] );
289	287