Added cartSummary.html which now contains the only copy of the cart display.
Removed cart display from all other areas and now including cartSummary.html
Added some Front CSS to deal with the new layout.
The summaryStore.html needs to be tested to make sure the CSS bundled with that is correct.
foreach ($this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'] as $registrantKey => $registrant) {
// Provide a more friendly date/time output
- $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['timeReformatted'] = date('l m/d/Y g:i A', strtotime($registrant['event_time']));
+ $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['timeReformatted'] = date('m/d/Y g:i A', strtotime($registrant['event_time']));
// Add registrant account to accounts table if needed
$this->addAccountToCart($registrant['account']);
}
// Add a more familiar date/time
- $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['timeReformatted'] = date('l m/d/Y g:i A', strtotime($registrant['event_time']));
+ $this->cart['events'][$eventKey]['classes'][$classKey]['rates'][$rateKey]['registrants'][$registrantKey]['timeReformatted'] = date('m/d/Y g:i A', strtotime($registrant['event_time']));
} // Each registrant
margin-left: auto;
margin-right: auto;
width: 100%;
- min-height: 3rem;
+ min-height: 1.5rem;
+ white-space: nowrap;
+}
+.glm-reg-indent-1 {
+ padding-left: .5rem;
+}
+.glm-reg-indent-2 {
+ padding-left: 1rem;
+}
+.glm-reg-indent-3 {
+ padding-left: 1.5rem;
+}
+.glm-reg-space-left {
+ padding-left: 1.25rem;
+}
+.glm-reg-right {
+ text-align: right;
+}
+.glm-reg-row-bold {
+ font-weight: bold;
+}
+.glm-reg-headder-row {
+ clear: both;
+ background-color: #eee;
+ height: 2rem;
+ padding-top: .2rem;
}
.glm-reg-nowrap {
white-space: nowrap;
}
/*}}} 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 h3 a {
text-transform: uppercase;
<h2 class="glm-left" style="clear: none;">Selected Registrations</h2>
</div>
+ {assign var="summaryType" value="cart"}
+ {include file='front/registrations/cartSummary.html'}
- <table class="glm-admin-table" width="100%">
- <thead>
-
- <tr>
- <th>Registering</th>
- <th>Registrant</th>
- <th>Event Date/Time</th>
- <th style="text-align: right;">Discount</th>
- <th style="text-align: right;">Rate</th>
- </tr>
-
-
- </thead>
-
- <tbody>
-{if $haveCart && $cart.haveEvents}
-
- {foreach $cart.events as $event}
- <tr>
- <th colspan="5" style=" border-bottom: 1px black solid;"><a href="{$regUrl}?page=registration&eventRegId={$event.reg_event}"><span class="dashicons dashicons-edit"></span></a>Event: {$event.event_name}</th>
- </tr>
- {foreach $event.classes as $class}
- <tr>
- <td colspan="5"> {$class.class_name}</td>
- </tr>
- {foreach $class.rates as $rate}
- <tr>
- <td colspan="4">
- {$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><!-- <a onClick="alert('When I get to it!'); return false;"><img src="{$assetUrl}/throwAwayBlue.svg" style="height: 2em;"></a> --></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}
-
- {/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"> </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"> </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} {* registrants *}
- {/foreach} {* rates *}
- {/foreach} {* classes *}
-
- <tr>
- <td colspan="2"> </td>
- <td style="text-align: right; border-top: 1px black solid;">Event registrants: {$event.eventRegistrants}</td>
- {if $event.eventDiscounts > 0}
- <td style="text-align: right; border-top: 1px black solid;">
- {$event.eventDiscounts|number_format:2}
- </td>
- {else}
- <td style="border-top: 1px black solid;"> </td>
- {/if}
- <td style="text-align: right; border-top: 1px black solid;">{$event.eventCharges|number_format:2}</td>
- </tr>
-
-
- {/foreach} {* events *}
- </tbody>
- <tfoot>
- <td colspan="2"> </td>
- <td>Total registrants: {$cart.totalRegistrants}</td>
- <td style="text-align: right;">
- {if $cart.totalDiscounts > 0}
- ${$cart.totalDiscounts|number_format:2}
- {else}
-
- {/if}
- </td>
- <td style="text-align: right;">${$cart.totalCharges|number_format:2}</td>
- </tfoot>
-{else}
- <tr><td colspan="5" class="glm-reg-warning glm-center">Your cart is empty. Please click "Register for Another Event" button above.</td></tr>
- </tbody>
-{/if}
-
- </table>
-
- {if $cart.blockCheckout || !$haveCart || !$cart.haveEvents}
+ {if $cart.blockCheckout || !$haveCart || !$cart.haveEvents}
<div>
<div class="glm-reg-warning">You have not yet submitted your registration. See above notes! <img src="{$assetUrl}/fingerUpRed.svg" style="height: 2em;"></div>
</div>
- {else}
+ {else}
<div class="glm-right">
<div class="glm-reg-warning">You have not yet submitted your registration! <img src="{$assetUrl}/fingerRightRed.svg" style="height: 2em;"> <a href="{$regUrl}?page=checkout" class="button tiny">Complete Registration</a></div>
</div>
- {/if}
+ {/if}
--- /dev/null
+ <div class="glm-reg-cart-container">
+{foreach $cart.events as $event}
+ <div class="glm-reg-row glm-reg-headder-row">
+ <div class="glm-small-12 glm-column">
+ {if $summaryType=="cart"}
+ <a href="{$regUrl}?page=registration&eventRegId={$event.reg_event}"><span class="dashicons dashicons-edit"></span></a>
+ {/if}
+ {$event.event_name}
+ </div>
+ </div>
+ {foreach $event.classes as $class}
+ <div class="glm-reg-row">
+ <div class="glm-small-12 glm-column">
+ {$class.class_name}
+ </div>
+ </div>
+ {foreach $class.rates as $rate}
+ {if $rate.rateBaseCharge > 0}
+ <div class="glm-reg-row glm-reg-indent-1">
+ <div class="glm-small-8 glm-medium-8 glm-column">
+ Base Rate:
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ ${$rate.rateBaseCharge|number_format:2}
+ </div>
+ </div>
+ {/if}
+ {foreach $rate.registrants as $registrant}
+ <div class="glm-reg-row glm-reg-indent-1">
+ <div class="glm-small-12 glm-medium-2 glm-column glm-reg-row-bold">
+ {$registrant.fname} {$registrant.lname}
+ </div>
+ <div class="glm-small-12 glm-medium-3 glm-column glm-reg-space-left">
+ {$registrant.timeReformatted}
+ </div>
+ <div class="glm-small-12 glm-medium-4 glm-column glm-reg-space-left">
+ Cookies and Milk (temp test data)
+ </div>
+ <div class="glm-small-12 glm-medium-3 glm-column glm-reg-right">
+ {if $registrant.registrantRate > 0}
+ ${$registrant.registrantRate|number_format:2}
+ {else}
+ (included)
+ {/if}
+ </div>
+ </div>
+ {if $registrant.registrantDiscounts == 0}
+ <div class="glm-reg-row glm-reg-indent-2">
+ <div class="glm-small-8 glm-medium-8 glm-column">
+ Registrant Discount
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ -${$registrant.registrantDiscounts|number_format:2}
+ </div>
+ </div>
+ {/if}
+ {/foreach} {* registrants *}
+ {/foreach} {* rates *}
+ {/foreach} {* classes *}
+ <div class="glm-reg-row">
+ <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right">
+ Event Discounts
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ ${$event.eventDiscounts|number_format:2}
+ </div>
+ </div>
+ <div class="glm-reg-row glm-reg-row-bold">
+ <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right">
+ Registrants: {$event.eventRegistrants}
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ ${$event.eventCharges|number_format:2}
+ </div>
+ </div>
+{/foreach} {* events *}
+ <div class="glm-reg-row glm-reg-headder-row">
+ <div class="glm-small-12 glm-medium-12 glm-column">
+ Registration Request Totals
+ </div>
+ </div>
+{if $cart.totalDiscounts == 0}
+ <div class="glm-reg-row">
+ <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right">
+ Total Discounts
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ ${$cart.totalDiscounts|number_format:2}
+ </div>
+ </div>
+{/if}
+ <div class="glm-reg-row glm-reg-row-bold">
+ <div class="glm-small-8 glm-medium-8 glm-column glm-reg-right">
+ Total registrants: {$cart.totalRegistrants}
+ </div>
+ <div class="glm-small-4 glm-medium-4 glm-column glm-reg-right">
+ ${$cart.totalCharges|number_format:2}
+ </div>
+ </div>
+ </div>
<h3 class="glm-left" style="clear: none;">Checkout</h3>
</div>
- <div class="glm-reg-row">
+ <div class="glm-row">
<div class="glm-large-6 glm-small-12 glm-columns">
<h4>Account Information</h4>
{if $regAccountId == 0}
</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"> {$class.class_name}</td>
- </tr>
- {foreach $class.rates as $rate}
- {if $rate.rateBaseCharge || $rate.registrant_credits}
- <tr>
- <td colspan="4">
- {$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> </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}
-
- {/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"> </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"> </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"> </td>
- <td>Total registrants: {$cart.totalRegistrants}</td>
- <td style="text-align: right;">
- {if $cart.totalDiscounts > 0}
- ${$cart.totalDiscounts|number_format:2}
- {else}
-
- {/if}
- </td>
- <td style="text-align: right;">${$cart.totalCharges|number_format:2}</td>
- </tfoot>
+
+ {assign var="summaryType" value="checkout"}
+ {include file='front/registrations/cartSummary.html'}
+
{/if} {* / if have cart *}
- </table>
<script type="text/javascript">
jQuery(function($){
.event-line {
padding-top: 1rem;
}
+ /* Temp replacement for glm-row without max-width and other checkout form tampering */
+ .glm-reg-row {
+ clear: both;
+ margin-left: auto;
+ margin-right: auto;
+ width: 100%;
+ min-height: 1.5rem;
+ white-space: nowrap;
+ }
+ .glm-reg-indent-1 {
+ padding-left: .5rem;
+ }
+ .glm-reg-indent-2 {
+ padding-left: 1rem;
+ }
+ .glm-reg-indent-3 {
+ padding-left: 1.5rem;
+ }
+ .glm-reg-space-left {
+ padding-left: 1.25rem;
+ }
+ .glm-reg-right {
+ text-align: right;
+ }
+ .glm-reg-row-bold {
+ font-weight: bold;
+ }
+ .glm-reg-headder-row {
+ clear: both;
+ background-color: #eee;
+ height: 2rem;
+ padding-top: .2rem;
+ }
+
+/* GLM GRID */
+.glm-small-1{width:5.33333rem}.glm-small-2{width:10.66667rem}.glm-small-3{width:16rem}.glm-small-4{width:21.33333rem}.glm-small-5{width:26.66667rem}.glm-small-6{width:32rem}.glm-small-7{width:37.33333rem}.glm-small-8{width:42.66667rem}.glm-small-9{width:48rem}.glm-small-10{width:53.33333rem}.glm-small-11{width:58.66667rem}.glm-small-12{width:64rem}.glm-medium-1{width:5.33333rem}.glm-medium-2{width:10.66667rem}.glm-medium-3{width:16rem}.glm-medium-4{width:21.33333rem}.glm-medium-5{width:26.66667rem}.glm-medium-6{width:32rem}.glm-medium-7{width:37.33333rem}.glm-medium-8{width:42.66667rem}.glm-medium-9{width:48rem}.glm-medium-10{width:53.33333rem}.glm-medium-11{width:58.66667rem}.glm-medium-12{width:64rem}.glm-large-1{width:5.33333rem}.glm-large-2{width:10.66667rem}.glm-large-3{width:16rem}.glm-large-4{width:21.33333rem}.glm-large-5{width:26.66667rem}.glm-large-6{width:32rem}.glm-large-7{width:37.33333rem}.glm-large-8{width:42.66667rem}.glm-large-9{width:48rem}.glm-large-10{width:53.33333rem}.glm-large-11{width:58.66667rem}.glm-large-12{width:64rem}@media only screen{.glm-small-1{width:8.33333%}.glm-small-2{width:16.66667%}.glm-small-3{width:25%}.glm-small-4{width:33.33333%}.glm-small-5{width:41.66667%}.glm-small-6{width:50%}.glm-small-7{width:58.33333%}.glm-small-8{width:66.66667%}.glm-small-9{width:75%}.glm-small-10{width:83.33333%}.glm-small-11{width:91.66667%}.glm-small-12{width:100%}}@media only screen and (min-width: 40.0625em){.glm-medium-1{width:8.33333%}.glm-medium-2{width:16.66667%}.glm-medium-3{width:25%}.glm-medium-4{width:33.33333%}.glm-medium-5{width:41.66667%}.glm-medium-6{width:50%}.glm-medium-7{width:58.33333%}.glm-medium-8{width:66.66667%}.glm-medium-9{width:75%}.glm-medium-10{width:83.33333%}.glm-medium-11{width:91.66667%}.glm-medium-12{width:100%}}@media only screen and (min-width: 64.0625em){.glm-large-1{width:8.33333%}.glm-large-2{width:16.66667%}.glm-large-3{width:25%}.glm-large-4{width:33.33333%}.glm-large-5{width:41.66667%}.glm-large-6{width:50%}.glm-large-7{width:58.33333%}.glm-large-8{width:66.66667%}.glm-large-9{width:75%}.glm-large-10{width:83.33333%}.glm-large-11{width:91.66667%}.glm-large-12{width:100%}}.glm-row{width:100%;position:relative}.glm-row::after{clear:both}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row::before,.glm-row::after{content:" ";display:table}.glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:64rem;width:100%}.wp-admin .glm-row{clear:both;margin-left:auto;margin-right:auto;max-width:100%;width:100%}.glm-column,.glm-columns{padding-left:0.9375rem;padding-right:0.9375rem;float:left}
+
+/*# sourceMappingURL=glm-grid.css.map */
+
</style>
</head>
<body>
</td>
</table>
<h3>Registrations</h3>
- <table class="summary-table" width="100%">
- <thead>
- <tr>
- <th>Registering</th>
- <th>Registrant</th>
- <th>Event Date/Time</th>
- <th>Discount</th>
- <th>Rate</th>
- </tr>
- </thead>
- <tbody>
- {foreach $cart.events as $event}
- <tr>
- <th colspan="5" class="event-line">Event: {$event.event_name}</th>
- </tr>
- {foreach $event.classes as $class}
- <tr>
- <td colspan="5"> {$class.class_name}</td>
- </tr>
- {foreach $class.rates as $rate}
- <tr>
- <td colspan="4">
- {$rate.rate_name}
- - Base Rate ({$rate.registrant_credits} registrants included)
- </td>
- <td class="td-right">{$rate.rateBaseCharge|number_format:2}</td>
- </tr>
- {foreach $rate.registrants as $registrant}
- <tr>
- <td> </td>
- <td>{$registrant.fname} {$registrant.lname}</td>
- <td>{$registrant.timeReformatted}</td>
- <td class="td-right">
- {if $registrant.registrantDiscounts > 0}
- {$registrant.registrantDiscounts|number_format:2}
- {else}
-
- {/if}
- </td>
- <td class="td-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"> </td>
- <td colspan="3">
- {if $acct.email != ''}E-Mail: {$acct.email}<br>{/if}
- (Account information is restricted)
- </td>
- </tr>
- {else}
- {if $acct.addr != '' || $acct.phone != '' || $acct.email != ''}
- <tr>
- <td colspan="2"> </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"> </td>
- <td>Total registrants: {$cart.totalRegistrants}</td>
- <td class="td-right">
- {if $cart.totalDiscounts > 0}
- ${$cart.totalDiscounts|number_format:2}
- {else}
-
- {/if}
- </td>
- <td class="td-right">${$cart.totalCharges|number_format:2}</td>
- </tfoot>
- </table>
+
+ {assign var="summaryType" value="store"}
+ {include file='front/registrations/cartSummary.html'}
+
</body>
</html>
\ No newline at end of file
projects / WP-Plugins / glm-member-db-registrations.git / commitdiff