From: Chuck Scott Date: Thu, 26 Oct 2017 16:13:29 +0000 (-0400) Subject: Completed initial layout of checkout page. X-Git-Tag: v1.0.0^2~317 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=47a5f3bca3670da93b119343d58d571ddce43e42;p=WP-Plugins%2Fglm-member-db-registrations.git Completed initial layout of checkout page. Implemented GLM grid approach for checkout page and added custom CSS to the top of front.css to accommodate that. Added hand pointing down icons for use on checkout page. Updated dataAccount.php and dataRegRequest.php to add proper state and country field specications. Added more checkout processing and support for that to checkout.php and regCartSupport class. --- diff --git a/assets/finberUpBlack.png b/assets/finberUpBlack.png deleted file mode 100644 index ecb5cd1..0000000 Binary files a/assets/finberUpBlack.png and /dev/null differ diff --git a/assets/fingerDownBlack.png b/assets/fingerDownBlack.png new file mode 100644 index 0000000..df7fc3a Binary files /dev/null and b/assets/fingerDownBlack.png differ diff --git a/assets/fingerDownBlack.svg b/assets/fingerDownBlack.svg new file mode 100644 index 0000000..ff23132 --- /dev/null +++ b/assets/fingerDownBlack.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/fingerDownRed.png b/assets/fingerDownRed.png new file mode 100644 index 0000000..305ac6d Binary files /dev/null and b/assets/fingerDownRed.png differ diff --git a/assets/fingerDownRed.svg b/assets/fingerDownRed.svg new file mode 100644 index 0000000..f54e110 --- /dev/null +++ b/assets/fingerDownRed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/fingerUpBlack.png b/assets/fingerUpBlack.png new file mode 100644 index 0000000..ecb5cd1 Binary files /dev/null and b/assets/fingerUpBlack.png differ diff --git a/classes/data/dataAccount.php b/classes/data/dataAccount.php index 3ed0ac6..40d3d4c 100644 --- a/classes/data/dataAccount.php +++ b/classes/data/dataAccount.php @@ -123,7 +123,7 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract 'use' => 'a', 'default' => 1 ), - + // Validated E-Mail address flag 'validated' => array ( 'field' => 'validated', @@ -131,17 +131,17 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract 'use' => 'lg', 'default' => false ), - + // Validation Code - Used to confirm the person creating an account // During validation process this includes the following. {validation_code}-{timestamp} - validation code is 6 digit number - // The validation code is sent in a simple E-Mail to the user who then has to provide that in a certain amount of time + // The validation code is sent in a simple E-Mail to the user who then has to provide that in a certain amount of time // The timestamp is to determine if the time for validation has expired. 'validation_code' => array ( 'field' => 'validation_code', 'type' => 'text', 'use' => 'lg' ), - + // Account /* 'registered_by' => array ( @@ -223,10 +223,11 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract // State 'state' => array ( - 'field' => 'state', - 'type' => 'text', - 'required' => false, - 'use' => 'a' + 'field' => 'state', + 'type' => 'list', + 'list' => $this->config['states'], + 'default' => $this->config['settings']['default_state'], + 'use' => 'a' ), // @@ -237,12 +238,13 @@ class GlmDataRegistrationsAccount extends GlmDataAbstract 'use' => 'a' ), - // + // Country 'country' => array ( - 'field' => 'country', - 'type' => 'text', - 'required' => false, - 'use' => 'a' + 'field' => 'country', + 'type' => 'list', + 'list' => $this->config['countries'], + 'default' => 'US', + 'use' => 'a' ), // diff --git a/classes/regCartSupport.php b/classes/regCartSupport.php index 70dd763..aeedfff 100644 --- a/classes/regCartSupport.php +++ b/classes/regCartSupport.php @@ -107,12 +107,16 @@ class GlmRegCartSupport 'account' => $account, 'validated' => false, 'status' => $this->config['submission_status_numb']['CART'], - 'user_trace_info' => $_SERVER["REMOTE_ADDR"]." - ".date("m/d/Y H:i:s") + 'user_trace_info' => $_SERVER["REMOTE_ADDR"]." - ".date("m/d/Y H:i:s"), + 'date_created' => date("Y-m-d H:i:s"), + 'last_update' => date("Y-m-d H:i:s") ), array( '%d', '%d', '%d', + '%s', + '%s', '%s' ) ); @@ -775,7 +779,8 @@ class GlmRegCartSupport } /* - * Remove an event record from the cart + * Remove an e // If there's a +vent record from the cart * * * @param integer $id ID of this reg_request_event record @@ -974,15 +979,18 @@ class GlmRegCartSupport $requestId = $_SESSION['glm_reg_cart_id']; } + $requestId = ($requestId - 0); + + $cartSummary = array('id' => false); // If we don't have a request ID - if (!$requestId) { - return false; - } + if ($requestId > 0) { - // Try to get the base cart info - $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config); - $cartSummary = $RegRequest->getRegRequestSimplified($requestId, true); + // Try to get the base cart info + $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config); + $cartSummary = $RegRequest->getRegRequestSimplified($requestId, true); + + } $cartSummary['regRequests'] = false; $cartSummary['haveOtherRequests'] = false; @@ -998,7 +1006,6 @@ class GlmRegCartSupport // Build where clause to get any other pending carts for this logged in registrations user $where = " T.account = $accountId - AND T.id != $requestId AND T.status = ".$this->config['submission_status_numb']['CART']." "; @@ -1006,13 +1013,16 @@ class GlmRegCartSupport $RegRequest = new GlmDataRegistrationsRegRequest($this->wpdb, $this->config); $cartSummary['regRequests'] = $RegRequest->getRegRequestListSimplified($where); - if ($cartSummary['regRequests'] && count($cartSummary['regRequests'])) { + if (is_array($cartSummary['regRequests']) && count($cartSummary['regRequests'])) { $cartSummary['haveOtherRequests'] = true; + } } } + + // echo "
".print_r($cartSummary,1)."
"; return $cartSummary; } diff --git a/css/front.css b/css/front.css index 2d5197c..ee8458d 100644 --- a/css/front.css +++ b/css/front.css @@ -1,4 +1,25 @@ /* Event Registration Edit Page */ + +/* 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: 3rem; +} +.glm-reg-nowrap { + white-space: nowrap; +} +.glm-reg-required { + color: red; +} +.glm-reg-fail input { + border: 4px #FFaBa9 solid; +} +/* end of tampering */ + + .glm-reg-event-list { width: 100%; padding: 0; @@ -278,13 +299,3 @@ span.glm-error { color: red; } -/* Checkout Form */ -.glm-reg-checkout .glm-form-input { - width: 46%; - margin-right: 1rem; - float: left; -} -.glm-reg-checkout div { - width: 100%; - float: none; -} diff --git a/models/admin/ajax/regFront/registrant.php b/models/admin/ajax/regFront/registrant.php index 459d6b7..469af88 100644 --- a/models/admin/ajax/regFront/registrant.php +++ b/models/admin/ajax/regFront/registrant.php @@ -135,7 +135,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations } - /** * addUpdateRegistrantToCart * @@ -166,14 +165,12 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations $data = array( 'reg_request' => $modelData['reg_request'], 'reg_event' => $modelData['reg_event'], - 'event_name' => $modelData['event_name'], - // 'event_datetime' => $modelData['event_datetime'], + 'event_name' => $modelData['event_name'] ); $dataFormat = array( '%d', // reg_request '%d', // reg_event - '%s', // event_name - // '%s', // event_datetime + '%s' // event_name ); if ( !$regRequestEventId ) { $this->wpdb->insert( @@ -217,7 +214,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations ); $data = array( 'reg_event' => $modelData['reg_event'], - // 'event_datetime' => $modelData['event_datetime'], 'reg_request' => $modelData['reg_request'], 'reg_request_event' => $regRequestEventId, 'class' => $modelData['reg_class'], @@ -225,7 +221,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations ); $dataFormat = array( '%d', // reg_event - // '%s', // event_datetime '%d', // reg_request '%d', // reg_request_event '%d', // class @@ -273,7 +268,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations ); $data = array( 'reg_event' => $modelData['reg_event'], - // 'event_datetime' => $modelData['event_datetime'], 'reg_request' => $modelData['reg_request'], 'reg_request_event' => $regRequestEventId, 'reg_request_class' => $regRequestClassId, @@ -285,7 +279,6 @@ class GlmMembersAdmin_registrations_ajax_registrant extends GlmDataRegistrations ) ; $dataFormat = array( '%d', // reg_event - // '%s', // event_datetime '%d', // reg_request '%d', // reg_request_event '%d', // reg_request_class diff --git a/models/admin/ajax/regFront/request.php b/models/admin/ajax/regFront/request.php index 85c2998..80f8530 100644 --- a/models/admin/ajax/regFront/request.php +++ b/models/admin/ajax/regFront/request.php @@ -81,8 +81,6 @@ class GlmMembersAdmin_registrations_ajax_request extends GlmDataRegistrationsReg public function modelAction($modelData) { -trigger_error(print_r($modelData,1)); - // Perform specified action switch ($modelData['option']) { diff --git a/models/front/registrations/cartLinkWidget.php b/models/front/registrations/cartLinkWidget.php index aef9c53..5df246a 100644 --- a/models/front/registrations/cartLinkWidget.php +++ b/models/front/registrations/cartLinkWidget.php @@ -83,7 +83,7 @@ class GlmMembersFront_registrations_cartLinkWidget $cartData = apply_filters('glm_members_registrations_cart_summary_data', false, false); - if (is_array($cartData) && $cartData['status']) { + if (is_array($cartData) && $cartData['id']) { $haveCart = true; } diff --git a/models/front/registrations/checkout.php b/models/front/registrations/checkout.php index 6106b1d..6ea6efc 100644 --- a/models/front/registrations/checkout.php +++ b/models/front/registrations/checkout.php @@ -53,6 +53,8 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport $haveCart = false; $option = false; + $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config); + // Get any provided option if (isset($_REQUEST['option'])) { $option = $_REQUEST['option']; @@ -62,10 +64,10 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport if (isset($_REQUEST['account'])) { // Make sure it's numeric - $this->accountID = ($_REQUEST['account'] - 0); + $this->accountId = ($_REQUEST['account'] - 0); - if ($this->accountID <= 0) { - $this->accountID = false; + if ($this->accountId <= 0) { + $this->accountId = false; } } @@ -108,12 +110,23 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport } - $view = 'checkout'; + // If this is not a guest submission - Break out the submitting account + $regAccountId = $this->cart['request']['account']; + if ($regAccountId) { + $regAccount = $Account->editEntry($regAccountId); +// If no account data.... + } + // Accounts list not needed + unset($this->cart['accounts']); + + $view = 'checkout'; // Compile template data $templateData = array( 'page' => 'checkout', + 'regAccountId' => $this->cart['request']['account'], + 'regAccount' => $regAccount, 'cartId' => $cartId, 'haveCart' => $haveCart, 'cart' => $this->cart, @@ -121,7 +134,10 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport 'loggedIn' => ( isset( $_SESSION['LoginAccount'] ) ) ? $_SESSION['LoginAccount']: false, 'assetUrl' => GLM_MEMBERS_REGISTRATIONS_PLUGIN_ASSETS_URL ); - // Return status, any suggested view, and any data to controller + + // echo "
".print_r($templateData,1)."
"; + + // Return status, any suggested view, and any data to controller return array( 'status' => true, 'modelRedirect' => false, diff --git a/models/front/registrations/checkoutProcess.php b/models/front/registrations/checkoutProcess.php index 2e4905f..96a6c75 100644 --- a/models/front/registrations/checkoutProcess.php +++ b/models/front/registrations/checkoutProcess.php @@ -16,7 +16,7 @@ // Load Registrations Front-End Support class require_once GLM_MEMBERS_REGISTRATIONS_PLUGIN_CLASS_PATH.'/regCartSupport.php'; -class GlmMembersAdmin_registrations_event extends GlmRegCartSupport +class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport { /** @@ -86,11 +86,71 @@ class GlmMembersAdmin_registrations_event extends GlmRegCartSupport public function modelAction($actionData = false) { + $requestId = false; + $haveRequest = false; + $accountId = false; + $view = 'checkout'; + $regAccount = false; + + // Try to get the cart and see if it's valid for checkout + if (isset($_SESSION['glm_reg_cart_id'])) { + + $requestId = ($_SESSION['glm_reg_cart_id'] - 0); + if ($requestId > 0) { + + // Try to get a validated cart + $this->checkRegistrationRequest($requestId); + + if ($this->cart['status'] && $this->cart['validated']) { + $haveRequest = true; + } + + } + + } + + // If this is a guest then try to create the account using the submitted data + if ($this->cart['request']['account'] == 0) { + + $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config); + $newAccount = $Account->insertEntry(); +echo "

