From: Steve Sutton Date: Tue, 16 Jul 2019 20:45:49 +0000 (-0400) Subject: UI element updates X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4ce5b216e139d58b87ee6adf7b5344e6f31d35aa;p=WP-Plugins%2Fglm-member-db-billing.git 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 --- 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 --- a/views/admin/billing/accounts.html +++ b/views/admin/billing/accounts.html @@ -35,7 +35,7 @@ {foreach $accounts as $t} {$t.id} - {$t.ref_name} + {$t.ref_name} {if $settings.allow_employees} {if $t.boss.value}Yes{/if} {/if} @@ -46,7 +46,9 @@ - | + | | @@ -149,4 +151,4 @@ {include file='admin/billing/accountReveals.html'} -{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 --- a/views/admin/billing/billing.html +++ b/views/admin/billing/billing.html @@ -16,4 +16,4 @@ Number of Pending Invoices Listed: replace me -{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 --- a/views/admin/billing/createInvoice.html +++ b/views/admin/billing/createInvoice.html @@ -82,4 +82,4 @@ -{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 --- a/views/admin/billing/editAccount.html +++ b/views/admin/billing/editAccount.html @@ -374,4 +374,4 @@ jQuery(document).ready(function($){ }); -{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 --- 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 --- a/views/admin/billing/editInvoice.html +++ b/views/admin/billing/editInvoice.html @@ -908,4 +908,4 @@ jQuery(document).ready(function($){ }); -{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 --- a/views/admin/billing/editInvoiceType.html +++ b/views/admin/billing/editInvoiceType.html @@ -38,8 +38,12 @@ ]} {include file="ui/f6/callout.html"} -
+ + + {include file='ui/f6/errorCallout.html'} + + {if isset($data.fieldData.id)} @@ -47,136 +51,136 @@ {/if} -
- -
- Invoice Type - -
- - {* 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'} - -
- - -
+
+ +
+ Invoice Type + +
+ + {* 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'} + +
+ +
+ +
+ {include file='ui/f6/errorCallout.html'} +
- - -{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 --- a/views/admin/billing/editNotificationType.html +++ b/views/admin/billing/editNotificationType.html @@ -52,6 +52,8 @@ {/if} + {include file='ui/f6/errorCallout.html'} +
@@ -245,6 +247,8 @@
+ {include file='ui/f6/errorCallout.html'} + @@ -258,4 +262,4 @@ jQuery(document).ready(function($){ }); -{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 --- a/views/admin/billing/editPayment.html +++ b/views/admin/billing/editPayment.html @@ -142,4 +142,4 @@ -{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 index 0000000..af8b3d4 --- /dev/null +++ b/views/admin/billing/footer.html @@ -0,0 +1,15 @@ + +
+ Billing
+ Copyright © 2014-{$thisYear} Gaslight Media - All Rights Reserved
+ Phone: 231-487-0692 - E-Mail: plugins@gaslightmedia.com
+ http://www.gaslightmedia.com +
+ + + + diff --git a/views/admin/billing/header.html b/views/admin/billing/header.html index 9a8d889..ce1df0a 100644 --- a/views/admin/billing/header.html +++ b/views/admin/billing/header.html @@ -35,11 +35,4 @@ - -
diff --git a/views/admin/billing/index.html b/views/admin/billing/index.html index b023573..c4f3ec7 100644 --- 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} - + {$t.ref_name} {$t.email} {$t.anniversary_date.date} {$t.renewal_date.date} @@ -42,7 +42,7 @@
-{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 --- a/views/admin/billing/invoiceTypes.html +++ b/views/admin/billing/invoiceTypes.html @@ -100,4 +100,4 @@ jQuery(document).ready(function($) { }); -{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 --- a/views/admin/billing/invoices.html +++ b/views/admin/billing/invoices.html @@ -57,6 +57,22 @@ {if $paging} + {* + + *} {/if}
@@ -77,7 +93,7 @@ {foreach $invoices as $t} {$t.id} - {$t.member_name} + {$t.member_name} {foreach $t.line_items as $item} {$item.name} {if $item.recurring && $item.recurrence_string}( {$item.recurrence_string} ){/if} @@ -293,4 +309,4 @@ -{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 --- a/views/admin/billing/invoicing.html +++ b/views/admin/billing/invoicing.html @@ -84,7 +84,7 @@

-

Total found: {$totalAccounts}

+

Total found: {$totalAccounts}

{if $successMsg}

{$successMsg}

{/if} {* Paging *} {if $paging} @@ -108,8 +108,8 @@ {foreach $accounts as $t} - - {$t.member_name} + + {$t.member_name} {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} @@ -152,4 +152,4 @@ }); -{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 --- a/views/admin/billing/logs.html +++ b/views/admin/billing/logs.html @@ -72,4 +72,4 @@ }); -{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 --- a/views/admin/billing/makePayment.html +++ b/views/admin/billing/makePayment.html @@ -134,4 +134,4 @@ jQuery(document).ready(function($){ -{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 --- a/views/admin/billing/makePaymentAdjustment.html +++ b/views/admin/billing/makePaymentAdjustment.html @@ -137,5 +137,5 @@ jQuery(document).ready(function($){ {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 --- 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 *} +
- + -
{if $paymentSuccess}Payment Completed{/if} {if $paymentError}Error With Payment{/if} @@ -17,7 +17,7 @@ {/if} {if $invoices} -
+ @@ -27,11 +27,12 @@ - {include file='ui/f6/errorCallout.html'} +
-
-
Select Invoice
-
+ {include file='ui/f6/errorCallout.html'} + +
+ {if $invoices} {foreach $invoices as $invoice}
-
- - {$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'} - -
-
Payment Method
-
+ + {$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'} + +
+
-
- - {$ui = [ - 'value' => '', - 'field' => 'payment_data', - 'label' => 'Payment Details', - 'placeholder' => 'Payment Details', - 'required' => false, - 'errorText' => 'Payment Details is Required' - ]} - {include file='ui/f6/text.html'} - -
-
Comment
-
+ + {$ui = [ + 'value' => '', + 'field' => 'payment_data', + 'label' => 'Payment Details', + 'placeholder' => 'Payment Details', + 'required' => false, + 'errorText' => 'Payment Details is Required' + ]} + {include file='ui/f6/text.html'} + +
+
-
- +
+ +
+ +
+ +
+ + {include file='ui/f6/errorCallout.html'} - {include file='ui/f6/errorCallout.html'} +
{else} diff --git a/views/admin/billing/makePaymentAjax.html b/views/admin/billing/makePaymentAjax.html index 2f74251..8819000 100644 --- a/views/admin/billing/makePaymentAjax.html +++ b/views/admin/billing/makePaymentAjax.html @@ -29,44 +29,49 @@ {include file='ui/f6/errorCallout.html'} - {if $invoices} -

Payment Information

- -
-
Select Invoice
-
- {if $invoices} - {foreach $invoices as $invoice} - - {/foreach} - {/if} -
+ {if $invoices} +

Payment Information

+ +
+
Select Invoice
+
+ {if $invoices} + {foreach $invoices as $invoice} + + {/foreach} + {/if}
+
-
-
Amount
-
-
-
+
+
Amount
+
+
+
- {* 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'} - + - {include file='ui/f6/errorCallout.html'} + + + + {include file='ui/f6/errorCallout.html'} - {else} + {else} You don't have any unpaid invoices! - {/if} + {/if}
diff --git a/views/admin/billing/notifications.html b/views/admin/billing/notifications.html index a4f9e44..3a4e6c8 100644 --- a/views/admin/billing/notifications.html +++ b/views/admin/billing/notifications.html @@ -89,4 +89,4 @@ }); -{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 --- a/views/admin/billing/paymentProcess.html +++ b/views/admin/billing/paymentProcess.html @@ -18,4 +18,4 @@ jQuery(document).ready(function($){ }); -{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 --- a/views/admin/billing/payments.html +++ b/views/admin/billing/payments.html @@ -42,6 +42,7 @@
+

Total found: {$numbDisplayed}

{if $paging} @@ -63,7 +64,7 @@ {assign var="i" value="0"} {foreach $payments as $t} - {$t.member_name} + {$t.member_name} {$t.transaction_time.datetime} {$t.amount|string_format:"%.2f"} {$t.payment_method} @@ -137,4 +138,4 @@ {include file='admin/billing/exportPaymentModal.html'}
-{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 --- a/views/admin/billing/renew.html +++ b/views/admin/billing/renew.html @@ -262,4 +262,4 @@ jQuery(document).ready(function($){ -{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 --- a/views/admin/billing/renewMembership.html +++ b/views/admin/billing/renewMembership.html @@ -5,4 +5,4 @@ {$message}
{/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 --- a/views/admin/billing/reports.html +++ b/views/admin/billing/reports.html @@ -146,7 +146,7 @@ {/if}

-

Total found: {$totalAccounts}

+

Total found: {$totalAccounts}

{* Paging *} {if $paging} @@ -155,7 +155,7 @@
{if isset( $accounts ) && !empty( $accounts )}
- +
@@ -169,7 +169,7 @@ {foreach $accounts as $t} @@ -212,7 +212,7 @@ {/if} @@ -291,4 +291,4 @@ }); -{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 --- 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') ); }); -{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 --- a/views/admin/billing/statements.html +++ b/views/admin/billing/statements.html @@ -98,7 +98,7 @@
-
Member Name
- + {$t.member_name} - + {$t.member_name}
+
@@ -146,7 +146,12 @@ {if isset( $settings.invoice_pdf_enabled ) && $settings.invoice_pdf_enabled} Print {else} - View + {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} + View {/if} @@ -186,5 +191,5 @@ {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 --- a/views/admin/billing/viewInvoice.html +++ b/views/admin/billing/viewInvoice.html @@ -45,5 +45,5 @@ jQuery(document).ready(function($) { }); {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 --- a/views/admin/billing/viewPayment.html +++ b/views/admin/billing/viewPayment.html @@ -27,4 +27,4 @@
Invoice #
-{include file='admin/footer.html'} +{include file='admin/billing/footer.html'}