WP-Plugins/glm-member-db-events.git
8 years agoFix variable name
Steve Sutton [Mon, 7 Nov 2016 13:40:26 +0000 (08:40 -0500)]
Fix variable name

Should be $venueId not venueId

8 years agoSet Beer Types from the setting in event management.
Steve Sutton [Mon, 7 Nov 2016 13:37:34 +0000 (08:37 -0500)]
Set Beer Types from the setting in event management.

Should not be hard coded in the search form.

8 years agoUpdate admin edit event page
Steve Sutton [Fri, 4 Nov 2016 20:22:32 +0000 (16:22 -0400)]
Update admin edit event page

This is for locking the venue select when checking use member location
flag.

8 years agoSetting up jquery for venue select if the use_member_location checked
Steve Sutton [Fri, 4 Nov 2016 19:49:42 +0000 (15:49 -0400)]
Setting up jquery for venue select if the use_member_location checked

If they pick the use_member_loction then set the venue and lock it to
that member. unlocking it when the uncheck the field.

8 years agoSet the venue to the member if they select use member location.
Steve Sutton [Fri, 4 Nov 2016 19:14:46 +0000 (15:14 -0400)]
Set the venue to the member if they select use member location.

This is so we can grab all other_ref_dest for creating a venue list.
This will behave like beer week current does.

8 years agoAdding in the venue to search form and query for event list.
Steve Sutton [Fri, 4 Nov 2016 17:43:30 +0000 (13:43 -0400)]
Adding in the venue to search form and query for event list.

Add the venues so they get pulled into the select box for search.
Add venue id for search query.

8 years agoadding comma separation to the event types and the beer types in the beer week agenda...
Anthony Talarico [Fri, 4 Nov 2016 17:31:56 +0000 (13:31 -0400)]
adding comma separation to the event types and the beer types in the beer week agenda view event content

8 years agofixing selectors for the beer week agenda view event venue label
Anthony Talarico [Fri, 4 Nov 2016 16:49:27 +0000 (12:49 -0400)]
fixing selectors for the beer week agenda view event venue label

8 years agoadding beer types, event types and venues to the agenda view event content section
Anthony Talarico [Fri, 4 Nov 2016 16:46:46 +0000 (12:46 -0400)]
adding beer types, event types and venues to the agenda view event content section

8 years agoUpdate category and amenity for editing events.
Steve Sutton [Fri, 4 Nov 2016 16:01:15 +0000 (12:01 -0400)]
Update category and amenity for editing events.

Need to check for option to be either submit or update for the deleting
of amenities or categories if none are set.

8 years agoAdding the dates field to events when using getFeaturedEvents
Steve Sutton [Fri, 4 Nov 2016 12:21:43 +0000 (08:21 -0400)]
Adding the dates field to events when using getFeaturedEvents

Was set in the other get events method.

