| @@ -5,9 +5,9 @@ | ||
| 5 | 5 | * This template can be overridden by copying it to yourtheme/learnpress/content-lesson/button-complete.php. |
| 6 | 6 | * |
| 7 | 7 | * @author ThimPress |
| 8 | 8 | * @package Learnpress/Templates |
| 9 | - * @version 4.0.0 | |
| 9 | + * @version 4.0.5 | |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | defined( 'ABSPATH' ) || exit(); |
| 13 | 13 | |
| @@ -18,28 +18,42 @@ | ||
| 18 | 18 | if ( $item->is_preview() && ! $user->has_enrolled_course( $course->get_id() ) ) { |
| 19 | 19 | return; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | -$message_confirm_complete_item = sprintf( '%s "%s"?', __( 'Do you want to complete the lesson?', 'learnpress' ), $item->get_title() ); | |
| 22 | +$message_confirm_complete_item = sprintf( | |
| 23 | + '%s "%s"?', | |
| 24 | + __( 'Do you want to complete the lesson', 'learnpress' ), | |
| 25 | + $item->get_title() | |
| 26 | +); | |
| 23 | 27 | $completed = $user->has_completed_item( $item->get_id(), $course->get_id() ); |
| 24 | 28 | |
| 25 | 29 | if ( $completed ) : |
| 30 | + $user_item_data = $user->get_item_data( $item->get_id(), $course->get_id() ); | |
| 31 | + if ( empty( $user_item_data ) ) { | |
| 32 | + return; | |
| 33 | + } | |
| 26 | 34 | ?> |
| 27 | - <div> | |
| 35 | + <div class="learn-press-message success"> | |
| 28 | 36 | <?php |
| 29 | 37 | echo sprintf( |
| 30 | 38 | '%s %s', |
| 31 | 39 | esc_html__( 'You have completed this lesson at ', 'learnpress' ), |
| 32 | - $user->get_item_data( $item->get_id(), $course->get_id(), 'end_time' ) | |
| 40 | + $user_item_data->get_end_time()->format( LP_Datetime::I18N_FORMAT_HAS_TIME ) | |
| 33 | 41 | ) |
| 34 | 42 | ?> |
| 35 | 43 | </div> |
| 36 | 44 | <button class="lp-button completed" disabled> |
| 37 | - <i class="fa fa-check"></i><?php esc_html_e( 'Completed', 'learnpress' ); ?> | |
| 45 | + <i class="lp-icon-check"></i><?php esc_html_e( 'Completed', 'learnpress' ); ?> | |
| 38 | 46 | </button> |
| 39 | -<?php else : ?> | |
| 40 | - | |
| 47 | + <?php | |
| 48 | +else : | |
| 49 | + $item_id_next = $course->get_next_item(); | |
| 50 | + /** | |
| 51 | + * @use LessonAjax::user_complete_lesson | |
| 52 | + */ | |
| 53 | + ?> | |
| 41 | 54 | <form method="post" name="learn-press-form-complete-lesson" |
| 55 | + action="<?php echo add_query_arg( [ 'complete-lesson' => '' ], LP_Settings::url_handle_lp_ajax() ); ?>" | |
| 42 | 56 | class="learn-press-form form-button <?php echo esc_attr( $completed ) ? 'completed' : ''; ?>" |
| 43 | 57 | data-title="<?php echo esc_attr( __( 'Complete lesson', 'learnpress' ) ); ?>" |
| 44 | 58 | data-confirm="<?php echo esc_attr( $message_confirm_complete_item ); ?>"> |
| 45 | 59 | |
| @@ -44,16 +58,15 @@ | ||
| 44 | 58 | data-confirm="<?php echo esc_attr( $message_confirm_complete_item ); ?>"> |
| 45 | 59 | |
| 46 | 60 | <?php do_action( 'learn-press/lesson/before-complete-button' ); ?> |
| 47 | 61 | |
| 48 | - <input type="hidden" name="id" value="<?php echo esc_attr( $item->get_id() ); ?>"/> | |
| 62 | + <input type="hidden" name="lesson_id" value="<?php echo esc_attr( $item->get_id() ); ?>"/> | |
| 49 | 63 | <input type="hidden" name="course_id" value="<?php echo esc_attr( $course->get_id() ); ?>"/> |
| 50 | - <input type="hidden" name="complete-lesson-nonce" | |
| 51 | - value="<?php echo esc_attr( wp_create_nonce( 'lesson-complete' ) ); ?>"/> | |
| 52 | - <input type="hidden" name="type" value="lp_lesson"/> | |
| 53 | - <input type="hidden" name="lp-ajax" value="complete-lesson"/> | |
| 54 | - <input type="hidden" name="noajax" value="yes"/> | |
| 55 | - <button class="lp-button button button-complete-item button-complete-lesson lp-btn-complete-item"> | |
| 64 | + <input type="hidden" name="nonce" | |
| 65 | + value="<?php echo wp_create_nonce( 'wp_rest' ); ?>"/> | |
| 66 | + <input type="hidden" name="lp-load-ajax" value="user_complete_lesson"/> | |
| 67 | + <button class="lp-button button-complete-lesson lp-btn-complete-item" | |
| 68 | + type="submit"> | |
| 56 | 69 | <?php echo esc_html__( 'Complete', 'learnpress' ); ?> |
| 57 | 70 | </button> |
| 58 | 71 | |
| 59 | 72 | <?php do_action( 'learn-press/lesson/after-complete-button' ); ?> |