| @@ -3,8 +3,9 @@ | ||
| 3 | 3 | use LearnPress\Helpers\Template; |
| 4 | 4 | use LearnPress\Models\CourseModel; |
| 5 | 5 | use LearnPress\Models\UserItems\UserCourseModel; |
| 6 | 6 | use LearnPress\Models\UserModel; |
| 7 | +use LearnPress\TemplateHooks\Course\SingleCourseModernLayout; | |
| 7 | 8 | use LearnPress\TemplateHooks\Course\SingleCourseTemplate; |
| 8 | 9 | use LearnPress\TemplateHooks\UserItem\UserCourseTemplate; |
| 9 | 10 | |
| 10 | 11 | /** |
| @@ -937,10 +938,13 @@ | ||
| 937 | 938 | /** |
| 938 | 939 | * Show info time handle of user |
| 939 | 940 | * |
| 940 | 941 | * @throws Exception |
| 942 | + * @deprecated 4.4.0 | |
| 941 | 943 | */ |
| 942 | 944 | public function user_time() { |
| 945 | + _deprecated_function( __METHOD__, '4.4.0' ); | |
| 946 | + return; | |
| 943 | 947 | $user = learn_press_get_current_user(); |
| 944 | 948 | |
| 945 | 949 | if ( ! $user ) { |
| 946 | 950 | return; |
| @@ -984,24 +988,17 @@ | ||
| 984 | 988 | * @throws Exception |
| 985 | 989 | * @author Nhamdv. |
| 986 | 990 | */ |
| 987 | 991 | public function user_progress() { |
| 988 | - if ( ! is_user_logged_in() ) { | |
| 992 | + $courseModel = CourseModel::find( get_the_ID(), true ); | |
| 993 | + if ( ! $courseModel ) { | |
| 989 | 994 | return; |
| 990 | 995 | } |
| 991 | 996 | |
| 992 | - $course = learn_press_get_course(); | |
| 993 | - $user = learn_press_get_current_user(); | |
| 997 | + $userModel = UserModel::find( get_current_user_id(), true ); | |
| 998 | + echo SingleCourseModernLayout::instance()->html_info_learning( $courseModel, $userModel ); | |
| 994 | 999 | |
| 995 | - if ( ! $course ) { | |
| 996 | - return; | |
| 997 | - } | |
| 998 | - | |
| 999 | - if ( ! $user->has_enrolled_or_finished( $course->get_id() ) ) { | |
| 1000 | - return; | |
| 1001 | - } | |
| 1002 | - | |
| 1003 | - if ( LP_LAZY_LOAD_ANIMATION ) { | |
| 1000 | + /*if ( LP_LAZY_LOAD_ANIMATION ) { | |
| 1004 | 1001 | echo '<div class="lp-course-progress-wrapper">'; |
| 1005 | 1002 | lp_skeleton_animation_html(); |
| 1006 | 1003 | echo '</div>'; |
| 1007 | 1004 | } else { |
| @@ -1015,9 +1012,9 @@ | ||
| 1015 | 1012 | learn_press_get_template( |
| 1016 | 1013 | 'single-course/sidebar/user-progress', |
| 1017 | 1014 | compact( 'user', 'course', 'course_data', 'course_results' ) |
| 1018 | 1015 | ); |
| 1019 | - } | |
| 1016 | + }*/ | |
| 1020 | 1017 | } |
| 1021 | 1018 | |
| 1022 | 1019 | public function course_extra_boxes_position_control() { |
| 1023 | 1020 | $course = LP_Course::get_course( get_the_ID() ); |
