From 894dbcb5664ee78d0cf20e3139270c6c7ced47f0 Mon Sep 17 00:00:00 2001
From: magepeopleteam <magepeopleteam@b8457f37-d9ea-0310-8a92-e5e31aec5664>
Date: Mon, 6 Sep 2021 05:59:29 +0000
Subject: [PATCH] function update

---
 inc/mep_functions.php         | 17 ++++++++++++-----
 inc/mep_user_custom_style.php | 26 +++++++++-----------------
 templates/list/default.php    |  4 ++--
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/inc/mep_functions.php b/inc/mep_functions.php
index ff78b30..c05f556 100755
--- a/inc/mep_functions.php
+++ b/inc/mep_functions.php
@@ -2777,7 +2777,11 @@ function mep_event_recurring_date_list_in_event_list_loop($event_id){
          $end_date                  = get_post_meta($event_id,'event_end_date',true);
          $end_datetime              = get_post_meta($event_id,'event_end_datetime',true);
          $show_multidate             = mep_get_option('mep_date_list_in_event_listing', 'general_setting_sec', 'no');
-                            
+
+         $show_end_date              = get_post_meta($event_id, 'mep_show_end_datetime', true) ? get_post_meta($event_id, 'mep_show_end_datetime', true) : 'yes';
+         $end_date_display_status    = apply_filters('mep_event_datetime_status',$show_end_date,$event_id);           
+
+
        if(is_array($more_date) && sizeof($more_date) > 0){
 
         ?>
@@ -2810,10 +2814,10 @@ function mep_event_recurring_date_list_in_event_list_loop($event_id){
                       </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']) {
+                        <?php echo get_mep_datetime($_more_date['event_more_start_date'] . ' ' . $_more_date['event_more_start_time'], 'time'); if($end_date_display_status == 'yes'){ ?> - <?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'); ?>
+                        echo get_mep_datetime($_more_date['event_more_end_date'] . ' ' . $_more_date['event_more_end_time'], 'time'); } ?>
                       </span>
                   </li>
                   <?php                                 
@@ -3756,6 +3760,8 @@ function mep_event_list_upcoming_date_li($event_id,$type='grid'){
   $event_start_datetime         = get_post_meta($event_id,'event_start_datetime',true);
   $event_end_datetime           = get_post_meta($event_id,'event_end_datetime',true);
   $event_multidate              = get_post_meta($event_id,'mep_event_more_date',true) ? get_post_meta($event_id,'mep_event_more_date',true) : [];
+  $show_end_date                = get_post_meta($event_id, 'mep_show_end_datetime', true) ? get_post_meta($event_id, 'mep_show_end_datetime', true) : 'yes';
+  $end_date_display_status      = apply_filters('mep_event_datetime_status',$show_end_date,$event_id);  
       $event_std[] = array(
           'event_std' => $event_start_datetime,
           'event_etd' => $event_end_datetime
@@ -3776,6 +3782,7 @@ $start_date = date('Y-m-d',strtotime($_event_std['event_std']));
 $end_date   = date('Y-m-d',strtotime($_event_std['event_etd']));
 if (strtotime(current_time('Y-m-d H:i')) < strtotime($std) && $cn == 0) {
   if($type == 'grid'){
+  
 ?>
 <li class="mep_list_event_date">
                               <div class="evl-ico"><i class="fa fa-calendar"></i></div>
@@ -3784,13 +3791,13 @@ if (strtotime(current_time('Y-m-d H:i')) < strtotime($std) && $cn == 0) {
                                       <?php  echo get_mep_datetime($std, 'date-text');  ?>                                    
                                   </h5>                                 
                                   <h5><?php echo get_mep_datetime($_event_std['event_std'], 'time');
-                                      if ($hide_only_end_time_list == 'no') { ?> - <?php if($start_date == $end_date){ echo get_mep_datetime($_event_std['event_etd'], 'time'); }else{ echo get_mep_datetime($_event_std['event_etd'], 'date-time-text');  } } ?></h5>
+                                      if ($hide_only_end_time_list == 'no' && $end_date_display_status == 'yes') { ?> - <?php if($start_date == $end_date){ echo get_mep_datetime($_event_std['event_etd'], 'time'); }else{ echo get_mep_datetime($_event_std['event_etd'], 'date-time-text');  } } ?></h5>
 </div>
 </li>
 <?php
   }elseif($type == 'minimal'){
     ?>
-<span class='mep_minimal_list_date'><i class="fa fa-calendar"></i> <?php  echo get_mep_datetime($std, 'date-text').' '; echo get_mep_datetime($_event_std['event_std'], 'time');  if ($hide_only_end_time_list == 'no') { ?> - <?php if($start_date == $end_date){ echo get_mep_datetime($_event_std['event_etd'], 'time'); }else{ echo get_mep_datetime($_event_std['event_etd'], 'date-time-text');  } } ?></span>
+<span class='mep_minimal_list_date'><i class="fa fa-calendar"></i> <?php  echo get_mep_datetime($std, 'date-text').' '; echo get_mep_datetime($_event_std['event_std'], 'time');  if ($hide_only_end_time_list == 'no' &&  $end_date_display_status == 'yes') { ?> - <?php if($start_date == $end_date){ echo get_mep_datetime($_event_std['event_etd'], 'time'); }else{ echo get_mep_datetime($_event_std['event_etd'], 'date-time-text');  } } ?></span>
 <?php
 }
 
diff --git a/inc/mep_user_custom_style.php b/inc/mep_user_custom_style.php
index ee0b756..aa04684 100644
--- a/inc/mep_user_custom_style.php
+++ b/inc/mep_user_custom_style.php
@@ -6,16 +6,15 @@ if (!defined('ABSPATH')) {
 add_action('wp_head', 'mep_user_custom_styles', 10, 999);
 function mep_user_custom_styles()
 {
-    $base_color = mep_get_option('mep_base_color', 'style_setting_sec', '#ffbe30');
-    $label_bg_color = mep_get_option('mep_title_bg_color', 'style_setting_sec', '#ffbe30');
-    $label_text_color = mep_get_option('mep_title_text_color', 'style_setting_sec', '#ffffff');
-    $cart_btn_bg_color = mep_get_option('mep_cart_btn_bg_color', 'style_setting_sec', '#ffbe30');
-    $cart_btn_txt_color = mep_get_option('mep_cart_btn_text_color', 'style_setting_sec', '#ffffff');
-
-    $calender_btn_bg_color = mep_get_option('mep_calender_btn_bg_color', 'style_setting_sec', '#ffbe30');
+    $base_color             = mep_get_option('mep_base_color', 'style_setting_sec', '#ffbe30');
+    $label_bg_color         = mep_get_option('mep_title_bg_color', 'style_setting_sec', '#ffbe30');
+    $label_text_color       = mep_get_option('mep_title_text_color', 'style_setting_sec', '#ffffff');
+    $cart_btn_bg_color      = mep_get_option('mep_cart_btn_bg_color', 'style_setting_sec', '#ffbe30');
+    $cart_btn_txt_color     = mep_get_option('mep_cart_btn_text_color', 'style_setting_sec', '#ffffff');
+    $calender_btn_bg_color  = mep_get_option('mep_calender_btn_bg_color', 'style_setting_sec', '#ffbe30');
     $calender_btn_txt_color = mep_get_option('mep_calender_btn_text_color', 'style_setting_sec', '#ffffff');
-    $faq_label_bg_color = mep_get_option('mep_faq_title_bg_color', 'style_setting_sec', '#ffbe30');
-    $faq_label_text_color = mep_get_option('mep_faq_title_text_color', 'style_setting_sec', '#ffffff');
+    $faq_label_bg_color     = mep_get_option('mep_faq_title_bg_color', 'style_setting_sec', '#ffbe30');
+    $faq_label_text_color   = mep_get_option('mep_faq_title_text_color', 'style_setting_sec', '#ffffff');
 
     ?>
     <style>
@@ -54,35 +53,28 @@ function mep_user_custom_styles()
         .mep_event_list_item:hover {
             border-color: <?php echo $base_color; ?>;
         }
-
         .mep_event_list_item .mep-list-header:before, .mep_event_grid_item .mep-list-header:before {
             border-color: <?php echo $base_color; ?>;
         }
-
-
         /*Cart sec Label Style*/
         .mep-default-feature-cart-sec h3, .mep-event-theme-1 h3.ex-sec-title, .mep-tem3-mid-sec h3.ex-sec-title, .mep-tem3-title-sec {
             background: <?php echo $label_bg_color; ?>;
             color: <?php echo $label_text_color; ?>;
         }
-
         /*FAQ Sec Style*/
         .mep-default-feature-faq-sec h4, .tmep-emplate-3-faq-sec .mep-event-faq-part h4 {
             background: <?php echo $faq_label_bg_color; ?>;
             color: <?php echo $faq_label_text_color; ?>;
         }
-
         h3.ex-sec-title {
             background: <?php echo $base_color; ?>;
         }
-
         /*Cart Button Style*/
         .mep-default-feature-cart-sec button.single_add_to_cart_button.button.alt.btn-mep-event-cart, .mep-event-theme-1 .btn-mep-event-cart, .mep-template-2-hamza .btn-mep-event-cart, .mep-tem3-mid-sec .btn-mep-event-cart {
             background: <?php echo $cart_btn_bg_color; ?>;
             color: <?php echo $cart_btn_txt_color; ?> !important;
             border-color: <?php echo $cart_btn_bg_color; ?>;
         }
-
         /*Calender Button Style*/
         .mep-default-sidrbar-calender-btn a, .mep-event-theme-1 .mep-add-calender, .mep-template-2-hamza .mep-add-calender, .mep-tem3-mid-sec .mep-add-calender, #mep_add_calender_button {
             background: <?php echo $calender_btn_bg_color; ?>;
@@ -100,4 +92,4 @@ function mep_user_custom_styles()
         <?php do_action('mep_event_user_custom_styling'); ?>
     </style>
     <?php
-}
+}
\ No newline at end of file
diff --git a/templates/list/default.php b/templates/list/default.php
index a7fb4f1..262a6ac 100644
--- a/templates/list/default.php
+++ b/templates/list/default.php
@@ -95,9 +95,9 @@ $mep_hide_event_hover_btn_text   = mep_get_option('mep_hide_event_hover_btn_text
                         <?php }
                     }
                     if ($hide_time_list == 'no' && $recurring == 'no') {
-                       do_action('mep_event_list_date_li',$event_id,'grid');
+                      do_action('mep_event_list_date_li',$event_id,'grid');
                     }elseif($hide_time_list == 'no' && $recurring != 'no'){
-                        do_action('mep_event_list_upcoming_date_li',$event_id);
+                      do_action('mep_event_list_upcoming_date_li',$event_id);
                     }?>
                    
                 </ul>