UI element updates

Working with abide forms.

diff --git a/views/admin/billing/accountReveals.html b/views/admin/billing/accountReveals.html
index 201531b..265c461 100644 (file)
--- a/views/admin/billing/accountReveals.html
+++ b/views/admin/billing/accountReveals.html
@@ -94,23 +94,23 @@
                 });
 
                 // View Link
-                $('.view').on('click', function(e){
-                    e.preventDefault();
-                    var member      = $(this).data('member');
-                    var id          = $(this).data('id');
-                    var $modalVidew = $('#glmBillingView');
-                    $.ajax({
-                        url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=ajaxBillingInfo&option=view&member=' + member + '&id=' + id,
-                        cache: false,
-                        beforeSend: startAjax,
-                        complete: completeAjax,
-                    }).done(function(resp){
-                        $modalVidew.html(resp).foundation('open').trigger('resizeme.zp.reveal');
+                //$('.view').on('click', function(e){
+                    //e.preventDefault();
+                    //var member      = $(this).data('member');
+                    //var id          = $(this).data('id');
+                    //var $modalVidew = $('#glmBillingView');
+                    //$.ajax({
+                    //    url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=ajaxBillingInfo&option=view&member=' + member + '&id=' + id,
+                    //    cache: false,
+                    //    beforeSend: startAjax,
+                    //    complete: completeAjax,
+                    //}).done(function(resp){
+                    //    $modalVidew.html(resp).foundation('open').trigger('resizeme.zp.reveal');
 
-                    });
+                    //});
 
-                    return false;
-                });
+                    //return false;
+                //});
 
             });
             return false;

diff --git a/views/admin/billing/accounts.html b/views/admin/billing/accounts.html
index 08f9017..3f987e8 100644 (file)
--- a/views/admin/billing/accounts.html
+++ b/views/admin/billing/accounts.html
@@ -35,7 +35,7 @@
                 {foreach $accounts as $t}
                     <tr class="glm-account-row{if $t@iteration is div by 2} alternate{/if}" data-id="{$t.id}">
                         <td> {$t.id} </td>
-                        <td> <a class="account-link" id="account-ref-dest-{$t.id}" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}" target="_blank"><b>{$t.ref_name}</b></a> </td>
+                        <td> <b id="account-ref-dest-{$t.id}">{$t.ref_name}</b> </td>
                         {if $settings.allow_employees}
                             <td> {if $t.boss.value}Yes{/if} </td>
                         {/if}
@@ -46,7 +46,9 @@
                     <tr id="account-container-{$t.id}" class="hide-for-large glm-account-links {if $t@iteration is div by 2} alternate{/if}">
                         <td colspan="{if $settings.allow_employees}6{else}5{/if}">
                             <span class="account-dashboard-link">
-                                <a class="account-member-dashboard" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&member={$t.ref_dest}" target="_blank">Member Dashboard</a> |
+                                <a title="Opens in a new window" class="account-member-dashboard" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&member={$t.ref_dest}" target="_blank">
+                                    Member Dashboard
+                                </a> |
                             </span>
                             <span class="account-dashboard-link">
                                 <a class="account-member-statements" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}">View Statements</a> |
@@ -149,4 +151,4 @@
     {include file='admin/billing/accountReveals.html'}
 
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/billing.html b/views/admin/billing/billing.html
index 0f74edc..ebb8e05 100644 (file)
--- a/views/admin/billing/billing.html
+++ b/views/admin/billing/billing.html
@@ -16,4 +16,4 @@
         <tr><th>Number of Pending Invoices Listed: </th><td> replace me </td></tr>
     </table>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/createInvoice.html b/views/admin/billing/createInvoice.html
index 9ca5864..ddb9966 100644 (file)
--- a/views/admin/billing/createInvoice.html
+++ b/views/admin/billing/createInvoice.html
@@ -82,4 +82,4 @@
 </script>
 
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/editAccount.html b/views/admin/billing/editAccount.html
index 4f7a622..00fedbd 100644 (file)
--- a/views/admin/billing/editAccount.html
+++ b/views/admin/billing/editAccount.html
@@ -374,4 +374,4 @@ jQuery(document).ready(function($){
 });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html
index 96d3cf7..763c618 100644 (file)
--- a/views/admin/billing/editAccountAjax.html
+++ b/views/admin/billing/editAccountAjax.html
@@ -429,11 +429,9 @@ jQuery(document).ready(function($){
     var abide = new Foundation.Abide($('#billingInfoForm'));
     $(document)
     .on('invalid.zf.abide', function(ev,elem){
+        elem.focus().blur();
+        $('#billingInfoForm').foundation('addErrorClasses', elem);
         return false;
-        // console.log('elem: ', elem);
-        // $('#billingInfoForm').foundation('addErrorClasses', elem);
-        // $('#billingInfoForm').foundation('requiredCheck', elem);
-        // console.log( 'Field id '+ev.target.id+' is invalid' );
     })
     // .on('forminvalid.zf.abide', function(ev,frm){
     //     console.log( 'form id '+ev.target.id+' is invalid' );

diff --git a/views/admin/billing/editInvoice.html b/views/admin/billing/editInvoice.html
index 2318aa4..0987711 100644 (file)
--- a/views/admin/billing/editInvoice.html
+++ b/views/admin/billing/editInvoice.html
@@ -908,4 +908,4 @@ jQuery(document).ready(function($){
 });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/editInvoiceType.html b/views/admin/billing/editInvoiceType.html
index ba938d4..a1beb2a 100644 (file)
--- a/views/admin/billing/editInvoiceType.html
+++ b/views/admin/billing/editInvoiceType.html
@@ -38,8 +38,12 @@
     ]}
     {include file="ui/f6/callout.html"}
 
