diff --git a/inc/admin_setting_panel.php b/inc/admin_setting_panel.php
index 83bb704..75eff87 100644
--- a/inc/admin_setting_panel.php
+++ b/inc/admin_setting_panel.php
@@ -94,7 +94,7 @@ class MAGE_Events_Setting_Controls {
'desc' => __( 'Event Details Template', 'mage-eventpress' ),
'type' => 'select',
'default' => 'no',
- 'options' => event_template_name()
+ 'options' => mep_event_template_name()
),
array(
'name' => 'mep_event_price_show',
diff --git a/inc/mep_enque.php b/inc/mep_enque.php
index f183ff7..45e2b2c 100644
--- a/inc/mep_enque.php
+++ b/inc/mep_enque.php
@@ -20,7 +20,7 @@ if($user_api){
}
-function add_admin_scripts( $hook ) {
+function mep_add_admin_scripts( $hook ) {
global $post;
@@ -36,7 +36,7 @@ function add_admin_scripts( $hook ) {
}
}
}
-add_action( 'admin_enqueue_scripts', 'add_admin_scripts', 10, 1 );
+add_action( 'admin_enqueue_scripts', 'mep_add_admin_scripts', 10, 1 );
diff --git a/inc/mep_event_meta.php b/inc/mep_event_meta.php
index 8cef06e..73a7f9a 100644
--- a/inc/mep_event_meta.php
+++ b/inc/mep_event_meta.php
@@ -902,11 +902,17 @@ function mep_event_ticket_type() {
var row = $( '.empty-row-t.screen-reader-text' ).clone(true);
row.removeClass( 'empty-row-t screen-reader-text' );
row.insertBefore( '#repeatable-fieldset-one-t tbody>tr:last' );
+ jQuery('#mep_ticket_type_empty option[value=inputbox]').attr('selected','selected');
+ jQuery('.empty-row-t #mep_ticket_type_empty option[value=inputbox]').removeAttr('selected');
return false;
});
$( '.remove-row-t' ).on('click', function() {
$(this).parents('tr').remove();
+ // $("selector").removeAttr(attribute);
+ jQuery('#mep_ticket_type_empty option[value=inputbox]').removeAttr('selected');
+ jQuery('#mep_ticket_type_empty option[value=dropdown]').removeAttr('selected');
+
return false;
});
});
@@ -973,7 +979,9 @@ $opt_rst_qty = isset($field['option_rsv_t']) ? $field['option_rsv_t'] : 0;
|
'?>
- |
+
+ |
diff --git a/inc/mep_extra_price.php b/inc/mep_extra_price.php
index d73cb4e..2b8cf78 100644
--- a/inc/mep_extra_price.php
+++ b/inc/mep_extra_price.php
@@ -2,7 +2,7 @@
function mep_add_custom_fields_text_to_cart_item( $cart_item_data, $product_id, $variation_id ){
$product_id = get_post_meta($product_id,'link_mep_event',true) ? get_post_meta($product_id,'link_mep_event',true) : $product_id;
-
+ $recurring = get_post_meta($product_id, 'mep_enable_recurring', true) ? get_post_meta($product_id, 'mep_enable_recurring', true) : 'no';
if (get_post_type($product_id) == 'mep_events') {
$tp = get_post_meta($product_id,'_price',true);
@@ -147,10 +147,17 @@ if(isset($_POST['mep_event_ticket_type'])){
$cnt++;
}
}
-
+
+ if($recurring == 'yes'){
+ $recurring_event_date = isset($_POST['recurring_event_date']) ? $_POST['recurring_event_date'] : array();
+ }else{
+ $recurring_event_date = array();
+ }
+
+
$cart_item_data['event_ticket_info'] = $ticket_type_arr;
- $cart_item_data['event_validate_info'] = $validate;
+ $cart_item_data['event_validate_info'] = $validate;
$cart_item_data['event_extra_option'] = $new;
$cart_item_data['event_user_info'] = $user;
$cart_item_data['event_tp'] = $tp;
@@ -159,6 +166,8 @@ if(isset($_POST['mep_event_ticket_type'])){
$cart_item_data['event_extra_service'] = $event_extra;
$cart_item_data['event_cart_location'] = $event_cart_location;
$cart_item_data['event_cart_date'] = $mep_event_start_date;
+ $cart_item_data['event_recurring_date'] = array_unique($recurring_event_date);
+ $cart_item_data['event_recurring_date_arr'] = $recurring_event_date;
// $cart_item_data['event_cart_date'] = $event_cart_date;
}
$cart_item_data['event_id'] = $product_id;
@@ -169,8 +178,8 @@ add_filter( 'woocommerce_add_cart_item_data', 'mep_add_custom_fields_text_to_car
-add_action( 'woocommerce_before_calculate_totals', 'add_custom_price',90,1 );
-function add_custom_price( $cart_object ) {
+add_action( 'woocommerce_before_calculate_totals', 'mep_add_custom_price',90,1 );
+function mep_add_custom_price( $cart_object ) {
foreach ( $cart_object->cart_contents as $key => $value ) {
$eid = $value['event_id'];
@@ -197,11 +206,23 @@ $eid = $cart_item['event_id'];
if (get_post_type($eid) == 'mep_events') {
$user_info = $cart_item['event_user_info'];
$ticket_type_arr = $cart_item['event_ticket_info'];
- $event_extra_service = $cart_item['event_extra_service'];
+ $event_extra_service = $cart_item['event_extra_service'];
+ $event_recurring_date = $cart_item['event_recurring_date'];
-
+ $recurring = get_post_meta($eid, 'mep_enable_recurring', true) ? get_post_meta($eid, 'mep_enable_recurring', true) : 'no';
echo "";
+
+if($recurring == 'yes'){
+ if(is_array($event_recurring_date) && sizeof($event_recurring_date) > 0){
+ foreach($event_recurring_date as $_event_recurring_date){
+ ?>
+ - :
+ 0){
foreach($user_info as $userinf){
?>
@@ -213,10 +234,12 @@ if(is_array($user_info) && sizeof($user_info) > 0){
- :
- :
0){
foreach($ticket_type_arr as $ticket){
echo '- '.$ticket['ticket_name']." - ".wc_price($ticket['ticket_price']).' x '.$ticket['ticket_qty'].' = '.wc_price($ticket['ticket_price'] * $ticket['ticket_qty']).'
';
@@ -258,7 +281,7 @@ function mep_checkout_validation( $posted ) {
}
if($ee > $total_left) {
$event = get_the_title($event_id);
- wc_add_notice( __( "Sorry, Seats are not available in $event, Available Seats $total_left but you selected $ee", 'mage-eventpress' ), 'error' );
+ wc_add_notice( __( "Sorry, Seats are not available in $event, Available Seats $total_left but you selected $ee", 'mage-eventpress' ), 'error' );
}
}
}
@@ -273,98 +296,83 @@ function mep_checkout_validation( $posted ) {
function mep_add_custom_fields_text_to_order_items( $item, $cart_item_key, $values, $order ) {
-$eid = $values['event_id'];
-if (get_post_type($eid) == 'mep_events') {
-$mep_events_extra_prices = $values['event_extra_option'];
-if(isset($values['event_ticket_type'])){
- $event_ticket_type = $values['event_ticket_type'];
-}else{
- $event_ticket_type = " ";
-}
-if(isset($values['event_ticket_price'])){
- $event_ticket_price = $values['event_ticket_price'];
-}else{
- $event_ticket_price = " ";
-}
-if(isset($values['event_ticket_qty'])){
- $event_ticket_qty = $values['event_ticket_qty'];
-}else{
- $event_ticket_qty = " ";
-}
-
+ $eid = $values['event_id'];
+ if (get_post_type($eid) == 'mep_events') {
+ $mep_events_extra_prices = $values['event_extra_option'];
+ if(isset($values['event_ticket_type'])){
+ $event_ticket_type = $values['event_ticket_type'];
+ }else{
+ $event_ticket_type = " ";
+ }
+ if(isset($values['event_ticket_price'])){
+ $event_ticket_price = $values['event_ticket_price'];
+ }else{
+ $event_ticket_price = " ";
+ }
+ if(isset($values['event_ticket_qty'])){
+ $event_ticket_qty = $values['event_ticket_qty'];
+ }else{
+ $event_ticket_qty = " ";
+ }
$user_set_format = mep_get_option( 'mep_event_time_format','general_setting_sec',12);
$date_format = get_option( 'date_format' );
$time_format = get_option( 'time_format' );
$wpdatesettings = $date_format.' '.$time_format;
- if($user_set_format == 12){
- $cart_date = date_i18n( 'Y-m-d h:i A', strtotime( $values['event_cart_date'] ) );
- }elseif($user_set_format == 24){
- $cart_date = date_i18n( 'Y-m-d H:i', strtotime( $values['event_cart_date'] ) );
- }elseif($user_set_format == 'wtss'){
- $cart_date = date_i18n( $wpdatesettings, strtotime( $values['event_cart_date'] ) );
- }
-
-
- $product_id = $values['product_id'];
- $cart_location = $values['event_cart_location'];
- $event_extra_service = $values['event_extra_service'];
- $ticket_type_arr = $values['event_ticket_info'];
+ $product_id = $values['product_id'];
+ $cart_location = $values['event_cart_location'];
+ $event_extra_service = $values['event_extra_service'];
+ $ticket_type_arr = $values['event_ticket_info'];
-$form_position = mep_get_option( 'mep_user_form_position', 'general_attendee_sec', 'details_page' );
+ $form_position = mep_get_option( 'mep_user_form_position', 'general_attendee_sec', 'details_page' );
if($form_position=='details_page'){
- $event_user_info = $values['event_user_info'];
+ $event_user_info = $values['event_user_info'];
}else{
- $event_user_info = mep_save_attendee_info_into_cart($eid);
+ $event_user_info = mep_save_attendee_info_into_cart($eid);
}
-
-
-
- $item->add_meta_data('Date',$cart_date);
-
+ $recurring = get_post_meta($eid, 'mep_enable_recurring', true) ? get_post_meta($eid, 'mep_enable_recurring', true) : 'no';
+ if($recurring == 'yes'){
+ $event_recurring_date = $values['event_recurring_date'];
+ $event_recurring_date_arr = $values['event_recurring_date_arr'];
+ if(is_array($event_recurring_date) && sizeof($event_recurring_date) > 0){
+ foreach($event_recurring_date as $_event_recurring_date){
+ $item->add_meta_data('Date',get_mep_datetime($_event_recurring_date, 'date-time-text'));
+ }
+ }
+ }else{
+ $event_recurring_date_arr = array();
+ $item->add_meta_data('Date',get_mep_datetime($cart_date, 'date-time-text'));
+ }
+ $item->add_meta_data('_recurring_date_arr',$event_recurring_date_arr);
$item->add_meta_data('Location',$cart_location);
$item->add_meta_data('_event_ticket_info',$values['event_ticket_info']);
-// if (is_array($mep_events_extra_prices) || is_object($mep_events_extra_prices)){
-// foreach ( $mep_events_extra_prices as $field ) {
-// if($field['option_qty']>0){
-// $item->add_meta_data(esc_attr( $field['option_name'] )." x ".$field['option_qty'], wc_price($field['option_qty'] *$field['option_price'] ) );
-// // $opt_name = $product_id.str_replace(' ', '', $field['option_name']);
-// // $opt_qty = $field['option_qty'];
-// // $tes = get_post_meta($product_id,"mep_xtra_$opt_name",true);
-// // $ntes = ($tes+$opt_qty);
-// // update_post_meta( $product_id, "mep_xtra_$opt_name",$ntes);
-// }
-// }
-// }
-
-
-if(is_array($ticket_type_arr) && sizeof($ticket_type_arr) > 0){
- foreach($ticket_type_arr as $ticket){
- $ticket_type_name = $ticket['ticket_name']." - ".wc_price($ticket['ticket_price']).' x '.$ticket['ticket_qty'].' = ';
- $ticket_type_val= wc_price($ticket['ticket_price'] * $ticket['ticket_qty']);
- $item->add_meta_data($ticket_type_name, $ticket_type_val );
-
- }
-}
-
-if(is_array($event_extra_service) && sizeof($event_extra_service) > 0){
- foreach($event_extra_service as $extra_service){
+ if(is_array($ticket_type_arr) && sizeof($ticket_type_arr) > 0){
+ foreach($ticket_type_arr as $ticket){
+ $ticket_type_name = $ticket['ticket_name']." - ".wc_price($ticket['ticket_price']).' x '.$ticket['ticket_qty'].' = ';
+ $ticket_type_val= wc_price($ticket['ticket_price'] * $ticket['ticket_qty']);
+ $item->add_meta_data($ticket_type_name, $ticket_type_val );
- $service_type_name = $extra_service['service_name']." - ".wc_price($extra_service['service_price']).' x '.$extra_service['service_qty'].' = ';
- $service_type_val= wc_price($extra_service['service_price'] * $extra_service['service_qty']);
- $item->add_meta_data($service_type_name, $service_type_val );
-
- }
-}
+ }
+ }
+
+ 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_val= wc_price($extra_service['service_price'] * $extra_service['service_qty']);
+ $item->add_meta_data($service_type_name, $service_type_val );
+
+ }
+ }
if($event_ticket_type){
diff --git a/inc/mep_functions.php b/inc/mep_functions.php
index 385eafb..ec94a36 100755
--- a/inc/mep_functions.php
+++ b/inc/mep_functions.php
@@ -256,7 +256,7 @@ function mep_get_all_tax_list($current_tax=null){
$vegetarian = $_user_info['user_vegetarian'];
$tshirtsize = $_user_info['user_tshirtsize'];
$ticket_type = $_user_info['user_ticket_type'];
- $ticket_qty = $_user_info['user_ticket_qty'];
+ $ticket_qty = $_user_info['user_ticket_qty'];
$event_date = $_user_info['user_event_date'];
$event_id = $_user_info['user_event_id'] ? $_user_info['user_event_id'] : $event_id;
$mep_ucf = isset($_user_info['mep_ucf']) ? $_user_info['mep_ucf'] : "";
@@ -313,11 +313,7 @@ function mep_get_all_tax_list($current_tax=null){
}
- // add_action('admin_init','ttest');
-
- function ttest(){
- mep_attendee_extra_service_create(11289,8938);
- }
+
function mep_attendee_extra_service_create($order_id,$event_id){
@@ -668,170 +664,7 @@ function mep_get_all_tax_list($current_tax=null){
- // 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;
-
- // Getting an instance of the order object
- $order = wc_get_order( $order_id );
- $order_meta = get_post_meta($order_id);
-
- $c = 1;
- # 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();
- $product_id = mep_event_get_order_meta($item_id,'_product_id');
- if($product_id==0){
-
- $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" );
-
-
- $mep_total = get_post_meta($event_id,'total_booking', true);
- if($mep_total){
- $mep_total_booking = $mep_total;
- }else{
- $mep_total_booking =0;
- }
-
-
- $email = $order_meta['_billing_email'][0];
- $order_meta_text = "_stock_msg_".$order_id;
- $order_processing = "processing_".$order_id;
- $order_completed = "completed_".$order_id;
- $order_cancelled = "cancelled_".$order_id;
- $mep_atnd = "_mep_atnd_".$order_id;
-
-
- // if($order->has_status( 'processing' ) || $order->has_status( 'pending' )) {
- if($order->has_status( 'processing' ) || $order->has_status( 'pending' )) {
- // update_post_meta( $event_id, $mep_atnd, "a2");
-
- $mep_stock_msgc = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),0);
- $mep_stock_orderc = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),1);
-
- if($mep_stock_orderc==$order_id){
- if($mep_stock_msgc=='cancelled'){
-
- 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);
- }
- }
- }
- }
-
- update_post_meta( $event_id, $order_meta_text, $order_processing);
-
- $mep_stock_msg = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),0);
- $mep_stock_order = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),1);
-
-
- if($mep_stock_order==$order_id){
- if($mep_stock_msg=='completed'){
- update_post_meta( $event_id, $order_meta_text, $order_processing);
- }
- else{
- update_post_meta( $event_id, 'total_booking', ($mep_total_booking+$item_quantity));
- update_post_meta( $event_id, $order_meta_text, $order_processing);
-
- }
- }
- }
-
-
- if($order->has_status( 'cancelled' ) || $order->has_status( 'refunded' ) || $order->has_status( 'failed' )) {
-
- update_post_meta( $event_id,$mep_atnd, "a2");
- update_post_meta( $event_id, $order_meta_text, $order_cancelled);
- $mep_stock_msg = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),0);
- $mep_stock_order = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),1);
-
-
- if($mep_stock_order==$order_id){
- $update_total_booking = update_post_meta( $event_id, 'total_booking', ($mep_total_booking-$item_quantity));
-
- 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);
- if($tes>0){
- update_post_meta( $event_id, "mep_xtra_$order_option_name",$ntes);
- }
- }
- }
- }
-
- }
-
- if( $order->has_status( 'completed' )) {
- update_post_meta( $event_id, $mep_atnd, "a2");
- // update_post_meta( $event_id, $order_meta_text, $order_completed);
- $mep_stock_msg = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),0);
- $mep_stock_order = mep_get_order_info(get_post_meta($event_id,$order_meta_text, true),1);
- // mep_event_confirmation_email_sent($event_id,$email);
- if($ordr_total==0){
- update_post_meta( $event_id, 'total_booking', ($mep_total_booking+$item_quantity));
- }
-
- if($mep_stock_order==$order_id){
-
- if($mep_stock_msg=='processing'){
- update_post_meta( $event_id, $order_meta_text, $order_completed);
- }elseif($mep_stock_msg=='pending'){
-
- if($ordr_total>0){
- 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);
-
- 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);
- }
- }
- }
-
- }
- }
- }
- }
- }
+
@@ -1010,19 +843,12 @@ function mep_get_all_tax_list($current_tax=null){
add_action('init','mep_include_template_parts');
function mep_include_template_parts(){
- // $template_name = 'templating.php';
- // $template_path = get_stylesheet_directory().'/mage-events/template-prts/';
- // if(file_exists($template_path . $template_name)) {
- // require_once(get_stylesheet_directory() . "/mage-events/template-prts/templating.php");
- // }else{
- // require_once(dirname(__FILE__) . "/inc/template-prts/templating.php");
- // }
require_once(dirname(__DIR__) . "/inc/template-prts/templating.php");
}
function mep_load_events_templates($template) {
- global $post;
+ global $post;
if ($post->post_type == "mep_events"){
$template_name = 'single-events.php';
$template_path = 'mage-events/';
@@ -1272,8 +1098,8 @@ function mep_get_all_tax_list($current_tax=null){
echo $content;
}
- // event_template_name();
- function event_template_name(){
+ // mep_event_template_name();
+ function mep_event_template_name(){
$template_name = 'index.php';
$template_path = get_stylesheet_directory().'/mage-events/themes/';
@@ -1308,7 +1134,7 @@ function mep_get_all_tax_list($current_tax=null){
function event_single_template_list($current_theme){
- $themes = event_template_name();
+ $themes = mep_event_template_name();
$buffer = ' |