8 years agoin the beerweek search form template file, increasing the columns for the icons so...
Anthony Talarico [Thu, 3 Nov 2016 18:14:45 +0000 (14:14 -0400)]
in the beerweek search form template file, increasing the columns for the icons so that the search icon can fit inside and float next to the date fields

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop
Steve Sutton [Thu, 3 Nov 2016 17:59:45 +0000 (13:59 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop

8 years agoMerge tag 'v1.5.3' into develop
Steve Sutton [Thu, 3 Nov 2016 17:59:31 +0000 (13:59 -0400)]
Merge tag 'v1.5.3' into develop

Version 1.5.3

8 years agoMerge branch 'hotfix/1.5.3' v1.5.3
Steve Sutton [Thu, 3 Nov 2016 17:58:20 +0000 (13:58 -0400)]
Merge branch 'hotfix/1.5.3'

8 years agoSort the events array if action is featured. hotfix/1.5.3
Steve Sutton [Thu, 3 Nov 2016 17:57:27 +0000 (13:57 -0400)]
Sort the events array if action is featured.

This is for templates that don't use the events grouped by day.

8 years agoadding classes to the beerweek search form labels
Anthony Talarico [Thu, 3 Nov 2016 17:05:05 +0000 (13:05 -0400)]
adding classes to the beerweek search form labels

8 years agoRemove debug
Steve Sutton [Thu, 3 Nov 2016 16:58:36 +0000 (12:58 -0400)]
Remove debug

turn off debug for smarty

8 years agoCheck for undefined variables.
Steve Sutton [Thu, 3 Nov 2016 16:54:57 +0000 (12:54 -0400)]
Check for undefined variables.

Turning on debug and testing out form.

8 years agoRemove flush
Steve Sutton [Thu, 3 Nov 2016 16:46:54 +0000 (12:46 -0400)]
Remove flush

not correct anyway

8 years agoAdd amenities and venues to frontAdd form.
Steve Sutton [Thu, 3 Nov 2016 16:44:25 +0000 (12:44 -0400)]
Add amenities and venues to frontAdd form.

Adding the amenities as checkboxes.
Add function for checking that at least one of them are required.
Adding venue list to the front end add event form.

8 years agoFix for front list page and edit form.
Steve Sutton [Thu, 3 Nov 2016 12:39:56 +0000 (08:39 -0400)]
Fix for front list page and edit form.

Edit form needs to set hidden field for other_ref_dest if venues are
off.
Front page fix for when to stop getting next end date.

8 years agoAdding new field into dataEvents.
Steve Sutton [Thu, 3 Nov 2016 12:04:27 +0000 (08:04 -0400)]
Adding new field into dataEvents.

This is to get the actual ref id stored in other_ref_dest field.

8 years agoSetup the venue for the member if set on event.
Steve Sutton [Wed, 2 Nov 2016 21:31:10 +0000 (17:31 -0400)]
Setup the venue for the member if set on event.

If the event has other_ref_dest set then get the member info record from
the name that was set. This will be used for the detail page.

8 years agoSetup the event form for venue location.
Steve Sutton [Wed, 2 Nov 2016 20:34:02 +0000 (16:34 -0400)]
Setup the event form for venue location.

If other_ref_dest is set it will hide the location.

8 years agoUpdating db tables with new fields.
Steve Sutton [Wed, 2 Nov 2016 19:03:28 +0000 (15:03 -0400)]
Updating db tables with new fields.

Adding new field for event management.
    use_venue_locations - To use other member locations as event
    locations.

Adding new field for event table.
    other_ref_dest - Another members id for location.

8 years agoMerge branch 'feature/beerweek' into develop
Steve Sutton [Wed, 2 Nov 2016 16:38:23 +0000 (12:38 -0400)]
Merge branch 'feature/beerweek' into develop

8 years agoUpdating the get events function in baseAction.php
Steve Sutton [Wed, 2 Nov 2016 16:35:42 +0000 (12:35 -0400)]
Updating the get events function in baseAction.php

Updating these so you can have more than one of these given and it will
select events properly.
Before it would only goto one case.
Building an array for the wherePart and imploding it with AND to build
the where part for the event list call.

8 years agoWIP for adding amenities
Steve Sutton [Tue, 1 Nov 2016 21:04:12 +0000 (17:04 -0400)]
WIP for adding amenities

Working on the amenities.

8 years agoWIP for event search.
Steve Sutton [Mon, 31 Oct 2016 21:12:57 +0000 (17:12 -0400)]
WIP for event search.

Adding amenities, members to search.

8 years agoFix for adding event with Categories and Amenities
Steve Sutton [Fri, 28 Oct 2016 21:05:12 +0000 (17:05 -0400)]
Fix for adding event with Categories and Amenities

Adding an event wasn't saving the Category or Amenity when first
inserted. Updated the code to insert the event get the event id then add
categories and amenities.

8 years agoMerge branch 'develop' into feature/beerweek feature/beerweek
Steve Sutton [Fri, 28 Oct 2016 18:26:22 +0000 (14:26 -0400)]
Merge branch 'develop' into feature/beerweek

8 years agoMerge branch 'feature/eventAmenities' into develop
Steve Sutton [Fri, 28 Oct 2016 15:31:14 +0000 (11:31 -0400)]
Merge branch 'feature/eventAmenities' into develop

8 years agoRemove parent drop down in add event amenity on the event edit page. feature/eventAmenities
Steve Sutton [Fri, 28 Oct 2016 15:25:03 +0000 (11:25 -0400)]
Remove parent drop down in add event amenity on the event edit page.

This was using same name as the category one. Parent of amenities not
used right now.

8 years agoUpdate the sql scripts so there's default names.
Steve Sutton [Fri, 28 Oct 2016 15:19:12 +0000 (11:19 -0400)]
Update the sql scripts so there's default names.

For the singular and plural names to have default of Amenity and
Amenities.

8 years agoUpdate events so the use_event_amenity flag works on edit and settings.
Steve Sutton [Fri, 28 Oct 2016 15:06:49 +0000 (11:06 -0400)]
Update events so the use_event_amenity flag works on edit and settings.

Setting up the use_event_amenity settings to turn off and
on the event amenities in settings page and the event edit add pages.

8 years agoWIP Event Amenities:
Steve Sutton [Fri, 28 Oct 2016 14:48:18 +0000 (10:48 -0400)]
WIP Event Amenities:

Event Amenity setting now using the event management name for amenities (beer types).
Event amenities now working on edit event page.
Event amenities now working for the setting page.
Setting: add edit delete amenities working.
Event edit page: adding editing deleting amenities to event working.

8 years agoMerge branch 'develop' into feature/eventAmenities
Steve Sutton [Fri, 28 Oct 2016 12:12:19 +0000 (08:12 -0400)]
Merge branch 'develop' into feature/eventAmenities

8 years agoMerge tag 'v1.5.2' into develop
Steve Sutton [Thu, 27 Oct 2016 18:32:25 +0000 (14:32 -0400)]
Merge tag 'v1.5.2' into develop

Version 1.5.2

8 years agoMerge branch 'hotfix/1.5.2' v1.5.2
Steve Sutton [Thu, 27 Oct 2016 18:32:19 +0000 (14:32 -0400)]
Merge branch 'hotfix/1.5.2'

8 years agoFix for the agenda view dates shown.
Steve Sutton [Thu, 27 Oct 2016 18:31:29 +0000 (14:31 -0400)]
Fix for the agenda view dates shown.

Looping through each recurrence and finding the correct one to output
the date.

8 years agoMerge tag 'v1.5.1' into develop
Steve Sutton [Thu, 27 Oct 2016 17:11:00 +0000 (13:11 -0400)]
Merge tag 'v1.5.1' into develop

Version 1.5.1

8 years agoMerge branch 'hotfix/1.5.1' v1.5.1
Steve Sutton [Thu, 27 Oct 2016 17:10:53 +0000 (13:10 -0400)]
Merge branch 'hotfix/1.5.1'

8 years agoAdd google map api key
Steve Sutton [Thu, 27 Oct 2016 17:10:27 +0000 (13:10 -0400)]
Add google map api key

Also bump version number.

8 years agoBROKEN Work in progress for adding event Amenities
Laury GvR [Wed, 26 Oct 2016 20:14:05 +0000 (16:14 -0400)]
BROKEN Work in progress for adding event Amenities

Amenities are added to the Edit Event form - but they are not
functional. A new amenity can be added successfully but is then
not attached to the event.

The "Add a new amenity" popup currently has a needless dropdown
but needs to optimally be like the "Add an amenity" in the member
DB settings. It will in fact -not- be like the category button in
that it shall nto have a parent, but needs to show the amenity
groups, which are not yet properly handled in the model.

Then the corresponding button for adding amenities, along with the
one for adding categories, needs to not be displayed if the user
lacks admin privileges.

8 years agoWorking on the beer week templates.
Steve Sutton [Wed, 26 Oct 2016 13:52:56 +0000 (09:52 -0400)]
Working on the beer week templates.

8 years agoMerge branch 'feature/memberOnlyFrontEndForm' into develop
Steve Sutton [Mon, 24 Oct 2016 18:21:12 +0000 (14:21 -0400)]
Merge branch 'feature/memberOnlyFrontEndForm' into develop

8 years agoUpdate shortcode text.
Steve Sutton [Mon, 24 Oct 2016 18:16:12 +0000 (14:16 -0400)]
Update shortcode text.

Explain the member_only attribute.

8 years agoIf the logged in user is member manager then allow adding to any member.
Steve Sutton [Mon, 24 Oct 2016 18:11:19 +0000 (14:11 -0400)]
If the logged in user is member manager then allow adding to any member.

Add event form is now working for member contact and member manager to
add event from the front end event form.

8 years agoSetting up the member ref_dest hidden field
Steve Sutton [Fri, 21 Oct 2016 20:59:45 +0000 (16:59 -0400)]
Setting up the member ref_dest hidden field

Setting up hidden fields for when member contact is logged in and
submits an event.

8 years agoMerge branch 'develop' into feature/memberOnlyFrontEndForm
Steve Sutton [Fri, 21 Oct 2016 18:37:56 +0000 (14:37 -0400)]
Merge branch 'develop' into feature/memberOnlyFrontEndForm

8 years agoUpdate edit event form for enable_members flag.
Steve Sutton [Fri, 21 Oct 2016 14:55:48 +0000 (10:55 -0400)]
Update edit event form for enable_members flag.

If the members are disabled then just output hidden field.

8 years agoUpdate to get enable_member flag.
Steve Sutton [Fri, 21 Oct 2016 14:23:33 +0000 (10:23 -0400)]
Update to get enable_member flag.

This is for turning off members in the glmAssociate plugins.

8 years agoStarting WIP for member only front end form.
Steve Sutton [Fri, 21 Oct 2016 13:03:57 +0000 (09:03 -0400)]
Starting WIP for member only front end form.

This form could be used on the front end for member only. So they can
quickly add events.

8 years agoadding view link to the admin events list page
Anthony Talarico [Wed, 19 Oct 2016 14:33:14 +0000 (10:33 -0400)]
adding view link to the admin events list page

8 years agoMerge tag 'v1.5.0' into develop
Steve Sutton [Wed, 19 Oct 2016 13:44:47 +0000 (09:44 -0400)]
Merge tag 'v1.5.0' into develop

Version 1.5.0

8 years agoMerge branch 'release/1.5.0' v1.5.0
Steve Sutton [Wed, 19 Oct 2016 13:44:42 +0000 (09:44 -0400)]
Merge branch 'release/1.5.0'

8 years agoBump version number
Steve Sutton [Wed, 19 Oct 2016 13:44:06 +0000 (09:44 -0400)]
Bump version number

New feature release
Dashboard

8 years agoMerge branch 'feature/dashboard' into develop
Steve Sutton [Tue, 18 Oct 2016 16:28:29 +0000 (12:28 -0400)]
Merge branch 'feature/dashboard' into develop

8 years agoMerge branch 'develop' into feature/dashboard
Steve Sutton [Tue, 18 Oct 2016 16:27:33 +0000 (12:27 -0400)]
Merge branch 'develop' into feature/dashboard

8 years agoadding detail-search-form class to the calendar detail view search form div so it...
Anthony Talarico [Mon, 17 Oct 2016 18:40:45 +0000 (14:40 -0400)]
adding detail-search-form class to the calendar detail view search form div so it can be targeted in the theme or with js

8 years agoincreasing the width of the calendar view selection dropdown, increasing from 2 colum...
Anthony Talarico [Mon, 17 Oct 2016 13:02:08 +0000 (09:02 -0400)]
increasing the width of the calendar view selection dropdown, increasing from 2 columns to 3

8 years agoMerge branch 'develop' into feature/dashboard
Steve Sutton [Fri, 14 Oct 2016 19:15:53 +0000 (15:15 -0400)]
Merge branch 'develop' into feature/dashboard

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop
Chuck Scott [Thu, 13 Oct 2016 20:12:22 +0000 (16:12 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop

8 years agoUpdated permissions to use new glmMembersUserCan() function and fixed other permissio...
Chuck Scott [Thu, 13 Oct 2016 20:12:01 +0000 (16:12 -0400)]
Updated permissions to use new glmMembersUserCan() function and fixed other permission issues.

8 years agoUpdating for events from glm associate.
Steve Sutton [Thu, 13 Oct 2016 20:00:47 +0000 (16:00 -0400)]
Updating for events from glm associate.

Adding our list of events into the block admin to link our events into
the glm Blocks.

8 years agoFix for when no members are there.
Steve Sutton [Thu, 13 Oct 2016 16:53:27 +0000 (12:53 -0400)]
Fix for when no members are there.

Before if you had no members it wouldn't let you add an event.
It wasn't setting the ref id for the form.

8 years agoMerge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop
Chuck Scott [Thu, 13 Oct 2016 15:41:06 +0000 (11:41 -0400)]
Merge branch 'develop' of cvs2:WP-Plugins/glm-member-db-events into develop

8 years agoAdded code to support updates - Temporatily commented out code added to index.php...
Chuck Scott [Thu, 13 Oct 2016 15:40:57 +0000 (11:40 -0400)]
Added code to support updates - Temporatily commented out code added to index.php for now.

8 years agoMerge tag 'v1.4.8' into develop
Anthony Talarico [Tue, 11 Oct 2016 19:39:20 +0000 (15:39 -0400)]
Merge tag 'v1.4.8' into develop

bumping version number, moving the placement of the agenda view to and from dates for the 'occurring' string so that the dates will actually display

8 years agoMerge branch 'hotfix/1.4.8' v1.4.8
Anthony Talarico [Tue, 11 Oct 2016 19:38:47 +0000 (15:38 -0400)]
Merge branch 'hotfix/1.4.8'

8 years agobumping version number, fixing placement of the to and from dates in the agenda view...
Anthony Talarico [Tue, 11 Oct 2016 19:37:44 +0000 (15:37 -0400)]
bumping version number, fixing placement of the to and from dates in the agenda view template otherwise they don't display

8 years agoMerge tag 'v1.4.7' into develop
Anthony Talarico [Tue, 11 Oct 2016 19:34:02 +0000 (15:34 -0400)]
Merge tag 'v1.4.7' into develop

bumping version number, using specific_dates from the recurrences array if the to and from dates are the same

8 years agoMerge branch 'hotfix/1.4.7' v1.4.7
Anthony Talarico [Tue, 11 Oct 2016 19:32:27 +0000 (15:32 -0400)]
Merge branch 'hotfix/1.4.7'

8 years agobumping version number, adding conditional to check for specific_dates in recurrences...
Anthony Talarico [Tue, 11 Oct 2016 19:31:30 +0000 (15:31 -0400)]
bumping version number, adding conditional to check for specific_dates in recurrences array if the to and from dates are the same and there are specific dates that exist.

8 years agoMerge tag 'v1.4.6' into develop
Anthony Talarico [Tue, 11 Oct 2016 16:58:29 +0000 (12:58 -0400)]
Merge tag 'v1.4.6' into develop

restricting output of agenda view events if the from and to dates of the event are the same, bumping version number

8 years agoMerge branch 'hotfix/1.4.6' v1.4.6
Anthony Talarico [Tue, 11 Oct 2016 16:57:57 +0000 (12:57 -0400)]
Merge branch 'hotfix/1.4.6'

8 years agorestricting agenda view date output if the start and end date of the events are the...
Anthony Talarico [Tue, 11 Oct 2016 16:57:21 +0000 (12:57 -0400)]
restricting agenda view date output if the start and end date of the events are the same, bumping version number

8 years agoRemove limit from the pending event list.
Steve Sutton [Tue, 11 Oct 2016 15:12:01 +0000 (11:12 -0400)]
Remove limit from the pending event list.

For this part list all pending events.

8 years agoUpdate for admin dashboard
Steve Sutton [Tue, 11 Oct 2016 14:49:58 +0000 (10:49 -0400)]
Update for admin dashboard

Setting up the same model and view so it will work in both the member
contact and client member manager dashboard areas.

8 years agoMerge branch 'develop' into feature/dashboard
Steve Sutton [Tue, 11 Oct 2016 14:35:21 +0000 (10:35 -0400)]
Merge branch 'develop' into feature/dashboard

8 years agoMerge tag 'v1.4.5' into develop
Anthony Talarico [Tue, 11 Oct 2016 13:59:55 +0000 (09:59 -0400)]
Merge tag 'v1.4.5' into develop

bumping version number, excluding pending events from the event calendar

8 years agoMerge branch 'hotfix/1.4.5' v1.4.5
Anthony Talarico [Tue, 11 Oct 2016 13:59:33 +0000 (09:59 -0400)]
Merge branch 'hotfix/1.4.5'

8 years agobumping version number, excluding pending events from the calendar that are pending
Anthony Talarico [Tue, 11 Oct 2016 13:59:02 +0000 (09:59 -0400)]
bumping version number, excluding pending events from the calendar that are pending

8 years agoMerge tag 'v1.4.4' into develop
Anthony Talarico [Mon, 10 Oct 2016 20:11:08 +0000 (16:11 -0400)]
Merge tag 'v1.4.4' into develop

removing test print statements left behind

8 years agoMerge branch 'hotfix/1.4.4' v1.4.4
Anthony Talarico [Mon, 10 Oct 2016 20:10:58 +0000 (16:10 -0400)]
Merge branch 'hotfix/1.4.4'

8 years agoremoving test print_r statements left behind
Anthony Talarico [Mon, 10 Oct 2016 20:10:38 +0000 (16:10 -0400)]
removing test print_r statements left behind

8 years agoMerge tag 'v1.4.3' into develop
Anthony Talarico [Mon, 10 Oct 2016 20:09:03 +0000 (16:09 -0400)]
Merge tag 'v1.4.3' into develop

bumping plugin version number, displaying days of week in agenda view only if there are more than 0 and less than 7 days selected.

8 years agoMerge branch 'hotfix/1.4.3' v1.4.3
Anthony Talarico [Mon, 10 Oct 2016 20:08:24 +0000 (16:08 -0400)]
Merge branch 'hotfix/1.4.3'

8 years agofixing agenda view event date output after searching, recurrences set to true in...
Anthony Talarico [Mon, 10 Oct 2016 20:06:59 +0000 (16:06 -0400)]
fixing agenda view event date output after searching, recurrences set to true in the event-list action. display days of the week in agenda view only if there are less than 7 and more than 0. bumping plugin version number

8 years agoMerge tag 'v1.4.2' into develop
Anthony Talarico [Mon, 10 Oct 2016 18:43:33 +0000 (14:43 -0400)]
Merge tag 'v1.4.2' into develop

removing the 'on' phrase from agenda view events if the the recurrence data contains all of the days in the week or 0 days of the week

8 years agoMerge branch 'hotfix/1.4.2' v1.4.2
Anthony Talarico [Mon, 10 Oct 2016 18:42:53 +0000 (14:42 -0400)]
Merge branch 'hotfix/1.4.2'

8 years agoremoving the 'on' phrase from agenda view events if there are 0 or 7 days listed...
Anthony Talarico [Mon, 10 Oct 2016 18:41:49 +0000 (14:41 -0400)]
removing the 'on' phrase from agenda view events if there are 0 or 7 days listed in the recurrences

8 years agoMerge tag 'v1.4.1' into develop
Anthony Talarico [Mon, 10 Oct 2016 16:06:08 +0000 (12:06 -0400)]
Merge tag 'v1.4.1' into develop

removing console statements from the events calendar plugin

8 years agoMerge branch 'hotfix/1.4.1' v1.4.1
Anthony Talarico [Mon, 10 Oct 2016 16:05:57 +0000 (12:05 -0400)]
Merge branch 'hotfix/1.4.1'

8 years agoremoving console statements from the event calendar view
Anthony Talarico [Mon, 10 Oct 2016 16:05:43 +0000 (12:05 -0400)]
removing console statements from the event calendar view

8 years agoMerge tag 'v1.4.0' into develop
Anthony Talarico [Mon, 10 Oct 2016 15:12:55 +0000 (11:12 -0400)]
Merge tag 'v1.4.0' into develop

bumping version number, release for calendar view

8 years agoMerge branch 'release/1.4.0' v1.4.0
Anthony Talarico [Mon, 10 Oct 2016 15:12:00 +0000 (11:12 -0400)]
Merge branch 'release/1.4.0'

8 years agobumping plugin version numbers
Anthony Talarico [Mon, 10 Oct 2016 15:08:10 +0000 (11:08 -0400)]
bumping plugin version numbers

8 years agochanging calendar view events ajax request loading gif overlay to 100% to accommodate...
Anthony Talarico [Thu, 6 Oct 2016 20:32:34 +0000 (16:32 -0400)]
changing calendar view events ajax request loading gif overlay to 100% to accommodate mobile view