Name = ".$_REQUEST['lname'].", ".$_REQUEST['fname']."

"; +echo "New Account
".print_r($newAccount,1)."
"; +exit; + + + } +// echo "
".print_r($this->cart,1)."
"; + + $Account = new GlmDataRegistrationsAccount($this->wpdb, $this->config); + + // + /* * Initial Checks */ - // Do we have a current login account + // If there's a logged in registrations user + if (isset($_SESSION) && isset($_SESSION['LoginAccount']) && + is_array($_SESSION['LoginAccount']) && + isset($_SESSION['LoginAccount']['id']) + ) { + + $accountId = ($_SESSION['LoginAccount']['id'] - 0); + + // Try to get the account + if ($accountId > 0) { + $regAccount = $Account->getEntry($accountId); + } + + } + + // If there wasn't an existing submission account + if (!$regAccount) { + + // Create an account now + + } // If not, then is guest checkout permitted? diff --git a/models/front/registrations/index.php b/models/front/registrations/index.php index 2f6753b..830dac3 100644 --- a/models/front/registrations/index.php +++ b/models/front/registrations/index.php @@ -93,6 +93,7 @@ class GlmMembersFront_registrations_index 'registration', 'cart', 'checkout', + 'checkoutProcess', 'summary', 'login', 'account', diff --git a/models/front/registrations/list.php b/models/front/registrations/list.php index 55adf32..0872fca 100644 --- a/models/front/registrations/list.php +++ b/models/front/registrations/list.php @@ -102,8 +102,6 @@ // Get a current list of reg events $listResult = $this->getSimpleRegEventsList($where.$alphaWhere, 'event_name', true, 'id', $start, $limit, true); - //echo '
$listResult: ' . print_r( $listResult, true ) . '
'; - // Get paging results $numbDisplayed = $listResult['returned']; $lastDisplayed = $listResult['last']; diff --git a/setup/frontHooks.php b/setup/frontHooks.php index 08fd77e..4bebe6f 100644 --- a/setup/frontHooks.php +++ b/setup/frontHooks.php @@ -63,6 +63,7 @@ add_filter( $regCartSummary['cartUrl'] = GLM_MEMBERS_REGISTRATIONS_SITE_BASE_URL.$this->config['settings']['canonical_reg_page'].'/?page=cart'; return $regCartSummary; + }, 10, 2 diff --git a/views/admin/registrations/accountEdit.html b/views/admin/registrations/accountEdit.html index 176ed4d..157d879 100644 --- a/views/admin/registrations/accountEdit.html +++ b/views/admin/registrations/accountEdit.html @@ -28,7 +28,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
Date CreatedDate Created {$account.fieldData.date_created.timestamp|date_format:"%D"} @@ -37,7 +37,7 @@
User Trace InfoUser Trace Info {$account.fieldData.user_trace_info} {if $account.fieldFail.user_trace_info}

