Update views on front end

Add collapse for the address part of the add edit registrant.
Add Registrant credits to the regClass part.

diff --git a/css/front.css b/css/front.css
index 565a106..6043a8c 100644 (file)
--- a/css/front.css
+++ b/css/front.css
@@ -165,6 +165,9 @@ label.registrant-label {
 label.reg-time {
     display: inline;
 }
+.ereg-addr {
+    display: none;
+}
 /*}}} End New Attendee Form */
 
 /*{{{ Login Page */

diff --git a/js/frontRegApp.js b/js/frontRegApp.js
index afc01a3..0acb594 100644 (file)
--- a/js/frontRegApp.js
+++ b/js/frontRegApp.js
@@ -493,6 +493,11 @@ app.Views.Front.RegClass = Backbone.View.extend({
         // 'click .add-new-registrant-cancel': 'cancelAddNew',
         // 'click .timeSelection': 'updateTimeSelection',
         'click .fc-event-container': 'updateTimeSelection',
+        'click .show-hide-address': 'toggleClass',
+    },
+
+    toggleClass: function(){
+        this.$('.ereg-addr').toggle();
     },
 
     updateTimeSelection: function(e){

diff --git a/js/models/front/regClass.js b/js/models/front/regClass.js
index d7e0700..8574212 100644 (file)
--- a/js/models/front/regClass.js
+++ b/js/models/front/regClass.js
@@ -13,6 +13,7 @@ app.Models.Front.RegClass = Backbone.Model.extend({
         reg_rate_name: '',
         reg_rate_base_price: '',
         reg_rate_per_reg: '',
+        registrant_credits: '',
         reg_count: 0,
         loggedIn: false,
         selectedTime: 0,

diff --git a/js/views/front/regClass.js b/js/views/front/regClass.js
index 96990cc..c617384 100644 (file)
--- a/js/views/front/regClass.js
+++ b/js/views/front/regClass.js
@@ -26,6 +26,11 @@ app.Views.Front.RegClass = Backbone.View.extend({
         // 'click .add-new-registrant-cancel': 'cancelAddNew',
         // 'click .timeSelection': 'updateTimeSelection',
         'click .fc-event-container': 'updateTimeSelection',
+        'click .show-hide-address': 'toggleClass',
+    },
+
+    toggleClass: function(){
+        this.$('.ereg-addr').toggle();
     },
 
     updateTimeSelection: function(e){

diff --git a/models/front/registrations/registration.php b/models/front/registrations/registration.php
index eb7497d..4e33ac4 100644 (file)
--- a/models/front/registrations/registration.php
+++ b/models/front/registrations/registration.php
@@ -203,6 +203,7 @@
                         $rClass['reg_rate_name']       = $time['name'];
                         $rClass['reg_rate_base_price'] = $time['base_rate'];
                         $rClass['reg_rate_per_reg']    = $time['per_registrant'];
+                        $rClass['registrant_credits']  = $time['registrant_credits'];
                         if ( $regEvent['time_specific'] ) {
                             $rClass['selectedTime'] = $time['id'];
                         }

diff --git a/views/front/registrations/registration.html b/views/front/registrations/registration.html
index 17f7ad5..3c9b562 100644 (file)
--- a/views/front/registrations/registration.html
+++ b/views/front/registrations/registration.html
@@ -60,6 +60,7 @@
                 <div class="glm-columns glm-small-12 glm-large-12"> <%= reg_rate_name  %> </div>
                 <div class="glm-columns glm-small-12 glm-large-12"> Base Rate: $<%= reg_rate_base_price %> </div>
                 <div class="glm-columns glm-small-12 glm-large-12"> Per Registrant: $<%= reg_rate_per_reg %> </div>
+                <div class="glm-columns glm-small-12 glm-large-12"> Registrant Credits: <%= registrant_credits %> </div>
                 <div class="glm-columns glm-small-12 glm-large-12 glm-hidden">
                     <% if ( app.timeSpecific ) { %>
                         <input class="timeSelection" type="hidden" name="timeOption">
@@ -115,26 +116,29 @@
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_email" value="<%- email %>"></div>
                 </div>
                 <div class="glm-row">
+                    <a class="show-hide-address">Address (show/hide)</a>
+                </div>
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">Address 1</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_addr1" value="<%- addr1 %>"></div>
                 </div>
-                <div class="glm-row">
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">Address 2</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_addr2" value="<%- addr2 %>"></div>
                 </div>
-                <div class="glm-row">
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">City</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_city" value="<%- city %>"></div>
                 </div>
-                <div class="glm-row">
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">State</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_state" value="<%- state %>"></div>
                 </div>
-                <div class="glm-row">
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">Zip/Postal Code</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_zip" value="<%- zip %>"></div>
                 </div>
-                <div class="glm-row">
+                <div class="glm-row ereg-addr">
                     <div class="glm-columns glm-large-4 glm-small-12">Country</div>
                     <div class="glm-columns glm-large-8 glm-small-12"><input class="add_reg_country" value="<%- country %>"></div>
                 </div>
@@ -158,36 +162,49 @@
     <% } else { %>
         <div class="glm-registrant-edit" title="Edit"><%= fname %> <%= lname %> <%= email %><span class="dashicons dashicons-edit"></span></div>
         <div class="reg-edit-form">
-            {/literal}{if $regEvent.time_specific.value}
-            {/if}{literal}
-            {/literal}{if $regEvent.time_specific.value}
-                <div style="width: 48%;">
-                {else}
-                <div>
-            {/if}{literal}
-            <div>
-                {/literal}{$terms.reg_term_contact_information}{literal}
-            </div>
-            <div>
-                <input class="reg_fname" placeholder="First Name" value="<%- fname %>">
-                <input class="reg_lname" placeholder="Last Name" value="<%- lname %>">
-            </div>
-            <div>
-                <input class="reg_email" placeholder="Email Address" value="<%- email %>"<% if ( email ) { %> disabled <% } %>>
-                (Email is optional)
-            </div>
-            <div>
-                <input class="reg_addr1" placeholder="Address 1" value="<%- addr1 %>">
-                <input class="reg_addr2" placeholder="Address 2" value="<%- addr2 %>">
-            </div>
-            <div>
-                <input class="reg_city" placeholder="City" value="<%- city %>">
-                <input class="reg_state" placeholder="State" value="<%- state %>">
-            </div>
-            <div>
-                <input class="reg_zip" placeholder="Zip/Postal Code" value="<%- zip %>">
-                <input class="reg_country" placeholder="Country" value="<%- country %>">
-            </div>
+            {/literal}{literal}
+                <div class="glm-columns glm-small-12 glm-large-12">
+                    <h4>{/literal}{$terms.reg_term_contact_information}{literal}</h4>
+                    <div class="glm-row">
+                        <div class="glm-columns glm-large-4 glm-small-12">First Name</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_fname" value="<%- fname %>"></div>
+                    </div>
+                    <div class="glm-row">
+                        <div class="glm-columns glm-large-4 glm-small-12">Last Name</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_lname" value="<%- lname %>"></div>
+                    </div>
+                    <div class="glm-row">
+                        <div class="glm-columns glm-large-4 glm-small-12">Email Address</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_email" value="<%- email %>"></div>
+                    </div>
+                    <div class="glm-row">
+                        <a class="show-hide-address">Address (show/hide)</a>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">Address 1</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_addr1" value="<%- addr1 %>"></div>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">Address 2</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_addr2" value="<%- addr2 %>"></div>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">City</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_city" value="<%- city %>"></div>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">State</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_state" value="<%- state %>"></div>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">Zip/Postal Code</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_zip" value="<%- zip %>"></div>
+                    </div>
+                    <div class="glm-row ereg-addr">
+                        <div class="glm-columns glm-large-4 glm-small-12">Country</div>
+                        <div class="glm-columns glm-large-8 glm-small-12"><input class="reg_country" value="<%- country %>"></div>
+                    </div>
+                </div>
             {/literal}{if $regEvent.time_specific.value}
                 <div>
                    <!-- Selected Time: <span id="reg-time-display-{literal}<%= id %>{/literal}">{literal}<%= reg_time_text %>{/literal}</span> -->