From: Anthony Talarico Date: Mon, 11 Dec 2017 17:31:10 +0000 (-0500) Subject: Merge branch 'develop' into feature/reorganize X-Git-Tag: v1.0.0^2~223^2~15 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=98173004ca3b0e3c98224f804f9b20714b9ccb58;p=WP-Plugins%2Fglm-member-db-registrations.git Merge branch 'develop' into feature/reorganize --- 98173004ca3b0e3c98224f804f9b20714b9ccb58 diff --cc views/front/registrations/checkout.html index fcda91a,6236262..3fd2af0 --- a/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} -

- {$checkoutPageText} -

+ {$checkoutPageText} +

{/if} {if $haveMessages} @@@ -517,25 -333,126 +516,25 @@@ You have one more step to complete your registration!

- + + +

Please wait while we process your registration request. If you don't see a new page, your registration request may not have been processed.

Something may have gone wrong.

+ 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. +

+ 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. +

- - - -

Please wait while we process your registration request. If you don't see a new page, your registration request may not have been processed.

Something may have gone wrong.

- 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. -

- 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. -

- -

Registration Summary

- - - - - - - - - - - - - - - - {foreach $cart.events as $event} - - - - {foreach $event.classes as $class} - - - - {foreach $class.rates as $rate} - {if $rate.rateBaseCharge || $rate.registrant_credits} - - - - - {/if} - {foreach $rate.registrants as $registrant} - - - - - - - - {assign var="acct" value=$cart.accounts.{$registrant.account}} - {if $acct.validated.value} - - - - - {else} - {if $acct.addr1 != '' || $acct.phone != '' || $acct.email != ''} - - - - - {/if} - {/if} - {/foreach} - {/foreach} - {/foreach} - {/foreach} - - - - - - - + {/if} {* / if have cart *} -

Registering	Registrant	Date/Time	Discount	Rate
Event: {$event.event_name}
{$class.class_name}
- {$rate.rate_name} - - Base Rate ({$rate.registrant_credits} registrants included) -				- {if $rate.rateBaseCharge}{$rate.rateBaseCharge\|number_format:2}{/if} -
	{$registrant.fname} {$registrant.lname}	{$registrant.timeReformatted}	- {if $registrant.registrantDiscounts > 0} - {$registrant.registrantDiscounts\|number_format:2} - {else} - - {/if} -	- {if $registrant.registrantRate > 0} - {$registrant.registrantRate\|number_format:2} - {else} - (included) - {/if} -
		- {if $acct.email != ''}E-Mail: {$acct.email} {/if} - (Account information is restricted) -
		- {if $acct.org != ''} {$acct.title}, {$acct.org} {/if} - {if $acct.addr1 != ''} {$acct.addr1} {/if} - {if $acct.addr2 != ''} {$acct.addr2} {/if} - {if $acct.city != ''} {$acct.city}, {$acct.state.value} {$acct.zip} {/if} - {if $acct.country.name != ''} {$acct.country.name} {/if} - {if $acct.phone != ''} Phone: {$acct.phone} {/if} - {if $acct.fax != ''} Fax: {$acct.fax} {/if} - {if $acct.email != ''} E-Mail: {$acct.email} {/if} -
		Total registrants: {$cart.totalRegistrants}	- {if $cart.totalDiscounts > 0} - ${$cart.totalDiscounts\|number_format:2} - {else} - - {/if} -	${$cart.totalCharges\|number_format:2}