{$account.fieldFail.user_trace_info}

{/if}
@@ -45,7 +45,7 @@
Member IDMember ID {if $account.fieldFail.member_id}

{$account.fieldFail.member_id}

{/if}
@@ -53,7 +53,7 @@
ActiveActive {if $account.fieldFail.active}

{$account.fieldFail.active}

{/if}
@@ -63,7 +63,7 @@

General Information

First NameFirst Name {if $account.fieldFail.fname}

{$account.fieldFail.fname}

{/if}
@@ -71,7 +71,7 @@
Last NameLast Name {if $account.fieldFail.lname}

{$account.fieldFail.lname}

{/if}
@@ -79,7 +79,7 @@
OrganizationOrganization {if $account.fieldFail.org}

{$account.fieldFail.org}

{/if}
@@ -87,7 +87,7 @@
TitleTitle {if $account.fieldFail.title}

{$account.fieldFail.title}

{/if}
@@ -95,7 +95,7 @@
Address 1Address 1 {if $account.fieldFail.addr1}

{$account.fieldFail.addr1}

{/if}
@@ -103,7 +103,7 @@
Address 2Address 2 {if $account.fieldFail.addr2}

{$account.fieldFail.addr2}

{/if}
@@ -111,7 +111,7 @@
CityCity {if $account.fieldFail.city}