-    <form action="{$thisUrl}?page={$thisPage}&glm_action==invoiceTypes" method="post" enctype="multipart/form-data" data-abide novalidate>
+    <form action="{$thisUrl}?page={$thisPage}&glm_action==invoiceTypes" method="post" enctype="multipart/form-data" data-abide novalidate data-validate-on-blur="true">
+
+        {include file='ui/f6/errorCallout.html'}
+
         <input type="hidden" name="glm_action" value="invoiceTypes">
+
         {if isset($data.fieldData.id)}
             <input type="hidden" name="option" value="update">
             <input id="edit-id" type="hidden" name="id" value="{$data.fieldData.id}">
@@ -47,136 +51,136 @@
             <input type="hidden" name="option" value="addNew">
         {/if}
 
-            <div class="grid-x grid-margin-x">
-
-                <fieldset class="fieldset cell small-12 medium-6">
-                    <legend>Invoice Type</legend>
-
-                    <div class="grid-x grid-margin-x">
-
-                        {* Invoice Type Name *}
-                        {$ui = [
-                            'value'       => $data.fieldData.name,
-                            'field'       => 'name',
-                            'label'       => 'Invoice Type Name',
-                            'required'    => $data.fieldRequired.name,
-                            'errorText'   => 'Invoice Type Name is Required',
-                            'dataError'   => $data.fieldFail.name
-                        ]}
-                        {include file='ui/f6/text.html'}
-
-                        {* Parent *}
-                        {$ui = [
-                            'value'     => $data.fieldData.parent.value,
-                            'field'     => 'parent',
-                            'label'     => 'Parent',
-                            'list'      => $invoiceTypes,
-                            'l_label'   => 'name',
-                            'l_value'   => 'id',
-                            'l_blank'   => true,
-                            'required'  => $data.fieldRequired.parent,
-                            'errorText' => 'Parent is Required',
-                            'dataError' => $data.fieldFail.parent
-                        ]}
-                        {include file='ui/f6/select.html'}
-
-                        {* Member Type *}
-                        {$ui = [
-                            'value'     => $data.fieldData.member_type.value,
-                            'field'     => 'member_type',
-                            'label'     => 'Member Type',
-                            'list'      => $memberTypes,
-                            'l_label'   => 'name',
-                            'l_value'   => 'id',
-                            'l_blank'   => true,
-                            'required'  => $data.fieldRequired.member_type,
-                            'errorText' => 'Member Type is Required',
-                            'dataError' => $data.fieldFail.member_type
-                        ]}
-                        {include file='ui/f6/select.html'}
-
-                        {* Amount *}
-                        {$ui = [
-                            'value'       => $data.fieldData.amount,
-                            'field'       => 'amount',
-                            'label'       => 'Amount',
-                            'pattern'     => 'number',
-                            'required'    => $data.fieldRequired.amount,
-                            'errorText'   => 'Amount is Required',
-                            'dataError'   => $data.fieldFail.amount
-                        ]}
-                        {include file='ui/f6/text.html'}
-
-                        {* Dynamic Amount *}
-                        {$ui = [
-                            'value'     => $data.fieldData.dynamic_amount.value,
-                            'field'     => 'dynamic_amount',
-                            'label'     => 'Dynamic Amount',
-                            'required'  => $data.fieldRequired.dynamic_amount,
-                            'errortext' => 'Dynamic Amount is Required',
-                            'helpText'  => 'Ask for the amount on Invoice Form',
-                            'dataError' => $data.fieldFail.dynamic_amount
-                        ]}
-                        {include file='ui/f6/checkbox.html'}
-
-                        {* Recurring *}
-                        {$ui = [
-                            'value'     => $data.fieldData.recurring.value,
-                            'field'     => 'recurring',
-                            'label'     => 'Recurring',
-                            'required'  => $data.fieldRequired.recurring,
-                            'errortext' => 'Recurring is Required',
-                            'dataError' => $data.fieldFail.recurring
-                        ]}
-                        {include file='ui/f6/checkbox.html'}
-
-                        {* Recurrence *}
-                        {$ui = [
-                            'value'     => $data.fieldData.recurrence,
-                            'field'     => 'recurrence',
-                            'label'     => 'Recurrence',
-                            'list'      => $recurrenceTypes,
-                            'l_blank'   => true,
-                            'required'  => $data.fieldRequired.recurrence,
-                            'errorText' => 'Recurrence is Required',
-                            'dataError' => $data.fieldFail.recurrence
-                        ]}
-                        {include file='ui/f6/select.html'}
-
-
-                        {* Code *}
-                        {$ui = [
-                            'value'       => $data.fieldData.qcode,
-                            'field'       => 'qcode',
-                            'label'       => 'Code',
-                            'required'    => $data.fieldRequired.qcode,
-                            'errorText'   => 'Code is Required',
-                            'dataError'   => $data.fieldFail.qcode
-                        ]}
-                        {include file='ui/f6/text.html'}
-
-                        {* Category *}
-                        {$ui = [
-                            'value'       => $data.fieldData.category,
-                            'field'       => 'category',
-                            'label'       => 'Category',
-                            'required'    => $data.fieldRequired.category,
-                            'errorText'   => 'Category is Required',
-                            'dataError'   => $data.fieldFail.category
-                        ]}
-                        {include file='ui/f6/text.html'}
-
-                    </div>
-
-
-            </div>
+        <div class="grid-x grid-margin-x">
+
+            <fieldset class="fieldset cell small-12 medium-6">
+                <legend>Invoice Type</legend>
+
+                <div class="grid-x grid-margin-x">
+
+                    {* Invoice Type Name *}
+                    {$ui = [
+                        'value'       => $data.fieldData.name,
+                        'field'       => 'name',
+                        'label'       => 'Invoice Type Name',
+                        'required'    => $data.fieldRequired.name,
+                        'errorText'   => 'Invoice Type Name is Required',
+                        'dataError'   => $data.fieldFail.name
+                    ]}
+                    {include file='ui/f6/text.html'}
+
+                    {* Parent *}
+                    {$ui = [
+                        'value'     => $data.fieldData.parent.value,
+                        'field'     => 'parent',
+                        'label'     => 'Parent',
+                        'list'      => $invoiceTypes,
+                        'l_label'   => 'name',
+                        'l_value'   => 'id',
+                        'l_blank'   => true,
+                        'required'  => $data.fieldRequired.parent,
+                        'errorText' => 'Parent is Required',
+                        'dataError' => $data.fieldFail.parent
+                    ]}
+                    {include file='ui/f6/select.html'}
+
+                    {* Member Type *}
+                    {$ui = [
+                        'value'     => $data.fieldData.member_type.value,
+                        'field'     => 'member_type',
+                        'label'     => 'Member Type',
+                        'list'      => $memberTypes,
+                        'l_label'   => 'name',
+                        'l_value'   => 'id',
+                        'l_blank'   => true,
+                        'required'  => $data.fieldRequired.member_type,
+                        'errorText' => 'Member Type is Required',
+                        'dataError' => $data.fieldFail.member_type
+                    ]}
+                    {include file='ui/f6/select.html'}
+
+                    {* Amount *}
+                    {$ui = [
+                        'value'       => $data.fieldData.amount,
+                        'field'       => 'amount',
+                        'label'       => 'Amount',
+                        'pattern'     => 'number',
+                        'required'    => $data.fieldRequired.amount,
+                        'errorText'   => 'Amount is Required',
+                        'dataError'   => $data.fieldFail.amount
+                    ]}
+                    {include file='ui/f6/text.html'}
+
+                    {* Dynamic Amount *}
+                    {$ui = [
+                        'value'     => $data.fieldData.dynamic_amount.value,
+                        'field'     => 'dynamic_amount',
+                        'label'     => 'Dynamic Amount',
+                        'required'  => $data.fieldRequired.dynamic_amount,
+                        'errortext' => 'Dynamic Amount is Required',
+                        'helpText'  => 'Ask for the amount on Invoice Form',
+                        'dataError' => $data.fieldFail.dynamic_amount
+                    ]}
+                    {include file='ui/f6/checkbox.html'}
+
+                    {* Recurring *}
+                    {$ui = [
+                        'value'     => $data.fieldData.recurring.value,
+                        'field'     => 'recurring',
+                        'label'     => 'Recurring',
+                        'required'  => $data.fieldRequired.recurring,
+                        'errortext' => 'Recurring is Required',
+                        'dataError' => $data.fieldFail.recurring
+                    ]}
+                    {include file='ui/f6/checkbox.html'}
+
+                    {* Recurrence *}
+                    {$ui = [
+                        'value'     => $data.fieldData.recurrence,
+                        'field'     => 'recurrence',
+                        'label'     => 'Recurrence',
+                        'list'      => $recurrenceTypes,
+                        'l_blank'   => true,
+                        'required'  => $data.fieldRequired.recurrence,
+                        'errorText' => 'Recurrence is Required',
+                        'dataError' => $data.fieldFail.recurrence
+                    ]}
+                    {include file='ui/f6/select.html'}
+
+
+                    {* Code *}
+                    {$ui = [
+                        'value'       => $data.fieldData.qcode,
+                        'field'       => 'qcode',
+                        'label'       => 'Code',
+                        'required'    => $data.fieldRequired.qcode,
+                        'errorText'   => 'Code is Required',
+                        'dataError'   => $data.fieldFail.qcode
+                    ]}
+                    {include file='ui/f6/text.html'}
+
+                    {* Category *}
+                    {$ui = [
+                        'value'       => $data.fieldData.category,
+                        'field'       => 'category',
+                        'label'       => 'Category',
+                        'required'    => $data.fieldRequired.category,
+                        'errorText'   => 'Category is Required',
+                        'dataError'   => $data.fieldFail.category
+                    ]}
+                    {include file='ui/f6/text.html'}
+
+                </div>
+
+            </fieldset>
+
+        </div>
 
         <input class="button primary" type="submit" value="{if isset( $data.fieldData.id )}Update{else}Add{/if} Invoice Type">
 
