Continuing on final front-end testing and cleanup
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 13 Feb 2018 20:16:10 +0000 (15:16 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 13 Feb 2018 20:16:10 +0000 (15:16 -0500)
Added use of terms in cartSummary.html.
Fixed missing date for "First Event Time" in reg event dashboard.
Fixed warnings and undefines in list.html - Need to stop using recurrences for this!
Fixed undefined for "locations" in registration.html.
Fixed layout and text problems with level headed in registration registration.html
Commented out payment methods from plugin.ini: Comp Code, Call from Merchant, Paypal
Updated defaults for payment methods in dataRegEvent.php
Now checking for admin users when selecting payment methods in regCartSupport.php
Reorganized Payment Method selection and better method checking in checkout.html
Fixed possible problem with default payment method selection
Edited description comment for Credit Card fields in create_database...sql

classes/data/dataRegEvent.php
classes/regCartSupport.php
config/plugin.ini
models/front/registrations/checkout.php
models/front/registrations/checkoutProcess.php
setup/databaseScripts/create_database_V0.0.25.sql
views/admin/registrations/eventDashboard.html
views/front/registrations/cartSummary.html
views/front/registrations/checkout.html
views/front/registrations/list.html
views/front/registrations/registration.html

index e4109f2..3203d97 100644 (file)
@@ -259,11 +259,11 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
                 'field'     => 'payment_methods',
                 'type'      => 'bitmap',
                 'bitmap'    => $this->config['payment_method'],
-                'default'   => 68,
+                'default'   => 64,
                 'use'       => 'a'
             ),
 
