Used wc native helper to remove markup from wc_price()

Author: sanjana4khan

classes/Instructor.php

@@ -705,6 +705,7 @@ public static function get_top_performing_courses_by_instructor( $instructor_id,
 	 * @since 4.0.0
 	 *
 	 * @param array $top_courses List of course objects returned from analytics.
+	 *
 	 * @return array Formatted top performing courses data.
 	 */
 	public static function format_instructor_top_performing_courses( $top_courses ) {
@@ -718,7 +719,7 @@ function ( $course ) {
 				return array(
 					'name'     => $course->course_title,
 					'url'      => get_permalink( $course->course_id ),
-					'revenue'  => wp_kses_post( tutor_utils()->tutor_price( $course->total_revenue ?? 0 ) ),
+					'revenue'  => wp_kses_post( tutor_utils()->tutor_price( $course->total_revenue ?? 0, false ) ),
 					'students' => $course->total_student ?? 0,
 				);
 			},

classes/Utils.php

@@ -6257,27 +6257,27 @@ public function get_earning_statements( $user_id = 0, $filter_data = array() ) {
 	 * Get the price format
 	 *
 	 * @since 1.1.2
-	 * @since 4.0.0 Condition added for Paid Membership Pro Monetization.
+	 * @since 4.0.0 Condition added for different monetizations and also added $html_markup for woocommece
 	 *
 	 * @param int $price price.
+	 * @param bool $html_markup  Whether to include HTML markup ( Only for woocommerce as it returns html markup ).                                    
 	 *
 	 * @return int|string
 	 */
-	public function tutor_price( $price = 0 ) {
+	public function tutor_price( $price = 0, $html_markup = true ) {
 
-		$price_float = floatval( Input::sanitize( $price ) );
 		$monetize_by = $this->get_option( 'monetize_by' );
 
 		if ( Ecommerce::MONETIZE_BY === $monetize_by ) {
 			return tutor_get_formatted_price( $price );
-		} elseif ( 'wc' ===  $monetize_by ) {
-			return wc_price( $price );
-		} elseif ( 'edd' === $monetize_by ) {
+		} elseif ( function_exists( 'wc_price' ) && 'wc' ===  $monetize_by ) {
+			return wc_price( $price, array( 'in_span' => $html_markup ) );
+		} elseif ( function_exists( 'edd_currency_filter' ) && 'edd' === $monetize_by ) {
 			return edd_currency_filter( edd_format_amount( $price ) );
-		} elseif ( 'pmpro' === $monetize_by ) {
-			return pmpro_formatPrice( $price_float );
+		} elseif (  function_exists( 'pmpro_formatPrice' ) && 'pmpro' === $monetize_by ) {
+			return pmpro_formatPrice( floatval( $price ) );
 		} else {		
-			return number_format_i18n( $price_float );
+			return number_format_i18n( floatval( $price ) );
 		}
 	}
 
@@ -10901,16 +10901,4 @@ public function get_script_locale_data( string $filename, string $locale = 'en_U
 
 		return null;
 	}
-
-	/**
-	 * Normalizes WooCommerce monetization output to plain text.
-	 *
-	 * @since 4.0.0
-	 *
-	 * @param string $value WooCommerce price HTML or encoded string.
-	 * @return string Plain text monetary value.
-	 */
-	public function fix_wc_monetization_format( $value ): string {
-		return wp_strip_all_tags( wp_specialchars_decode( $value ) );
-	}
 }

templates/dashboard/instructor/home.php

@@ -180,7 +180,7 @@ function ( $carry, $section ) {
 		'variation'     => 'success',
 		'title'         => esc_html__( 'Total Earnings', 'tutor' ),
 		'icon'          => Icon::EARNING,
-		'value'         => wp_kses_post( tutor_utils()->tutor_price( $total_earnings ?? 0 ) ),
+		'value'         => wp_kses_post( tutor_utils()->tutor_price( $total_earnings ?? 0, false ) ),
 		'hover_content' => $total_earnings_state_card_details,
 	),
 	array(
@@ -404,10 +404,6 @@ class="tutor-flex tutor-gap-5 tutor-z-positive"
 		<?php foreach ( $stat_cards as $card ) : ?>
 			<div class="tutor-flex-1">
 			<?php
-			// If from woo-commerce convert the monetization data to appropriate format.
-			if ( 'wc' === tutor_utils()->get_option( 'monetize_by' ) ) {
-				$card['value'] = tutor_utils()->fix_wc_monetization_format( $card['value'] );
-			}
 			tutor_load_template(
 				'dashboard.instructor.analytics.stat-card',
 				array(

templates/dashboard/instructor/home/top-performing-course-item.php

@@ -11,11 +11,6 @@
 defined( 'ABSPATH' ) || exit;
 
 use TUTOR\Icon;
-
-// If from woo-commerce convert the monetization data to appropriate format.
-if ( 'wc' === tutor_utils()->get_option( 'monetize_by' ) ) {
-	$item['revenue'] = tutor_utils()->fix_wc_monetization_format( $item['revenue'] );
-}
 ?>
 
 <div class="tutor-dashboard-home-course">