{$account.fieldFail.city}

{/if}
@@ -119,7 +119,7 @@
StateState {if $account.fieldFail.state}

{$account.fieldFail.state}

{/if}
@@ -127,7 +127,7 @@
ZIPZIP {if $account.fieldFail.zip}

{$account.fieldFail.zip}

{/if}
@@ -135,7 +135,7 @@
CountryCountry {if $account.fieldFail.country}

{$account.fieldFail.country}

{/if}
@@ -143,7 +143,7 @@
PhonePhone {if $account.fieldFail.phone}

{$account.fieldFail.phone}

{/if}
@@ -151,7 +151,7 @@
FaxFax {if $account.fieldFail.fax}

{$account.fieldFail.fax}

{/if}
@@ -161,7 +161,7 @@

Billing Information

First NameFirst Name {if $account.fieldFail.bill_fname}

{$account.fieldFail.bill_fname}

{/if}
@@ -169,7 +169,7 @@
Last NameLast Name {if $account.fieldFail.bill_lname}

{$account.fieldFail.bill_lname}

{/if}
@@ -177,7 +177,7 @@
OrganizationOrganization {if $account.fieldFail.bill_org}

{$account.fieldFail.bill_org}

{/if}
@@ -185,7 +185,7 @@
TitleTitle {if $account.fieldFail.bill_title}

