Merge branch 'develop' into feature/formsUpdates

diff --cc classes/regCartSupport.php
Simple merge

diff --cc css/front.css
index 2269f03,fbcc04c..71fc70c
--- 1/css/front.css
--- 2/css/front.css
+++ b/css/front.css
@@@ -225,4 -298,7 +225,10 @@@ span.glm-error 
  .glm-reg-warning {
      color: red;
  }
 +/*}}} End Errors */
++
++
+ #glm-reg-widget {
+     display: inline-block;
+ }
+ 

diff --cc views/front/registrations/checkout.html
index 392e7f6,f3f767e..b71e65f
--- 1/views/front/registrations/checkout.html
--- 2/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@@ -179,148 -193,106 +193,106 @@@
                      <div class="glm-reg-row">
                          <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_cvv} glm-reg-required{/if}">CVV:</div>
                          <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}"><input type="text" placeholder="3 digit number on back of card" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if}></div>
 -                    </div>                    
 +                    </div>
                  </div>
-   {/if}
                  <div class="glm-large-6 glm-columns">
-                     <h4>Additional Contact Information</h4>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_fname} glm-reg-required{/if}">First Name:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_fname} glm-reg-fail{/if}"><input type="text" name="contact_fname" value="{$regAccount.fieldData.contact_fname}"{if $regAccount.fieldRequired.contact_fname} required{/if}></div>
-                     </div>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_addr1} glm-reg-required{/if}">Address:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_addr1} glm-reg-fail{/if}"><input type="text" name="contact_addr1" value="{$regAccount.fieldData.contact_addr1}"{if $regAccount.fieldRequired.contact_addr1} required{/if}></div>
-                     </div>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_addr2} glm-reg-required{/if}">&nbsp;</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_addr2} glm-reg-fail{/if}"><input type="text" name="contact_addr2" value="{$regAccount.fieldData.contact_addr2}"{if $regAccount.fieldRequired.contact_addr2} required{/if}></div>
-                     </div>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_city} glm-reg-required{/if}">City:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_city} glm-reg-fail{/if}"><input type="text" name="contact_city" value="{$regAccount.fieldData.contact_city}"{if $regAccount.fieldRequired.contact_city} required{/if}></div>
-                     </div>
+                     <h4>Global Custom Fields Go Here</h4>
                      <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_state} glm-reg-required{/if}">State:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_state} glm-reg-fail{/if}">
-                             <select name="contact_state">
-                                 <option value=""></option>
-                     {foreach $regAccount.fieldData.contact_state.list as $s}
-                                 <option value="{$s.value}"{if $memberInfo.fieldData.contact_state.value == $s.value} selected="selected"{/if}>
-                                     {$s.name}
-                                 </option>
-                     {/foreach}
-                             </select>
-                         </div>
-                     </div>
+                         <div class="glm-large-12 glm-columns"></div>Custom fields that are event, level, rate, or registrant specific will be collected on registration selection page.</div>
+                     </dic>
+                 </div>
 -  {/if}                
++  {/if}
+             </div>
+             <div class="glm-reg-row">
+                 <div class="glm-large-12 glm-columns">
                      <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_zip} glm-reg-required{/if}">Zip/Postal Code:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_zip} glm-reg-fail{/if}"><input type="text" name="contact_zip" value="{$regAccount.fieldData.contact_zip}"{if $regAccount.fieldRequired.contact_zip} required{/if}></div>
+                         <h4>Terms and Conditions (*** Added fields for events ***)</h4>
+                         You <span class="glm-reg-required">must check</span> the boxes below to confirm that you agree to the listed Terms and Conditions for each event.
                      </div>
+     {foreach $cart.events as $event}
                      <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_country} glm-reg-required{/if}">Country:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_country} glm-reg-fail{/if}">
-                             <select name="contact_country">
-                                 <option value=""></option>
-                     {foreach $regAccount.fieldData.contact_country.list as $c}
-                                 <option value="{$c.value}"{if $memberInfo.fieldData.contact_country.value == $c.value} selected="selected"{/if}>
-                                     {$c.name}
-                                 </option>
-                     {/foreach}
-                             </select>
+                         <div class="glm-large-1">&nbsp;</div>
+                         <div class="glm-large-11 glm-columns glm-reg-nowrap">
+                             <h5>{$event.event_name}:</h5>
+                             <input type="checkbox" name="terms_{$event.id}" value="accept" required> {$event.event_terms} {$event.id}<br>
+                             *** Any added fields go here ***
 -                            
++
                          </div>
                      </div>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_email} glm-reg-required{/if}">E-mail:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_email} glm-reg-fail{/if}"><input type="text" name="contact_email" value="{$regAccount.fieldData.contact_email}"{if $regAccount.fieldRequired.contact_email} required{/if}></div>
