From: Steve Sutton Date: Wed, 14 Aug 2019 15:15:02 +0000 (-0400) Subject: Add free as flag for events X-Git-Tag: v1.7.31^2~1 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=8a06bd34fc1128fdb19921317f216bc96ce22da0;p=WP-Plugins%2Fglm-member-db-events.git Add free as flag for events Adding as shortcode attribute and as allowed request variable. --- diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php index 802e4b6..8080315 100644 --- a/models/front/events/baseAction.php +++ b/models/front/events/baseAction.php @@ -246,6 +246,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents $city_id = $params['city_id']; $region_id = $params['region_id']; $limit = $params['limit']; + $free = $params['free']; $this->postAddTimes = true; $whereParts = array(); @@ -259,6 +260,10 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents $whereParts[] = "T.ref_type = ".$this->config['ref_type_numb']['Member']." and T.ref_dest = $member_id "; } + if ( true === $free ) { + $whereParts[] = "T.free = true"; + } + if ( $amenity_id = filter_var( $amenity_id, FILTER_VALIDATE_INT ) ) { $whereParts[] = " T.id IN ( diff --git a/models/front/events/list.php b/models/front/events/list.php index ab51095..78a0ace 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -74,6 +74,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $customPage = false; $groupByDay = true; $groupMonth = false; + $free = null; $this->notInCat = array(); $pdfCategoryList = ''; @@ -137,6 +138,12 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction ORDER BY name"; $regionData = $this->wpdb->get_results( $regionSql, ARRAY_A ); + if ( isset( $actionData['request']['free'] ) ) { + $free = filter_var( $actionData['request']['free'], FILTER_VALIDATE_BOOLEAN ); + } + if ( isset( $_REQUEST['free'] ) ) { + $free = filter_var( $_REQUEST['free'], FILTER_VALIDATE_BOOLEAN ); + } // If there's a pageslug as attribute then update the pageSlug if ( isset ( $actionData['request']['pageslug'] ) ) { $pageSlug = $actionData['request']['pageslug']; @@ -499,6 +506,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction 'city_id' => $cityId, 'region_id' => $regionId, 'limit' => $limit, + 'free' => (bool)$free, ); switch ( $action ) { diff --git a/setup/shortcodes.php b/setup/shortcodes.php index 97181eb..03db7b1 100644 --- a/setup/shortcodes.php +++ b/setup/shortcodes.php @@ -112,6 +112,7 @@ $glmMembersEventsShortcodes = array( 'group_by_day' => true, 'group_month' => false, 'show_all_in_agenda' => false, + 'free' => null, ) ), 'glm-members-event-detail' => array(