{$account.fieldFail.bill_title}

{/if}
@@ -193,7 +193,7 @@
Address 1Address 1 {if $account.fieldFail.bill_addr1}

{$account.fieldFail.bill_addr1}

{/if}
@@ -201,7 +201,7 @@
Address 2Address 2 {if $account.fieldFail.bill_addr2}

{$account.fieldFail.bill_addr2}

{/if}
@@ -209,7 +209,7 @@
CityCity {if $account.fieldFail.bill_city}

{$account.fieldFail.bill_city}

{/if}
@@ -217,7 +217,7 @@
StateState {if $account.fieldFail.bill_state}

{$account.fieldFail.bill_state}

{/if}
@@ -225,7 +225,7 @@
ZIPZIP {if $account.fieldFail.bill_zip}

{$account.fieldFail.bill_zip}

{/if}
@@ -233,7 +233,7 @@
CountryCountry {if $account.fieldFail.bill_country}

{$account.fieldFail.bill_country}

{/if}
@@ -241,7 +241,7 @@
PhonePhone {if $account.fieldFail.bill_phone}

{$account.fieldFail.bill_phone}

{/if}
@@ -249,7 +249,7 @@
FaxFax {if $account.fieldFail.bill_fax}

{$account.fieldFail.bill_fax}

{/if}
@@ -257,7 +257,7 @@
EmailEmail {if $account.fieldFail.email}