+        {include file='ui/f6/errorCallout.html'}
+
     </form>
 </div>
 
-<script>
-</script>
-
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/editNotificationType.html b/views/admin/billing/editNotificationType.html
index f9ca292..e3e8c75 100644 (file)
--- a/views/admin/billing/editNotificationType.html
+++ b/views/admin/billing/editNotificationType.html
@@ -52,6 +52,8 @@
             <input type="hidden" name="option" value="insert">
         {/if}
 
+        {include file='ui/f6/errorCallout.html'}
+
         <div class="grid-container">
             <div class="grid-x grid-margin-x">
 
@@ -245,6 +247,8 @@
             </div>
         </div>
 
+        {include file='ui/f6/errorCallout.html'}
+
     </form>
 
 </div>
@@ -258,4 +262,4 @@ jQuery(document).ready(function($){
 });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/editPayment.html b/views/admin/billing/editPayment.html
index ac5727c..1382176 100644 (file)
--- a/views/admin/billing/editPayment.html
+++ b/views/admin/billing/editPayment.html
@@ -142,4 +142,4 @@
     </script>
 
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/footer.html b/views/admin/billing/footer.html
new file mode 100644 (file)
index 0000000..af8b3d4
--- /dev/null
+++ b/views/admin/billing/footer.html
@@ -0,0 +1,15 @@
+    </div> <!-- / admin content area -->
+    <div class="glm-copyright">
+        Billing<br>
+        Copyright &copy; 2014-{$thisYear} Gaslight Media - All Rights Reserved<br>
+        Phone: 231-487-0692 - E-Mail: plugins@gaslightmedia.com<br>
+        <a href="http://www.gaslightmedia.com">http://www.gaslightmedia.com</a>
+    </div>
+</div> <!-- / wrap -->
+
+<script>
+    jQuery(document).ready(function($){
+        $(document).foundation();
+    });
+</script>
+

