Merge branch 'develop' into filip/revert-old-onboarding

Author: ilicfilip

classes/admin/class-page.php

@@ -104,7 +104,8 @@ public function add_page() {
 			'manage_options',
 			$page_identifier,
 			'__return_empty_string',
-			\progress_planner()->get_ui__branding()->get_admin_menu_icon()
+			\progress_planner()->get_ui__branding()->get_admin_menu_icon(),
+			\progress_planner()->get_ui__branding()->get_admin_submenu_position()
 		);
 
 		\add_submenu_page(

classes/ui/class-branding.php

@@ -184,6 +184,19 @@ public function get_admin_submenu_name(): string {
 			: $this->get_api_data()['admin_submenu_name'];
 	}
 
+	/**
+	 * Get the admin-submenu position.
+	 *
+	 * @return int|null
+	 */
+	public function get_admin_submenu_position(): mixed {
+		if ( $this->get_branding_id() !== 0 && $this->get_branding_id() !== 4958 ) {
+			return -1000;
+		}
+
+		return null;
+	}
+
 	/**
 	 * Get the Ravi name.
 	 *

tests/phpunit/test-class-page-types.php

@@ -74,6 +74,7 @@ public static function set_lessons_cache() {
 			[
 				'site'        => \get_site_url(),
 				'license_key' => \progress_planner()->get_license_key(),
+				'locale'      => apply_filters( 'prpl_lesson_locale', \get_locale() ),
 			],
 			$url
 		);