Placed Billing fields back into the contact profile form

diff --git a/css/admin.css b/css/admin.css
index 1bb343f..155f3d0 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -120,6 +120,9 @@
     background: transparent;
     border: 0;
 }
+#glm-table-profile .glm-contact-sub-data-links > .glm-contact-content-toggle.selected {
+    box-shadow: none;
+}
 #glm-table-profile .glm-contact-sub-data-links .glm-contact-link-to-top {
     text-align: right;
 }

diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index 76f881e..04579a0 100644 (file)
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -758,7 +758,21 @@
                     </div>
                 </div>
             </div>
-
+            
+        {if apply_filters( 'glm-members-billing-enabled', false )}
+            <div id="glm-contact-billing-fields-toggle" class="glm-contact-content-toggle">
+                <h3>Billing Info</h3>
+            </div>
+            <div id="glm-contact-billing-fields-container" class="glm-admin-form-section glm-contact-content-data">
+                <div id="glm-contact-billing-fields">
+                    {apply_filters( 'glm-members-billing-contact-form', '', $contactInfo.fieldData.ref_dest )}
+                    <div class="glm-contact-sub-data-links glmgrid-row">
+                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
+                    </div>
+                </div>
+            </div>
+        {/if}
 
             <div id="glm-contact-custom-fields-toggle" class="glm-contact-content-toggle">
                 <h3>
@@ -807,57 +821,57 @@
                 </div>
             </div>
 
-                       <div id="glm-contact-removed-items-toggle" class="glm-contact-content-toggle glm-hidden">
-                                <h3>Removed Items</h3>
-                                <span><input type="checkbox" name="active" {if true} checked{/if}> Publish on front end</span>
-                                <span><input type="checkbox" name="active" {if false} checked{/if}> Use for Billing</span>
-                            </div>
-                            <div id="glm-contact-removed-items-container" class="glm-admin-form-section glm-contact-content-data glm-hidden">
-                                <div id="glm-contact-removed-items glm-hidden">
-                                    <table class="glm-admin-table glm-admin-table-inner">
-                                        <tr>
-                                            <th {if $contactInfo.fieldRequired.contact_type}class="glm-required"{/if}>Contact Type</th>
-                                            <td {if $contactInfo.fieldFail.contact_type}class="glm-form-bad-input"{/if}>
-                                                <select name="contact_type">
-                                    {foreach from=$contactInfo.fieldData.contact_type.list item=v}
-                                                    <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
-                                                        {$v.name}
-                                                    </option>
-                                    {/foreach}
-                                                </select>
-                                                {if $contactInfo.fieldFail.contact_type}<p>{$contactInfo.fieldFail.contact_type}</p>{/if}
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th {if $contactInfo.fieldRequired.county}class="glm-required"{/if}>County</th>
-                                            <td {if $contactInfo.fieldFail.county}class="glm-form-bad-input"{/if}>
-                                                <input id="county" type="text" name="county" value="{$contactInfo.fieldData.county}" class="glm-form-text-input-short">
-                                                {if $contactInfo.fieldFail.county}<p>{$contactInfo.fieldFail.county}</p>{/if}
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <th {if $contactInfo.fieldRequired.descr}class="glm-required"{/if}>Position/Responsibilities</th>
-                                            <td {if $contactInfo.fieldFail.descr}class="glm-form-bad-input"{/if}>
-                                                {php}
-                                                    wp_editor('{$contactInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
-                                                        'quicktags' => false,
-                                                        'media_buttons' => false,
-                                                        'wpautop' => false,
-                                                        'textarea_name' => 'descr',
-                                                        'editor_height' => 100,     // Height in px, overrides editor_rows
-                                                            // 'textarea_rows' => 4,
-                                                    ));
-                                                {/php}
-                                                {if $contactInfo.fieldFail.descr}<p>{$contactInfo.fieldFail.descr}</p>{/if}
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <div class="glm-contact-sub-data-links glmgrid-row">
-                                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
-                                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
-                                    </div>
-                                </div>
-                            </div>
+            <div id="glm-contact-removed-items-toggle" class="glm-contact-content-toggle glm-hidden">
+                <h3>Removed Items</h3>
+                <span><input type="checkbox" name="active" {if true} checked{/if}> Publish on front end</span>
+                <span><input type="checkbox" name="active" {if false} checked{/if}> Use for Billing</span>
+            </div>
+            <div id="glm-contact-removed-items-container" class="glm-admin-form-section glm-contact-content-data glm-hidden">
+                <div id="glm-contact-removed-items glm-hidden">
+                    <table class="glm-admin-table glm-admin-table-inner">
+                        <tr>
+                            <th {if $contactInfo.fieldRequired.contact_type}class="glm-required"{/if}>Contact Type</th>
+                            <td {if $contactInfo.fieldFail.contact_type}class="glm-form-bad-input"{/if}>
+                                <select name="contact_type">
+                    {foreach from=$contactInfo.fieldData.contact_type.list item=v}
+                                    <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
+                                        {$v.name}
+                                    </option>
+                    {/foreach}
+                                </select>
+                                {if $contactInfo.fieldFail.contact_type}<p>{$contactInfo.fieldFail.contact_type}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $contactInfo.fieldRequired.county}class="glm-required"{/if}>County</th>
+                            <td {if $contactInfo.fieldFail.county}class="glm-form-bad-input"{/if}>
+                                <input id="county" type="text" name="county" value="{$contactInfo.fieldData.county}" class="glm-form-text-input-short">
+                                {if $contactInfo.fieldFail.county}<p>{$contactInfo.fieldFail.county}</p>{/if}
+                            </td>
+                        </tr>
+                        <tr>
+                            <th {if $contactInfo.fieldRequired.descr}class="glm-required"{/if}>Position/Responsibilities</th>
+                            <td {if $contactInfo.fieldFail.descr}class="glm-form-bad-input"{/if}>
+                                {php}
+                                    wp_editor('{$contactInfo.fieldData.descr|escape:quotes}', 'glm_descr', array(
+                                        'quicktags' => false,
+                                        'media_buttons' => false,
+                                        'wpautop' => false,
+                                        'textarea_name' => 'descr',
+                                        'editor_height' => 100,     // Height in px, overrides editor_rows
+                                            // 'textarea_rows' => 4,
+                                    ));
+                                {/php}
+                                {if $contactInfo.fieldFail.descr}<p>{$contactInfo.fieldFail.descr}</p>{/if}
+                            </td>
+                        </tr>
+                    </table>
+                    <div class="glm-contact-sub-data-links glmgrid-row">
+                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
+                    </div>
+                </div>
+            </div>
 
         </div>
         <p><span class="glm-required">*</span> Required</p>