From a76c995a9506ae28e1b947dfe257aff58bff2e74 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 16 Feb 2017 12:36:40 -0500
Subject: [PATCH] Updated plugin.ini to clear up confusion for ref_type for
 various things. Removed required from some fields Updated assignments on
 Development outline

---
 classes/data/dataManagement.php           | 11 +----
 config/plugin.ini                         | 51 +++++++++++++-------
 misc/documentation/DevelopmentOutline.txt | 16 +++++--
 views/admin/management/registrations.html | 57 ++++++++++++++++-------
 views/admin/management/regterms.html      |  5 +-
 5 files changed, 88 insertions(+), 52 deletions(-)

diff --git a/classes/data/dataManagement.php b/classes/data/dataManagement.php
index 92a1595..795bd73 100644
--- a/classes/data/dataManagement.php
+++ b/classes/data/dataManagement.php
@@ -114,7 +114,7 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
                 'view_only' => true,
                 'use' => 'a'
             ),
-            
+
             'canonical_reg_page' => array (
                 'field' => 'canonical_reg_page',
                 'type' => 'text',
@@ -233,7 +233,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
             'reg_authorize_net_login' => array (
                 'field' => 'reg_authorize_net_login',
                 'type' => 'text',
-                'required' => true,
                 'use' => 'a'
             ),
 
@@ -241,7 +240,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
             'reg_authorize_net_key' => array (
                 'field' => 'reg_authorize_net_key',
                 'type' => 'text',
-                'required' => true,
                 'use' => 'a'
             ),
 
@@ -250,11 +248,10 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
                 'field' => 'reg_authorize_net_test',
                 'type' => 'list',
                 'list' => $this->config['proc_test_mode'],
-                'required' => true,
                 'default' => $this->config['proc_test_mode_numb']['Local Approval Test'],
                 'use' => 'a'
             ),
-            
+
             // Always Use Full Billing Info
             'reg_authorize_net_conf' => array (
                 'field' => 'reg_authorize_net_conf',
@@ -267,7 +264,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
             'reg_authorize_net_merchant_email' => array (
                 'field' => 'reg_authorize_net_merchant_email',
                 'type' => 'text',
-                'required' => true,
                 'use' => 'a'
             ),
 
@@ -275,7 +271,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
             'reg_merchant_solutions_acctid' => array (
                 'field' => 'reg_merchant_solutions_acctid',
                 'type' => 'text',
-                'required' => true,
                 'use' => 'a'
             ),
 
@@ -283,7 +278,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
             'reg_merchant_solutions_merchantpin' => array (
                 'field' => 'reg_merchant_solutions_merchantpin',
                 'type' => 'text',
-                'required' => true,
                 'use' => 'a'
             ),
 
@@ -292,7 +286,6 @@ class GlmDataRegistrationsManagement extends GlmDataAbstract
                 'field' => 'reg_merchant_solutions_test',
                 'type' => 'list',
                 'list' => $this->config['proc_test_mode'],
-                'required' => true,
                 'default' => $this->config['proc_test_mode_numb']['Local Approval Test'],
                 'use' => 'a'
             ),
diff --git a/config/plugin.ini b/config/plugin.ini
index bf7abf6..9ab91c3 100644
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -10,25 +10,11 @@
 ;
 ; Show Rate type (how it rates will be displayed in lists) - Use as List
 ;
-show_rate_type[10]                              = 'Detailed'
-show_rate_type[20]                              = 'From (lowest cost)'
+show_rate_type[10]                             = 'Detailed'
+show_rate_type[20]                             = 'From (lowest cost)'
 
-show_rate_type_numb['Detailed']                 = 10
-show_rate_type_numb['From']                     = 20
-
-;
-; Data Reference Types (for MagicForm or ?) - List only
-; Used to point to something submitted that requires additional data
-;
-data_ref_type[10]                               = 'Registration Request'
-data_ref_type[20]                               = 'Event Registration'
-data_ref_type[30]                               = 'Rate Class Selected'
-data_ref_type[40]                               = 'Account'
-
-data_ref_type_numb['Registration Request']      = 10
-data_ref_type_numb['Event Registration']        = 20
-data_ref_type_numb['Rate Class Selected']       = 30
-data_ref_type_numb['Account']                   = 40
+show_rate_type_numb['Detailed']                = 10
+show_rate_type_numb['From']                    = 20
 
 ;
 ; Registration Account Options - Use as Bitmap only