diff --git a/views/admin/billing/header.html b/views/admin/billing/header.html
index 9a8d889..ce1df0a 100644 (file)
--- a/views/admin/billing/header.html
+++ b/views/admin/billing/header.html
@@ -35,11 +35,4 @@
         </li>
     </ul>
 
-    <script>
-    jQuery(document).ready(function($){
-        $(document).foundation();
-
-    });
-    </script>
-
     <div class="">

diff --git a/views/admin/billing/index.html b/views/admin/billing/index.html
index b023573..c4f3ec7 100644 (file)
--- a/views/admin/billing/index.html
+++ b/views/admin/billing/index.html
@@ -34,7 +34,7 @@
                 {if $list.number > 0}
                     {foreach $list.data.list as $t}
                         <tr class="glm-account-row{if $t@iteration is div by 2} alternate{/if}" data-id="{$t.id}">
-                            <td> <a class="account-link" id="account-ref-dest-{$t.id}" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}" target="_blank">{$t.ref_name}</a> </td>
+                            <td> <b id="account-ref-dest-{$t.id}">{$t.ref_name}</b> </td>
                             <td> {$t.email} </td>
                             <td> {$t.anniversary_date.date} </td>
                             <td> {$t.renewal_date.date} </td>
@@ -42,7 +42,7 @@
                         <tr id="account-container-{$t.id}" class="glm-account-links glm-hidden{if $t@iteration is div by 2} alternate{/if}">
                             <td colspan="4">
                                 <span class="account-dashboard-link">
-                                    <a class="account-member-dashboard" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&member={$t.ref_dest}" target="_blank">Member Dashboard</a> |
+                                    <a title="Opens in a new window" class="account-member-dashboard" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&member={$t.ref_dest}" target="_blank">Member Dashboard</a> |
                                 </span>
                                 <span class="account-dashboard-link">
                                     <a class="account-member-statements" data-member="{$t.ref_dest}" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}">View Statements</a> |
@@ -136,4 +136,4 @@
     {include file='admin/billing/accountReveals.html'}
 </div>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/invoiceTypes.html b/views/admin/billing/invoiceTypes.html
index 8103f55..f2c5c3b 100644 (file)
--- a/views/admin/billing/invoiceTypes.html
+++ b/views/admin/billing/invoiceTypes.html
@@ -100,4 +100,4 @@ jQuery(document).ready(function($) {
 });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/invoices.html b/views/admin/billing/invoices.html
index 055437c..240063a 100644 (file)
--- a/views/admin/billing/invoices.html
+++ b/views/admin/billing/invoices.html
@@ -57,6 +57,22 @@
         {if $paging}
             <input type="Submit" name="pageSelect" value="Previous {$limit} Invoices" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
             <input type="Submit" name="pageSelect" value="Next {$limit} Invoices" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
+            {*
+            <nav aria-label="Pagination">
+                <ul class="pagination">
+                    <li class="pagination-previous{if !$prevStart} disabled{/if}">
+                        {if $prevStart}<a href="#">{/if}
+                            Previous {$limit} Invoices
+                        {if $prevStart}</a>{/if}
+                    </li>
+                    <li class="pagination-next{if !$nextStart} disabled{/if}">
+                        {if $nextStart}<a href="#">{/if}
+                            Next {$limit} Invoices
+                        {if $nextStart}</a>{/if}
+                    </li>
+                  </ul>
+            </nav>
+            *}
         {/if}
             <br clear="all">
 
@@ -77,7 +93,7 @@
                     {foreach $invoices as $t}
                         <tr class="glm-invoice-row{if $t@iteration is div by 2} alternate{/if}" data-id="{$t.id}">
                             <td> {$t.id} </td>
-                            <td> <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.member_id}"><b>{$t.member_name}</b></a> </td>
+                            <td> <b>{$t.member_name}</b> </td>
                             <td>
                             {foreach $t.line_items as $item}
                                 {$item.name} {if $item.recurring && $item.recurrence_string}( {$item.recurrence_string} ){/if}
@@ -293,4 +309,4 @@
     </script>
 
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/invoicing.html b/views/admin/billing/invoicing.html
index 106c43a..ce16153 100644 (file)
--- a/views/admin/billing/invoicing.html
+++ b/views/admin/billing/invoicing.html
@@ -84,7 +84,7 @@
         </fieldset>
         <br clear="all">
         <br clear="all">
-        <p>Total found: {$totalAccounts}</p>
+        <p>Total found: <span class="label">{$totalAccounts}</span></p>
         {if $successMsg}<p><span class="glm-notice glm-flash-updated">{$successMsg}</span></p>{/if}
         {* Paging *}
         {if $paging}
@@ -108,8 +108,8 @@
                     {foreach $accounts as $t}
                         <tr>
                             <td>
-                                <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}">
-                                    {$t.member_name}
+                                <a title="Opens in a new window" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}" target="_blank">
+                                    <b>{$t.member_name}</b>
                                 </a>
                             </td>
                             {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled}
@@ -152,4 +152,4 @@
     });
     </script>
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/logs.html b/views/admin/billing/logs.html
index 659d38e..069979e 100644 (file)
--- a/views/admin/billing/logs.html
+++ b/views/admin/billing/logs.html
@@ -72,4 +72,4 @@
     });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/makePayment.html b/views/admin/billing/makePayment.html
