From d068ea8cbce142d49fcec90a4905095745239223 Mon Sep 17 00:00:00 2001 From: "Md.Harun-Ur-Rashid" Date: Thu, 5 Oct 2023 14:52:44 +0600 Subject: [PATCH 1/2] Update - course card add review progress when strict mode --- templates/loop/course-continue.php | 43 +++++++++++++++++++----------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/templates/loop/course-continue.php b/templates/loop/course-continue.php index e54b14aee..0ef2a4708 100644 --- a/templates/loop/course-continue.php +++ b/templates/loop/course-continue.php @@ -10,32 +10,45 @@ * @since 1.7.4 */ +use Tutor\Models\CourseModel; + ?>
+ ' . __( 'Start Learning', 'tutor' ) . ' + + '; - $course_id = get_the_ID(); - $enroll_btn = ' - ' . __( 'Start Learning', 'tutor' ) . ' - - '; +$lesson_url = tutor_utils()->get_course_first_lesson(); +$completed_percent = tutor_utils()->get_course_completed_percent(); +$is_completed_course = tutor_utils()->is_completed_course(); +$retake_course = tutor_utils()->can_user_retake_course(); +$button_class = 'tutor-btn tutor-btn-outline-primary tutor-btn-md tutor-btn-block '; +$can_complete_course = CourseModel::can_complete_course( $course_id, $user_id ); +$completion_mode = tutor_utils()->get_option( 'course_completion_process' ); - $lesson_url = tutor_utils()->get_course_first_lesson(); - $completed_percent = tutor_utils()->get_course_completed_percent(); - $is_completed_course = tutor_utils()->is_completed_course(); - $retake_course = tutor_utils()->can_user_retake_course(); - $button_class = 'tutor-btn tutor-btn-outline-primary tutor-btn-md tutor-btn-block ' . ( $retake_course ? ' tutor-course-retake-button' : '' ); +if ( $retake_course && $can_complete_course && CourseModel::MODE_FLEXIBLE === $completion_mode ) { + $button_class .= ' tutor-course-retake-button'; +} if ( $lesson_url && ! $is_completed_course ) { ob_start(); ?> 0 && $completed_percent < 100 ) { + esc_html_e( 'Continue Learning', 'tutor' ); + } elseif ( 100 === (int) $completed_percent && false === $can_complete_course ) { + esc_html_e( 'Review Progress', 'tutor' ); + } else { + esc_html_e( 'Continue Learning', 'tutor' ); + } } ?> From 56ea751c3d23238600a4c926f89f2913de3aad1a Mon Sep 17 00:00:00 2001 From: "Md.Harun-Ur-Rashid" Date: Thu, 5 Oct 2023 14:57:20 +0600 Subject: [PATCH 2/2] cs fix --- templates/loop/course-continue.php | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/loop/course-continue.php b/templates/loop/course-continue.php index 0ef2a4708..16b3f8c81 100644 --- a/templates/loop/course-continue.php +++ b/templates/loop/course-continue.php @@ -1,5 +1,4 @@