-                     </div>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.contact_phone} glm-reg-required{/if}">Phone:</div>
-                         <div class="glm-large-9 glm-columns{if $regAccount.fieldFail.contact_phone} glm-reg-fail{/if}"><input type="text" name="contact_phone" value="{$regAccount.fieldData.contact_phone}"{if $regAccount.fieldRequired.contact_phone} required{/if}></div>
-                     </div>
-                 </div>
-             </div>
-             <div class="glm-reg-row">
-                 <div class="glm-large-6 glm-columns">
-                     <h4>Global Custom Fields Go Here</h4>
-                     <div class="glm-reg-row">
-                         <div class="glm-large-12 glm-columns"></div>Custom fields that are event, level, rate, or registrant specific will be collected on registration selection page.</div>
-                     </dic>
+     {/foreach}
                  </div>
              </div>
-         </div>
-     </div>
 -            
 -    {if $cart.totalCharges > 0} 
 +
 +    {if $cart.totalCharges > 0}
-         <div style="text-align: right;"><h2>Total Charged: ${$cart.totalCharges|number_format:2}</h2></div>
+             <div style="text-align: right;"><h2>Total Charged: ${$cart.totalCharges|number_format:2}</h2></div>
      {else}
-         <div style="text-align: right;">(There is no charge for your request.)</div>
+             <div style="text-align: right;">(There is no charge for your request.)</div>
      {/if}
  
      {if $cart.blockCheckout}
-     <div>
-         <div class="glm-reg-warning">You have not yet submitted your registration. See above for issues! <img src="{$assetUrl}/fingerUpRed.svg" style="height: 2em;"></div>
-     </div>
+             <div>
+                 <div class="glm-reg-warning">You have not yet submitted your registration. See above for issues! <img src="{$assetUrl}/fingerUpRed.svg" style="height: 2em;"></div>
+             </div>
      {else}
-     <div class="glm-right" style="white-space; nowrap;">
-         <span class="glm-reg-warning">You have one more step to complete your registration!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <input type="submit" name="Submit Registration" class="button tiny">
-     </div>
+             <div class="glm-right" style="white-space; nowrap;">
+                 <span class="glm-reg-warning">You have one more step to complete your registration!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <input type="submit" value="Submit Registration Request" class="button tiny">
+             </div>
      {/if}
  
-     </form>
+         </form>
  
-     <h4 id="cart-summary">Registration Summary</h4>
-     <table class="glm-admin-table" width="100%">
+         <h4 id="cart-summary">Registration Summary</h4>
+         <table class="glm-admin-table" width="100%">
 -    
 +
-         <thead>
+             <thead>
 -    
 +
-             <tr>
-                 <th>Registering</th>
-                 <th>Registrant</th>
-                 <th>Date/Time</th>
-                 <th>Discount</th>
-                 <th>Rate</th>
-             </tr>
+                 <tr>
+                     <th>Registering</th>
+                     <th>Registrant</th>
+                     <th>Date/Time</th>
+                     <th>Discount</th>
+                     <th>Rate</th>
+                 </tr>
 -    
 -    
 +
 +
-         </thead>
-         <tbody>
+             </thead>
+             <tbody>
    {foreach $cart.events as $event}
-             <tr>
-                 <th colspan="5">Event: {$event.event_name}</th>
-             </tr>
+                 <tr>
+                     <th colspan="5">Event: {$event.event_name}</th>
+                 </tr>
      {foreach $event.classes as $class}
-             <tr>
-                 <td colspan="5">&nbsp;&nbsp;&nbsp;&nbsp;{$class.class_name}</td>
-             </tr>
+                 <tr>
+                     <td colspan="5">&nbsp;&nbsp;&nbsp;&nbsp;{$class.class_name}</td>
+                 </tr>
        {foreach $class.rates as $rate}
-             <tr>
-                 <td colspan="4">
-                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{$rate.rate_name}
-                     - Base Rate ({$rate.registrant_credits} registrants included)
-                 </td>
-                 <td style="text-align: right;">{$rate.rateBaseCharge|number_format:2}</td>
-             </tr>
+                 <tr>
+                     <td colspan="4">
+                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{$rate.rate_name}
+                         - Base Rate ({$rate.registrant_credits} registrants included)
+                     </td>
+                     <td style="text-align: right;">{$rate.rateBaseCharge|number_format:2}</td>
+                 </tr>
          {foreach $rate.registrants as $registrant}
