diff --git a/inc/admin_setting_panel.php b/inc/admin_setting_panel.php index 429ba57..84b2baa 100644 --- a/inc/admin_setting_panel.php +++ b/inc/admin_setting_panel.php @@ -113,6 +113,17 @@ if (!class_exists('MAGE_Events_Setting_Controls')) : 'wpml' => 'WPML' ) ), + array( + 'name' => 'mep_event_list_order_by', + 'label' => __('Event List Order By', 'mage-eventpress'), + 'desc' => __('Please select Event list order by which value Event Title or Event Date. By Default is: Event Upcoming Date', 'mage-eventpress'), + 'type' => 'select', + 'default' => 'meta_value', + 'options' => array( + 'meta_value' => 'Event Upcoming Date', + 'title' => 'Event Title' + ) + ), array( 'name' => 'mep_event_label', 'label' => __('Event Label', 'mage-eventpress'), @@ -230,6 +241,17 @@ if (!class_exists('MAGE_Events_Setting_Controls')) : 'no' => 'No' ) ), + array( + 'name' => 'mep_hide_expired_date_in_calendar', + 'label' => __('Hide Expired Event from Calendar', 'mage-eventpress'), + 'desc' => __('If you want to hide the expired event from the calendar please select Yes. Its applicable for the Free Calendar', 'mage-eventpress'), + 'type' => 'select', + 'default' => 'no', + 'options' => array( + 'yes' => 'Yes', + 'no' => 'No' + ) + ), array( 'name' => 'mep_event_direct_checkout', 'label' => __('Redirect Checkout after Booking', 'mage-eventpress'), diff --git a/inc/mep_functions.php b/inc/mep_functions.php index c3828b0..d3dec39 100755 --- a/inc/mep_functions.php +++ b/inc/mep_functions.php @@ -3692,7 +3692,7 @@ if (!function_exists('mep_cart_display_ticket_type_list')) { function mep_cart_display_ticket_type_list($ticket_type_arr, $eid) { ob_start(); foreach ($ticket_type_arr as $ticket) { - echo '
  • ' . esc_attr($ticket['ticket_name']) . " - " . wc_price(esc_attr(mep_get_price_including_tax($eid, $ticket['ticket_price']))) . ' x ' . esc_attr($ticket['ticket_qty']) . ' = ' . wc_price(esc_attr(mep_get_price_including_tax($eid, (float)$ticket['ticket_price'] * (float)$ticket['ticket_qty']))) . '
  • '; + echo '
  • ' . esc_attr($ticket['ticket_name']) . " - " . wc_price(esc_attr(mep_get_price_including_tax($eid, (float)$ticket['ticket_price']))) . ' x ' . esc_attr($ticket['ticket_qty']) . ' = ' . wc_price(esc_attr(mep_get_price_including_tax($eid, (float)$ticket['ticket_price'] * (float)$ticket['ticket_qty']))) . '
  • '; } return apply_filters('mep_display_ticket_in_cart_list', ob_get_clean(), $ticket_type_arr, $eid); } diff --git a/inc/mep_query.php b/inc/mep_query.php index df22dca..5095441 100644 --- a/inc/mep_query.php +++ b/inc/mep_query.php @@ -8,9 +8,11 @@ if (!defined('ABSPATH')) { */ function mep_event_query($show, $sort = '', $cat = '', $org = '', $city = '', $country = '', $evnt_type = 'upcoming') { - $event_expire_on_old = mep_get_option('mep_event_expire_on_datetimes', 'general_setting_sec', 'event_start_datetime'); - $event_expire_on = $event_expire_on_old == 'event_end_datetime' ? 'event_expire_datetime' : $event_expire_on_old; - $now = current_time('Y-m-d H:i:s'); + $event_expire_on_old = mep_get_option('mep_event_expire_on_datetimes', 'general_setting_sec', 'event_start_datetime'); + $event_order_by = mep_get_option('mep_event_list_order_by', 'general_setting_sec', 'meta_value'); + $event_expire_on = $event_expire_on_old == 'event_end_datetime' ? 'event_expire_datetime' : $event_expire_on_old; + $now = current_time('Y-m-d H:i:s'); + if ( get_query_var('paged') ) { $paged = get_query_var('paged'); } elseif ( get_query_var('page') ) { @@ -60,7 +62,7 @@ function mep_event_query($show, $sort = '', $cat = '', $org = '', $city = '', $c 'paged' => $paged, 'posts_per_page' => $show, 'order' => $sort, - 'orderby' => 'meta_value', + 'orderby' => $event_order_by, // 'meta_key' => 'event_start_datetime', 'meta_key' => 'event_upcoming_datetime', 'meta_query' => array( @@ -113,6 +115,4 @@ function mep_event_pagination($total_page) array('mep_events'), @@ -53,6 +55,23 @@ function mep_event_calender() $event_dates = mep_get_event_dates_arr(get_the_id()); $now = current_time('Y-m-d H:i:s'); foreach ($event_dates as $_dates) { + + +if($hide_expired == 'no'){ + ?> +{ + start : '', + end : '', + title : '', + url : '', + class : '', + color : '#000', + data : {} + }, + { @@ -68,6 +87,7 @@ foreach ($event_dates as $_dates) { } } } +} $i++; wp_reset_postdata(); ?> diff --git a/inc/template-prts/event_add_cart.php b/inc/template-prts/event_add_cart.php index 8beb759..f0a3e21 100755 --- a/inc/template-prts/event_add_cart.php +++ b/inc/template-prts/event_add_cart.php @@ -161,7 +161,7 @@ if (!function_exists('mep_get_event_reg_btn')) { - + diff --git a/inc/template-prts/event_ticket_type.php b/inc/template-prts/event_ticket_type.php index 3c82a92..0fe9fc5 100755 --- a/inc/template-prts/event_ticket_type.php +++ b/inc/template-prts/event_ticket_type.php @@ -1,7 +1,7 @@ - + - + + diff --git a/readme.txt b/readme.txt index 3c7312d..45bc738 100644 --- a/readme.txt +++ b/readme.txt @@ -2,8 +2,8 @@ Contributors: magepeopleteam, aamahin Tags: event, woocomerce events manager, events manager, Wordpress Events plugin, Events plugin, wp events Requires at least: 5.3 -Stable tag: 3.8.1 -Version: 3.8.1 +Stable tag: 3.8.2 +Version: 3.8.2 Tested up to: 6.1 WC requires at least: 3.0 WC tested up to: 6.5 @@ -919,4 +919,12 @@ Bug fixed * Update Release: Recurring Waitlist showing issue fixed. Bug fixed -19 Jan 2023* \ No newline at end of file +19 Jan 2023* + + += 3.8.2= +* Update Release: +Event Sorting by event title added in Event Settings Page +Expired Event show or not in calendar settings added in Event Settings Page. +Bug fixed. +01 Feb 2023* \ No newline at end of file diff --git a/woocommerce-event-press.php b/woocommerce-event-press.php index 2bf1089..9b15ca8 100644 --- a/woocommerce-event-press.php +++ b/woocommerce-event-press.php @@ -3,7 +3,7 @@ * Plugin Name: Event Manager and Tickets Selling Plugin for WooCommerce * Plugin URI: http://mage-people.com * Description: A Complete Event Solution for WordPress by MagePeople.. - * Version: 3.8.1 + * Version: 3.8.2 * Author: MagePeople Team * Author URI: http://www.mage-people.com/ * Text Domain: mage-eventpress