Changeset 1011855

Timestamp:

10/22/2014 01:38:25 AM (11 years ago)

Author:

loushou

Message:

• added better error handling on ticket reservation form
• improved 'qsBlock' code to adjust properly to covered element size
• updated 'over available tickets' check to be more universal

loushou

Location:

opentickets-community-edition/trunk

Files:

• assets/js/utils/tools.js (modified) (2 diffs)
• inc/core/zoner.class.php (modified) (2 diffs)
• inc/venues/event-area/post-type.class.php (modified) (6 diffs)
• inc/venues/event-area/pricing.class.php (modified) (2 diffs)
• launcher.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

opentickets-community-edition/trunk/assets/js/utils/tools.js

@@ -171 +171 @@
 
 (function($) {
+    /*
   $.fn.qsBlock = function(settings) {
     return this.each(function() {
@@ -201 +202 @@
 
   $.fn.qsUnblock = function(element) { return this.each(function() { $(this).trigger('unblock'); }); };
+    */
+  $.fn.qsBlock = function(settings) {
+    return this.each(function() {
+      var element = $(this), position = element.css( 'position' ),
+          sets = $.extend(true, { msg:'<h1>Loading...</h1>', css:{ backgroundColor:'#000000', opacity:0.5 }, msgcss:{ color:'#ffffff' } }, settings),
+          bd = $('<div class="block-backdrop"></div>').appendTo( element ), msg = $('<div class="block-msg"></div>').appendTo( element ),
+                    dims = { width:element.outerWidth(), height:element.outerHeight() };
+            if ( position == 'static' )
+                element.css( { position:'relative' } );
+            $(sets.msg).css({ color:'inherit' }).appendTo(msg);
+      var mhei = msg.height();
+      bd.css($.extend({
+        position: 'absolute',
+        width: 'auto',
+        height: 'auto',
+        top: 0, bottom:0,
+        left: 0, right:0
+      }, sets.css));
+      msg.css($.extend({
+        textAlign: 'center',
+        position: 'absolute',
+        width: dims.width,
+        top: '50%',
+        left: 0,
+                marginTop: -mhei
+      }, sets.msgcss));
+            msg.find('h1').css({ fontSize: dims.height > 30 ? 28 : '100%' });
+
+      var ublock = function() { element.css( { position:position } ); bd.remove(); msg.remove(); element.off('unblock', ublock); }
+      element.on('unblock', ublock);
+    }); 
+  };  
+
+  $.fn.qsUnblock = function(element) { return this.each(function() { $(this).trigger('unblock'); }); };
 })(jQuery);
 

opentickets-community-edition/trunk/inc/core/zoner.class.php

