= 4.2.6.7 =

~ Tweak: LP_Settings_Emails_Group class ~ Fixed: error buy course via Guest, show popup allow repurchase.
LearnPress · May 10, 2024 · 3b48fbf · 3b48fbf
1 parent e3613e3
commit 3b48fbf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/inc/admin/settings/email-groups/class-lp-settings-emails-group.php b/inc/admin/settings/email-groups/class-lp-settings-emails-group.php
@@ -26,21 +26,23 @@ public function __construct() {
 		parent::__construct();
 
 		$emails = LP_Emails::instance()->emails;
+		$this->items = apply_filters(
+			"learn-press/settings/emails-group/$this->group_id/key-ids",
+			$this->items
+		);
 
-		$ids = array_fill_keys( $this->items, '' );
-
-		foreach ( $this->items as $id ) {
-			foreach ( $emails as $email ) {
-				if ( ! is_object( $email ) ) {
-					continue;
-				}
+		$ids = [];
+		foreach ( $emails as $email ) {
+			if ( ! is_object( $email ) ) {
+				continue;
+			}
 
-				if ( ! array_key_exists( $email->id, $ids ) ) {
-					continue;
-				}
-				$email->group      = $this;
-				$ids[ $email->id ] = $email;
+			//Todo: need review code here
+			if ( ! in_array( $email->id, $this->items ) ) {
+				continue;
 			}
+			$email->group      = $this;
+			$ids[ $email->id ] = $email;
 		}
 
 		$this->items = $ids;

diff --git a/inc/rest-api/v1/frontend/class-lp-rest-courses-controller.php b/inc/rest-api/v1/frontend/class-lp-rest-courses-controller.php
@@ -427,15 +427,18 @@ public function purchase_course( WP_REST_Request $request ) {
 			}
 
 			$filter              = new LP_User_Items_Filter();
-			$filter->user_id     = get_current_user_id();
+			$filter->user_id     = $user->get_id();
 			$filter->item_id     = $course_id;
 			$course_item         = $lp_user_items_db->get_last_user_course( $filter );
 			$latest_user_item_id = 0;
 			if ( $course_item && isset( $course_item->user_item_id ) ) {
 				$latest_user_item_id = $course_item->user_item_id;
 			}
 
-			if ( $course->allow_repurchase() && ! empty( $latest_user_item_id ) && empty( $allow_repurchase_type ) ) {
+			if ( $course->allow_repurchase()
+				 && ! $user->is_guest()
+				 && ! empty( $latest_user_item_id )
+				 && empty( $allow_repurchase_type ) ) {
 				if ( $course->allow_repurchase_course_option() === 'popup' ) {
 					ob_start();
 					?>
@@ -444,7 +447,7 @@ public function purchase_course( WP_REST_Request $request ) {
 							<li>
 								<label>
 									<input name="_lp_allow_repurchase_type" value="reset" type="radio"
-											checked="checked"/>
+										   checked="checked"/>
 									<?php esc_html_e( 'Reset Course progress', 'learnpress' ); ?>
 								</label>
 							</li>