index 05ec2ee..22bca49 100644 (file)
--- a/views/admin/billing/makePayment.html
+++ b/views/admin/billing/makePayment.html
@@ -134,4 +134,4 @@ jQuery(document).ready(function($){
 </script>
 
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/makePaymentAdjustment.html b/views/admin/billing/makePaymentAdjustment.html
index ba1fd22..4d703c3 100644 (file)
--- a/views/admin/billing/makePaymentAdjustment.html
+++ b/views/admin/billing/makePaymentAdjustment.html
@@ -137,5 +137,5 @@ jQuery(document).ready(function($){
 </script>
 
 {if !$adminAjaxPassthru}
-    {include file='admin/footer.html'}
+    {include file='admin/billing/footer.html'}
 {/if}

diff --git a/views/admin/billing/makePaymentAdjustmentAjax.html b/views/admin/billing/makePaymentAdjustmentAjax.html
index ab1a1e8..2c8e62d 100644 (file)
--- a/views/admin/billing/makePaymentAdjustmentAjax.html
+++ b/views/admin/billing/makePaymentAdjustmentAjax.html
@@ -1,11 +1,11 @@
 {* makePaymentAdjustment *}
 {* This Form is used for uptravel billing member payments *}
+<div id="billing-payment-form" class="glm-billing-form grid-container">
 
-<button class="close-button" data-close aria-label="Close" type="button">
-    <span aria-hidden="true">&times;</span>
-</button>
+    <button class="close-button" data-close aria-label="Close" type="button">
+        <span aria-hidden="true">&times;</span>
+    </button>
 
-<div id="billing-payment-form" class="glm-billing-form">
 
     {if $paymentSuccess}<span class="glm-notice glm-flash-updated">Payment Completed</span>{/if}
     {if $paymentError}<span class="glm-notice glm-flash-updated">Error With Payment</span>{/if}
@@ -17,7 +17,7 @@
     {/if}
 
     {if $invoices}
-        <form id="billingPaymentForm" action="{$ajaxUrl}?action=glm_members_admin_ajax" method="post" data-abide novalidate>
+        <form id="billingPaymentForm" action="{$ajaxUrl}?action=glm_members_admin_ajax" method="post" data-abide novalidate data-validate-on-blur="true">
             <input type="hidden" name="glm_action" value="ajaxBillingInfo" />
 
             <input type="hidden" name="page" value="{$thisPage}" />
@@ -27,11 +27,12 @@
             <input type="hidden" name="account_id" value="{$account.fieldData.id}" />
             <input type="hidden" name="amount" value="" id="total_amount" />
 
-            {include file='ui/f6/errorCallout.html'}
+            <fieldset class="fieldset grid-x grid-margin-x">
 
-            <div class="glm-billing-field">
-                <div class="glm-billing-label glm-required"> Select Invoice </div>
-                <div class="glm-billing-input">
+                {include file='ui/f6/errorCallout.html'}
+
+                <div class="cell small-12">
+                    <label> Select Invoice </label>
                     {if $invoices}
                         {foreach $invoices as $invoice}
                             <label>
@@ -41,22 +42,20 @@
                         {/foreach}
                     {/if}
                 </div>
-            </div>
-
-            {$ui = [
-                'value'       => '',
-                'field'       => 'amount',
-                'label'       => 'Amount',
-                'pattern'     => 'number',
-                'placeholder' => 'Amount',
-                'required'    => true,
-                'errorText'   => 'Amount is Required and must be Numeric'
-            ]}
-            {include file='ui/f6/text.html'}
-
-            <div class="glm-billing-field">
-                <div class="glm-billing-label glm-required"> Payment Method </div>
-                <div class="glm-billing-input">
+
+                {$ui = [
+                    'value'       => '',
+                    'field'       => 'amount',
+                    'label'       => 'Amount',
+                    'pattern'     => 'number',
+                    'placeholder' => 'Amount',
+                    'required'    => true,
+                    'errorText'   => 'Amount is Required and must be Numeric'
+                ]}
+                {include file='ui/f6/text.html'}
+
+                <div class="cell small-12">
+                    <label class="glm-required"> Payment Method </label>
                     <select name="payment_method" required>
                         <option value=""></option>
                         {foreach $paymentMethods as $value => $label}
@@ -64,28 +63,35 @@
                         {/foreach}
                     </select>
                 </div>
-            </div>
-
-            {$ui = [
-                'value'       => '',
-                'field'       => 'payment_data',
-                'label'       => 'Payment Details',
-                'placeholder' => 'Payment Details',
-                'required'    => false,
-                'errorText'   => 'Payment Details is Required'
-            ]}
-            {include file='ui/f6/text.html'}
-
-            <div class="glm-billing-field">
-                <div class="glm-billing-label"> Comment </div>
-                <div class="glm-billing-input">
+
+                {$ui = [
+                    'value'       => '',
+                    'field'       => 'payment_data',
+                    'label'       => 'Payment Details',
+                    'placeholder' => 'Payment Details',
+                    'required'    => false,
+                    'errorText'   => 'Payment Details is Required'
+                ]}
+                {include file='ui/f6/text.html'}
+
+                <div class="cell small-12">
+                    <label> Comment </label>
                     <textarea name="notes" style="height: 50px;"></textarea>
                 </div>
-            </div>
 
-            <input class="button button-primary" type="submit" value="Make Payment">
+                <div class="cell small-6">
+                    <input class="button button-primary" type="submit" style="margin-top: 0;" value="Make Payment">
+                </div>
+
+                <div class="cell small-6">
+                    <button class="button button-secondary float-right" data-close aria-label="Cancel" type="button">
+                        <span>Cancel</span>
+                    </button>
+                </div>
+
+                {include file='ui/f6/errorCallout.html'}
 
-            {include file='ui/f6/errorCallout.html'}
+            </fieldset>
 
         </form>
     {else}

diff --git a/views/admin/billing/makePaymentAjax.html b/views/admin/billing/makePaymentAjax.html
index 2f74251..8819000 100644 (file)
--- a/views/admin/billing/makePaymentAjax.html
+++ b/views/admin/billing/makePaymentAjax.html
@@ -29,44 +29,49 @@
         {include file='ui/f6/errorCallout.html'}
             <!-- Call for billing section -->
 
-            {if $invoices}
-                <h2>Payment Information</h2>
-
-                <div class="glm-billing-field">
-                    <div class="glm-billing-label glm-required"> Select Invoice </div>
-                    <div class="glm-billing-input">
-                        {if $invoices}
-                            {foreach $invoices as $invoice}
-                                <label>
-                                    <input type="checkbox" name="invoices[]" data-amount="{$invoice.balance}" value="{$invoice.id}" checked />
-                                    {foreach $invoice.line_items as $line_items}
-                                        {$line_items.name}
-                                    {/foreach}
-                                    ${$invoice.balance} Due {$invoice.due_date.date}
-                                </label>
-                            {/foreach}
-                        {/if}
-                    </div>
+        {if $invoices}
+            <h2>Payment Information</h2>
+
+            <div class="glm-billing-field">
+                <div class="glm-billing-label glm-required"> Select Invoice </div>
+                <div class="glm-billing-input">
+                    {if $invoices}
+                        {foreach $invoices as $invoice}
+                            <label>
+                                <input type="checkbox" name="invoices[]" data-amount="{$invoice.balance}" value="{$invoice.id}" checked />
+                                {foreach $invoice.line_items as $line_items}
+                                    {$line_items.name}
+                                {/foreach}
+                                ${$invoice.balance} Due {$invoice.due_date.date}
+                            </label>
+                        {/foreach}
+                    {/if}
                 </div>
+            </div>
 
-                <div class="glm-billing-field">
-                    <div class="glm-billing-label glm-required"> Amount </div>
-                    <div class="glm-billing-input">
-                        <div id="total_amount_display"></div>
-                    </div>
+            <div class="glm-billing-field">
+                <div class="glm-billing-label glm-required"> Amount </div>
+                <div class="glm-billing-input">
+                    <div id="total_amount_display"></div>
                 </div>
+            </div>
 
-        {* Include the Payment Form template *}
-        {* Only if payments types are setup *}
-        {include file='common/billing/paymentForm.html'}
+            {* Include the Payment Form template *}
+            {* Only if payments types are setup *}
+            {include file='common/billing/paymentForm.html'}
 
-        <input class="button button-primary" type="submit" value="Make Payment" {if $billing_settings.proc_methods == 4} onclick="onGetCardNonce(event)"{/if}>
+            <input class="button button-primary" type="submit" value="Make Payment" {if $billing_settings.proc_methods == 4} onclick="onGetCardNonce(event)"{/if}>
 
-        {include file='ui/f6/errorCallout.html'}
+            <button class="button glm-right" data-close aria-label="Cancel" type="button">
+                <span>Cancel</span>
+            </button>
+
+
+            {include file='ui/f6/errorCallout.html'}
 
-            {else}
+        {else}
             You don't have any unpaid invoices!
-            {/if}
+        {/if}
 
     </form>
 </div>

diff --git a/views/admin/billing/notifications.html b/views/admin/billing/notifications.html
index a4f9e44..3a4e6c8 100644 (file)
--- a/views/admin/billing/notifications.html
+++ b/views/admin/billing/notifications.html
@@ -89,4 +89,4 @@
     });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/paymentProcess.html b/views/admin/billing/paymentProcess.html
index c201286..6fd6f4e 100644 (file)
--- a/views/admin/billing/paymentProcess.html
+++ b/views/admin/billing/paymentProcess.html
@@ -18,4 +18,4 @@ jQuery(document).ready(function($){
 });
 </script>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/payments.html b/views/admin/billing/payments.html
index 1973e3c..b08d529 100644 (file)
--- a/views/admin/billing/payments.html
+++ b/views/admin/billing/payments.html
@@ -42,6 +42,7 @@
 
         <br clear="all">
 
+        <p>Total found: <span class="label">{$numbDisplayed}</span></p>
         {if $paging}
             <input type="Submit" name="pageSelect" value="Previous {$limit} Accounts" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
             <input type="Submit" name="pageSelect" value="Next {$limit} Accounts" class="button button-secondary glm-button"{if !$nextStart} disabled{/if}>
@@ -63,7 +64,7 @@
                     {assign var="i" value="0"}
                     {foreach $payments as $t}
                         <tr class="glm-payment-row{if $t@iteration is div by 2} alternate{/if}" data-id="{$t.id}">
-                            <td> <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.member_id}"><b>{$t.member_name}</b></a> </td>
+                            <td> <b>{$t.member_name}</b> </td>
                             <td> {$t.transaction_time.datetime} </td>
                             <td> {$t.amount|string_format:"%.2f"} </td>
                             <td> {$t.payment_method} </td>
@@ -137,4 +138,4 @@
     {include file='admin/billing/exportPaymentModal.html'}
 
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/renew.html b/views/admin/billing/renew.html
index ddc5424..639af39 100644 (file)
--- a/views/admin/billing/renew.html
+++ b/views/admin/billing/renew.html
@@ -262,4 +262,4 @@ jQuery(document).ready(function($){
 </script>
 
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/renewMembership.html b/views/admin/billing/renewMembership.html
index 62b146c..410dfb5 100644 (file)
--- a/views/admin/billing/renewMembership.html
+++ b/views/admin/billing/renewMembership.html
@@ -5,4 +5,4 @@
 {$message}<br>
 {/foreach}
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/reports.html b/views/admin/billing/reports.html
index afb81c0..81e8a9b 100644 (file)
--- a/views/admin/billing/reports.html
+++ b/views/admin/billing/reports.html
@@ -146,7 +146,7 @@
         {/if}
         <br clear="all">
         <br clear="all">
-        <p>Total found: {$totalAccounts}</p>
+        <p>Total found: <span class="label">{$totalAccounts}</span></p>
         {* Paging *}
         {if $paging}
             <input type="Submit" name="pageSelect" value="Previous {$limit} Reports" class="button button-secondary glm-button"{if !$prevStart} disabled{/if}>
@@ -155,7 +155,7 @@
         <br clear="all">
         {if isset( $accounts ) && !empty( $accounts )}
             <div id="account-list">
-                <table class="wp-list-table widefat fixed posts glm-admin-table">
+                <table class="stack glm-admin-table-inner">
                     <thead>
                         <tr>
                             <th> Member Name </th>
@@ -169,7 +169,7 @@
                     {foreach $accounts as $t}
                         <tr>
                             <td>
-                                <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}">
+                                <a title="Opens in a new window" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.ref_dest}" target="_blank">
                                     {$t.member_name}
                                 </a>
                             </td>
@@ -212,7 +212,7 @@
                                 {/if}
                             </td>
                             <td>
-                                <a href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.member_id}">
+                                <a title="Opens in a new window" href="{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$t.member_id}" target="_blank">
                                     {$t.member_name}
                                 </a>
                             </td>