@@ -305 +305 @@
         } else {
             // get the available occupancy of the event
-            $available = apply_filters('qsot-get-event-available-tickets', 0, $event, $ticket_type_id);
+            $available = apply_filters('qsot-get-event-available-tickets', 0, $event);
             // determine how many this person already has reserved
-            $owns = apply_filters('qsot-zoner-owns', 0, $event, $ticket_type_id, self::$o->{'z.states.r'}, $customer_id);
+            $owns = array_sum( array_values( apply_filters('qsot-zoner-owns', 0, $event, 0, self::$o->{'z.states.r'}, $customer_id) ) );
+            //$owns_tt = apply_filters('qsot-zoner-owns', 0, $event, $ticket_type_id, self::$o->{'z.states.r'}, $customer_id);
 
             // if this user already owns some seats for this event, then 
             if ($owns) {
                 // if they are requesting more than is available, then just fail
-                if ($count > ($available + $owns)) return false;
+                if ($count > ($available + $owns)) return new WP_Error( 'There are not ' . $count . ' tickets available to reserve.' );
                 // otherwise update the reservation count for this user for this event
                 $res = $wpdb->update(
@@ -323 +324 @@
             } else {
                 // if the user is requesting more than what is currently available, then just fail
-                if ($count > $available) return false;
+                if ($count > $available) return new WP_Error( 'There are not ' . $count . ' tickets available to reserve.' );
                 // oterhwise, insert the reservations for these seats now
                 $res = $wpdb->insert(

opentickets-community-edition/trunk/inc/venues/event-area/post-type.class.php

@@ -357 +357 @@
         if ($qty > 0 && is_object($event) && is_object($event->meta) && is_object($event->meta->_event_area_obj) && is_object($event->meta->_event_area_obj->ticket)) {
             $res = apply_filters('qsot-zoner-reserve-current-user', false, $event, $event->meta->_event_area_obj->ticket->id, $qty);
-            if ($res) {
+            if ($res && ! is_wp_error( $res ) ) {
                 $resp['s'] = true;
                 $resp['m'] = array('Updated your reservations successfully.');
@@ -366 +366 @@
                 $resp['data']['available_more'] = $resp['data']['available'] - $resp['data']['owns'];
                 WC()->cart->maybe_set_cart_cookies();
+            } else if ( is_wp_error( $res ) ) {
+                $resp['e'] = array_merge( $res['e'], $res->get_error_messages() );
             } else {
                 $resp['e'][] = 'Could not update your reservations.';
@@ -388 +390 @@
         if (is_object($event) && is_object($event->meta) && is_object($event->meta->_event_area_obj) && is_object($event->meta->_event_area_obj->ticket)) {
             $customer_id = apply_filters('qsot-zoner-current-user', md5(isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : time()));
-            $where = array(
-                'customer_id' => $customer_id,
-                'event_id' => $event->ID,
-                'ticket_type_id' => $event->meta->_event_area_obj->ticket->id,
-                'state' => self::$o->{'z.states.r'},
-            );
-            if ($data['quantity'] <= 0) {
-                $set = array(
-                    'qty' => 0,
-                    '_delete' => true,
+
+            // get the available occupancy of the event
+            $available = apply_filters('qsot-get-event-available-tickets', 0, $event);
+            // determine how many this person already has reserved
+            $owns = apply_filters( 'qsot-zoner-owns', 0, $event, 0, self::$o->{'z.states.r'}, $customer_id );
+            $owns_all = array_sum( array_values( $owns ) );
+
+            $quantity = $data['quantity'];
+
+            if ( $quantity <= $available ) {
+                $where = array(
+                    'customer_id' => $customer_id,
+                    'event_id' => $event->ID,
+                    'ticket_type_id' => $event->meta->_event_area_obj->ticket->id,
+                    'state' => self::$o->{'z.states.r'},
                 );
-            } else {
-                $set = array(
-                    'qty' => $data['quantity'],
-                );
-            }
-            $res = apply_filters('qsot-zoner-update-reservation', false, $where, $set);
-            $owns = apply_filters('qsot-zoner-owns-current-user', 0, $event, $event->meta->_event_area_obj->ticket->id, self::$o->{'z.states.r'});
-
-            if ($data['quantity'] <= 0) {
-                if (!$owns && $res) {
-                    $resp['s'] = true;
-                    $resp['m'] = array('Updated your reservations successfully.');
-                    $resp['data'] = array(
-                        'owns' => $owns,
-                        'available' => $event->meta->available,
+                if ($data['quantity'] <= 0) {
+                    $set = array(
+                        'qty' => 0,
+                        '_delete' => true,
                     );
-                    $resp['data']['available_more'] = $resp['data']['available'] - $resp['data']['owns'];
                 } else {
-                    if ($owns) $resp['e'][] = 'A problem occurred when trying to remove your reservations.';
-                    else $resp['e'][] = 'Could not update your reservations.';
+                    $set = array(
+                        'qty' => $data['quantity'],
+                    );
+                }
+                $res = apply_filters('qsot-zoner-update-reservation', false, $where, $set);
+                $owns = apply_filters('qsot-zoner-owns-current-user', 0, $event, $event->meta->_event_area_obj->ticket->id, self::$o->{'z.states.r'});
+
+                if ($data['quantity'] <= 0) {
+                    if (!$owns && $res) {
+                        $resp['s'] = true;
+                        $resp['m'] = array('Updated your reservations successfully.');
+                        $resp['data'] = array(
+                            'owns' => $owns,
+                            'available' => $event->meta->available,
+                        );
+                        $resp['data']['available_more'] = $resp['data']['available'] - $resp['data']['owns'];
+                    } else {
+                        if ($owns) $resp['e'][] = 'A problem occurred when trying to remove your reservations.';
+                        else $resp['e'][] = 'Could not update your reservations.';
+                    }
+                } else {
+                    if (!$res || !$owns) {
+                        if ($owns) $resp['e'][] = 'A problem occurred when trying to update your reservations.';
+                        else $resp['e'][] = 'Could not update your reservations.';
+                    } else {
+                        $resp['s'] = true;
+                        $resp['m'] = array('Updated your reservations successfully.');
+                        $resp['data'] = array(
+                            'owns' => $owns,
+                            'available' => $event->meta->available,
+                        );
+                        $resp['data']['available_more'] = $resp['data']['available'] - $resp['data']['owns'];
+                    }
                 }
             } else {
-                if (!$res || !$owns) {
-                    if ($owns) $resp['e'][] = 'A problem occurred when trying to update your reservations.';
-                    else $resp['e'][] = 'Could not update your reservations.';
-                } else {
-                    $resp['s'] = true;
-                    $resp['m'] = array('Updated your reservations successfully.');
-                    $resp['data'] = array(
-                        'owns' => $owns,
-                        'available' => $event->meta->available,
-                    );
-                    $resp['data']['available_more'] = $resp['data']['available'] - $resp['data']['owns'];
-                }
+                $resp['e'][] = __( sprintf(
+                    'There are not enough available tickets to increase the quantity of %s to %d. There are only %d available.',
+                    $event->meta->_event_area_obj->ticket->get_title(),
+                    $quantity,
+                    $available
+                ), 'qsot' );
             }
         } else {
@@ -717 +737 @@
             if (empty($customer_id)) $customer_id = md5($order->id);
             $res = apply_filters('qsot-zoner-reserve', false, $event, $event->meta->_event_area_obj->ticket->id, $qty, $customer_id, $oid);
-            if ($res) {
+            if ( $res && ! is_wp_error( $res ) ) {
                 do_action('qsot-order-admin-added-tickets', $order, $event, $event->meta->_event_area_obj->ticket->id, $qty);
                 $resp['s'] = true;
@@ -1114 +1134 @@
                 if ($requested_count > 0) {
                     $success = apply_filters('qsot-zoner-reserve-current-user', false, $event, $ticket_type_id, $requested_count);
-                    if (!$success) {
+                    if ( ! $success || is_wp_error( $success ) ) {
                         $available = apply_filters('qsot-get-event-available-tickets', 0, $event, $ticket_type_id);
                         $ticket = get_product($ticket_type_id);
@@ -1146 +1166 @@
                     $owns = apply_filters('qsot-zoner-owns-current-user', 0, $event, $ticket_type_id, self::$o->{'z.states.r'});
                     $success = apply_filters('qsot-zoner-reserve-current-user', false, $event, $ticket_type_id, $requested_count);
-                    if (!$success) {
+                    if ( ! $success | is_wp_error( $success ) ) {
                         $available = apply_filters('qsot-get-event-available-tickets', 0, $event, $ticket_type_id);
                         $ticket = get_product($ticket_type_id);

opentickets-community-edition/trunk/inc/venues/event-area/pricing.class.php

@@ -37 +37 @@
             add_action('woocommerce_order_status_changed', array(__CLASS__, 'order_status_changed'), 100, 3);
             add_action('woocommerce_before_cart_item_quantity_zero', array(__CLASS__, 'delete_cart_ticket'), 10, 1);
-            add_action('woocommerce_after_cart_item_quantity_update', array(__CLASS__, 'not_more_than_available'), 10, 2);
             add_filter('woocommerce_get_cart_item_from_session', array(__CLASS__, 'load_item_data'), 20, 3);
             add_action('woocommerce_add_order_item_meta', array(__CLASS__, 'add_item_meta'), 10, 3);
@@ -50 +49 @@
 
             add_filter('qsot-item-is-ticket', array(__CLASS__, 'item_is_ticket'), 10, 2);
+
+            if ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) {
+                add_action('woocommerce_after_cart_item_quantity_update', array(__CLASS__, 'not_more_than_available'), 10, 2);
+            }
 
             if (is_admin()) {

opentickets-community-edition/trunk/launcher.php

@@ -4 +4 @@
  * Plugin URI:  http://opentickets.com/
  * Description: Event Management and Online Ticket Sales Platform
- * Version:     1.6.11
+ * Version:     1.6.12
  * Author:      Quadshot Software LLC
  * Author URI:  http://quadshot.com/
@@ -41 +41 @@
             'fctm' => 'fc',
             'always_reserve' => 0,
-            'version' => '1.6.11',
+            'version' => '1.6.12',
             'min_wc_version' => '2.1.0',
             'core_post_type' => 'qsot-event',

opentickets-community-edition/trunk/readme.txt

@@ -140 +140 @@
 == Changelog ==
 
+= 1.6.12 =
+* added better error handling on ticket reservation form
+* improved 'qsBlock' code to adjust properly to covered element size 
+* updated 'over available tickets' check to be more universal
+
 = 1.6.11 =
 * repaired 'my-orders' section of the my account printout on the edit user page in the admin (thanks @rjh1990)