@@ -69,6 +55,35 @@ pay_code_type_numb['Free']                      = 10
 pay_code_type_numb['Amount']                    = 20
 pay_code_type_numb['Percent']                   = 30
 
+;
+; Payment Code Ref Types - List only
+;
+pay_code_ref_type[10]                           = 'Global'
+pay_code_ref_type[20]                           = 'Event'
+pay_code_ref_type[30]                           = 'Registration Class'
+pay_code_ref_type[40]                           = 'Registration Rate'
+
+pay_code_ref_type_numb['Global']                = 10
+pay_code_ref_type_numb['Event']                 = 20
+pay_code_ref_type_numb['Registration Class']    = 30
+pay_code_ref_type_numb['Registration Rate']     = 40
+
+;
+; Registration Ref Type
+; Used to point to a piece of a registration submission
+;
+reg_ref_type[10]                               = 'Registration Request'
+reg_ref_type[20]                               = 'Event'
+reg_ref_type[30]                               = 'Registration Class'
+reg_ref_type[40]                               = 'Registration Rate'
+reg_ref_type[50]                               = 'Registrant'
+
+reg_ref_type_numb['Registration Request']      = 10
+reg_ref_type_numb['Event']                     = 20
+reg_ref_type_numb['Registration CLass']        = 30
+reg_ref_type_numb['Registration Rate']         = 40
+reg_ref_type_numb['Registrant']                = 50
+
 ;
 ; Credit Cards - Use as Bitmap Index or List
 ;
diff --git a/misc/documentation/DevelopmentOutline.txt b/misc/documentation/DevelopmentOutline.txt
index 80db076..41a7fef 100644
--- a/misc/documentation/DevelopmentOutline.txt
+++ b/misc/documentation/DevelopmentOutline.txt
@@ -2,12 +2,13 @@ Registrations Add-On Work Items - Preliminary
 
 ADMIN
 
-* General - Chuck
-    - Activation/Deactivation
-    - Database table installation / updates
-    - Generasl Configuration
+* General
+    DONE - Activation/Deactivation
+    DONE - Database table installation / updates
+    DONE - Generasl Configuration
 
 * Management
+    Chuck
     - Recall and update of management data
     - Access by Managers only
 
@@ -16,21 +17,26 @@ ADMIN
     - Accessed by Managers and Site owners
 
 * Support Classes
+    Chuck
     - Searches for and organizes various groups of data
-        - Assemble all data for a particular registration request
+       - Assemble all data for a particular registration request
 
 * Additional Information fields 
+    Anthony - Global Added Information Fields in Settings
     - May be used in association with various types of data (see data_ref_type in plugin.ini)
     - Add, Update, Delete list of added info records
     - Accessible by anyone configuring registration for an event
     - Possibly common code used while editing various things that can have additional information fields
 
 * Payment Codes 
+    Anthony - Global Payment Codes in Settings
     - May be used in associatin with various types of data (see data_ref_type in plugin.ini) or as "Global" payment codes
     - Add, Update, Delete list of Payment Codes 
     - Possibly common code used while editing various things that can have payment codes
 
 * Registration configuration for a specific event
+    Laury - Filter in Events list 
+    Laury - Add registration to an event and edit base event registration record
     - Passed an Event add-on event ID that matches the ID of the event it the Event add-on
     - Add (when first used for an event), edit, update, delete
 
diff --git a/views/admin/management/registrations.html b/views/admin/management/registrations.html
index 575bfbf..5ae6b5c 100644
--- a/views/admin/management/registrations.html
+++ b/views/admin/management/registrations.html
@@ -2,12 +2,12 @@
 <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
         
     <a id="glm-settings" data-show-table="glm-table-registrations" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=registrations" 
-       class="glm-settings-tab nav-tab{if ($option2=='registrations') || ($option2=='')} nav-tab-active{/if}">
+       class="glm-settings-tab nav-tab nav-tab-active">
         General
     </a>
     
     <a id="glm-settings" data-show-table="glm-table-regterms" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=regterms"  
-       class="glm-settings-tab nav-tab{if $option2=='regterms'} nav-tab-active{/if}">
+       class="glm-settings-tab nav-tab">
         Terms
     </a>
     
