Removed addTimeToCart() from regCartSupport class. No longer needed.

Removed replaceRequestingAccount() from regCartSupport class. No longer needed.
Fixed problem with comparison of rate date number.
Fixed loss of event ID when merging time and rate for use with registration page.

diff --git a/classes/data/dataRegEvent.php b/classes/data/dataRegEvent.php
index 30c3d7a..4c5d754 100644 (file)
--- a/classes/data/dataRegEvent.php
+++ b/classes/data/dataRegEvent.php
@@ -716,7 +716,7 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
 
                                     // Preserve rate ID and don't let it trash the time ID
                                     $rv['rate_id'] = $rv['id'];
-                                    unset($rv['id']);
+                                    unset($rv['id'], $rv['reg_event']);
 
                                     $this->regEventData['reg_class'][$ck]['times'][$tv['event_time']] = array_merge($tv, $rv);
                                     $this->regEventData['reg_class'][$ck]['hasTimes'] = true;

diff --git a/classes/regCartSupport.php b/classes/regCartSupport.php
index c2b081f..70dd763 100644 (file)
--- a/classes/regCartSupport.php
+++ b/classes/regCartSupport.php
@@ -232,9 +232,6 @@ class GlmRegCartSupport
                                         // Add registrant account to accounts table
                                         $this->addAccountToCart($registrant['account']);
 
-                                        // Add time data to reg_times table
-// ****                                        $this->addTimeToCart($registrant['reg_time']);
-
                                     } // Each Registrant
                                 }
 
@@ -648,22 +645,6 @@ class GlmRegCartSupport
 
     }
 
