Merge pull request #356 from lightspeeddevelopment/add/355

Added compatibility for Sensei 3.0 new features.

Author: josearmandoabreu

assets/css/sensei/maps/sensei.css.map

@@ -388,7 +388,8 @@ article.page {
 							padding-right: 10px;
 						}
 						&.currently-in-course {
-							.course-products {
+							.course-products,
+							.single_add_to_cart_button {
 								display: none;
 							}
 						}
@@ -501,6 +502,13 @@ article.page {
 								order: 3;
 								.button.view-results {
 									margin-left: 0;
+									@include lsx-button-scaffolding();
+									@include small-button();
+									@include lsx-button-colour();
+									margin-left: $lsx-gap;
+									&:hover {
+										@extend %button-hover;
+									}
 								}
 								form {
 									width: 100%;
@@ -588,6 +596,12 @@ article.page {
 			margin-right: auto;
 			.course {
 				margin-bottom: 0;
+				&.user-status-active,
+				&.user-status-completed {
+					.single_add_to_cart_button {
+						display: none;
+					}
+				}
 				//@include media('<tablet') {
 					display: flex;
 					flex-direction: column;

assets/css/sensei/sensei.css

@@ -1,19 +1,25 @@
 # LSX Change log
 
-# [[2.7.1]] - In Development
+# [[2.8.0]] - 2020-05-21
 
 ### Added
 - One new hooks/actions added in layouts: `lsx_entry_inside_top` to hook into a page content.
 - WooCommerce 4.1 compatibility.
 - Adding Yoast 14.0.+ compatibility.
+- Added compatibility for LSX Banners for Sensei single lessons.
 
 ### Changed
 - Woocommerce Cart, Checkout, Thank You and Restricted styling improved.
 - Layout changed on Cart, Checkout, Thank You and Restricted woocommerce pages.
+- Updated Sensei related functions to replace deprecated functions.
 
 ### Fixed
 - Fixed issue #346 'If LSX banners is not enabled there is a simple banner showing on each page.'.
 - Body class `using-gutenberg` affecting other custom post type single pages was removed from any custom post type single page.
+- Fixed a few styling issues related to Sensei templates.
+
+### Security
+- Testing compatibility with WordPress 5.4.1
 
 
 ## [[2.7.0]](https://github.com/lightspeeddevelopment/lsx/releases/tag/2.7.0) - 2020-03-30

assets/css/sensei/sensei.scss

@@ -11,7 +11,7 @@
 	exit;
 }
 
-define( 'LSX_VERSION', '2.7' );
+define( 'LSX_VERSION', '2.8' );
 
 if ( class_exists( 'WooCommerce' ) ) {
 	require get_template_directory() . '/includes/woocommerce/woocommerce.php';

changelog.md

@@ -187,7 +187,10 @@ function lsx_global_header() {
 		}
 
 		if ( is_page() && ( 'page' !== $show_on_front || ! is_front_page() ) ) :
-			?>
+			if ( class_exists( 'LSX_Banners' ) && empty( apply_filters( 'lsx_banner_plugin_disable', false ) && ( ! has_post_thumbnail() ) ) ) {
+				return;
+			}
+				?>
 			<div class="archive-header-wrapper banner-page col-<?php echo esc_attr( $size ); ?>-12">
 				<?php lsx_global_header_inner_bottom(); ?>
 				<header class="archive-header">
@@ -196,6 +199,7 @@ function lsx_global_header() {
 
 			</div>
 			<?php
+
 		elseif ( is_single() && ! is_singular( 'post' ) ) :
 			?>
 			<div class="archive-header-wrapper banner-single col-<?php echo esc_attr( $size ); ?>-12">

functions.php

@@ -98,7 +98,7 @@ public function get_course_thumbnail() {
 	 */
 	public function course_body_div_open() {
 		global $post, $current_user;
-		$is_user_taking_course    = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+		$is_user_taking_course    = Sensei_Utils::has_started_course( $post->ID, $current_user->ID );
 		$user_taking_course_class = '';
 		if ( ! empty( $is_user_taking_course ) ) {
 			$user_taking_course_class = 'currently-in-course';
@@ -148,16 +148,17 @@ public function course_body_div_results_close() {
 	 */
 	public function display_course_amount() {
 		global $post, $current_user;
-		$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
-		$wc_post_id            = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
-		$course_purchasable    = '';
+		$is_user_taking_course   = Sensei_Course::is_user_enrolled( $post->ID, $current_user->ID );
+		$is_user_starting_course = Sensei_Utils::has_started_course( $post->ID, $current_user->ID );
+		$wc_post_id              = absint( get_post_meta( $post->ID, '_course_woocommerce_product', true ) );
+		$course_purchasable      = '';
 		if ( class_exists( 'Sensei_WC' ) ) {
 			$course_purchasable = Sensei_WC::is_course_purchasable( $post->ID );
 			$currency           = get_woocommerce_currency_symbol();
 			$product            = new WC_Product( $wc_post_id );
-			if ( ( ! empty( $product->get_price() ) ) && ( ! $is_user_taking_course ) ) {
+			if ( ( ! empty( $product->get_price() ) ) && ( ( ! $is_user_taking_course ) || ( ! $is_user_starting_course ) ) ) {
 				echo '<span class="course-product-price price"><span>' . esc_html( $currency ) . ' </span>' . sprintf( '%0.2f', esc_html( $product->get_price() ) ) . '</span>';
-			} elseif ( ( '' === $product->get_price() || 0 == $product->get_price() ) && $course_purchasable ) {
+			} elseif ( ( '' === $product->get_price() || 0 == $product->get_price() ) && $course_purchasable && ( ( ! $is_user_taking_course ) || ( ! $is_user_starting_course ) ) ) {
 				echo '<span class="course-product-price price">' . wp_kses_post( 'Free!', 'lsx' ) . '</span>';
 			}
 		}

includes/layout.php

@@ -60,6 +60,8 @@ public function __construct() {
 
 			add_filter( 'get_the_archive_title', array( $this, 'lsx_sensei_modify_archive_title' ), 99, 1 );
 
+			add_filter( 'lsx_banner_allowed_post_types', array( $this, 'lsx_banner_allowed_post_types_sensei' ) );
+
 			// LSX.
 			add_filter( 'lsx_global_header_disable', array( $this, 'lsx_sensei_disable_lsx_banner' ) );
 			// LSX Banners - Plugin, Placeholders.
@@ -189,13 +191,21 @@ public function lsx_sensei_modify_archive_title( $title ) {
 		 * @subpackage sensei
 		 */
 		public function lsx_sensei_disable_lsx_banner( $disabled ) {
-			if ( is_sensei() ) {
+			if ( is_sensei() && ( ! is_singular( 'lesson' ) ) ) {
 				$disabled = true;
 			}
 
 			return $disabled;
 		}
 
+		/**
+		 * Enable project custom post type on LSX Banners.
+		 */
+		public function lsx_banner_allowed_post_types_sensei( $post_types ) {
+			$post_types[] = 'lesson';
+			return $post_types;
+		}
+
 		/**
 		 * Filters the archive title.
 		 *
@@ -226,7 +236,7 @@ public function lsx_sensei_category_title( $html ) {
 		 */
 		public function lsx_sensei_add_buttons( $course_id ) {
 			global $post, $current_user;
-			$is_user_taking_course = Sensei_Utils::user_started_course( $post->ID, $current_user->ID );
+			$is_user_taking_course = Sensei_Course::is_user_enrolled( $post->ID, $current_user->ID );
 			$course_purchasable    = '';
 			if ( class_exists( 'Sensei_WC' ) ) {
 				$course_purchasable = Sensei_WC::is_course_purchasable( $post->ID );
@@ -250,7 +260,18 @@ public function lsx_sensei_add_buttons( $course_id ) {
 		 * @subpackage sensei
 		 */
 		public function lsx_sensei_add_to_cart_text( $text ) {
+			global $post, $current_user;
+			$is_user_taking_course = Sensei_Utils::has_started_course( $post->ID, $current_user->ID );
+			$is_course_on_cart     = Sensei_WC::is_course_in_cart( $post->ID, $current_user->ID );
+
 			$text = esc_html__( 'Add to cart', 'lsx' );
+
+			if ( ( $is_user_taking_course ) ) {
+				return;
+			}
+			if ( ( $is_course_on_cart ) ) {
+				$text = esc_html__( 'Course added to cart', 'lsx' );
+			}
 			return $text;
 		}
 

includes/sensei/class-lsx-sensei-course.php

@@ -3,9 +3,9 @@ Contributors: feedmymedia
 Donate link: https://donate.lsdev.biz/
 Tags: LSX Theme, Gutenberg, Block Based Builder, WordPress Theme 
 Requires at least: 5.1.1
-Tested up to: 5.4
+Tested up to: 5.4.1
 Requires PHP: 7.0
-Stable tag: 2.7
+Stable tag: 2.8
 License: GPLv3
 Licence URI: https://www.gnu.org/licenses/gpl-3.0.en.html