From: Steve Sutton Date: Wed, 1 Nov 2017 14:23:58 +0000 (-0400) Subject: Merge branch 'develop' into feature/formsUpdates X-Git-Tag: v1.0.0^2~309^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bb1d2034735831c9e280887123f64e92d387b3ce;p=WP-Plugins%2Fglm-member-db-registrations.git Merge branch 'develop' into feature/formsUpdates --- bb1d2034735831c9e280887123f64e92d387b3ce diff --cc css/front.css index 2269f03,fbcc04c..71fc70c --- a/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 --- a/views/front/registrations/checkout.html +++ b/views/front/registrations/checkout.html @@@ -179,148 -193,106 +193,106 @@@
CVV:
-
+ - {/if}
-

Additional Contact Information

-
-
First Name:
-
-
-
-
Address:
-
-
-
-
 
-
-
-
-
City:
-
-
+

Global Custom Fields Go Here

-
State:
-
- -
-
+
Custom fields that are event, level, rate, or registrant specific will be collected on registration selection page.
+ + - {/if} ++ {/if} + +
+
-
Zip/Postal Code:
-
+

Terms and Conditions (*** Added fields for events ***)

+ You must check the boxes below to confirm that you agree to the listed Terms and Conditions for each event.
+ {foreach $cart.events as $event}
-
Country:
-
- +
 
+
+
{$event.event_name}:
+ {$event.event_terms} {$event.id}
+ *** Any added fields go here *** - ++
-
-
E-mail:
-
-
-
-
Phone:
-
-
-
-
-
-
-

Global Custom Fields Go Here

-
-
Custom fields that are event, level, rate, or registrant specific will be collected on registration selection page.
- + {/foreach}
-
- - - {if $cart.totalCharges > 0} + + {if $cart.totalCharges > 0} -

Total Charged: ${$cart.totalCharges|number_format:2}

+

Total Charged: ${$cart.totalCharges|number_format:2}

{else} -
(There is no charge for your request.)
+
(There is no charge for your request.)
{/if} {if $cart.blockCheckout} -
-
You have not yet submitted your registration. See above for issues!
-
+
+
You have not yet submitted your registration. See above for issues!
+
{else} -
- You have one more step to complete your registration! -
+
+ You have one more step to complete your registration! +
{/if} - + -

Registration Summary

- +

Registration Summary

+
- + - + - + - - - - - - - + + + + + + + - - + + - - + + {foreach $cart.events as $event} - - - + + + {foreach $event.classes as $class} - - - + + + {foreach $class.rates as $rate} - - - - + + + + {foreach $rate.registrants as $registrant} - - - - - - - + + + + + + + {/foreach} {/foreach} {/foreach} diff --cc views/front/registrations/list.html index b6deb2c,ff5d7cd..658ed51 --- a/views/front/registrations/list.html +++ b/views/front/registrations/list.html @@@ -1,49 -1,31 +1,50 @@@ {include file='front/registrations/header.html'} -
+ {if $haveRegEvents} {foreach $regEvents as $event} -
-

{$event.event_name}

- {if $event.image} - - {/if} +
+

{$event.event_name}

+ {if $event.image} {/if}

{$event.intro}

-
RegisteringRegistrantDate/TimeDiscountRate
RegisteringRegistrantDate/TimeDiscountRate
Event: {$event.event_name}
Event: {$event.event_name}
    {$class.class_name}
    {$class.class_name}
-         {$rate.rate_name} - - Base Rate ({$rate.registrant_credits} registrants included) - {$rate.rateBaseCharge|number_format:2}
+         {$rate.rate_name} + - Base Rate ({$rate.registrant_credits} registrants included) + {$rate.rateBaseCharge|number_format:2}
 {$registrant.fname} {$registrant.lname}{$registrant.event_time} - {if $registrant.registrantDiscount > 0} - {$registrant.registrantDiscount|number_format:2} - {else} -   - {/if} - - {if $registrant.registrantRate > 0} - {$registrant.registrantRate|number_format:2} - {else} - (included) - {/if} -
 {$registrant.fname} {$registrant.lname}{$registrant.event_time} + {if $registrant.registrantDiscount > 0} + {$registrant.registrantDiscount|number_format:2} + {else} +   + {/if} + + {if $registrant.registrantRate > 0} + {$registrant.registrantRate|number_format:2} + {else} + (included) + {/if} +
- - - - {foreach $event.times as $time} - - - - {/foreach} -
Days/Times
- {if $time.recur_name != 'Imported Event Schedule'} - {$time.recur_name} - {/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"} -
+
+
+ Dates/Times: +
+
+ {foreach $event.times as $time} + {if $time.recur_name && $time.recur_name != 'Imported Event Schedule'} + {$time.recur_name}
+ {/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"}
+ {/foreach} +
+
+ {if $event.hide_address.name == 'No'} +
+
+ Location: +
+
+ {if !$event.use_member_location.value && ($event.locations.name || $event.locations.address)} + {if $event.locations.name}{$event.locations.name}
{/if} + {if $event.locations.address} {$event.locations.address}
{/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}
{/if} + {if $event.member.addr1} {$event.member.addr1}
{/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} +
+
+ {/if} ++ {/foreach} {else}