@@ -37,6 +37,10 @@
                             <br>Use only the page name at the end of the permalink for the member detail page.
                         </td>
                     </tr>
+                    <tr>
+                        <td></td>
+                        <th><p>Organization Processing Registrations</p></th>
+                    </tr>
                     <tr>
                         <th {if $regSettings.fieldRequired.reg_org_name}class="glm-required"{/if}>Organization Name:</th>
                         <td {if $regSettings.fieldFail.reg_org_name}class="glm-form-bad-input"{/if}>
@@ -107,33 +111,42 @@
                             {if $regSettings.fieldFail.reg_org_from_email}<p>{$regSettings.fieldFail.reg_org_from_email}</p>{/if}
                         </td>
                     </tr>
+                    <tr>
+                        <td></td>
+                        <th><p>Payment</p></th>
+                    </tr>
                     <tr>
                         <th {if $regSettings.fieldRequired.reg_payment_methods}class="glm­required"{/if}>Payment Methods:</th>
                         <td {if $regSettings.fieldFail.reg_payment_methods}class="glm­form­bad­input" data­tabid="glm-reg-payment-methods"{/if}>
                       {foreach from=$regSettings.fieldData.reg_payment_methods.bitmap item=v}
-                            <input type="checkbox" name="reg_payment_methods[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_payment_methods[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_payment_methods}<p>{$regSettings.fieldFail.reg_payment_methods}</p>{/if}
                         </td>
                     </tr>
+                    <tr>
+                        <th {if $regSettings.fieldRequired.reg_cc_accepts}class="glm­required"{/if}>Credit Card Accepted:</th>
+                        <td {if $regSettings.fieldFail.reg_cc_accepts}class="glm­form­bad­input" data­tabid="glm-reg-cc-accepts"{/if}>
+                      {foreach from=$regSettings.fieldData.reg_cc_accepts.bitmap item=v}
+                            <input type="checkbox" name="reg_cc_accepts[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
+                      {/foreach}                    
+                            {if $regSettings.fieldFail.reg_cc_accepts}<p>{$regSettings.fieldFail.reg_cc_accepts}</p>{/if}
+                        </td>
+                    </tr>
                     <tr>
                         <th {if $regSettings.fieldRequired.reg_proc_methods}class="glm­required"{/if}>Processing Methods:</th>
                         <td {if $regSettings.fieldFail.reg_proc_methods}class="glm­form­bad­input" data­tabid="glm-reg-processing-methods"{/if}>
                       {foreach from=$regSettings.fieldData.reg_proc_methods.bitmap item=v}
-                            <input type="checkbox" name="reg_proc_methods[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_proc_methods[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_proc_methods}<p>{$regSettings.fieldFail.reg_proc_methods}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th {if $regSettings.fieldRequired.reg_cc_accepts}class="glm­required"{/if}>Credit Card Accepted:</th>
-                        <td {if $regSettings.fieldFail.reg_cc_accepts}class="glm­form­bad­input" data­tabid="glm-reg-cc-accepts"{/if}>
-                      {foreach from=$regSettings.fieldData.reg_cc_accepts.bitmap item=v}
-                            <input type="checkbox" name="reg_cc_accepts[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
-                      {/foreach}                    
-                            {if $regSettings.fieldFail.reg_cc_accepts}<p>{$regSettings.fieldFail.reg_cc_accepts}</p>{/if}
-                        </td>
+                        <td></td>
+                        <th><p>Authorize.net</p></th>
                     </tr>
+                    <tr>
                     <tr>
                         <th {if $regSettings.fieldRequired.reg_authorize_net_login}class="glm-required"{/if}>Authorize.net Login:</th>
                         <td {if $regSettings.fieldFail.reg_authorize_net_login}class="glm-form-bad-input"{/if}>
@@ -162,7 +175,7 @@
                         </td>
                     </tr>
                     <tr>
-                        <th>Always Use Full Billing Info</th>
+                        <th>Send Confirmation E-Mail</th>
                         <td>
                             <input type="checkbox" name="reg_authorize_net_conf"{if $regSettings.fieldData.reg_authorize_net_conf.value} checked="checked"{/if}>
                         </td>
@@ -174,6 +187,10 @@
                             {if $regSettings.fieldFail.reg_authorize_net_merchant_email}<p>{$regSettings.fieldFail.reg_authorize_net_merchant_email}</p>{/if}
                         </td>
                     </tr>
