From 12fc4723faafc3cfb2cf88279e5785a88d2a0f06 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Fri, 4 Nov 2016 12:46:46 -0400 Subject: [PATCH] adding beer types, event types and venues to the agenda view event content section --- models/front/events/list.php | 3 ++- views/front/events/beerweek.html | 33 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/models/front/events/list.php b/models/front/events/list.php index 467854a..6a4e8e4 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -221,12 +221,14 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } break; case 'event-list': + $this->postAddLocations = true; $this->postAddRecurrences = true; $events = $this->getModelEventsData( $categoryId, null, $memberId, $amenityId ); if ( !$view ) { $view = 'agenda.html'; } $this->postAddRecurrences = false; + $this->postAddLocations = false; break; case 'nameSearch': // get list of names based on term @@ -690,7 +692,6 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction 'calDates' => $calDates, 'cal_view' => $calendar_view ); - error_reporting(E_ALL ^ E_NOTICE); return array( 'status' => $status, diff --git a/views/front/events/beerweek.html b/views/front/events/beerweek.html index 74033d6..935e4b0 100644 --- a/views/front/events/beerweek.html +++ b/views/front/events/beerweek.html @@ -15,8 +15,10 @@ +
{foreach $key as $events} + {foreach $events as $event}
@@ -40,7 +42,6 @@ {$day|substr:0:3} {/if} {/foreach} - {/if} ) @@ -55,6 +56,36 @@ {/if}
+
+ + {if !empty($event.amenities)} + Beer Types: + {foreach $event.amenities as $beer} + {$beer.name} + {/foreach} + {/if} + +
+
+ + {if !empty($event.categories)} + Event Types: + {foreach $event.categories as $type} + {$type.name} + {/foreach} + {/if} + +
+
+ + + {if $event.use_member_location.value === '1'} + Event Venue: {$event.ref_dest} + {else if $event.other_ref_dest} + Event Venue: {$event.other_ref_dest} + {/if} + +
{if $event.image}{/if} {$event.intro}
-- 2.17.1