Merge pull request #142 from MultinetInteractive/feature-moreprices

1.0.28

Author: itssimple

eduadmin.php

@@ -8,7 +8,7 @@
 	 * Plugin URI:	http://www.eduadmin.se
 	 * Description:	EduAdmin plugin to allow visitors to book courses at your website
 	 * Tags:	booking, participants, courses, events, eduadmin, lega online
-	 * Version:	1.0.27
+	 * Version:	1.0.28
 	 * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
 	 * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
 	 * Requires at least: 4.7

includes/_shortcodes.php

@@ -410,6 +410,54 @@ function eduadmin_get_detailinfo( $attributes ) {
 					foreach ( $prices as $price ) {
 						$uniquePrices[ $price->Description ] = $price;
 					}
+					
+					if ( count( $uniquePrices ) == 0 ) {
+						$filtering = new XFiltering();
+						$f         = new XFilter( 'ObjectID', '=', $selectedCourse->ObjectID );
+						$filtering->AddItem( $f );
+
+						$f = new XFilter( 'PublicPriceName', '=', "True" );
+						$filtering->AddItem( $f );
+
+						$sorting       = new XSorting();
+						$customOrder   = null;
+						$customOrderBy = null;
+						if ( !empty( $attributes['order'] ) ) {
+							$customOrder = $attributes['order'];
+						}
+
+						if ( !empty( $attributes['orderby'] ) ) {
+							$customOrderBy = $attributes['orderby'];
+						}
+
+						if ( $customOrderBy != null ) {
+							$orderby   = explode( ' ', $customOrderBy );
+							$sortorder = explode( ' ', $customOrder );
+							foreach ( $orderby as $od => $v ) {
+								if ( isset( $sortorder[ $od ] ) ) {
+									$or = $sortorder[ $od ];
+								} else {
+									$or = "ASC";
+								}
+
+								$s = new XSort( $v, $or );
+								$sorting->AddItem( $s );
+							}
+						} else {
+							$s = new XSort( 'PriceNameID', $customOrder != null ? $customOrder : 'ASC' );
+							$sorting->AddItem( $s );
+						}
+
+						$edo = get_transient( 'eduadmin-objectpublicpricename_' . $selectedCourse->ObjectID );
+						if ( !$edo ) {
+							$edo = EDU()->api->GetObjectPriceName( EDU()->get_token(), $sorting->ToString(), $filtering->ToString() );
+							set_transient( 'eduadmin-objectpublicpricename_' . $selectedCourse->ObjectID, $edo, 10 );
+						}
+
+						foreach ( $edo as $price ) {
+							$uniquePrices[ $price->Description ] = $price;
+						}
+					}
 
 					$currency = get_option( 'eduadmin-currency', 'SEK' );
 					if ( 1 == count( $uniquePrices ) ) {
@@ -721,4 +769,4 @@ function eduadmin_get_login_view( $attributes ) {
 		add_shortcode( 'eduadmin-objectinterest', 'eduadmin_get_object_interest' );
 		add_shortcode( 'eduadmin-eventinterest', 'eduadmin_get_event_interest' );
 		add_shortcode( 'eduadmin-coursepublicpricename', 'eduadmin_get_course_public_pricename' );
-	}
+	}

readme.md

@@ -3,7 +3,7 @@ Contributors: mnchga
 Tags: booking, participants, courses, events, eduadmin, lega online
 Requires at least: 4.7
 Tested up to: 4.9.2
-Stable tag: 1.0.27
+Stable tag: 1.0.28
 Requires PHP: 5.2
 License: GPL3
 License-URI: https://www.gnu.org/licenses/gpl-3.0.en.html