From a5481bb2f0262633635d506e90433c5b70762fda Mon Sep 17 00:00:00 2001
From: magepeopleteam <magepeopleteam@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Thu, 2 Jan 2020 12:10:06 +0000
Subject: [PATCH] version 3.0.3 released

---
 readme.txt                                    | 10 ++-
 templates/taxonomy-organozer.php              | 16 +++-
 templates/template-prts/event_date.php        | 87 ++++++++++---------
 templates/template-prts/event_ticket_type.php |  2 +-
 woocommerce-event-press.php                   |  6 +-
 5 files changed, 74 insertions(+), 47 deletions(-)

diff --git a/readme.txt b/readme.txt
index 4db965f..f4c4597 100644
--- a/readme.txt
+++ b/readme.txt
@@ -446,4 +446,12 @@ A. you can create support ticket here with problem details with possible screens
 ==> Add Calendar Button issue fixed
 ==> Event Checkout Validation
 ==> Missing Translation added.
-17 Dec 2019*
\ No newline at end of file
+17 Dec 2019*
+
+
+*= 3.0.3 =
+* Update Release:
+==> Code Improved
+==> Date Issue Fixed in Some template and organizer page & PDF Ticket
+==> Email HTML support issue fixed
+02 Jan 2020*
\ No newline at end of file
diff --git a/templates/taxonomy-organozer.php b/templates/taxonomy-organozer.php
index 3e5ea5e..c1b6362 100644
--- a/templates/taxonomy-organozer.php
+++ b/templates/taxonomy-organozer.php
@@ -34,13 +34,27 @@ $term_id = get_queried_object()->term_id;
 
 
  if(time() < strtotime($newformat)){
+     
+     
+   	$start_datetime 	= $event_meta['event_start_date'][0].' '.$event_meta['event_start_time'][0];
+	$start_date 		= $event_meta['event_start_date'][0];
+	$start_time 		= $event_meta['event_start_time'][0];
+
+	$end_datetime 		= $event_meta['event_end_date'][0].' '.$event_meta['event_end_time'][0];
+
+	$end_date = $event_meta['event_end_date'][0];
+	$end_time = $event_meta['event_end_time'][0];  
+     
+     
+     
+     
 
 	?>
 	<div class='mep_event_list_item'>
 		<div class="mep_list_thumb"><?php the_post_thumbnail('medium'); ?></div>
 		<div class="mep_list_event_details"><a href="<?php the_permalink(); ?>">
 			<h2 class='mep_list_title'><?php the_title(); ?></h2>
-			<h3 class='mep_list_date'>on <?php echo $event_meta['event_start_date'][0].' '.$event_meta['event_start_time'][0]; ?> - <?php echo $event_meta['event_end_date'][0].' '.$event_meta['event_end_time'][0]; ?></h3>
+			<h3 class='mep_list_date'>on <?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></h3>
 
 			<p><?php echo $event_meta['mep_location_venue'][0]; ?>,<?php echo $event_meta['mep_street'][0]; ?>, <?php echo $event_meta['mep_city'][0]; ?>,<?php echo $event_meta['mep_state'][0]; ?>,<?php echo $event_meta['mep_postcode'][0]; ?>,<?php echo $event_meta['mep_country'][0]; ?></p>
 		</a>
diff --git a/templates/template-prts/event_date.php b/templates/template-prts/event_date.php
index ecb2bad..8033392 100644
--- a/templates/template-prts/event_date.php
+++ b/templates/template-prts/event_date.php
@@ -1,66 +1,67 @@
 <?php 
 add_action('mep_event_date','mep_ev_datetime');
 function mep_ev_datetime(){
-global $event_meta;	
+	global $event_meta;
 	$start_datetime 	= $event_meta['event_start_date'][0].' '.$event_meta['event_start_time'][0];
 	$start_date 		= $event_meta['event_start_date'][0];
-	$start_time 		= $event_meta['event_start_time'][0];	
-	
+	$start_time 		= $event_meta['event_start_time'][0];
+
 	$end_datetime 		= $event_meta['event_end_date'][0].' '.$event_meta['event_end_time'][0];
-	
+
 	$end_date = $event_meta['event_end_date'][0];
 	$end_time = $event_meta['event_end_time'][0];
 
-    if ( array_key_exists( 'mep_event_more_date', $event_meta ) ) {
-    	$more_date = unserialize( $event_meta['mep_event_more_date'][0] );
-    } else {
-    	$more_date = array();
-    }
+	if ( array_key_exists( 'mep_event_more_date', $event_meta ) ) {
+		$more_date = unserialize( $event_meta['mep_event_more_date'][0] );
+	} else {
+		$more_date = array();
+	}
 
 	$recurring = get_post_meta(get_the_id(), 'mep_enable_recurring', true) ? get_post_meta(get_the_id(), 'mep_enable_recurring', true) : 'no';
 	$mep_show_upcoming_event = get_post_meta(get_the_id(), 'mep_show_upcoming_event', true) ? get_post_meta(get_the_id(), 'mep_show_upcoming_event', true) : 'no';
 	$cn = 1;
-	
-if($recurring == 'yes'){
 
-	if(strtotime(current_time('Y-m-d H:i')) < strtotime($start_datetime)){
-?>
-	<p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p>,
+	if($recurring == 'yes'){
 
-<?php
-	}
-	foreach ($more_date as $_more_date) {
-		if(strtotime(current_time('Y-m-d H:i')) < strtotime($_more_date['event_more_start_date'].' '.$_more_date['event_more_start_time'])){
-			if($mep_show_upcoming_event == 'yes'){
-				$cnt = 1;
-			  }else{
-				$cnt = $cn;
-			  }
-			  
-			  if($cn == $cnt){
-		?>
- 		
-		<p><?php echo get_mep_datetime($_more_date['event_more_start_date'],'date-text').' '.get_mep_datetime($_more_date['event_more_start_time'],'time'); ?> - <?php if($_more_date['event_more_start_date'] != $_more_date['event_more_end_date']){  echo get_mep_datetime($_more_date['event_more_end_date'],'date-text') .' - '; }  echo get_mep_datetime($_more_date['event_more_end_time'],'time'); ?></p>
-		<?php
-		$cn++;
+		if(strtotime(current_time('Y-m-d H:i')) < strtotime($start_datetime)){
+			?>
+            <p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p>,
+
+			<?php
 		}
-	}
-	}
-}elseif(is_array($more_date) && sizeof($more_date) > 0){
-	foreach ($more_date as $_more_date) {
+		foreach ($more_date as $_more_date) {
+			if(strtotime(current_time('Y-m-d H:i')) < strtotime($_more_date['event_more_start_date'].' '.$_more_date['event_more_start_time'])){
+				if($mep_show_upcoming_event == 'yes'){
+					$cnt = 1;
+				}else{
+					$cnt = $cn;
+				}
+
+				if($cn == $cnt){
+					?>
+
+                    <p><?php echo get_mep_datetime($_more_date['event_more_start_date'],'date-text').' '.get_mep_datetime($_more_date['event_more_start_time'],'time'); ?> - <?php if($_more_date['event_more_start_date'] != $_more_date['event_more_end_date']){  echo get_mep_datetime($_more_date['event_more_end_date'],'date-text') .' - '; }  echo get_mep_datetime($_more_date['event_more_end_time'],'time'); ?></p>
+					<?php
+					$cn++;
+				}
+			}
+		}
+	}elseif(is_array($more_date) && sizeof($more_date) > 0){?>
+    <p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p><br>
+		<?php foreach ($more_date as $_more_date) {
+			?>
+           
+           <p><?php echo get_mep_datetime($_more_date['event_more_start_date'],'date-text').' '.get_mep_datetime($_more_date['event_more_start_time'],'time'); ?> - <?php if($_more_date['event_more_start_date'] != $_more_date['event_more_end_date']){  echo get_mep_datetime($_more_date['event_more_end_date'],'date-text') .' - '; }  echo get_mep_datetime($_more_date['event_more_end_time'],'time'); ?></p><br>
+			<?php
+		}
+
+	}else{
+
 		?>
-	<p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p>, 		
-		<p><?php echo get_mep_datetime($_more_date['event_more_start_date'],'date-text').' '.get_mep_datetime($_more_date['event_more_start_time'],'time'); ?> - <?php if($_more_date['event_more_start_date'] != $_more_date['event_more_end_date']){  echo get_mep_datetime($_more_date['event_more_end_date'],'date-text') .' - '; }  echo get_mep_datetime($_more_date['event_more_end_time'],'time'); ?></p>
+        <p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p>
 		<?php
 	}
 
-}else{
-
-	?>
-<p><?php echo get_mep_datetime($start_datetime,'date-text').' '.get_mep_datetime($start_datetime,'time'); ?> - <?php if($start_date != $end_date){  echo get_mep_datetime($end_datetime,'date-text') .' - '; }  echo get_mep_datetime($end_datetime,'time'); ?></p>
-	<?php
-}
-
 
 
 }
diff --git a/templates/template-prts/event_ticket_type.php b/templates/template-prts/event_ticket_type.php
index 04f7550..312f6df 100644
--- a/templates/template-prts/event_ticket_type.php
+++ b/templates/template-prts/event_ticket_type.php
@@ -20,7 +20,7 @@ if($mep_event_ticket_type){
 ?>
 <?php echo "<h3 class='ex-sec-title'>".mep_get_label($pid,'mep_event_ticket_type_text','Ticket Type:
 ')."</h3>"; ?>
-<input type="hidden" name='mep_event_start_date' value="<?php echo get_post_meta($post->ID, 'event_start_date', true); ?>">
+<input type="hidden" name='mep_event_start_date' value="<?php echo get_post_meta($post->ID, 'event_start_date', true).' '.get_post_meta($post->ID, 'event_start_time', true); ?>">
 <table>
 <?php 
 $count =1;
diff --git a/woocommerce-event-press.php b/woocommerce-event-press.php
index ec81e7f..8b93abd 100644
--- a/woocommerce-event-press.php
+++ b/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.0.2
+* Version: 3.0.3
 * Author: MagePeople Team
 * Author URI: http://www.mage-people.com/
 * Text Domain: mage-eventpress
@@ -2398,6 +2398,10 @@ jQuery('#quantity_5a7abbd1bff73').on('change', function () {
 echo $content = ob_get_clean();
 }
 
+function mep_set_email_content_type(){
+    return "text/html";
+}
+add_filter( 'wp_mail_content_type','mep_set_email_content_type' );
 
 }else{
 function mep_admin_notice_wc_not_active() {