@@ -291,4 +291,4 @@
     });
     </script>
 </div>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/settings.html b/views/admin/billing/settings.html
index 39b444a..5b3d56b 100644 (file)
--- a/views/admin/billing/settings.html
+++ b/views/admin/billing/settings.html
@@ -199,7 +199,7 @@
                                     'field'     => 'renewal_day_static',
                                     'label'     => 'All Members Renew same day each year',
                                     'required'  => $data.fieldRequired.renewal_day_static,
-                                    'errortext' => 'All Members Renew same day each year is Required',
+                                    'errorText' => 'All Members Renew same day each year is Required',
                                     'helpText'  => 'All Member renewal on the same day each billing period (yearly)',
                                     'dataError' => $data.fieldFail.renewal_day_static
                                 ]}
@@ -274,7 +274,7 @@
                                     'media'     => false,
                                     'quicktags' => false,
                                     'required'  => $data.fieldRequired.receipt_text,
-                                    'errortext' => 'Receipt Text is Required',
+                                    'errorText' => 'Receipt Text is Required',
                                     'dataError' => $data.fieldFail.receipt_text
                                 ]}
                                 {include file='ui/f6/editor.html'}
@@ -345,7 +345,7 @@
                                     'field'     => 'account_number_enabled',
                                     'label'     => 'Enable Account Number',
                                     'required'  => $data.fieldRequired.account_number_enabled,