{$account.fieldFail.email}

{/if}
@@ -265,7 +265,7 @@
Login PasswordLogin Password {if $option == 'create'} @@ -283,7 +283,7 @@
Email OK?Email OK? {if $account.fieldFail.email_ok}

{$account.fieldFail.email_ok}

{/if}
@@ -291,7 +291,7 @@
Is Member?Is Member? {if $account.fieldFail.is_member}

{$account.fieldFail.is_member}

{/if}
@@ -301,7 +301,7 @@

Contact Information

First NameFirst Name {if $account.fieldFail.contact_fname}

{$account.fieldFail.contact_fname}

{/if}
@@ -309,7 +309,7 @@
Last NameLast Name {if $account.fieldFail.contact_lname}

{$account.fieldFail.contact_lname}

{/if}
@@ -317,7 +317,7 @@
OrganizationOrganization {if $account.fieldFail.contact_org}

{$account.fieldFail.contact_org}

{/if}
@@ -325,7 +325,7 @@
TitleTitle {if $account.fieldFail.contact_title}

{$account.fieldFail.contact_title}

{/if}
@@ -333,7 +333,7 @@
Address 1Address 1 {if $account.fieldFail.contact_addr1}

{$account.fieldFail.contact_addr1}

{/if}
@@ -341,7 +341,7 @@
Address 2Address 2 {if $account.fieldFail.contact_addr2}

{$account.fieldFail.contact_addr2}

{/if}
@@ -349,7 +349,7 @@
CityCity {if $account.fieldFail.contact_city}

{$account.fieldFail.contact_city}

{/if}
@@ -357,7 +357,7 @@
StateState {if $account.fieldFail.contact_state}

{$account.fieldFail.contact_state}

{/if}
@@ -365,7 +365,7 @@
ZIPZIP {if $account.fieldFail.contact_zip}

{$account.fieldFail.contact_zip}

{/if}
@@ -373,7 +373,7 @@
CountryCountry {if $account.fieldFail.contact_country}

{$account.fieldFail.contact_country}

{/if}
@@ -381,7 +381,7 @@
Contact PhoneContact Phone {if $account.fieldFail.contact_phone}

{$account.fieldFail.contact_phone}

{/if}
@@ -389,7 +389,7 @@
Contact FaxContact Fax {if $account.fieldFail.contact_fax}

{$account.fieldFail.contact_fax}

{/if}
@@ -397,7 +397,7 @@
Contact EmailContact Email {if $account.fieldFail.contact_email}

{$account.fieldFail.contact_email}

{/if}
@@ -405,7 +405,7 @@
Contact Email OK?Contact Email OK? {if $account.fieldFail.contact_email_ok}

{$account.fieldFail.contact_email_ok}

{/if}
@@ -413,7 +413,7 @@
GuardianGuardian {if $account.fieldFail.guardian}

{$account.fieldFail.guardian}

{/if}
@@ -424,7 +424,7 @@
Emergency ContactEmergency Contact {if $account.fieldFail.emer_contact}

{$account.fieldFail.emer_contact}

{/if}
@@ -432,7 +432,7 @@
Emergency PhoneEmergency Phone {if $account.fieldFail.emer_phone}

{$account.fieldFail.emer_phone}

{/if}
@@ -440,7 +440,7 @@
Medical HistoryMedical History {if $account.fieldFail.med_history}

{$account.fieldFail.med_history}

