fix: Fix for filtering courses/events for the selected city, not just which course templates that has ever had an event there.

Author: Chris Gårdenberg

PLUGIN-CHECKSUM

@@ -1 +1 @@
-a39447ffe765166511c2ef20fb003a4d
+23d5df3f333dd3ff156ad9369676c945

includes/edu-ajax-functions.php

@@ -26,6 +26,7 @@ function edu_listview_courselist() {
 		' and LastApplicationDate ge ' . date_i18n( 'c' ) .
 		' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
 		' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
+		( ! empty( $_POST['city'] ) ? ' and LocationId eq ' . intval( $_POST['city'] ) : '' ) .
 		';' .
 		'$top=1' .
 		';' .

includes/eduapi-helper-functions.php

@@ -182,6 +182,7 @@ public function GetCourseList( $attributes, $category_id, $city, $subjectid, $co
 			' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
 			' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
 			' and OnDemand eq false' .
+			( ! empty( $city ) ? ' and LocationId eq ' . intval( $city ) : '' ) .
 			';' .
 			'$expand=PriceNames($filter=PublicPriceName;$select=PriceNameId,PriceNameDescription,Price,MaxParticipantNumber,NumberOfParticipants,DiscountPercent;)' .
 			';' .
@@ -223,11 +224,7 @@ public function GetCourseList( $attributes, $category_id, $city, $subjectid, $co
 			$orderby   = explode( ' ', $custom_order_by );
 			$sortorder = explode( ' ', $custom_order_by_order );
 			foreach ( $orderby as $od => $v ) {
-				if ( isset( $sortorder[ $od ] ) ) {
-					$or = $sortorder[ $od ];
-				} else {
-					$or = 'asc';
-				}
+				$or = isset( $sortorder[ $od ] ) ? $sortorder[ $od ] : 'asc';
 
 				if ( edu_validate_column( 'course', $v ) !== false ) {
 					$sorting[] = $v . ' ' . strtolower( $or );
@@ -300,6 +297,7 @@ public function GetOnDemandCourseList( $attributes, $category_id, $city, $subjec
 			' and CompanySpecific eq false' .
 			' and OnDemand eq true' .
 			' and OnDemandPublished eq true' .
+			( ! empty( $city ) ? ' and LocationId eq ' . intval( $city ) : '' ) .
 			';' .
 			'$expand=PriceNames($filter=PublicPriceName;$select=PriceNameId,PriceNameDescription,Price,MaxParticipantNumber,NumberOfParticipants,DiscountPercent;)' .
 			';' .
@@ -341,11 +339,7 @@ public function GetOnDemandCourseList( $attributes, $category_id, $city, $subjec
 			$orderby   = explode( ' ', $custom_order_by );
 			$sortorder = explode( ' ', $custom_order_by_order );
 			foreach ( $orderby as $od => $v ) {
-				if ( isset( $sortorder[ $od ] ) ) {
-					$or = $sortorder[ $od ];
-				} else {
-					$or = 'asc';
-				}
+				$or = isset( $sortorder[ $od ] ) ? $sortorder[ $od ] : 'asc';
 
 				if ( edu_validate_column( 'course', $v ) !== false ) {
 					$sorting[] = $v . ' ' . strtolower( $or );
@@ -417,6 +411,7 @@ public function GetEventList( $attributes, $category_id, $city, $subjectid, $cou
 			' and StartDate le ' . edu_get_timezoned_date( 'c', 'now 23:59:59 +' . $fetch_months . ' months' ) .
 			' and EndDate ge ' . edu_get_timezoned_date( 'c', 'now' ) .
 			' and OnDemand eq false' .
+			( ! empty( $city ) ? ' and LocationId eq ' . intval( $city ) : '' ) .
 			';' .
 			'$expand=PriceNames($filter=PublicPriceName;$select=PriceNameId,PriceNameDescription,Price,MaxParticipantNumber,NumberOfParticipants,DiscountPercent;),EventDates($orderby=StartDate;$select=StartDate,EndDate;)' .
 			';' .
@@ -530,6 +525,7 @@ public function GetOnDemandEventList( $attributes, $category_id, $city, $subject
 			' and CompanySpecific eq false' .
 			' and OnDemand eq true' .
 			' and OnDemandPublished eq true' .
+			( ! empty( $city ) ? ' and LocationId eq ' . intval( $city ) : '' ) .
 			';' .
 			'$expand=PriceNames($filter=PublicPriceName;$select=PriceNameId,PriceNameDescription,Price,MaxParticipantNumber,NumberOfParticipants,DiscountPercent;),EventDates($orderby=StartDate;$select=StartDate,EndDate;)' .
 			';' .