v 3.3.3 released

css/style.css

@@ -372,7 +372,14 @@ button.single_add_to_cart_button.button.alt.btn-mep-event-cart { cursor: pointer
     font-size: 70px!important;
 }
 
-
+.mep-wailist-form input {
+    display: block;
+    overflow: hidden;
+    margin: 20px auto!important;
+    width: 100%;
+    padding: 10px!important;
+    background: #fff!important;
+}
 
 /* Minimal Styles */
 .mep_event_minimal_list {

inc/mep_extra_price.php

@@ -38,7 +38,7 @@ function mep_add_custom_fields_text_to_cart_item($cart_item_data, $product_id, $
 
     
 // echo '<pre>';
-// print_r($user);
+// // print_r($user);
 // print_r($ticket_type_arr);
 // die();
 
@@ -152,11 +152,12 @@ $hide_date_status  = mep_get_option('mep_hide_date_from_order_page', 'general_se
   <?php
      }
     if (is_array($ticket_type_arr) && sizeof($ticket_type_arr) > 0) {
-      echo mep_cart_display_ticket_type_list($ticket_type_arr);
+      // echo $eid;
+      echo mep_cart_display_ticket_type_list($ticket_type_arr, $eid);
     }
     if (is_array($event_extra_service) && sizeof($event_extra_service) > 0) {
       foreach ($event_extra_service as $extra_service) {
-        echo '<li>' . $extra_service['service_name'] . " - " . wc_price($extra_service['service_price']) . ' x ' . $extra_service['service_qty'] . ' = ' . wc_price( (int) $extra_service['service_price'] * (int) $extra_service['service_qty']) . '</li>';
+        echo '<li>' . $extra_service['service_name'] . " - " . wc_price(mep_get_price_including_tax($eid,$extra_service['service_price'])) . ' x ' . $extra_service['service_qty'] . ' = ' . wc_price( mep_get_price_including_tax($eid,(int) $extra_service['service_price'] * (int) $extra_service['service_qty'])) . '</li>';
       }
     }
     do_action('mep_after_cart_item_display_list',$cart_item);
@@ -232,14 +233,14 @@ function mep_add_custom_fields_text_to_order_items($item, $cart_item_key, $value
 
     if (is_array($ticket_type_arr) && sizeof($ticket_type_arr) > 0) {    
       
-     mep_cart_order_data_save_ticket_type($item,$ticket_type_arr);
+     mep_cart_order_data_save_ticket_type($item,$ticket_type_arr,$eid);
 
     }
 
     if (is_array($event_extra_service) && sizeof($event_extra_service) > 0) {
       foreach ($event_extra_service as $extra_service) {
-        $service_type_name = $extra_service['service_name'] . " - " . wc_price($extra_service['service_price']) . ' x ' . $extra_service['service_qty'] . ' = ';
+        $service_type_name = $extra_service['service_name'] . " - " . wc_price(mep_get_price_including_tax($eid,$extra_service['service_price'])) . ' x ' . $extra_service['service_qty'] . ' = ';
-        $service_type_val = wc_price($extra_service['service_price'] * $extra_service['service_qty']);
+        $service_type_val = wc_price(mep_get_price_including_tax($eid,$extra_service['service_price'] * $extra_service['service_qty']));
         $item->add_meta_data($service_type_name, $service_type_val);
       }
     }

inc/mep_file_include.php

@@ -23,3 +23,4 @@ require_once(dirname(__DIR__) . "/inc/mep_tax_meta.php");
 require_once(dirname(__DIR__) . "/inc/mep_upgrade.php");
 require_once(dirname(__DIR__) . "/inc/mep_functions.php");
 require_once(dirname(__DIR__) . "/inc/mep_query.php");
+// require_once(dirname(__DIR__) . "/support/elementor/elementor-support.php");

inc/mep_functions.php

@@ -402,6 +402,7 @@ $ticket_total_price = (mep_get_event_ticket_price_by_name($event_id,$ticket_type
       update_post_meta( $pid, 'ea_event_id', $event_id );
       update_post_meta( $pid, 'ea_order_id', $order_id );
       update_post_meta( $pid, 'ea_user_id', $user_id );
+      update_post_meta( $pid, 'mep_checkin', 'No' );
       update_post_meta( $order_id, 'ea_user_id', $user_id );
       update_post_meta( $order_id, 'order_type_name', 'mep_events' );
       update_post_meta( $pid, 'ea_ticket_no', $pin );
@@ -1836,7 +1837,7 @@ if (!function_exists('mep_get_term_as_class')) {
       if($tt){
       $t_class = array();
       foreach($tt as $tclass){
-          $t_class[] = 'mage-'.$tclass->slug;         
+          $t_class[] = 'mage-'.$tclass->term_id;         
       }
       $main_class = implode(' ',$t_class);
       return $main_class;
@@ -2741,22 +2742,22 @@ function mep_cart_display_user_list($user_info){
 
 
 if (!function_exists('mep_cart_display_ticket_type_list')) { 
-function mep_cart_display_ticket_type_list($ticket_type_arr){
+function mep_cart_display_ticket_type_list($ticket_type_arr,$eid){
 ob_start();
   foreach ($ticket_type_arr as $ticket) {
-    echo '<li>' . $ticket['ticket_name'] . " - " . wc_price($ticket['ticket_price']) . ' x ' . $ticket['ticket_qty'] . ' = ' . wc_price((float) $ticket['ticket_price'] * (float) $ticket['ticket_qty']) . '</li>';
+    echo '<li>' . $ticket['ticket_name'] . " - " . wc_price(mep_get_price_including_tax($eid,$ticket['ticket_price'])) . ' x ' . $ticket['ticket_qty'] . ' = ' . wc_price(mep_get_price_including_tax($eid, (float) $ticket['ticket_price'] * (float) $ticket['ticket_qty'])) . '</li>';
   }
-  return apply_filters('mep_display_ticket_in_cart_list',ob_get_clean(),$ticket_type_arr);
+  return apply_filters('mep_display_ticket_in_cart_list',ob_get_clean(),$ticket_type_arr,$eid);
 }
 }
 
 
 
 if (!function_exists('mep_cart_order_data_save_ticket_type')) { 
-function mep_cart_order_data_save_ticket_type($item,$ticket_type_arr){
+function mep_cart_order_data_save_ticket_type($item,$ticket_type_arr,$eid){
   foreach ($ticket_type_arr as $ticket) {
-    $ticket_type_name = $ticket['ticket_name'] . " - " . wc_price($ticket['ticket_price']) . ' x ' . $ticket['ticket_qty'] . ' = ';
+    $ticket_type_name = $ticket['ticket_name'] . " - " . wc_price(mep_get_price_including_tax($eid,$ticket['ticket_price'])) . ' x ' . $ticket['ticket_qty'] . ' = ';
-    $ticket_type_val = wc_price($ticket['ticket_price'] * $ticket['ticket_qty']);
+    $ticket_type_val = wc_price(mep_get_price_including_tax($eid,$ticket['ticket_price'] * $ticket['ticket_qty']));
     $ticket_name_meta = apply_filters('mep_event_order_meta_ticket_name_filter',$ticket_type_name,$ticket);
     $item->add_meta_data($ticket_name_meta, $ticket_type_val);
   }
@@ -2792,7 +2793,7 @@ function mep_single_page_js_script($event_id){
     jQuery(document).ready(function() {
 
 
-<?php if(sizeof($mep_event_faq) > 0){ ?>
+<?php if(sizeof($mep_event_faq) > 0 && !is_admin() ){ ?>
                 jQuery("#mep-event-accordion").accordion({
                     collapsible: true,
                     active: false
@@ -2974,18 +2975,18 @@ if (!function_exists('mep_get_event_dates_arr')) {
       if(sizeof($event_more_dates) > 0){
         $i=0;
           foreach ($event_more_dates as $mdate) {   
-              if(strtotime($now) < strtotime($mdate['event_more_start_date'].' '.$mdate['event_more_start_time'])){       
+              // if(strtotime($now) < strtotime($mdate['event_more_start_date'].' '.$mdate['event_more_start_time'])){       
               $mstart = $mdate['event_more_start_date'].' '.$mdate['event_more_start_time'];
               $mend = $mdate['event_more_end_date'].' '.$mdate['event_more_end_time'];
               $m_date_arr[$i]['start'] = $mstart;
               $m_date_arr[$i]['end'] = $mend;
-              }
+              // }
               $i++;
           }
       }
       $event_dates = array_merge($date_arr,$m_date_arr);
 
-// print_r($event_dates);
+
 
       return apply_filters('mep_event_dates_in_calender_free',$event_dates,$event_id);
   }
@@ -3014,3 +3015,128 @@ if (!function_exists('mep_get_events_custom_meta_for_api')) {
         return $post_meta;
     }
 }
+
+
+
+
+
+function mep_elementor_get_tax_term( $tax ) {
+  $terms = get_terms( array(
+		'taxonomy'   => $tax,
+		'hide_empty' => false,
+	) );
+ 
+	$list  = array( '0' => __( 'Show All', '' ) );
+	
+	foreach ( $terms as $_term ) {
+		$list[ $_term->term_id ] = $_term->name;
+	}
+	
+	return $list;
+}
+
+
+
+
+// add_action('init','price_test');
+
+function price_test(){
+  echo mep_get_price_including_tax( 408, 100);
+  die();
+}
+
+
+function mep_get_price_including_tax( $event, $price, $args = array() ) {
+
+	$args = wp_parse_args(
+		$args,
+		array(
+			'qty'   => '',
+			'price' => '',
+		)
+  );
+  
+  $_product = get_post_meta($event, 'link_wc_product', true) ? get_post_meta($event, 'link_wc_product', true) : $event;
+	// $price = '' !== $args['price'] ? max( 0.0, (float) $args['price'] ) : $product->get_price();
+	$qty   = '' !== $args['qty'] ? max( 0.0, (float) $args['qty'] ) : 1;
+  $product = wc_get_product( $_product );
+
+	if ( '' === $price ) {
+		return '';
+	} elseif ( empty( $qty ) ) {
+		return 0.0;
+	}
+
+	$line_price   = $price * $qty;
+	$return_price = $line_price;
+
+	if ( $product->is_taxable() ) {
+
+
+
+
+
+		if ( ! wc_prices_include_tax() ) {
+
+			$tax_rates = WC_Tax::get_rates( $product->get_tax_class() );
+			$taxes     = WC_Tax::calc_tax( $line_price, $tax_rates, false );
+
+			if ( 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ) ) {
+				$taxes_total = array_sum( $taxes );
+			} else {
+				$taxes_total = array_sum( array_map( 'wc_round_tax_total', $taxes ) );
+			}
+
+			$return_price = round( $line_price, wc_get_price_decimals() );
+		} else {
+
+
+      // print_r($product);
+
+		  $tax_rates      = WC_Tax::get_rates( $product->get_tax_class() );
+			$base_tax_rates = WC_Tax::get_base_tax_rates( $product->get_tax_class( 'unfiltered' ) );
+
+
+// print_r($base_tax_rates);
+
+
+			/**
+			 * If the customer is excempt from VAT, remove the taxes here.
+			 * Either remove the base or the user taxes depending on woocommerce_adjust_non_base_location_prices setting.
+			 */
+			if ( ! empty( WC()->customer ) && WC()->customer->get_is_vat_exempt() ) { // @codingStandardsIgnoreLine.
+				$remove_taxes = apply_filters( 'woocommerce_adjust_non_base_location_prices', true ) ? WC_Tax::calc_tax( $line_price, $base_tax_rates, true ) : WC_Tax::calc_tax( $line_price, $tax_rates, true );
+
+				if ( 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ) ) {
+					$remove_taxes_total = array_sum( $remove_taxes );
+				} else {
+					$remove_taxes_total = array_sum( array_map( 'wc_round_tax_total', $remove_taxes ) );
+				}
+
+				$return_price = round( $line_price, wc_get_price_decimals() );
+       
+				/**
+			 * The woocommerce_adjust_non_base_location_prices filter can stop base taxes being taken off when dealing with out of base locations.
+			 * e.g. If a product costs 10 including tax, all users will pay 10 regardless of location and taxes.
+			 * This feature is experimental @since 2.4.7 and may change in the future. Use at your risk.
+			 */
+			} else{
+			$base_taxes   = WC_Tax::calc_tax( $line_price, $base_tax_rates, true );
+			$modded_taxes = WC_Tax::calc_tax( $line_price - array_sum( $base_taxes ), $tax_rates, false );
+
+				if ( 'yes' === get_option( 'woocommerce_tax_round_at_subtotal' ) ) {
+					$base_taxes_total   = array_sum( $base_taxes );
+					$modded_taxes_total = array_sum( $modded_taxes );
+				} else {
+					$base_taxes_total   = array_sum( array_map( 'wc_round_tax_total', $base_taxes ) );
+					$modded_taxes_total = array_sum( array_map( 'wc_round_tax_total', $modded_taxes ) );
+				}
+				$return_price = round( $line_price - $base_taxes_total , wc_get_price_decimals() );
+      }
+      
+
+      
+		}
+	}
+	return apply_filters( 'woocommerce_get_price_including_tax', $return_price, $qty, $product );
+}

inc/mep_shortcode.php

@@ -134,13 +134,13 @@ function mep_event_list($atts, $content = null)
             /**
              * This is the hook where category filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_cat_names');
+            do_action('mep_event_list_cat_names',$cat);
         }
         if ($org_f == 'yes') {
             /**
              * This is the hook where Organization filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_org_names');
+            do_action('mep_event_list_org_names',$org);
         } ?>
 
         <div class="mep_event_list_sec">
@@ -281,13 +281,13 @@ function mep_expire_event_list($atts, $content = null)
             /**
              * This is the hook where category filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_cat_names');
+            do_action('mep_event_list_cat_names',$cat);
         }
         if ($org_f == 'yes') {
             /**
              * This is the hook where Organization filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_org_names');
+            do_action('mep_event_list_org_names',$org);
         } ?>
         <div class="mep_event_list_sec">
             <?php
@@ -393,13 +393,20 @@ function mep_event_onepage_list($atts, $content = null)
         "cat"           => "0",
         "org"           => "0",
         "style"         => "grid",
+        "column"        => 3,
         "cat-filter"    => "no",
         "org-filter"    => "no",
         "show"          => "-1",
         "pagination"    => "no",
-        'sort' => 'ASC'
+        "city"          => "",
+        "country"       => "",
+        "carousal-nav"  => "no",
+        "carousal-dots" => "yes",
+        "carousal-id" => "102448",
+        "timeline-mode" => "vertical",
+        'sort'          => 'ASC',
+        'status'          => 'upcoming'
     );
-
     $params         = shortcode_atts($defaults, $atts);
     $cat            = $params['cat'];
     $org            = $params['org'];
@@ -409,6 +416,20 @@ function mep_event_onepage_list($atts, $content = null)
     $show           = $params['show'];
     $pagination     = $params['pagination'];
     $sort           = $params['sort'];
+    $column         = $style != 'grid' ? 1 : $params['column'];
+    $nav            = $params['carousal-nav'] == 'yes' ? 1 : 0;
+    $dot            = $params['carousal-dots'] == 'yes' ? 1 : 0;
+    $city           = $params['city'];
+    $country        = $params['country'];
+    $cid            = $params['carousal-id'];
+    $status            = $params['status'];
+    $main_div       = $pagination == 'carousal' ? '<div class="mage_grid_box owl-theme owl-carousel"  id="mep-carousel' . $cid . '">' : '<div class="mage_grid_box">';
+
+    $time_line_div_start    = $style == 'timeline' ? '<div class="timeline"><div class="timeline__wrap"><div class="timeline__items">' : '';
+    $time_line_div_end      = $style == 'timeline' ? '</div></div></div>' : '';
+
+    $flex_column    = $column;
+    $mage_div_count = 0;
     $event_expire_on = mep_get_option('mep_event_expire_on_datetimes', 'general_setting_sec', 'event_start_datetime');
    ob_start();
     do_action('woocommerce_before_single_product');
@@ -418,13 +439,13 @@ function mep_event_onepage_list($atts, $content = null)
             /**
              * This is the hook where category filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_cat_names');
+            do_action('mep_event_list_cat_names',$cat);
         }
         if ($org_f == 'yes') {
             /**
              * This is the hook where Organization filter lists are fired from inc/template-parts/event_list_tax_name_list.php File
              */
-            do_action('mep_event_list_org_names');
+            do_action('mep_event_list_org_names',$org);
         } ?>
 
         <div class="mep_event_list_sec">
@@ -434,30 +455,19 @@ function mep_event_onepage_list($atts, $content = null)
             $show_price_label   = mep_get_option('event-price-label', 'general_setting_sec', 'Price Starts from:');
             $paged              = get_query_var("paged") ? get_query_var("paged") : 1;
 
-            /**
+
-             * The Main Query function mep_event_query is locet in inc/mep_query.php File
+
-             */
-            if ($cat > 0) {
-                $loop =  mep_event_query('cat', $show, $sort, $cat, 0, 'upcoming');
-            } elseif ($org > 0) {
-                $loop =  mep_event_query('org', $show, $sort, 0, $org, 'upcoming');
-            } else {
-                $loop =  mep_event_query('all', $show, $sort, 0, 0, 'upcoming');
-            }
             ?>
             <div class="mep_event_list_sec">
                 <?php
+
                 /**
                  * The Main Query function mep_event_query is locet in inc/mep_query.php File
                  */
-                if ($cat > 0) {
+                $loop =  mep_event_query($show, $sort, $cat, $org, $city, $country, $status);
-                    $loop =  mep_event_query('cat', $show, $sort, $cat, 0, 'upcoming');
-                } elseif ($org > 0) {
-                    $loop =  mep_event_query('org', $show, $sort, 0, $org, 'upcoming');
-                } else {
-                    $loop =  mep_event_query('all', $show, $sort, 0, 0, 'upcoming');
-                }
                 $loop->the_post();
+
+
                 $event_meta         = get_post_custom(get_the_id());
                 $author_terms       = get_the_terms(get_the_id(), 'mep_org');
                 $start_datetime     = $event_meta['event_start_date'][0] . ' ' . $event_meta['event_start_time'][0];

inc/mep_upgrade.php

@@ -182,6 +182,27 @@ function mep_get_all_order_data_and_create_attendee()
 
 
 
+    if (get_option('mep_attendee_checkin_update_01') != 'completed') {
+
+        $args = array(
+            'post_type' => 'mep_events_attendees',
+            'posts_per_page' => -1
+        );
+
+        $qr = new WP_Query($args);
+        foreach ($qr->posts as $result) {
+            $post_id = $result->ID;
+            $ea_checkin   = get_post_meta($post_id, 'mep_checkin', true) ? get_post_meta($post_id, 'mep_checkin', true) : 'No';
+            if ($ea_checkin == 'No') {
+                $event_id    = get_post_meta($post_id, 'ea_event_id', true);                
+                update_post_meta($post_id, 'mep_checkin', 'No');
+            }
+        }
+        update_option('mep_attendee_checkin_update_01', 'completed');
+    }
+
+
+
 
     if (get_option('mep_event_multidate_update_2') != 'completed') {
 

inc/template-prts/event_add_cart.php

@@ -90,8 +90,8 @@ if (!function_exists('mep_get_event_reg_btn')) {
                 /**
                  * If All the seats are booked then it fire the below hooks, The event no seat texts are in the inc/template-parts/event_labels.php file
                  */
-                do_action('mep_event_no_seat_text');
+                do_action('mep_event_no_seat_text',$post_id);
-                do_action('mep_after_no_seat_notice');
+                do_action('mep_after_no_seat_notice',$post_id);
 
             } else {
                 /**
@@ -144,7 +144,6 @@ if (!function_exists('mep_get_event_reg_btn')) {
 
 
 add_action('mep_add_to_cart_list', 'mep_get_event_reg_btn_list');
-
 if (!function_exists('mep_get_event_reg_btn_list')) {
     // Get Event Registration Button
     function mep_get_event_reg_btn_list()
@@ -233,8 +232,8 @@ if (!function_exists('mep_get_event_reg_btn_list')) {
                 /**
                  * If All the seats are booked then it fire the below hooks, The event no seat texts are in the inc/template-parts/event_labels.php file
                  */
-                do_action('mep_event_no_seat_text');
+                do_action('mep_event_no_seat_text',$post_id);
-                do_action('mep_after_no_seat_notice');
+                do_action('mep_after_no_seat_notice',$post_id);
             } else {
                 /**
                  * If everything is fine then its go on ....

inc/template-prts/event_list_tax_name_list.php

@@ -5,20 +5,26 @@ if (!defined('ABSPATH')) {
 
 add_action('mep_event_list_cat_names', 'mep_display_event_cat_name_in_list');
 if (!function_exists('mep_display_event_cat_name_in_list')) {
-    function mep_display_event_cat_name_in_list()
+    function mep_display_event_cat_name_in_list($cat)
     {
         ob_start();
 ?>
         <div class="mep-events-cats-list">
             <?php
+            if($cat > 0){
+            $terms = get_terms(array(
+                'parent' => $cat,
+                'taxonomy' => 'mep_cat'
+            )); }else{
                 $terms = get_terms(array(
                     'taxonomy' => 'mep_cat'
                 ));
+            }
             ?>
             <div class="mep-event-cat-controls">
                 <button type="button" class="mep-cat-control" data-filter="all"><?php _e('All', 'mage-eventpress'); ?></button>
                 <?php foreach ($terms as $_terms) { ?>
-                    <button type="button" class="mep-cat-control" data-filter=".<?php echo 'mage-' . $_terms->slug; ?>"><?php echo $_terms->name; ?></button>
+                    <button type="button" class="mep-cat-control" data-filter=".<?php echo 'mage-' . $_terms->term_id; ?>"><?php echo $_terms->name; ?></button>
                 <?php } ?>
             </div>
         </div>
@@ -27,23 +33,32 @@ if (!function_exists('mep_display_event_cat_name_in_list')) {
         echo apply_filters('mage_event_category_name_filter_list', $content);
     }
 }
+
+// 
+
+
+
 add_action('mep_event_list_org_names', 'mep_display_event_org_name_in_list');
 if (!function_exists('mep_display_event_org_name_in_list')) {
-    function mep_display_event_org_name_in_list()
+    function mep_display_event_org_name_in_list($org)
     {
         ob_start();
     ?>
         <div class="mep-events-cats-list">
             <?php
-            $terms = get_terms(
+            if($org > 0){
-                array(
+                $terms = get_terms(array(
+                    'parent' => $org,
                     'taxonomy' => 'mep_org'
-                )
+                )); }else{
-            );
+                    $terms = get_terms(array(
+                        'taxonomy' => 'mep_org'
+                    ));
+                }
             ?>
             <div class="mep-event-cat-controls">
                 <button type="button" class="mep-cat-control" data-filter="all"><?php _e('All', 'mage-eventpress'); ?></button><?php  foreach ($terms as $_terms) {  ?>
-                    <button type="button" class="mep-cat-control" data-filter=".<?php echo 'mage-' . $_terms->slug; ?>"><?php echo $_terms->name; ?></button><?php  }  ?>
+                    <button type="button" class="mep-cat-control" data-filter=".<?php echo 'mage-' . $_terms->term_id; ?>"><?php echo $_terms->name; ?></button><?php  }  ?>
             </div>
         </div>
     <?php

inc/template-prts/event_ticket_type.php

@@ -16,7 +16,7 @@ if (!function_exists('mep_ev_ticket_type')) {
         if ($mep_event_ticket_type) {
 ?>
             <?php echo "<h3 class='ex-sec-title'>" . mep_get_label($post_id, 'mep_event_ticket_type_text', 'Ticket Type:') . "</h3>"; ?>
-            <table>
+            <table id='mep_event_ticket_type_table'>
                 <?php do_action('mep_event_ticket_type_loop_list', $post_id); ?>
             </table>
         <?php

inc/template-prts/event_ticket_type_loop_list.php

@@ -36,6 +36,7 @@ if (!function_exists('mep_event_ticket_type_loop_list_html')) {
             $total_min_seat         = apply_filters('mep_ticket_min_qty', 0, $post_id, $field);
             $default_quantity       = apply_filters('mep_ticket_default_qty', $default_qty, $post_id, $field);
             $total_left             = apply_filters('mep_total_ticket_of_type', $total_tickets, $post_id, $field, $event_date);
+            $total_ticket_left      = apply_filters('mep_total_ticket_left_of_type', $total_tickets, $post_id, $field, $event_date);
             $ticket_price           = apply_filters('mep_ticket_type_price', $ticket_type_price, $ticket_type_name, $post_id, $field);
             $passed                 = apply_filters('mep_ticket_type_validation', true);
             $start_date = get_post_meta($post_id, 'event_start_datetime', true);

inc/template-prts/single-events.php

@@ -37,7 +37,7 @@ do_action('mep_event_single_page_after_header');
 </div>
 <?php 
 $builder_version = mep_get_builder_version();
-
+$mep_event_faq = get_post_meta(get_the_id(), 'mep_event_faq', true) ? get_post_meta(get_the_id(), 'mep_event_faq', true) : [];
 if($builder_version < 3.5){
 ?>
 <script>
@@ -54,11 +54,12 @@ function calculateTotal() {
 
 
 jQuery(document).ready(function () {
-
+    <?php if(sizeof($mep_event_faq) > 0 && !is_admin() ){ ?>
   jQuery( "#mep-event-accordion" ).accordion({
         collapsible: true,
         active: false
   });
+  <?php } ?>
   
 jQuery(document).on("change", ".etp", function() {
     var sum = 0;

readme.txt

@@ -4,10 +4,10 @@ Tags: event, woocomerce events manager, events manager, Wordpress Events plugin,
 Requires at least: 5.3
 Stable tag: trunk
 Version: 2.1.3
-Tested up to: 5.4
+Tested up to: 5.5
 Requires PHP: 7.0
 WC requires at least: 3.0
-WC tested up to: 4.2
+WC tested up to: 4.4
 Requires PHP: 7.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -598,3 +598,11 @@ Decimal Amount calculation issue fixed in cart
 Google Schema text warning issue fixed
 
 20 July 2020*
+
+
+= 3.3.3 =
+* Update Release:
+Code Optimized & Improved
+Bug Fixed
+
+14 Sept 2020*

templates/list/default.php

@@ -46,7 +46,7 @@
                     if ($hide_org_list == 'no') {
                         if (sizeof($author_terms) > 0) {
                     ?>
-                            <li>
+                            <li class="mep_list_org_name">
                                 <div class="evl-ico"><i class="fa fa-university"></i></div>
                                 <div class="evl-cc">
                                     <h5>
@@ -62,7 +62,7 @@
                     if ($event_type != 'online') {
                         if ($hide_location_list == 'no') { ?>
 
-                            <li>
+                            <li class="mep_list_location_name">
                                 <div class="evl-ico"><i class="fa fa-location-arrow"></i></div>
                                 <div class="evl-cc">
                                     <h5>
@@ -77,7 +77,7 @@
                     if ($hide_time_list == 'no') {
                         if (strtotime(current_time('Y-m-d H:i')) < strtotime($event_meta['event_start_datetime'][0])) {
                         ?>
-                            <li>
+                            <li class="mep_list_event_date">
                                 <div class="evl-ico"><i class="fa fa-calendar"></i></div>
                                 <div class="evl-cc">
                                     <h5>

templates/single/extra_service_list.php

@@ -1,5 +1,5 @@
 <h3 class='ex-sec-title'><?php echo mep_get_label($post_id, 'mep_event_extra_service_text', 'Extra Service:'); ?></h3>
-            <table>
+            <table id='mep_event_extra_service_table'>
                 <tr>
                     <td align="left"><?php echo mep_get_option('mep_name_text', 'label_setting_sec', __('Name:', 'mage-eventpress')); ?></td>
                     <td class="mage_text_center"><?php echo mep_get_option('mep_quantity_text', 'label_setting_sec', __('Quantity:', 'mage-eventpress')); ?></td>
@@ -34,7 +34,7 @@
                                     <div class="mage_input_group">
                                         <span class="fa fa-minus qty_dec"></span>
                                         <input id="eventpx" <?php //if($ext_left<=0){ echo "disabled"; }
-                                                            ?> size="4" inputmode="numeric" type="text" class='extra-qty-box' name='event_extra_service_qty[]' data-price='<?php echo $field['option_price']; ?>' value='0' min="0" max="<?php echo $ext_left; ?>">
+                                                            ?> size="4" inputmode="numeric" type="text" class='extra-qty-box' name='event_extra_service_qty[]' data-price='<?php echo mep_get_price_including_tax($post_id,$field['option_price']); ?>' value='0' min="0" max="<?php echo $ext_left; ?>">
                                         <span class="fa fa-plus qty_inc"></span>
                                     </div>
                             <?php }
@@ -42,9 +42,9 @@
                                 echo mep_get_option('mep_not_available_text', 'label_setting_sec') ? mep_get_option('mep_not_available_text', 'label_setting_sec') : _e('Not Available', 'mage-eventpress');
                             } ?>
                         </td>
-                        <td class="mage_text_center"><?php echo wc_price($field['option_price']);
+                        <td class="mage_text_center"><?php echo wc_price(mep_get_price_including_tax($post_id, $field['option_price']));
                                                         if ($ext_left > 0) { ?>
-                                <p style="display: none;" class="price_jq"><?php echo $field['option_price']; ?></p>
+                                <p style="display: none;" class="price_jq"><?php echo mep_get_price_including_tax($post_id,$field['option_price']); ?></p>
                                 <input type="hidden" name='event_extra_service_name[]' value='<?php echo $field['option_name']; ?>'>
                                 <input type="hidden" name='event_extra_service_price[]' value='<?php echo $field['option_price']; ?>'>
                             <?php } ?>

templates/single/ticket_type_list.php

@@ -1,7 +1,7 @@
                 <tr>
                     <td align="Left"><?php echo $field['option_name_t']; ?>
 
-                        <?php if ($mep_available_seat == 'on') { ?><div class="xtra-item-left"><?php echo max($total_left, 0); ?>
+                        <?php if ($mep_available_seat == 'on') { ?><div class="xtra-item-left"><?php echo max($total_ticket_left, 0); ?>
 
                                 <?php echo mep_get_option('mep_left_text', 'label_setting_sec') ? mep_get_option('mep_left_text', 'label_setting_sec') : _e('Left:', 'mage-eventpress');  ?>
 
@@ -28,7 +28,7 @@
 
                                 <div class="mage_input_group">
                                     <span class="fa fa-minus qty_dec"></span>
-                                    <input id="eventpxtp_<?php echo $count; ?>" type="text" class='extra-qty-box etp' name='option_qty[]' data-price='<?php echo $ticket_price; ?>' value='<?php echo $default_quantity; ?>' min="<?php echo $total_min_seat; ?>" max="<?php echo max($total_seats, 0); ?>">
+                                    <input id="eventpxtp_<?php echo $count; ?>" type="text" class='extra-qty-box etp' name='option_qty[]' data-price='<?php echo mep_get_price_including_tax($post_id,$ticket_price); ?>' value='<?php echo $default_quantity; ?>' min="<?php echo $total_min_seat; ?>" max="<?php echo max($total_left, 0); ?>">
                                     <span class="fa fa-plus qty_inc"></span>
                                 </div>
                             <?php }
@@ -39,14 +39,14 @@
                             _e('No Seat Available', 'mage-eventpress');
                         }
                         $ticket_name = $field['option_name_t'];
-                        do_action('mep_after_ticket_type_qty', $post_id, $ticket_name, $field, $default_quantity);
+                        do_action('mep_after_ticket_type_qty', $post_id, $ticket_name, $field, $default_quantity,$start_date);
                         ?>
                     </td>
                     <td class="ticket-price"><span class="tkt-pric">
                             <?php echo mep_get_option('mep_per_ticket_price_text', 'label_setting_sec') ? mep_get_option('mep_per_ticket_price_text', 'label_setting_sec') : _e('Per Ticket Price:', 'mage-eventpress');  ?>
-                        </span> <strong><?php echo wc_price($ticket_price); ?></strong>
+                        </span> <strong><?php echo wc_price(mep_get_price_including_tax($post_id,$ticket_price)); ?></strong>
-                        <?php if ($total_left > 0) { ?>
+                        <?php if ($total_seats > 0) { ?>
-                            <p style="display: none;" class="price_jq"><?php echo $ticket_price; ?></p>
+                            <p style="display: none;" class="price_jq"><?php echo mep_get_price_including_tax($post_id,$ticket_price); ?></p>
 
                         <?php } ?>
                     </td>

woocommerce-event-press.php

@@ -3,7 +3,7 @@
  * Plugin Name: Woocommerce Events Manager
  * Plugin URI: http://mage-people.com
  * Description: A Complete Event Solution for WordPress by MagePeople..
- * Version: 3.3.2
+ * Version: 3.3.3
  * Author: MagePeople Team
  * Author URI: http://www.mage-people.com/
  * Text Domain: mage-eventpress