-                                    'errortext' => 'Enable Account Number is Required',
+                                    'errorText' => 'Enable Account Number is Required',
                                     'dataError' => $data.fieldFail.account_number_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -356,7 +356,7 @@
                                     'field'     => 'account_number_required',
                                     'label'     => 'Require Account Number',
                                     'required'  => $data.fieldRequired.account_number_required,
-                                    'errortext' => 'Require Account Number is Required',
+                                    'errorText' => 'Require Account Number is Required',
                                     'dataError' => $data.fieldFail.account_number_required
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -367,7 +367,7 @@
                                     'field'     => 'invoice_show_account_number',
                                     'label'     => 'Show Account # On Invoices',
                                     'required'  => $data.fieldRequired.invoice_show_account_number,
-                                    'errortext' => 'Show Account # is Required',
+                                    'errorText' => 'Show Account # is Required',
                                     'dataError' => $data.fieldFail.invoice_show_account_number
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -378,7 +378,7 @@
                                     'field'     => 'invoice_show_invoice_number',
                                     'label'     => 'Show Invoice # On Invoices',
                                     'required'  => $data.fieldRequired.invoice_show_invoice_number,
-                                    'errortext' => 'Show Invoice # is Required',
+                                    'errorText' => 'Show Invoice # is Required',
                                     'dataError' => $data.fieldFail.invoice_show_invoice_number
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -389,7 +389,7 @@
                                     'field'     => 'allow_membership_choice',
                                     'label'     => 'Allow Membership Choice When Renewing',
                                     'required'  => $data.fieldRequired.allow_membership_choice,
-                                    'errortext' => 'Allow Membership Choice When Renewing is Required',
+                                    'errorText' => 'Allow Membership Choice When Renewing is Required',
                                     'dataError' => $data.fieldFail.allow_membership_choice
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -400,7 +400,7 @@
                                     'field'     => 'allow_employees',
                                     'label'     => 'Allow Employees',
                                     'required'  => $data.fieldRequired.allow_employees,
-                                    'errortext' => 'Allow Employees is Required',
+                                    'errorText' => 'Allow Employees is Required',
                                     'dataError' => $data.fieldFail.allow_employees
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -411,7 +411,7 @@
                                     'field'     => 'member_types_enabled',
                                     'label'     => 'Use Member Types in Invoice Types',
                                     'required'  => $data.fieldRequired.member_types_enabled,
-                                    'errortext' => 'Use Member Types in Invoice Types is Required',
+                                    'errorText' => 'Use Member Types in Invoice Types is Required',
                                     'dataError' => $data.fieldFail.member_types_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -422,7 +422,7 @@
                                     'field'     => 'quickbooks_enabled',
                                     'label'     => 'Enable Quickbooks',
                                     'required'  => $data.fieldRequired.quickbooks_enabled,
