Add region for search

region id can now be searched for event or event member locations.

diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php
index ab244e7..803c47b 100644 (file)
--- a/models/front/events/baseAction.php
+++ b/models/front/events/baseAction.php
@@ -230,6 +230,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
             'amenity_id' => null,
             'venue_id'   => null,
             'city_id'    => null,
+            'region_id'  => null,
             'limit'      => null,
         );
 
@@ -243,6 +244,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
         $amenity_id = $params['amenity_id'];
         $venue_id   = $params['venue_id'];
         $city_id    = $params['city_id'];
+        $region_id  = $params['region_id'];
         $limit      = $params['limit'];
 
         $this->postAddTimes = true;
@@ -295,6 +297,28 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents
             )
             )";
         }
+        if ( ( $region_id = filter_var( $region_id, FILTER_VALIDATE_INT ) ) && !$is_name_search ) {
+            // echo '<pre>$region_id: ' . print_r( $region_id, true ) . '</pre>';
+            $whereParts[] = "(
+            (T.use_member_location <> true
+            AND
+            T.id IN (
+                SELECT event
+                  FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "locations
+                 WHERE region = {$region_id}
+            ))
+        OR (
+            T.use_member_location = true
+            AND
+            T.ref_dest IN (
+                SELECT member
+                  FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_info
+                 WHERE status = 10
+                   AND region = {$region_id}
+            )
+            )
+            )";
+        }
 
         if ( $venue_id = filter_var( $venue_id, FILTER_VALIDATE_INT ) ) {
             $whereParts[] = "

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 72d0cb3..ea77ae4 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -63,6 +63,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         $amenities       = array();
         $memberId        = null;
         $cityId          = null;
+        $regionId        = null;
         $members         = array();
         $venues          = array();
         $venueId         = null;
@@ -172,6 +173,10 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             $search = true;
             $action = 'event-list';
         }
+        if ( isset( $_REQUEST['region'] ) && $regionId = filter_var( $_REQUEST['region'], FILTER_VALIDATE_INT ) ) {
+            $search = true;
+            $action = 'event-list';
+        }
         if ( isset( $_REQUEST['venue'] ) && $venueId = filter_var( $_REQUEST['venue'], FILTER_VALIDATE_INT ) ) {
             $search = true;
             $action = 'event-list';
@@ -386,6 +391,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             'amenity_id' => $amenityId,
             'venue_id'   => $venueId,
             'city_id'    => $cityId,
+            'region_id'  => $regionId,
             'limit'      => $limit,
         );