Merge branch 'develop' into feature/reorganize

diff --cc views/front/registrations/checkout.html
index fcda91a,6236262..3fd2af0
--- 1/views/front/registrations/checkout.html
--- 2/views/front/registrations/checkout.html
+++ b/views/front/registrations/checkout.html
@@@ -1,9 -1,9 +1,9 @@@
 -{include file='front/registrations/header.html'}
 +{apply_filters('glm_members_registrations_header', 'accountHeader')}
  
  {if $checkoutPageText}
- <div>
-     {$checkoutPageText}
- </div>
+     <div>
+         {$checkoutPageText}
+     </div>
  {/if}
  
  {if $haveMessages}
@@@ -517,25 -333,126 +516,25 @@@
                  <span class="glm-reg-warning">You have one more step to complete your registration!</span> <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <input id="regSubmitButton" type="submit" value="Submit Registration Request" class="button tiny">
              </div>
  
- 
 +        </form>
 +    
 +        <div id="regSubmitDialog" title="Please wait...">Please wait while we process your registration request. If you don't see a new page, your registration request may not have been processed.</div>
 +        <div id="regSubmitFailDialog" title="Oops!">
 +            <h3>Something may have gone wrong.</h3>
 +            <p>
 +                It may be that your registration request was received and processed and you didn't receive our response yet.
 +                If you still don't see a response in a while, try returning to the cart using the button above.
 +                If still don't see any response, please check your E-Mail to see if you have been sent a confirmation.
 +            </p>
 +            <p>
 +                In any case, we will never process your request more than once. If you can return to the cart, it should say if
 +                your request was recieved and processed. If not, you may try the checkout process again or come back later.
 +            </p>
          </div>
 -
 -    </form>
 -
 -    <div id="regSubmitDialog" title="Please wait...">Please wait while we process your registration request. If you don't see a new page, your registration request may not have been processed.</div>
 -    <div id="regSubmitFailDialog" title="Oops!">
 -        <h3>Something may have gone wrong.</h3>
 -        <p>
 -            It may be that your registration request was received and processed and you didn't receive our response yet.
 -            If you still don't see a response in a while, try returning to the cart using the button above.
 -            If still don't see any response, please check your E-Mail to see if you have been sent a confirmation.
 -        </p>
 -        <p>
 -            In any case, we will never process your request more than once. If you can return to the cart, it should say if
 -            your request was recieved and processed. If not, you may try the checkout process again or come back later.
 -        </p>
      </div>
 -
 -    <h4 id="cart-summary">Registration Summary</h4>
 -    <table class="glm-admin-table" width="100%">
 -
 -        <thead>
 -
 -            <tr>
 -                <th>Registering</th>
 -                <th>Registrant</th>
 -                <th>Date/Time</th>
 -                <th>Discount</th>
 -                <th>Rate</th>
 -            </tr>
 -
 -
 -        </thead>
 -            <tbody>
 -  {foreach $cart.events as $event}
 -            <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>
 -      {foreach $class.rates as $rate}
 -        {if $rate.rateBaseCharge || $rate.registrant_credits}
 -            <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;">
 -                    {if $rate.rateBaseCharge}{$rate.rateBaseCharge|number_format:2}{/if}
 -                </td>
 -            </tr>
 -        {/if}
 -        {foreach $rate.registrants as $registrant}
 -            <tr>
 -                <td>&nbsp;</td>
 -                <td>{$registrant.fname} {$registrant.lname}</td>
 -                <td>{$registrant.timeReformatted}</td>
 -                <td style="text-align: right;">
 -                    {if $registrant.registrantDiscounts > 0}
 -                        {$registrant.registrantDiscounts|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>
 -          {assign var="acct" value=$cart.accounts.{$registrant.account}}
 -          {if $acct.validated.value}
 -            <tr>
 -                <td colspan="2">&nbsp;</td>
 -                <td colspan="3">
 -                  {if $acct.email != ''}E-Mail: {$acct.email}<br>{/if}
 -                  (Account information is restricted)
 -                </td>
 -            </tr>
 -          {else}
 -            {if $acct.addr1 != '' || $acct.phone != '' || $acct.email != ''}
 -            <tr>
 -                <td colspan="2">&nbsp;</td>
 -                <td colspan="3">
 -                  {if $acct.org != ''}          {$acct.title}, {$acct.org}<br>                      {/if}
 -                  {if $acct.addr1 != ''}        {$acct.addr1}<br>                                   {/if}
 -                  {if $acct.addr2 != ''}        {$acct.addr2}<br>                                   {/if}
 -                  {if $acct.city != ''}         {$acct.city}, {$acct.state.value} {$acct.zip}<br>   {/if}
 -                  {if $acct.country.name != ''} {$acct.country.name}<br>                            {/if}
 -                  {if $acct.phone != ''}        Phone: {$acct.phone}<br>                            {/if}
 -                  {if $acct.fax != ''}          Fax: {$acct.fax}<br>                                {/if}
 -                  {if $acct.email != ''}        E-Mail: {$acct.email}                               {/if}
 -                </td>
 -            </tr>
 -            {/if}
 -          {/if}
 -        {/foreach}
 -      {/foreach}
 -    {/foreach}
 -  {/foreach}
 -        </tbody>
 -        <tfoot>
 -            <td colspan="2">&nbsp;</td>
 -            <td>Total registrants: {$cart.totalRegistrants}</td>
 -            <td style="text-align: right;">
 -                {if $cart.totalDiscounts > 0}
 -                    ${$cart.totalDiscounts|number_format:2}
 -                {else}
 -                    &nbsp;
 -                {/if}
 -            </td>
 -            <td style="text-align: right;">${$cart.totalCharges|number_format:2}</td>
 -        </tfoot>
 +</div>
  {/if} {* / if have cart *}
 -    </table>
+ 
  <script type="text/javascript">
      jQuery(function($){