From 26dac9671b91eaf5a30aecc4b1110ba014c75f77 Mon Sep 17 00:00:00 2001
From: magepeopleteam <magepeopleteam@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Mon, 23 Nov 2020 11:28:38 +0000
Subject: [PATCH] file update

---
 inc/mep_functions.php      | 38 +++++++++++++++++++++++++-------------
 templates/list/default.php |  2 +-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/inc/mep_functions.php b/inc/mep_functions.php
index 2ee8304..4b6f2c1 100755
--- a/inc/mep_functions.php
+++ b/inc/mep_functions.php
@@ -2579,21 +2579,33 @@ function mep_event_recurring_date_list_in_event_list_loop($event_id){
             <?php
         }
         
-        if($recurring == 'yes'){
-        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'])) {
-             
-                    ?>
-                    <li><span class='mep-more-date'><i class="fa fa-calendar"></i> <?php echo get_mep_datetime($_more_date['event_more_start_date'] . ' ' . $_more_date['event_more_start_time'], 'date-text'); ?></span> <span class='mep-more-time'><i class="fa fa-clock-o"></i> <?php echo get_mep_datetime($_more_date['event_more_start_date'] . ' ' . $_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'] . ' ' . $_more_date['event_more_end_time'], 'date-text') . ' - ';
-                        }
-                        echo get_mep_datetime($_more_date['event_more_end_date'] . ' ' . $_more_date['event_more_end_time'], 'time'); ?></span></li>
-                    <?php                                 
-            }
-        }
-      }elseif($recurring == 'everyday'){
+
+      
+      if($recurring == 'everyday'){
         do_action('mep_event_everyday_date_list_display',$event_id);
+      }else{
+        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'])) {
+           
+                  ?>
+                  <li><span class='mep-more-date'><i class="fa fa-calendar"></i> <?php echo get_mep_datetime($_more_date['event_more_start_date'] . ' ' . $_more_date['event_more_start_time'], 'date-text'); ?></span> <span class='mep-more-time'><i class="fa fa-clock-o"></i> <?php echo get_mep_datetime($_more_date['event_more_start_date'] . ' ' . $_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'] . ' ' . $_more_date['event_more_end_time'], 'date-text') . ' - ';
+                      }
+                      echo get_mep_datetime($_more_date['event_more_end_date'] . ' ' . $_more_date['event_more_end_time'], 'time'); ?></span></li>
+                  <?php                                 
+          }
       }
+      }
+
+
+
+
+
+
+
+
+
+
         echo '</ul>';
         ?>
         <?php if($show_multidate == 'yes'){ ?><span id="show_event_schdule<?php echo $event_id; ?>" class='mep_more_date_btn mep-tem3-title-sec'><?php echo mep_get_option('mep_event_view_more_date_btn_text', 'label_setting_sec', __('View More Date', 'mage-eventpress')); //_e('View More Date','mage-eventpress'); ?></span><?php } ?>
diff --git a/templates/list/default.php b/templates/list/default.php
index 65a0b61..c25606f 100644
--- a/templates/list/default.php
+++ b/templates/list/default.php
@@ -79,7 +79,7 @@ $mep_hide_event_hover_btn_text   = mep_get_option('mep_hide_event_hover_btn_text
                             </li>
                         <?php }
                     }
-                    if ($hide_time_list == 'no' && $recurring == 'no') {
+                    if ($hide_time_list == 'no' && $recurring == 'no' && sizeof($event_multidate) == 0) {
                         if (strtotime(current_time('Y-m-d H:i')) < strtotime($event_meta['event_start_datetime'][0])) {
                         ?>
                             <li class="mep_list_event_date">