-             <tr>
-                 <td>&nbsp;</td>
-                 <td>{$registrant.fname} {$registrant.lname}</td>
-                 <td>{$registrant.event_time}</td>
-                 <td style="text-align: right;">
-                     {if $registrant.registrantDiscount > 0}
-                         {$registrant.registrantDiscount|number_format:2}
-                     {else}
-                         &nbsp;
-                     {/if}
-                 </td>
-                 <td style="text-align: right;">
-                     {if $registrant.registrantRate > 0}
-                         {$registrant.registrantRate|number_format:2}
-                     {else}
-                         (included)
-                     {/if}
-                 </td>
-             </tr>
+                 <tr>
+                     <td>&nbsp;</td>
+                     <td>{$registrant.fname} {$registrant.lname}</td>
+                     <td>{$registrant.event_time}</td>
+                     <td style="text-align: right;">
+                         {if $registrant.registrantDiscount > 0}
+                             {$registrant.registrantDiscount|number_format:2}
+                         {else}
+                             &nbsp;
+                         {/if}
+                     </td>
+                     <td style="text-align: right;">
+                         {if $registrant.registrantRate > 0}
+                             {$registrant.registrantRate|number_format:2}
+                         {else}
+                             (included)
+                         {/if}
+                     </td>
+                 </tr>
          {/foreach}
        {/foreach}
      {/foreach}

diff --cc views/front/registrations/list.html
index b6deb2c,ff5d7cd..658ed51
--- 1/views/front/registrations/list.html
--- 2/views/front/registrations/list.html
+++ b/views/front/registrations/list.html
@@@ -1,49 -1,31 +1,50 @@@
  {include file='front/registrations/header.html'}
 -<div class="glm-reg-event-list">
 +<divi id="glm-reg-list" class="glm-reg-row">
  {if $haveRegEvents}
      {foreach $regEvents as $event}
 -    <div class="glm-reg-event-item clearfix">
 -        <h2><a href="{$thisUrl}?page=registration&eventRegId={$event.id}">{$event.event_name}</a></h2>
 -        {if $event.image}
 -            <img style="float:right;" src="{$glmPluginMediaUrl}/images/thumb/{$event.image}">
 -        {/if}
 +    <div class="glm-columns glm-large-12 glm-reg-event-item">
 +        <h3><a href="{$thisUrl}?page=registration&eventRegId={$event.id}">{$event.event_name}</a></h3>
 +        {if $event.image} <img style="float:right;" src="{$glmPluginMediaUrl}/images/thumb/{$event.image}"> {/if}
          <p>{$event.intro}</p>
 -        <table>
 -            <tr>
 -                <th> Days/Times </th>
 -            </tr>
 -            {foreach $event.times as $time}
 -                <tr>
 -                    <td>
 -                        {if $time.recur_name != 'Imported Event Schedule'}
 -                        <i>{$time.recur_name}</i>
 -                        {/if}
 -                        {$time.start_time.timestamp|date_format:"%A, %B %e, %Y"}
 -                        {$time.start_time.timestamp|date_format:"%l:%M %P"}
 -                        -
 -                        {$time.end_time.timestamp|date_format:"%l:%M %P"}
 -                    </td>
 -                </tr>
 -            {/foreach}
 -        </table>
 +        <div class="glm-reg-row">
 +            <div class="glm-columns glm-large-2 glm-small-12">
 +                <strong> Dates/Times: </strong>
 +            </div>
 +            <div class="glm-columns glm-large-10">
 +                {foreach $event.times as $time}
 +                    {if $time.recur_name && $time.recur_name != 'Imported Event Schedule'}
 +                    <strong>{$time.recur_name}</strong><br />
 +                    {/if}
 +                    {$time.start_time.timestamp|date_format:"%A, %B %e, %Y"}
 +                    {$time.start_time.timestamp|date_format:"%l:%M %P"}
 +                    -
 +                    {$time.end_time.timestamp|date_format:"%l:%M %P"}<br />
 +                {/foreach}
 +            </div>
 +        </div>
 +        {if $event.hide_address.name == 'No'}
 +            <div class="glm-reg-row">
 +                <div class="glm-columns glm-large-2 glm-small-12">
 +                    <strong> Location: </strong>
 +                </div>
 +                <div class="glm-columns glm-large-10 glm-small-12">
 +                    {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)}
 +                        {if $event.locations.name}{$event.locations.name}<br>{/if}
 +                        {if $event.locations.address} {$event.locations.address}<br> {/if}
 +                        {if $event.locations.city.name}{$event.locations.city.name}{/if}{if $event.locations.state.value}, {$event.locations.state.value} {/if}
 +                        {if $event.locations.zip} {$event.locations.zip} {/if}
 +                        {if $event.locations.phone} {apply_filters('glm_associate_phone_filter', $event.locations.phone)} {/if}
 +                    {elseif $event.use_member_location.value || $event.other_ref_dest}
 +                        {if $event.member.member} {$event.member.member}<br> {/if}
 +                        {if $event.member.addr1} {$event.member.addr1}<br> {/if}
 +                        {if $event.member.city}{$event.member.city}{/if}{if $event.member.state.value}, {$event.member.state.value}{/if}
 +                        {if $event.member.zip} {$event.member.zip} {/if}
 +                        {if $event.member.phone} {apply_filters('glm_associate_phone_filter', $event.member.phone)} {/if}
 +                    {/if}
 +                </div>
 +            </div>
 +        {/if}
++
      </div>
      {/foreach}
  {else}