-                                    'errortext' => 'Enable Quickbooks is Required',
+                                    'errorText' => 'Enable Quickbooks is Required',
                                     'dataError' => $data.fieldFail.quickbooks_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -433,7 +433,7 @@
                                     'field'     => 'member_billing_enabled',
                                     'label'     => 'Enable Members Billing Tab',
                                     'required'  => $data.fieldRequired.member_billing_enabled,
-                                    'errortext' => 'Enable Members Billing Tab is Required',
+                                    'errorText' => 'Enable Members Billing Tab is Required',
                                     'dataError' => $data.fieldFail.member_billing_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -444,7 +444,7 @@
                                     'field'     => 'billing_fields_required',
                                     'label'     => 'Require Billing Fields',
                                     'required'  => $data.fieldRequired.billing_fields_required,
-                                    'errortext' => 'Require Billing Fields is Required',
+                                    'errorText' => 'Require Billing Fields is Required',
                                     'dataError' => $data.fieldFail.billing_fields_required
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -455,7 +455,7 @@
                                     'field'     => 'invoice_methods_enabled',
                                     'label'     => 'Enable Invoice Methods',
                                     'required'  => $data.fieldRequired.invoice_methods_enabled,
-                                    'errortext' => 'Enable Invoice Methods is Required',
+                                    'errorText' => 'Enable Invoice Methods is Required',
                                     'dataError' => $data.fieldFail.invoice_methods_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -466,7 +466,7 @@
                                     'field'     => 'billing_county_enabled',
                                     'label'     => 'Enable Billing Counties',
                                     'required'  => $data.fieldRequired.billing_county_enabled,
-                                    'errortext' => 'Enable Billing Counties is Required',
+                                    'errorText' => 'Enable Billing Counties is Required',
                                     'dataError' => $data.fieldFail.billing_county_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -477,7 +477,7 @@
                                     'field'     => 'billing_contact_name_enabled',
                                     'label'     => 'Enable Billing Contact Name',
                                     'required'  => $data.fieldRequired.billing_contact_name_enabled,
-                                    'errortext' => 'Enable Billing Contact Name is Required',
+                                    'errorText' => 'Enable Billing Contact Name is Required',
                                     'dataError' => $data.fieldFail.billing_contact_name_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -488,7 +488,7 @@
                                     'field'     => 'invoice_pdf_enabled',
                                     'label'     => 'Create PDF Invoices',
                                     'required'  => $data.fieldRequired.invoice_pdf_enabled,
-                                    'errortext' => 'Create PDF Invoices is Required',
+                                    'errorText' => 'Create PDF Invoices is Required',
                                     'dataError' => $data.fieldFail.invoice_pdf_enabled
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
@@ -524,4 +524,4 @@
         var settings = new Foundation.ResponsiveAccordionTabs( $('#glm-settings-tabs') );
     });
 </script>
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}

diff --git a/views/admin/billing/statements.html b/views/admin/billing/statements.html
index 1d744f1..be82b77 100644 (file)
--- a/views/admin/billing/statements.html
+++ b/views/admin/billing/statements.html
@@ -98,7 +98,7 @@
 
 <div id="glm-admin-billing-wrapper">
 
-    <table class="glm-admin-table wp-list-table striped">
+    <table class="{if !$adminAjaxPassthru}glm-admin-table wp-list-table striped{else}stack{/if}">
         <thead>
             <tr>
                 <th style="width:50px;">Invoice #</th>
@@ -146,7 +146,12 @@
                             {if isset( $settings.invoice_pdf_enabled ) && $settings.invoice_pdf_enabled}
                                 <a class="print" data-member="{$memberID}" href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=createPDFInvoice&id={$transaction.type_id}" target="_blank">Print</a>
                             {else}
-                                <a class="view" data-member="{$memberID}" data-id="{$transaction.type_id}" href="{$thisUrl}?page={$thisPage}&glm_action=billing&option=view&member={$memberID}&id={$transaction.type_id}">View</a>
+                                {if $adminAjaxPassthru}
+                                    {$viewUrl = "{$adminUrl}?page=glm-members-admin-menu-member&glm_action=billing&option=view&member={$memberID}&id={$transaction.type_id}"}
+                                {else}
+                                    {$viewUrl = "{$thisUrl}?page={$thisPage}&glm_action=billing&option=view&member={$memberID}&id={$transaction.type_id}"}
+                                {/if}
+                                <a class="view" title="Opens in a new window" data-member="{$memberID}" data-id="{$transaction.type_id}" href="{$viewUrl}"{if $adminAjaxPassthru} target="_blank"{/if}>View</a>
                             {/if}
                         </td>
                     </tr>
@@ -186,5 +191,5 @@
 
 </div>
 {if !$adminAjaxPassthru}
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}
 {/if}

diff --git a/views/admin/billing/viewInvoice.html b/views/admin/billing/viewInvoice.html
index 06f466c..07f01a0 100644 (file)
--- a/views/admin/billing/viewInvoice.html
+++ b/views/admin/billing/viewInvoice.html
@@ -45,5 +45,5 @@ jQuery(document).ready(function($) {
 });
 </script>
 {if !$adminAjaxPassthru}
-    {include file='admin/footer.html'}
+    {include file='admin/billing/footer.html'}
 {/if}

diff --git a/views/admin/billing/viewPayment.html b/views/admin/billing/viewPayment.html
index 55598d3..13231fa 100644 (file)
--- a/views/admin/billing/viewPayment.html
+++ b/views/admin/billing/viewPayment.html
@@ -27,4 +27,4 @@
     </tr>
 </table>
 
-{include file='admin/footer.html'}
+{include file='admin/billing/footer.html'}