diff --git a/css/style.css b/css/style.css index 34b216f..0b5443c 100644 --- a/css/style.css +++ b/css/style.css @@ -916,7 +916,18 @@ label.mep-show { height: auto; margin: 15px 0; } +ul#mep_add_calender_links li a { + display: block; + margin-top: 20px; + width: 100%; +} +ul#mep_add_calender_links { + margin: 0 auto; + width: 185px; + list-style: none; + padding: 0; +} /*Theme 3| Shahan*/ .mep-tem3-title-sec { background: #1A84A5; diff --git a/inc/mep_csv_export.php b/inc/mep_csv_export.php index d8bb96b..97580b9 100644 --- a/inc/mep_csv_export.php +++ b/inc/mep_csv_export.php @@ -86,11 +86,13 @@ $order = get_post_meta($event, 'mep_events_extra_prices', true); $exs = array(); $order_extra_service_arr = mep_get_event_extra_service_items($post_id); if($order_extra_service_arr){ + if($order){ foreach ($order as $_exs) { // $exs[] = $_exs['option_name']; $exs[] = mep_get_extra_service_order_qty($_exs['option_name'], $order_extra_service_arr); } } +} return array_merge($row, $crow, $exs); } @@ -201,11 +203,23 @@ $meta = $_GET['meta_value']; } $posts = $wpdb->get_results($query); - foreach ( $posts as $i=>$post ) { -$status = get_post_status($post->post_id); -if($status=='publish'){ +foreach ( $posts as $i=>$post ) { + if(isset($_GET['meta_value'])){ $post_id = $post->post_id; + }else{ + $post_id = $post->ID; + } + + + + + +$status = get_post_status($post_id); + +if($status=='publish'){ + if(isset($_GET['meta_value'])){ + $event = strip_tags($_GET['meta_value']); $row = mep_get_event_user_fields_data($post_id,$event); }else{ diff --git a/inc/mep_shortcode.php b/inc/mep_shortcode.php index cc8aeb8..6172b63 100644 --- a/inc/mep_shortcode.php +++ b/inc/mep_shortcode.php @@ -273,6 +273,7 @@ if($style=='list'){ @@ -532,6 +533,7 @@ if($style=='list'){ //} } +wp_reset_postdata(); if($pagination=='yes'){ ?> diff --git a/readme.txt b/readme.txt index c42ebcf..a18031c 100644 --- a/readme.txt +++ b/readme.txt @@ -1,10 +1,10 @@ === WooCommerce Event Manager === -Contributors: magepeopleteam +Contributors: magepeopleteam, aamahin Tags: event, woocomerce events manager, events manager, Wordpress Events plugin, Events plugin, wp events Requires at least: 4.5 Stable tag: trunk Version: 2.1.3 -Tested up to: 5.1.1 +Tested up to: 5.2 Requires PHP: 5.6 WC requires at least: 3.0 WC tested up to: 3.5.0 @@ -320,11 +320,8 @@ A. you can create support ticket here with problem details with possible screens 28 April 2019* - -*= 2.5.9 = +*= 2.6 = *Update Release: -==> CSV Export Issue fixed -==> Increase Security -==> Add Seat status column into event list in Dashboard -==> Add Tax, Now tax can be applicable into Event -05 May 2019* \ No newline at end of file +==> CSV Blank issue fixed +==> Multiple Add Calender feature added. +21 May 2019* \ No newline at end of file diff --git a/woocommerce-event-press.php b/woocommerce-event-press.php index ab1c4d4..6dfdccf 100644 --- a/woocommerce-event-press.php +++ b/woocommerce-event-press.php @@ -225,6 +225,34 @@ update_post_meta( $event_id, $mep_atnd, "a1"); } + + +add_action('woocommerce_checkout_order_processed', 'mep_event_order_status_make_pending', 10, 1); + +function mep_event_order_status_make_pending($order_id) +{ + // Getting an instance of the order object + $order = wc_get_order( $order_id ); + $order_meta = get_post_meta($order_id); + + # Iterating through each order items (WC_Order_Item_Product objects in WC 3+) + foreach ( $order->get_items() as $item_id => $item_values ) { + $item_quantity = $item_values->get_quantity(); + $item_id = $item_id; + } +$ordr_total = $order->get_total(); +$event_id = mep_event_get_order_meta($item_id,'event_id'); +if (get_post_type($event_id) == 'mep_events') { + $order_meta_text = "_stock_msg_".$order_id; + $order_processing = "pending_".$order_id; + + update_post_meta( $event_id, $order_meta_text, $order_processing); +} +} + + + +add_action('woocommerce_order_status_changed', 'your_function', 10, 4); add_action('woocommerce_order_status_changed', 'mep_event_seat_management', 10, 4); function mep_event_seat_management( $order_id, $from_status, $to_status, $order ) { global $wpdb; @@ -242,6 +270,10 @@ global $wpdb; } $ordr_total = $order->get_total(); $event_id = mep_event_get_order_meta($item_id,'event_id'); + +if (get_post_type($event_id) == 'mep_events') { + + $table_name = $wpdb->prefix . 'woocommerce_order_itemmeta'; $result = $wpdb->get_results( "SELECT * FROM $table_name WHERE order_item_id=$item_id" ); @@ -305,9 +337,6 @@ if($mep_stock_order==$order_id){ } - - - if($order->has_status( 'cancelled' )) { update_post_meta( $event_id,$mep_atnd, "a2"); update_post_meta( $event_id, $order_meta_text, $order_cancelled); @@ -353,12 +382,26 @@ update_post_meta( $event_id, $mep_atnd, "a2"); if($mep_stock_msg=='processing'){ update_post_meta( $event_id, $order_meta_text, $order_completed); + }elseif($mep_stock_msg=='pending'){ + + update_post_meta( $event_id, 'total_booking', ($mep_total_booking+$item_quantity)); + update_post_meta( $event_id, $order_meta_text, $order_completed); + + foreach ( $result as $page ){ + if (strpos($page->meta_key, '_') !== 0) { + $order_option_name = $event_id.str_replace(' ', '', mep_get_string_part($page->meta_key,0)); + $order_option_qty = mep_get_string_part($page->meta_key,1); + $tes = get_post_meta($event_id,"mep_xtra_$order_option_name",true); + $ntes = ($tes+$order_option_qty); + update_post_meta( $event_id, "mep_xtra_$order_option_name",$ntes); + } + } + + + } else{ - - - // update_post_meta( $event_id, 'total_booking', ($mep_total_booking+$item_quantity)); update_post_meta( $event_id, $order_meta_text, $order_completed); @@ -375,7 +418,7 @@ update_post_meta( $event_id, $mep_atnd, "a2"); } } - +} } @@ -582,16 +625,61 @@ $location = $event_meta['mep_location_venue'][0]." ".$event_meta['mep_street'][0 ?> - + +
Add Calender
+ + + + + + +