Merge branch 'develop' into feature/reorganize
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Dec 2017 19:26:02 +0000 (14:26 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 11 Dec 2017 19:26:02 +0000 (14:26 -0500)
12 files changed:
1  2 
assets/events/calendar-icon-24x24.png
assets/events/contact-icon-24x24.png
assets/events/cost-icon-24x24.png
assets/events/location-icon-24x24.png
assets/events/print-icon-24x24.png
assets/events/rss-icon-24x24.png
assets/events/search-icon-24x24.png
assets/events/tickets-icon-24x24.png
assets/events/time-icon-24x24.png
css/front.css
views/front/registrations/cart.html
views/front/registrations/checkout.html

index 0000000,0000000..d50b0fc
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..6cf4326
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..877dde3
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..b7f44fc
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..3cc022c
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..6de194a
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..e4580aa
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..6840272
new file mode 100644 (file)
Binary files differ
index 0000000,0000000..c9076fb
new file mode 100644 (file)
Binary files differ
diff --cc css/front.css
  }
  /*}}} end of tampering */
  
+ .glm-reg-cart-container {
+     clear: both;
+     border: solid 1px black;
+     background-color: white;
+     margin-top: 1rem;
+     margin-bottom: 1rem;
+     font-size: 0.875rem;
+ }
  /*{{{ Event Registration List */
 +#glm-reg-list{
 +    max-width: 800px;
 +}
  #glm-reg-list h3 a {
      text-transform: uppercase;
  }
Simple merge
                          </div>
                      </div>
                  </div>
 -                <div class="glm-large-6 glm-small-12 glm-columns" style="">
 +                <div class="glm-small-12 glm-large-6 glm-columns">
-                         <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>
-                 
-                         </table>
++                         <h4 id="cart-summary">Registration Summary</h4>
++    
++                        {assign var="summaryType" value="checkout"}
++                        {include file='front/registrations/cartSummary.html'}
 +                </div>
 +                <div class="glm-large-6 glm-small-12 glm-columns" style="clear: both;">
                      <div class="glm-reg-row"><div class="glm-small-12 glm-columns"><h4>Billing Information</h4></div></div>
                      <div class="glm-reg-row"><div class="glm-small-12 glm-columns"><input id="glm-reg-bill-same" type="checkbox" name="billing_same" value="1"{if $regAccount.billingSame} checked{/if}>&nbsp;Same as Account Information</div></div>
                      <div class="glm-reg-row glm-reg-bill-field">
                  <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>
 +</div>
 -    <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>
 -    
 -    {assign var="summaryType" value="checkout"}
 -    {include file='front/registrations/cartSummary.html'}
++   
  {/if} {* / if have cart *}
  
  <script type="text/javascript">