-    /*
-     * Update request to use another account
-     *
-     * @param integer $requestId
-     * @param integer $accountId
-     *
-     * @return boolean True is success otherwise false
-     * @access public
-     */
-    public function replaceRequestingAccount($requestId = false, $accountId = false)
-    {
-
-        // **** NEED TO COMPLETE THIS FUNCTION ****
-
-    }
-
     /*
      * Check if logged in user has permission to access cart
      *
@@ -847,42 +828,6 @@ class GlmRegCartSupport
 
     }
 
-    /*
-     * Add a reg_time record to the times list in the temoporary cart array if not already there
-     *
-     *
-     * @param integer $timeId
-     *
-     * @return boolean Success or fail
-     * @access public
-     */
-    public function addTimeToCart($timeId)
-    {
-
-        // Check the supplied reg_time ID
-        $timeId = ($timeId-0);
-        if ($timeId == 0) {
-            return false;
-        }
-
-        // Try to get the account record for the person who submitted (is submitting) the request
-        $RegTime = new GlmDataRegistrationsRegTime($this->wpdb, $this->config);
-        $time = $RegTime->getEntry($timeId);
-
-        // If time was not found
-        if (!$time) {
-            return false;
-        }
-
-        // If the time doesn't exist in the times array, add it
-        if (!isset($this->cart['times'][$timeId])) {
-            $this->cart['times'][$time['id']] = $time;
-        }
-
-        return true;
-
-    }
-
     /*
      * Purge old reg_time_pending entries
      *

diff --git a/js/adminRegApp.js b/js/adminRegApp.js
index ef66a77..302a213 100644 (file)
--- a/js/adminRegApp.js
+++ b/js/adminRegApp.js
@@ -65,8 +65,8 @@ app.Models.Admin.RegRate = Backbone.Model.extend({
         name: '',
         start_days: 0,
         end_days: 0,
-        base_rate: 0.0,
-        per_registrant: 0.0,
+        base_rate: 0.00,
+        per_registrant: 0.00,
         registrant_credits: 0
     },
 
@@ -419,7 +419,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         if (v == '')  {
             v = 0;
         }
-        v = '$' + Number(v).toFixed(2);
+        v = Number(v).toFixed(2);
         return v;
     },
 
@@ -572,8 +572,8 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         var datesError = '';
         
         var cur = model.cid;                // ID of current rate
-        var start = current.start_days;
-        var end = current.end_days;
+        var start = parseInt(current.start_days);
+        var end = parseInt(current.end_days);
      
         if (start < end) {
             datesError += 'Start days must be greater than end days. ';

diff --git a/js/models/admin/regRate.js b/js/models/admin/regRate.js
index 231fcff..0963609 100644 (file)
--- a/js/models/admin/regRate.js
+++ b/js/models/admin/regRate.js
@@ -12,8 +12,8 @@ app.Models.Admin.RegRate = Backbone.Model.extend({
         name: '',
         start_days: 0,
         end_days: 0,
-        base_rate: 0.0,
-        per_registrant: 0.0,
+        base_rate: 0.00,
+        per_registrant: 0.00,
         registrant_credits: 0
     },
 

diff --git a/js/views/admin/regRate.js b/js/views/admin/regRate.js
index 8311adb..a250f00 100644 (file)
--- a/js/views/admin/regRate.js
+++ b/js/views/admin/regRate.js
@@ -40,7 +40,7 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         if (v == '')  {
             v = 0;
         }
-        v = '$' + Number(v).toFixed(2);
+        v = Number(v).toFixed(2);
         return v;
     },
 
@@ -193,8 +193,8 @@ app.Views.Admin.RegRate = Backbone.View.extend({
         var datesError = '';
         
         var cur = model.cid;                // ID of current rate
-        var start = current.start_days;
-        var end = current.end_days;
+        var start = parseInt(current.start_days);
+        var end = parseInt(current.end_days);
      
         if (start < end) {
             datesError += 'Start days must be greater than end days. ';

diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php
index e43bc2a..caaf630 100644 (file)
--- a/models/front/registrations/registration.php
+++ b/models/front/registrations/registration.php
@@ -154,7 +154,7 @@
             $this->postProcAddedEventData = true;
             $regEvent = $this->getEventForRegistration($eventRegID);
 
-            //echo '<pre>$regEvent: ' . print_r( $regEvent, true ) . '</pre>';
+            // echo '<pre>$regEvent: ' . print_r( $regEvent, true ) . '</pre>';
 
             // Create an $event array with the event data.
             $event = array(

diff --git a/setup/databaseScripts/create_database_V0.0.15.sql b/setup/databaseScripts/create_database_V0.0.15.sql
index 414f752..5ba3b76 100644 (file)
--- a/setup/databaseScripts/create_database_V0.0.15.sql
+++ b/setup/databaseScripts/create_database_V0.0.15.sql
@@ -270,6 +270,7 @@ CREATE TABLE {prefix}reg_time_pending (
     id INT NOT NULL AUTO_INCREMENT,
     reg_event INT NULL,                                         -- Pointer to reg_event table
     reg_time INT NULL,                                          -- ID of time record
+++    registrant INT NULL,                                        -- ID of reg_request_registrant record                                                  -- 
     expire_time DATETIME NULL,                                  -- Time at which this hold expires
     PRIMARY KEY (id),
     INDEX (reg_event),

diff --git a/views/admin/registrations/eventEditLevels.html b/views/admin/registrations/eventEditLevels.html
index 1dc0e57..a8b5ed2 100644 (file)
--- a/views/admin/registrations/eventEditLevels.html
+++ b/views/admin/registrations/eventEditLevels.html
@@ -125,7 +125,7 @@
                                 <td>
                                     <span class="glm-nowrap">Base $<input class="rate-base-rate glm-form-text-input-veryshort" type="text" name="base_rate_<% if (id) { %><%- id %><% } else { %> new <% } %>" value="<% if (base_rate) { %><%- base_rate %><% } %>"></span>
                                     <span class="glm-nowrap">Per-Registrant $<input class="rate-per-registrant glm-form-text-input-veryshort" type="text" name="per_registrant_<% if (id) { %><%- id %><% } else { %> new <% } %>" value="<% if (per_registrant) { %><%- per_registrant %><% } %>"></span>
-                                    <span class="glm-nowrap">Registrant Credits <input class="rate-registrant-credits glm-form-text-input-veryshort" type="text" name="registrant_credits_<% if (id) { %><%- id %><% } else { %> new <% } %>" value="<% if (registrant_credits) { %><%- registrant_credits %><% } %>"></span>
+                                    <span class="glm-nowrap">Registrant Credits <input class="rate-registrant-credits glm-form-text-input-veryshort" type="text" name="registrant_credits_<% if (id) { %><%- id %><% } else { %> new <% } %>" value="<% if (registrant_credits) { %><%= registrant_credits %><% } %>"></span>
                                     <br>
                                 </td>
                             </tr>