+                    <tr>
+                        <td></td>
+                        <th><p>Merchant Solutions</p></th>
+                    </tr>
                     <tr>
                         <th {if $regSettings.fieldRequired.reg_merchant_solutions_acctid}class="glm-required"{/if}>Merchant Solutions Account ID:</th>
                         <td {if $regSettings.fieldFail.reg_merchant_solutions_acctid}class="glm-form-bad-input"{/if}>
@@ -202,6 +219,10 @@
                         </td>
                     </tr>
                     <tr>
+                        <td></td>
+                        <th><p>Billing Information Fields</p></th>
+                    </tr>
+                    </tr>
                         <th>Always Use Full Billing Info</th>
                         <td>
                             <input type="checkbox" name="reg_full_billing_info"{if $regSettings.fieldData.reg_full_billing_info.value} checked="checked"{/if}>
@@ -211,7 +232,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_no_charge}class="glm­required"{/if}>Billing Info used for No Charge:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_no_charge}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-no-charge"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_no_charge.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_no_charge[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_no_charge[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_no_charge}<p>{$regSettings.fieldFail.reg_bill_info_req_no_charge}</p>{/if}
                         </td>
@@ -220,7 +241,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_comp_code}class="glm­required"{/if}>Billing Info used for Comp Code:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_comp_code}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-comp-code"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_comp_code.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_comp_code[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_comp_code[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_comp_code}<p>{$regSettings.fieldFail.reg_bill_info_req_comp_code}</p>{/if}
                         </td>
@@ -229,7 +250,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_cash}class="glm­required"{/if}>Billing Info used for Cash:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_cash}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-cash"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_cash.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_cash[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_cash[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_cash}<p>{$regSettings.fieldFail.reg_bill_info_req_cash}</p>{/if}
                         </td>
@@ -238,7 +259,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_check}class="glm­required"{/if}>Billing Info used for Check:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_check}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-check"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_check.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_check[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_check[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_check}<p>{$regSettings.fieldFail.reg_bill_info_req_check}</p>{/if}
                         </td>
@@ -247,7 +268,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_credit_card}class="glm­required"{/if}>Billing Info used for Credit Card:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_credit_card}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-credit-card"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_credit_card.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_credit_card[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_credit_card[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_credit_card}<p>{$regSettings.fieldFail.reg_bill_info_req_credit_card}</p>{/if}
                         </td>
@@ -256,7 +277,7 @@
                         <th {if $regSettings.fieldRequired.reg_bill_info_req_merchant_call}class="glm­required"{/if}>Billing Info used for Payment by Call From Merchant:</th>
                         <td {if $regSettings.fieldFail.reg_bill_info_req_merchant_call}class="glm­form­bad­input" data­tabid="glm-reg-bill-info-req-merchant-call"{/if}>
                       {foreach from=$regSettings.fieldData.reg_bill_info_req_merchant_call.bitmap item=v}
-                            <input type="checkbox" name="reg_bill_info_req_merchant_call[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}> {$v.name}<br>
+                            <input type="checkbox" name="reg_bill_info_req_merchant_call[{$v.value}]" value="{$v.value}"{if $v.default} checked{/if}>{$v.name}
                       {/foreach}                    
                             {if $regSettings.fieldFail.reg_bill_info_req_merchant_call}<p>{$regSettings.fieldFail.reg_bill_info_req_merchant_call}</p>{/if}
                         </td>
diff --git a/views/admin/management/regterms.html b/views/admin/management/regterms.html
index 17c6f1c..46ac7cb 100644
--- a/views/admin/management/regterms.html
+++ b/views/admin/management/regterms.html
@@ -1,15 +1,16 @@
+{include file='admin/management/header.html'}
 <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
     
     <input type="hidden" name="glm_action" value="general">
     
     
     <a id="glm-settings" data-show-table="glm-table-general" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=registrations"
-       class="glm-settings-tab nav-tab{if $option=='registrations'} nav-tab-active{/if}">
+       class="glm-settings-tab nav-tab">
         General
     </a>
     
     <a id="glm-settings" data-show-table="glm-table-terms" href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=regterms"  
-       class="glm-settings-tab nav-tab{if $option=='regterms'  }{/if}">
+       class="glm-settings-tab nav-tab nav-tab-active">
         Terms
     </a>
     
-- 
2.17.1