Merge pull request #2698 from themeum/bivas-v4

Fix: Add checkout error message for pause enrollment courses

Author: Anindra123

assets/src/js/front/pages/course-landing.js

@@ -25,6 +25,7 @@ window.jQuery(document).ready(($) => {
                             data: {
                                 action: 'tutor_reset_course_progress',
                                 course_id: course_id,
+                                context: 'course-landing',
                             },
                             beforeSend: () => {
                                 button.prop('disabled', true).addClass('is-loading');
@@ -35,7 +36,7 @@ window.jQuery(document).ready(($) => {
                                 }
                             },
                             error: function(response) {
-                                tutor_toast(__( 'Error', 'tutor' ),(response.responseJSON || {}).message ||__('Something went wrong', 'tutor'));
+                                tutor_toast(__( 'Error', 'tutor' ),(response.responseJSON || {}).message ||__('Something went wrong', 'tutor'), 'error' );
                             },
                             complete: function () {
                                 button.prop('disabled', false).removeClass('is-loading');

assets/src/js/frontend/learning-area/common.ts

@@ -10,6 +10,7 @@ interface CourseCompletePayload {
 }
 interface CourseRetakePayload {
   course_id: number;
+  context: string;
 }
 
 /**
@@ -70,7 +71,7 @@ export const courseCompleteHandler = () => {
     },
 
     async handleCourseRetake(courseId: number) {
-      await this.courseRetakeMutation?.mutate({ course_id: courseId });
+      await this.courseRetakeMutation?.mutate({ course_id: courseId, context: 'learning-area' });
     },
   };
 };

assets/src/js/frontend/learning-area/sidebar.ts

@@ -12,6 +12,7 @@ import { type AxiosError } from 'axios';
 
 interface ResetProgressPayload {
   course_id: number;
+  context: string;
 }
 
 interface ResetProgressResponse {
@@ -104,7 +105,7 @@ export const sidebarComponent = ({
     },
 
     resetProgress() {
-      this.resetProgressMutation?.mutate({ course_id: this.courseId });
+      this.resetProgressMutation?.mutate({ course_id: this.courseId, context: 'learning-area-sidebar' });
     },
   };
 };

classes/Course.php

@@ -3084,10 +3084,16 @@ public function delete_associated_enrollment( $post_id ) {
 	public function tutor_reset_course_progress() {
 		tutor_utils()->checking_nonce();
 		$course_id             = Input::post( 'course_id', 0, Input::TYPE_INT );
+		$context               = Input::post( 'context', '' );
 		$course_reset_progress = tutor_utils()->get_option( 'course_reset_progress', false );
 		$course_retake_feature = tutor_utils()->get_option( 'course_retake_feature', false );
 
-		if ( ! $course_reset_progress || ! $course_retake_feature ) {
+		if ( ! $course_reset_progress && 'learning-area-sidebar' === $context ) {
+			$this->response_bad_request( __( 'You are not allowed to reset course progress.', 'tutor' ) );
+			return;
+		}
+
+		if ( ! $course_retake_feature && ( 'course-landing' === $context || 'learning-area' === $context ) ) {
 			$this->response_bad_request( __( 'You are not allowed to reset course progress.', 'tutor' ) );
 			return;
 		}

ecommerce/CheckoutController.php

@@ -635,9 +635,9 @@ public function pay_now() {
 							$errors,
 							sprintf(
 							// Translators: %s course name.
-								__( ' Course %s cannot be enrolled right now.', 'tutor' )
+								__( 'Course %s cannot be enrolled right now.', 'tutor' ),
+								get_the_title( $course_id ) ?? ''
 							),
-							get_the_title( $course_id ) ?? ''
 						);
 					}
 				}