From: Chuck Scott Date: Wed, 18 Oct 2017 19:56:43 +0000 (-0400) Subject: Fixed problem with rate ID overlaying time ID in getEventForRegistration(); X-Git-Tag: v1.0.0^2~339 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=0ad270a80ca8e6f4ae8f5e4fdf53ef22fea826e3;p=WP-Plugins%2Fglm-member-db-registrations.git Fixed problem with rate ID overlaying time ID in getEventForRegistration(); More updates to cart. --- diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php index f5f0902..30c3d7a 100644 --- a/classes/data/dataRegEvent.php +++ b/classes/data/dataRegEvent.php @@ -684,6 +684,11 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract // If it's time to register with this time/rate - Add it to the class data if (time() > $earliestTime && time() < $latestTime) { + + // Preserve rate ID and don't let it trash the time ID + $rv['rate_id'] = $rv['id']; + unset($rv['id']); + $this->regEventData['reg_class'][$ck]['times'][$tv['event_time']] = array_merge($tv, $rv); $this->regEventData['reg_class'][$ck]['hasTimes'] = true; } @@ -708,6 +713,11 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract // If it's time to register with this time/rate - Add it to the class data if (time() > $earliestTime && time() < $latestTime) { + + // Preserve rate ID and don't let it trash the time ID + $rv['rate_id'] = $rv['id']; + unset($rv['id']); + $this->regEventData['reg_class'][$ck]['times'][$tv['event_time']] = array_merge($tv, $rv); $this->regEventData['reg_class'][$ck]['hasTimes'] = true; } diff --git a/classes/data/dataRegRequestClass.php b/classes/data/dataRegRequestClass.php index 573ce39..85d1bcf 100644 --- a/classes/data/dataRegRequestClass.php +++ b/classes/data/dataRegRequestClass.php @@ -124,14 +124,6 @@ class GlmDataRegistrationsRequestClass extends GlmDataAbstract 'use' => 'lgneud' ), - // Selected Start Time - 'event_datetime' => array ( - 'field' => 'event_datetime', - 'type' => 'datetime', - 'required' => true, - 'use' => 'lgneud' - ), - // Pointer to reg_request_event table 'reg_request_event' => array ( 'field' => 'reg_request_event', diff --git a/classes/data/dataRegRequestRate.php b/classes/data/dataRegRequestRate.php index d031243..3a2161d 100644 --- a/classes/data/dataRegRequestRate.php +++ b/classes/data/dataRegRequestRate.php @@ -125,14 +125,6 @@ class GlmDataRegistrationsRegRequestRate extends GlmDataAbstract 'use' => 'lgneud' ), - // Selected Start Time - 'event_datetime' => array ( - 'field' => 'event_datetime', - 'type' => 'datetime', - 'required' => true, - 'use' => 'lgneud' - ), - // Pointer to reg_request_event table entry 'reg_request_event' => array ( 'field' => 'reg_request_event', diff --git a/models/front/registrations/cart.php b/models/front/registrations/cart.php index 477ea08..18e2a49 100644 --- a/models/front/registrations/cart.php +++ b/models/front/registrations/cart.php @@ -131,7 +131,6 @@ class GlmMembersFront_registrations_cart extends GlmRegCartSupport } - $view = 'cart'; // Compile template data diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php index dd3c027..07603b1 100644 --- a/models/front/registrations/registration.php +++ b/models/front/registrations/registration.php @@ -222,7 +222,7 @@ $registrants = array(); - echo '
$cart: ' . print_r( $cart, true ) . '
'; + // echo '
$cart: ' . print_r( $cart, true ) . '
'; // Looping through to grab out registrants from the cart. if ( isset( $cart['events'] ) && is_array( $cart['events'] ) ) { @@ -308,9 +308,10 @@ } // - End loop through events. } + // echo '
$registrants: ' . print_r( $registrants, true ) . '
'; - // echo '
$regEvent: ' . print_r( $regEvent, true ) . '
'; + // echo '
$regEvent: ' . print_r( $cart, true ) . '
'; // Compile template data $templateData = array( diff --git a/setup/databaseScripts/create_database_V0.0.15.sql b/setup/databaseScripts/create_database_V0.0.15.sql index 90a844b..2781513 100644 --- a/setup/databaseScripts/create_database_V0.0.15.sql +++ b/setup/databaseScripts/create_database_V0.0.15.sql @@ -459,7 +459,7 @@ CREATE TABLE {prefix}reg_request_event ( CREATE TABLE {prefix}reg_request_class ( id INT NOT NULL AUTO_INCREMENT, reg_event INT NULL, -- Pointer to reg_event entry - event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart +-- event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart reg_request INT NULL, -- Pointer to the registration request record reg_request_event INT NULL, -- Pointer to reg_request_event table entry class INT NULL, -- Pointer to event reg_class table - False (0) if registration class no longer exits @@ -479,7 +479,7 @@ CREATE TABLE {prefix}reg_request_class ( CREATE TABLE {prefix}reg_request_rate ( id INT NOT NULL AUTO_INCREMENT, reg_event INT NULL, -- Pointer to reg_event entry - event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart +-- event_datetime DATETIME NULL, -- Date and time of event time selected so it will always be in the cart reg_request INT NULL, -- Pointer to the registration request record reg_request_event INT NULL, -- Pointer to reg_request_event table entry reg_request_class INT NULL, -- Pointer to reg_request_class table entry