-            // Bitmap of restricted (admin use only) payment methods for this event - see paymenttrue_method
+            // Bitmap of payment methods for use with admin users in the front-end
             'restricted_payment_methods' => array (
                 'field'     => 'restricted_payment_methods',
                 'type'      => 'bitmap',
@@ -363,7 +363,7 @@ class GlmDataRegistrationsRegEvent extends GlmDataAbstract
 
                 // echo '<pre>$eventData: ' . print_r( $eventData, true ) . '</pre>';
 
-                // Add to the registration event arraytrue
+                // Add to the registration event array
                 $result_data['intro']               = $eventData['intro'];
                 $result_data['eventDescr']          = $eventData['descr'];
                 $result_data['image']               = $eventData['image'];
index d04883d..2bbe205 100644 (file)
@@ -230,9 +230,13 @@ class GlmRegCartSupport
         if ($this->cart['events']) {
             foreach ($this->cart['events'] as $eventKey => $event) {
 
-                // Get accepted payment methods
+                // Get accepted payment methods. If admin user use restricted payment methods
                 $e = $RegEvent->getEntry($event['reg_event']);
-                $this->cart['events'][$eventKey]['payment_methods'] = $e['payment_methods'];
+                if (is_user_logged_in() && apply_filters('glm_members_menu_members', true)) {
+                    $this->cart['events'][$eventKey]['payment_methods'] = $e['restricted_payment_methods'];
+                } else {
+                    $this->cart['events'][$eventKey]['payment_methods'] = $e['payment_methods'];
+                }
 
                 // If custom fields add-on is installed - get custom fields data
                 if (apply_filters('glm-members-customfields-plugin-active', false)) {
index c110be1..57ed5b7 100644 (file)
@@ -31,20 +31,22 @@ registration_account_option_numb['Member']              = 3
 ; Payment Method - Use as Bitmap Index or List
 ;
 payment_method[1]                               = 'No Charge'
-payment_method[2]                               = 'Comp Code'
+payment_method[2]                               = 'Pay On Arrival'
 payment_method[3]                               = 'Cash'
 payment_method[4]                               = 'Check'
-payment_method[5]                               = 'Call from Merchant'
+payment_method[5]                               = 'Call from Merchant'
 payment_method[6]                               = 'Credit Card'
-payment_method[7]                               = 'PayPal'
+; payment_method[7]                               = 'PayPal'
+payment_method [10]                             = 'Payment Pending'
 
 payment_method_numb['NoCharge']                 = 1
-payment_method_numb['CompCode']                 = 2
+payment_method_numb['OnArrival']                = 2
 payment_method_numb['Cash']                     = 3
 payment_method_numb['Check']                    = 4
-payment_method_numb['CallFromMerchant']         = 5
+payment_method_numb['CallFromMerchant']         = 5
 payment_method_numb['CreditCard']               = 6
-payment_method_numb['PayPal']                   = 7
+; payment_method_numb['PayPal']                   = 7
+payment_method_numb['Pending']                  = 10
 
 ; Default payment method is Credit Card
 default_payment_method                          = 6
@@ -201,8 +203,8 @@ submission_status[10]                           = 'COMPLETE'
 submission_status[20]                           = 'UNPAID'
 submission_status[30]                           = 'CC_PEND'
 submission_status[40]                           = 'CC_DECL'
-submission_status[50]                           = 'CHECK_PEND'
-submission_status[60]                           = 'AT_EVENT'
+submission_status[50]                           = 'PAYMENT_PEND'
+submission_status[60]                           = 'ON ARRIVAL'
 submission_status[70]                           = 'ADMIN HOLD'
 submission_status[80]                           = 'FAILED'
 submission_status[99]                           = 'CANCELED'
@@ -212,8 +214,8 @@ submission_status_numb['COMPLETE']              = 10
 submission_status_numb['UNPAID']                = 20
 submission_status_numb['CC_PEND']               = 30
 submission_status_numb['CC_DECL']               = 40
-submission_status_numb['CHECK_PEND']            = 50
-submission_status_numb['AT_EVENT']              = 60
+submission_status_numb['PAYMENT_PEND']          = 50
+submission_status_numb['ON_ARRIVAL']            = 60
 submission_status_numb['ADMIN_HOLD']            = 70
 submission_status_numb['FAILED']                = 80
 submission_status_numb['CANCELED']              = 99
index c95c452..7f7dd4e 100644 (file)
@@ -254,18 +254,31 @@ class GlmMembersFront_registrations_checkout extends GlmRegCartSupport
         $Management = new GlmDataRegistrationsManagement($this->wpdb, $this->config);
         $management = $Management->getEntry(1);
 
-        // Get accepted pay methods and block out any not selected for an event
+        // Get all payment methods and assume they might all be available
         $availPaymentMethods = $management['reg_payment_methods']['bitmap'];
+        foreach ($availPaymentMethods as $methKey=>$methVal) {
+            $availPaymentMethods[$methKey]['default'] = true;
+        }
+
+        // For each event in cart, check each payment method. Only methods enabled in all events are available.
         foreach ($this->cart['events'] as $event) {
             foreach ($event['payment_methods']['bitmap'] as $payMethodKey=>$payMethodVal) {
-                if (!$payMethodVal['default']) {
-                    $availPaymentMethods[$payMethodKey]['default'] = 0;
+
+                // If this one isn't set for event, remove it from the list
+                if (!$payMethodVal['default'] && isset($availPaymentMethods[$payMethodKey])) {
+                    unset($availPaymentMethods[$payMethodKey]);
                 }
             }
         }
 
-        // Set default payment method
-        $payMethod = $this->config['default_payment_method'];
+        // If there's only one payment method, make that the selcted method
+        if (count($availPaymentMethods) == 1) {
+            $payMethod = key($availPaymentMethods);
+
+        // Otherwise use default payment method - Note that it might not be available.
+        } else {
+            $payMethod = $this->config['default_payment_method'];
+        }
 
         // Get any payment method specified or selected on checkout attempt
         if (isset($actionData['payMethod'])) {
index 5feedc6..fb58242 100644 (file)
@@ -314,27 +314,79 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
             $payMethod = false;
         }
 
+        // Check if Billing data source fields
+        $billPrefix = 'bill_';
+        if (isset($_REQUEST['billing_same']) && $_REQUEST['billing_same']) {
+            $billPrefix = '';
+        }
+        $billing = array(
+            'fname'   => $regAccount['fieldData'][$billPrefix.'fname'],
+            'lname'   => $regAccount['fieldData'][$billPrefix.'lname'],
+            'addr1'   => $regAccount['fieldData'][$billPrefix.'addr1'],
+            'addr2'   => $regAccount['fieldData'][$billPrefix.'addr2'],
+            'city'    => $regAccount['fieldData'][$billPrefix.'city'],
+            'state'   => $regAccount['fieldData'][$billPrefix.'state']['value'],
+            'country' => $regAccount['fieldData'][$billPrefix.'country']['value'],
+            'zip'     => $regAccount['fieldData'][$billPrefix.'zip'],
+            'phone'   => $regAccount['fieldData'][$billPrefix.'phone'],
+            'email'   => $regAccount['fieldData']['email']
+        );
+
         // Execute selected payment method
         switch ($payMethod) {
 
+            /*
+            submission_status_numb['CART']                  = 0
+            submission_status_numb['COMPLETE']              = 10
+            submission_status_numb['UNPAID']                = 20
+            submission_status_numb['CC_PEND']               = 30
+            submission_status_numb['CC_DECL']               = 40
+            submission_status_numb['PAYMENT_PEND']          = 50
+            submission_status_numb['ON_ARRIVAL']            = 60
+            submission_status_numb['ADMIN_HOLD']            = 70
+            submission_status_numb['FAILED']                = 80
+            submission_status_numb['CANCELED']              = 99
+            */
+
             // No Charge
             case $this->config['payment_method_numb']['NoCharge']:
+                $cartStatus = $this->config['submission_status_numb']['COMPLETE'];
                 break;
 
-            // Comp Code
-            case $this->config['payment_method_numb']['CompCode']:
+            // Pay on Arrival
+            case $this->config['payment_method_numb']['OnArrival']:
+                $cartStatus = $this->config['submission_status_numb']['PAYMENT_PEND'];
                 break;
 
             // Cash
             case $this->config['payment_method_numb']['Cash']:
+                $cartStatus = $this->config['submission_status_numb']['COMPLETE'];
                 break;
 
             // Check
             case $this->config['payment_method_numb']['Check']:
+
+                // Get the check input
+                $cardData = array(
+                'cc_name' => filter_input(INPUT_POST, 'cc_name', FILTER_SANITIZE_STRING),       // Name on Check
+                'cc_numb' => filter_input(INPUT_POST, 'cc_numb', FILTER_SANITIZE_NUMBER_INT)    // Check Number
+                );
+
+                // Check all credit card input
+                if (
+                    $cardData['cc_name'] && $cardData['cc_name'] != '' &&   // Name on Check
+                    $cardData['cc_numb'] && $cardData['cc_numb'] > 0        // Check Number
+                    ) {
+                        $cartStatus = $this->config['submission_status_numb']['COMPLETE'];
+                    } else {
+                        $messages[] = 'You did not supply all required check information.';
+                    }
+
                 break;
 
-            // Call From Merchant
-            case $this->config['payment_method_numb']['CallFromMerchant']:
+            // Payment Pending
+            case $this->config['payment_method_numb']['Pending']:
+                $cartStatus = $this->config['submission_status_numb']['PAYMENT_PEND'];
                 break;
 
             // Credit Card
@@ -411,24 +463,6 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
                     $messages[] = 'You did not supply all required credit card information.';
                 }
 
-                // Billing data
-                $billPrefix = 'bill_';
-                if (isset($_REQUEST['billing_same']) && $_REQUEST['billing_same']) {
-                    $billPrefix = '';
-                }
-                $billing = array(
-                    'fname'   => $regAccount['fieldData'][$billPrefix.'fname'],
-                    'lname'   => $regAccount['fieldData'][$billPrefix.'lname'],
-                    'addr1'   => $regAccount['fieldData'][$billPrefix.'addr1'],
-                    'addr2'   => $regAccount['fieldData'][$billPrefix.'addr2'],
-                    'city'    => $regAccount['fieldData'][$billPrefix.'city'],
-                    'state'   => $regAccount['fieldData'][$billPrefix.'state']['value'],
-                    'country' => $regAccount['fieldData'][$billPrefix.'country']['value'],
-                    'zip'     => $regAccount['fieldData'][$billPrefix.'zip'],
-                    'phone'   => $regAccount['fieldData'][$billPrefix.'phone'],
-                    'email'   => $regAccount['fieldData']['email']
-                );
-
                 if (count($messages) == 0) {
 
                     // Determine the directory of the payment processor to load and instatiate it.
@@ -445,7 +479,7 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
                         'ccnumb'  => $cardData['cc_numb'],                       // Card Number
                         'ccexp'   => $cardData['cc_exp'],                        // Expiration Date
                         'cccode'  => $cardData['cc_cvv'],                        // CCV - security code
-                        'invoice' => 0101010101                                  // Invoice # is session ID (or some part thereof)
+                        'invoice' => 'reg-'.$_SESSION['glm_reg_cart_id']         // Invoice # is "reg-" plus cart ID
                     );
 
                     // Now try to run the card processor
@@ -458,10 +492,6 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
 
                     // set $ccConfirmation
 
-/**** NEED TO FIX INVOICE # ABOVE ****/
-
-
-
                 }
 
                 break;
@@ -476,6 +506,7 @@ class GlmMembersFront_registrations_checkoutProcess extends GlmRegCartSupport
                 break;
 
         }
+exit;
 
         /*
          * Update the reg_request reccord: account id, billing, payment, status, etc...
index 08d1c80..5e078c5 100644 (file)
@@ -455,8 +455,8 @@ CREATE TABLE {prefix}reg_request (
     total_discounts DOUBLE PRECISION NULL,                      -- Total of all comps and discounts
     registrants SMALLINT NULL,                                  -- Total number of registrants in this cart
     cc_type TINYINT NULL,                                       -- Credit Card type (if used) - See credit_card in plugin.ini
-    cc_name TINYTEXT NULL,
-    cc_numb TINYTEXT NULL,
+    cc_name TINYTEXT NULL,                                      -- Name on Credit Card or Name on Check 
+    cc_numb TINYTEXT NULL,                                      -- Credit Card Number or Check Number
     cc_exp TINYTEXT NULL,
     cc_cvv TINYTEXT NULL,
     cc_conf TINYTEXT NULL,                                      -- Confirmation code back from card processor
index 936bbcf..65f8948 100644 (file)
@@ -19,7 +19,7 @@
                         <h3>First {$terms.reg_term_event_cap} Time:</h3>
                     </div>
                     <div class="glm-small-12 glm-column time-input">
-                        {$regEvent.first_datetime.datetime}
+                        {$regEventFirstTime.datetime}
                     </div>
                 </div>
                 <div class="glm-row">
@@ -27,7 +27,7 @@
                         <h3>Last {$terms.reg_term_event_cap} Time:</h3>
                     </div>
                     <div class="glm-small-12 glm-column">
-                        {$regEvent.last_datetime.datetime}
+                        {$regEventLastTime.datetime}
                     </div>
                 </div>
             </div>
index 98d869f..bc1e5cd 100644 (file)
@@ -1,4 +1,4 @@
-
+{debug}
 {if $summaryType=="adminRequest"}
     {assign var="summaryColumnsItem" value="small-7 "}
     {assign var="summaryColumnsCharge" value="small-5 "}
@@ -8,7 +8,6 @@
 {/if}
     <div class="glm-reg-cart-container">
 {foreach $cart.events as $event}
-{debug}
         <div class="glm-reg-cart-event-container small-12 columns">
             <div class="row glm-reg-header-row glm-cart-summary-event-name-row">
                 <div class="small-12 medium-6 column">
@@ -24,7 +23,7 @@
                             
                         </div>
                         <div class="small-4 medium-4 columns glm-reg-cart-header-data">
-                            {$terms.reg_term_attendee_plur_cap}: {$event.eventRegistrants}
+<!--                           {$terms.reg_term_attendee_plur_cap}: {$event.eventRegistrants} -->
                         </div>
                         <div class="small-4 medium-4 columns glm-reg-cart-data glm-reg-cart-header-data">
 <!--                            event.eventCharges|number_format:2 -->
   {foreach $class.rates as $rate}
             <div class="row glm-reg-cart-event-class">
                 <div class="small-8 column reg-cart-class-name">
-                    <span>{$terms.reg_term_registration_cap} Level:</span> {$class.class_name}
+                    <span>{$terms.reg_term_registration_cap} {$terms.reg_term_level_cap}:</span> {$class.class_name}
                 </div>
                 <div class="small-4 column text-right reg-cart-class-name glm-bold glm-reg-cart-charges-col">
                     {if $rate.rateBaseCharge > 0}{$rate.base_rate_money}{/if}
                 </div>
             </div>
-   {if $rate.rateBaseCharge > 0}
-<!--            <div class="glm-reg-row glm-reg-indent-1 glm-reg-cart-class-rate">
-                <div class="small-8 medium-8 column glm-reg-cart-label">
-                    Base Rate:
-                </div>
-                <div class="small-4 medium-4 column glm-reg-right glm-reg-cart-data">
-                    ${$rate.rateBaseCharge|number_format:2}
-                </div>
-            </div>-->
-   {/if}
-   
    {foreach $rate.registrants as $registrant}
         <div class="glm-reg-cart-registrant-item">
             <div class="row glm-reg-cart-registrant">
                         (included)
                     {/if}
                 </div>
-
-                
-<!--                <div class="{$summaryClass4Col} column glm-reg-space-left glm-reg-right glm-reg-row-bold">
-                    {$terms.reg_term_attendee_cap} Charge:
-                </div>-->
                 
             </div>
     {if $registrant.event_attendee_custom_form}
index 7d9f2cd..2c87310 100644 (file)
             </div>
 
   {if $cart.totalCharges > 0}
-            <div class="glm-row">
-                <div class="glm-large-6 glm-small-12 glm-columns">
-                    <h4>Payment Information</h4>
-                    {foreach $payMethods as $payMethod}
-                      {if $payMethod.default}
-
-                        {$pmName = array_search($payMethod.value, $payMethodsNumb)}
-                        {$pmNumb = $payMethodsNumb.{$pmName}}
-                          <div><input id="payMethodButton_{$pmNumb}" type="radio" name="payMethod" value="{$pmNumb}" class="payMethodSelector" required {if $defaultPayMethod == {$pmNumb}} checked{/if}> <label for="payMethodButton_{$pmNumb}">{$payMethods.{$pmNumb}.name}</label></div>
-                        {if $payMethods.{$payMethod.value}.default} 
-
-                            {if $pmName == "CompCode"} 
-                                <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.comp_code} glm-reg-required{/if}">Enter code{if $regAccount.fieldRequired.comp_code} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.comp_code} glm-reg-fail{/if}">
-                                            <input type="text" name="comp_code" value="{$regAccount.fieldData.comp_code}"{if $regAccount.fieldRequired.comp_code} required{/if} class="payMethodInput payMethodInput_{$pmNumb}">
-                                        </div>
-                                    </div>
+              <div class="glm-row">
+                  <div class="glm-large-6 glm-small-12 glm-columns">
+                      <h4>Payment Information</h4>
+                          <div style="white-space: nowrap;">
+    {foreach $payMethods as $payMethod}
+
+        {$pmName = array_search($payMethod.value, $payMethodsNumb)}
+        {$pmNumb = $payMethodsNumb.{$pmName}}
+                              <input id="payMethodButton_{$pmNumb}" type="radio" name="payMethod" value="{$pmNumb}" class="payMethodSelector"{if $defaultPayMethod==$pmNumb} checked="checked"{/if}>&nbsp;&nbsp;{$payMethods.{$pmNumb}.name}&nbsp;&nbsp;&nbsp;&nbsp;
+    {/foreach}
+                          </div>
+    {foreach $payMethods as $payMethod}
+
+        {$pmName = array_search($payMethod.value, $payMethodsNumb)}
+        {$pmNumb = $payMethodsNumb.{$pmName}}
+
+            {if $pmName == "NoCharge"}
+                {* Nothing here for now *}
+            {else if $pmName == "OnArrival"} 
+                {* Nothing here for now *}
+            {else if $pmName == "Cash"} 
+                {* Nothing here for now *}
+            {else if $pmName == "Check"} 
+                        <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_name} glm-reg-required{/if}">Name on Check{if $regAccount.fieldRequired.cc_name} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}">
+                                    <input type="text" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if} class="payMethodInput payMethodInput_{$pmNumb}">
                                 </div>
-                            {else if $pmName == "CreditCard"} 
-                                
-                                <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_name} glm-reg-required{/if}">Name on Card{if $regAccount.fieldRequired.cc_name} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}">
-                                            <input type="text" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if} class="payMethodInput payMethodInput_{$pmNumb}">
-                                        </div>
-                                    </div>
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_type} glm-reg-required{/if}">Card Type{if $regAccount.fieldRequired.cc_type} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_type} glm-reg-fail{/if}">
-                                            <select name="cc_type" class="payMethodInput payMethodInput_{$pmNumb}">
-                                                <option value=""></option>
-                                    {foreach $regAccount.fieldData.cc_type.list as $c}
-                                                <option value="{$c.value}"{if $c.default} selected="selected"{/if}>
-                                                    {$c.name}
-                                                </option>
-                                    {/foreach}
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_numb} glm-reg-required{/if}">Card Number{if $regAccount.fieldRequired.cc_numb} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_numb} glm-reg-fail{/if}">
-                                            <input type="text" placeholder="Numbers Only" name="cc_numb" value="{$regAccount.fieldData.cc_numb}"{if $regAccount.fieldRequired.cc_numb} required{/if} class="payMethodInput payMethodInput_{$pmNumb} cc-input">
-                                       </div>
-                                    </div>
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_exp} glm-reg-required{/if}">Card Expiration{if $regAccount.fieldRequired.cc_exp} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_exp} glm-reg-fail{/if}">
-                                            <input type="text" placeholder="MM/YY" name="cc_exp" value="{$regAccount.fieldData.cc_exp}"{if $regAccount.fieldRequired.cc_exp} required{/if} class="payMethodInput payMethodInput_{$pmNumb} expire-input">
-                                        </div>
-                                    </div>
-                                    <div class="glm-reg-row">
-                                        <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_cvv} glm-reg-required{/if}">CVV{if $regAccount.fieldRequired.cc_cvv} *{/if}</div>
-                                        <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_cvv} glm-reg-fail{/if}">
-                                            <input type="text" placeholder="3 or 4 digit security code on back of card" name="cc_cvv" value="{$regAccount.fieldData.cc_cvv}"{if $regAccount.fieldRequired.cc_cvv} required{/if} class="payMethodInput payMethodInput_{$pmNumb} cvv-input">
-                                        </div>
-                                    </div>
+                            </div>
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_numb} glm-reg-required{/if}">Check Number{if $regAccount.fieldRequired.cc_numb} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_numb} glm-reg-fail{/if}">
+                                    <input type="text" placeholder="Numbers Only" name="cc_numb" value="{$regAccount.fieldData.cc_numb}"{if $regAccount.fieldRequired.cc_numb} required{/if} class="payMethodInput payMethodInput_{$pmNumb} cc-input">
+                               </div>
+                            </div>
+                        </div>
+            {else if $pmName == "CreditCard"} 
+                        <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_name} glm-reg-required{/if}">Name on Card{if $regAccount.fieldRequired.cc_name} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_name} glm-reg-fail{/if}">
+                                    <input type="text" name="cc_name" value="{$regAccount.fieldData.cc_name}"{if $regAccount.fieldRequired.cc_name} required{/if} class="payMethodInput payMethodInput_{$pmNumb}">
                                 </div>
-                            {else}
-                                <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
-
+                            </div>
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_type} glm-reg-required{/if}">Card Type{if $regAccount.fieldRequired.cc_type} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_type} glm-reg-fail{/if}">
+                                    <select name="cc_type" class="payMethodInput payMethodInput_{$pmNumb}">
+                                        <option value=""></option>
+                {foreach $regAccount.fieldData.cc_type.list as $c}
+                                        <option value="{$c.value}"{if $c.default} selected="selected"{/if}>
+                                            {$c.name}
+                                        </option>
+                {/foreach}
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_numb} glm-reg-required{/if}">Card Number{if $regAccount.fieldRequired.cc_numb} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_numb} glm-reg-fail{/if}">
+                                    <input type="text" placeholder="Numbers Only" name="cc_numb" value="{$regAccount.fieldData.cc_numb}"{if $regAccount.fieldRequired.cc_numb} required{/if} class="payMethodInput payMethodInput_{$pmNumb} cc-input">
+                               </div>
+                            </div>
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_exp} glm-reg-required{/if}">Card Expiration{if $regAccount.fieldRequired.cc_exp} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_exp} glm-reg-fail{/if}">
+                                    <input type="text" placeholder="MM/YY" name="cc_exp" value="{$regAccount.fieldData.cc_exp}"{if $regAccount.fieldRequired.cc_exp} required{/if} class="payMethodInput payMethodInput_{$pmNumb} expire-input">
                                 </div>
-                            {/if}
-                        {/if}
-                        
-                      {/if} {* default is set *}
-                    {/foreach}
+                            </div>
+                            <div class="glm-reg-row">
+                                <div class="glm-reg-checkout-field-label glm-small-12 glm-large-3 glm-columns glm-reg-nowrap{if $regAccount.fieldRequired.cc_cvv} glm-reg-required{/if}">CVV{if $regAccount.fieldRequired.cc_cvv} *{/if}</div>
+                                <div class="glm-reg-checkout-field-data glm-small-12 glm-large-9 glm-columns{if $regAccount.fieldFail.cc_cvv} glm-reg-fail{/if}">
+                                    <input type="text" placeholder="3 or 4 digit security code on back of card" name="cc_cvv" value="{$regAccount.fieldData.cc_cvv}"{if $regAccount.fieldRequired.cc_cvv} required{/if} class="payMethodInput payMethodInput_{$pmNumb} cvv-input">
+                                </div>
+                            </div>
+                        </div>
+            {else}
+                        <div id="payMethod_{$pmNumb}" class="payMethodSelection glm-hidden">
+
+                        </div>
+            {/if}
+        
+    {/foreach}
                     
                 </div>
   {/if} {* / total charges > 0 *}
index babe832..94e9201 100644 (file)
     {foreach $regEvents as $event}
         {assign var=first value = $event.times|@key}
         {assign var=first_date value = $event.times.$first.start_time.timestamp}
-        {assign var=last value = $event.reg_time|@end}
-        {assign var=last_date value = $event.end_datetime}
-        {assign var=time_specific value = $event.time_specific.value}
+        
+        {* these are not in use  -  !!!Also need to stop using Recurrences here!!!! *} 
+        {* assign var=last value = $event.reg_time|@end *}
+        {* assign var=last_date value = $event.end_datetime *}
+        {* assign var=time_specific value = $event.time_specific.value *}
      
 <!--        <pre>{$event|@print_r}</pre>-->
         <!-- EVENT REG ITEM START -->
index 5c4cac2..968ecb0 100644 (file)
@@ -85,7 +85,7 @@
                                     <p>Attend any time during event</p>
                                     <% _.each(reg_time, function(rTime){ %>
                                         <% if ( rTime.attendee_max > 0 ) { %>
-                                    <p> Maximum Registrants: <%= rTime.attendee_max %><br>
+                                    <p> Maximum {/literal}{$terms.reg_term_attendee_plur_cap}{literal}: <%= rTime.attendee_max %><br>
                                         Currently Available: <%= rTime.attendees_available %> </p>
                                         <% } %>
                                     <% }); %>
                 <span class="columns small-12 large-3 glm-reg-level-title glm-reg-level-info"><%= name %></span>
 
                 <% if( reg_rate_base_price ){ %>
-                    <div class="columns small-12 large-2 glm-reg-level-info"> Base Rate: $<%= reg_rate_base_price %> </div>
+                    <div class="columns small-12 large-3 glm-reg-level-info"> Base Rate: $<%= reg_rate_base_price %> </div>
                 <% } %>
                 <% if( reg_rate_per_reg ){ %>
-                    <div class="columns small-12 large-2 glm-reg-level-info"> Per Registrant: $<%= reg_rate_per_reg %> </div>
+                    <div class="columns small-12 large-3 glm-reg-level-info"> Per {/literal}{$terms.reg_term_attendee_cap}{literal}: $<%= reg_rate_per_reg %> </div>
                 <% } %>
                 <% if( registrant_credits ){ %>
-                    <div class="columns small-12 large-2 glm-reg-level-info"> Per Registrant: $<%= registrant_credits %> </div>
+                    <div class="columns small-12 large-3 glm-reg-level-info"> {/literal}{$terms.reg_term_attendee_plur_cap}{literal} Included: <%= registrant_credits %> </div>
                 <% } %>
 
                 <div class="columns small-12 glm-reg-level-info">
@@ -527,7 +527,7 @@ jQuery(function($){
     regEvent.setClassRegistrants( {$regJSON} );
     var glmApp = new app.Views.Front.App();
 
-    {if $regEvent.locations}
+    {if isset($regEvent.locations) && $regEvent.locations}
         $("#glm-reg-detail-map-button").click(function() {
             var map_container   = "#glm-reg-map-container";
             var map             = "#glm-reg-map";