From bf56a89f3f0676d2ff445bc0d066f521f653402c Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Wed, 19 Sep 2018 15:03:39 -0400 Subject: [PATCH] Updates for generating pdf when using more than one cat in shorcode. If the shortcode has more than one category then we need to pull the list of categories and send it to the pdf admin ajax call. Before it was just sending the form which had only a single select so only the last category that was marked selected would get submitted to the pdf generator. --- js/dashboard.js | 4 +++- models/front/events/baseAction.php | 1 + models/front/events/list.php | 16 ++++++++++++---- views/front/events/searchForm.html | 6 +++--- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/js/dashboard.js b/js/dashboard.js index 2df4189..d90cb64 100644 --- a/js/dashboard.js +++ b/js/dashboard.js @@ -26,7 +26,9 @@ jQuery(document).ready(function ($) { } jQuery('#glm-event-pdf-submit').click(function(event){ eventForm = $('#glm-member-event-search'); - eventForm.attr('action', ajaxUrl + '?action=glm_members_admin_ajax&glm_action=pdfOutput&glm-event-pdf=1'); + // Get the data-cats + var categories = $(this).data('cats'); + eventForm.attr('action', ajaxUrl + '?action=glm_members_admin_ajax&glm_action=pdfOutput&glm-event-pdf=1&categories=' + categories ); }); if (jQuery('#glm-event-name').length > 0) { var cache = {}; diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php index 51f18ad..0ce1b5a 100644 --- a/models/front/events/baseAction.php +++ b/models/front/events/baseAction.php @@ -407,6 +407,7 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents } // echo '
$whereParts: ' . print_r( $whereParts, true ) . '
'; + // exit; if ( isset( $whereParts ) && !empty( $whereParts ) ) { $where = implode( ' AND ', $whereParts); } diff --git a/models/front/events/list.php b/models/front/events/list.php index 805aece..4c72089 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -73,6 +73,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $groupByDay = true; $groupMonth = false; $this->notInCat = array(); + $pdfCategoryList = ''; // get list cities to search by @@ -130,14 +131,19 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } // Get any numeric categories selected in the submitted shortcode and add to $cats array. // This sets categories that are available for selection by the user - if ( !( isset( $_REQUEST['category'] ) && $_REQUEST['category'] ) - && isset( $actionData['request']['category'] ) - && $categoryId = filter_var( $actionData['request']['category'], FILTER_SANITIZE_STRING ) + if ( !( isset( $_REQUEST['category'] ) && $_REQUEST['category'] && !isset( $_REQUEST['categories'] ) ) + && ( isset( $actionData['request']['category'] ) || $_REQUEST['categories'] ) ) { + $pdfCategoryList = $actionData['request']['category']; $categoryId = array(); // Convert comma separated list to an array - $catsRequested = explode(',', $actionData['request']['category']); + if( isset( $actionData['request']['category'] ) && filter_var( $actionData['request']['category'], FILTER_SANITIZE_STRING ) ) { + $catsRequested = explode(',', $actionData['request']['category'] ); + } + if ( isset( $_REQUEST['categories'] ) && filter_var( $_REQUEST['categories'], FILTER_SANITIZE_STRING ) ) { + $catsRequested = explode(',', $_REQUEST['categories'] ); + } // Check for numeric IDs only while (list($k, $v) = each($catsRequested)) { @@ -155,6 +161,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } } + if ( isset( $_REQUEST['amenity'] ) && $amenityId = filter_var( $_REQUEST['amenity'], FILTER_VALIDATE_INT ) ) { $search = true; $action = 'event-list'; @@ -690,6 +697,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction 'cal_view' => $calendar_view, 'pageSlug' => $pageSlug, 'customPage' => $customPage, + 'pdfCatList' => $pdfCategoryList, // 'override' => $override_default_view ); error_reporting(E_ALL ^ E_NOTICE); diff --git a/views/front/events/searchForm.html b/views/front/events/searchForm.html index 9d76c3d..e7a35b0 100644 --- a/views/front/events/searchForm.html +++ b/views/front/events/searchForm.html @@ -24,7 +24,7 @@