{/if}
@@ -448,7 +448,7 @@
Allergy MedicationAllergy Medication {if $account.fieldFail.allergy_med}

{$account.fieldFail.allergy_med}

{/if}
@@ -456,7 +456,7 @@
NotesNotes {if $account.fieldFail.notes} diff --git a/views/front/registrations/cartLinkWidget.html b/views/front/registrations/cartLinkWidget.html index e029df6..6ee49d2 100644 --- a/views/front/registrations/cartLinkWidget.html +++ b/views/front/registrations/cartLinkWidget.html @@ -28,18 +28,25 @@ -
+
- + {foreach $regRequests as $rr} - + + {/foreach} @@ -49,15 +56,21 @@ {/if} diff --git a/views/front/registrations/checkout.html b/views/front/registrations/checkout.html index 9d922e6..5def0b1 100644 --- a/views/front/registrations/checkout.html +++ b/views/front/registrations/checkout.html @@ -1,82 +1,261 @@ {include file='front/registrations/header.html'} {if $haveCart} - + {* Hidden fields go here *} -
+ See summary of registration request and charges below -

Checkout

+
-

Account Information

-
- - +
+
+ Your registration is not complete! Please complete the form and click "Submit" below. +
+

Checkout

+
+ +
+
+

Account Information

+ {if $regAccountId == 0} +
+
E-Mail Address:
+
+
+
+
Password:
+
+
+ {else} +
+
E-Mail Address:
+
{$regAccount.fieldData.email}
+
+ {/if} +
+
First Name:
+
+
+
+
Last Name:
+
+
+
+
Organization:
+
+
+
+
Title:
+
+
+
+
Address:
+
+
+
+
 
+
+
+
+
City:
+
+
+
+
State/Province:
+
+ +
+
+
+
Zip/Postal Code:
+
+
+
+
Country:
+
+ +
+
+
+
+

Billing Information

+
 Same as Account Information
+
+
First Name:
+
+
+
+
Last Name:
+
+
+
+
Address:
+
+
+
+
 
+
+
+
+
City:
+
+
+
+
State:
+
+ +
+
+
+
Zip/Postal Code:
+
+
+
+
Country:
+
+ +
+
+
+
Phone:
+
+
+
+
FAX:
+
+
+
+
+ {if $cart.totalCharges > 0} +
+
+

Payment Information

+

*** Temporary - will depend on payment methods ***

+
+
Card Type:
+
+
+
+
Name on Card:
+
+
+
+
Card Number:
+
+
+
+
Card Expiration:
+
+
+
+
CVV:
+
+
+
+ {/if} +
+

Additional Contact Information

+
+
First Name:
+
+
+
+
Address:
+
+
+
+
 
+
+
+
+
City:
+
+
+
+
State:
+
+ +
+
+
+
Zip/Postal Code:
+
+
+
+
Country:
+
+ +
+
+
+
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.
+ +
+
-
- - -
-
- - -
-
- - -
-
- - -
- -

Billing Information

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
- -

Contact Information

-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-

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

+ {if $cart.totalCharges > 0} +

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

+ {else} +
(There is no charge for your request.)
+ {/if} {if $cart.blockCheckout}
@@ -84,14 +263,13 @@
{else}
- You have one more step to complete your registration! Submit Registration - or Return to Cart + You have one more step to complete your registration!
{/if} -

Registration Summary

+

Registration Summary

IDDate createdDate last updated
IDDate createdDate last updatedSelected
{$rr.id} + {$rr.id} + {$rr.date_created.datetime} {$rr.last_update.datetime} + {if $rr.id == $id} + Yes + {/if} +
diff --git a/views/front/registrations/header.html b/views/front/registrations/header.html index 51a6120..d404f3a 100644 --- a/views/front/registrations/header.html +++ b/views/front/registrations/header.html @@ -11,5 +11,8 @@ {if $page != 'register'} Register for Another Event {/if} + {if $page != 'cart'} + Return to Cart + {/if}