From 123899665dbd0ef8fba1214d217ae3c721ff904d Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 2 Jul 2019 17:12:00 -0400 Subject: [PATCH] Redo Billing Admin with Foindation 6 Converting the forms to use x-y grid. Setting up tables with stack class. Start the Billing Setting within a reveal. Replacing the main navigation from our glm-associate nav to Foundation 6 menu. --- classes/data/dataAccounts.php | 2 +- models/admin/ajax/ajaxBillingInfo.php | 2 +- models/admin/ajax/ajaxBillingSettings.php | 78 +++ models/admin/billing/index.php | 4 + models/admin/billing/invoices.php | 4 + models/admin/billing/invoicing.php | 4 + models/admin/billing/logs.php | 4 + models/admin/billing/payments.php | 7 +- models/admin/billing/reports.php | 4 + models/admin/member/billing.php | 32 +- models/admin/settings/billing.php | 12 +- setup/validActions.php | 1 + views/admin/billing/accountSearchForm.html | 65 +-- views/admin/billing/accounts.html | 320 ++++++------ views/admin/billing/editAccountAjax.html | 306 +++++++----- views/admin/billing/editInvoice.html | 456 ++++++++---------- views/admin/billing/editPayment.html | 243 +++++----- views/admin/billing/exportBillingModal.html | 2 +- views/admin/billing/exportPaymentModal.html | 2 +- views/admin/billing/exportReportModal.html | 2 +- views/admin/billing/header.html | 72 ++- views/admin/billing/index.html | 134 ++--- views/admin/billing/invoices.html | 399 +++++++-------- views/admin/billing/invoicing.html | 273 ++++++----- views/admin/billing/invoicingSubHeader.html | 20 +- .../billing/makePaymentAdjustmentAjax.html | 188 ++++++++ views/admin/billing/makePaymentAjax.html | 187 +++++++ views/admin/billing/payments.html | 160 +++--- views/admin/billing/reports.html | 395 +++++++-------- views/admin/billing/reportsSubHeader.html | 28 +- views/admin/billing/subHeader.html | 17 +- views/admin/settings/billingAjax.html | 23 + 32 files changed, 2068 insertions(+), 1378 deletions(-) create mode 100644 models/admin/ajax/ajaxBillingSettings.php create mode 100644 views/admin/billing/makePaymentAdjustmentAjax.html create mode 100644 views/admin/billing/makePaymentAjax.html create mode 100644 views/admin/settings/billingAjax.html diff --git a/classes/data/dataAccounts.php b/classes/data/dataAccounts.php index 56d34e3..00e7292 100644 --- a/classes/data/dataAccounts.php +++ b/classes/data/dataAccounts.php @@ -216,7 +216,7 @@ class GlmDataAccounts extends GlmDataAbstract 'field' => 'invoice_type', 'type' => 'integer', 'use' => 'a', - 'required' => false, + 'required' => true, ), // Anniversary Date diff --git a/models/admin/ajax/ajaxBillingInfo.php b/models/admin/ajax/ajaxBillingInfo.php index 5675a53..c03964b 100644 --- a/models/admin/ajax/ajaxBillingInfo.php +++ b/models/admin/ajax/ajaxBillingInfo.php @@ -61,7 +61,7 @@ class GlmMembersAdmin_ajax_ajaxBillingInfo extends GlmMembersAdmin_member_billin public $ajaxSide = true; - public function __construct ($wpdb, $config) + public function __construct ( $wpdb, $config ) { // Save WordPress Database object diff --git a/models/admin/ajax/ajaxBillingSettings.php b/models/admin/ajax/ajaxBillingSettings.php new file mode 100644 index 0000000..2f3b73a --- /dev/null +++ b/models/admin/ajax/ajaxBillingSettings.php @@ -0,0 +1,78 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @version 0.1 + */ + +require_once GLM_MEMBERS_BILLING_PLUGIN_PATH . '/models/admin/settings/billing.php'; + +/** + * Steve Note + * + * You can get to this using the following URL. + * + * + {host}/wp-admin/admin-ajax.php?action=glm_members_admin_ajax&glm_action=runQueue + * + * You should be able to do this as POST or GET and should be able to add and read additional parameters. + * I added a "mystuff" parameter to the URL above and it does output from the code in the + * modelAction() function below. + * + * To add another model under models/admin/ajax all you need to do is create it and add it to the + * setup/validActions.php file. + * + */ + +/** + * This class handles the work of creating new invoices based on. + * 1) Member Type of member matching a paid invoiceType + * 2) Member renewal date past + * 3) Member has Billing Account + * 4) Member has no active Invoice + * 5) Renewal date is within the next 30 Days + * + */ +class GlmMembersAdmin_ajax_ajaxBillingSettings extends GlmMembersAdmin_settings_billing +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * Plugin Configuration Data + * + * @var $config + * @access public + */ + public $config; + + public $ajaxSide = true; + + public function __construct ( $wpdb, $config ) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + parent::__construct( $this->wpdb, $this->config ); + } + + +} diff --git a/models/admin/billing/index.php b/models/admin/billing/index.php index 547b317..87ae51e 100644 --- a/models/admin/billing/index.php +++ b/models/admin/billing/index.php @@ -138,6 +138,10 @@ class GlmMembersAdmin_billing_index extends GlmDataAccounts $lockedWhereT = 'true'; $lockedWhere = 'true'; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Check if there's a logged in user who is locked to their own entity $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); if ($lockedToMember) { diff --git a/models/admin/billing/invoices.php b/models/admin/billing/invoices.php index 7ec9ff7..7762b00 100644 --- a/models/admin/billing/invoices.php +++ b/models/admin/billing/invoices.php @@ -136,6 +136,10 @@ class GlmMembersAdmin_billing_invoices extends GlmDataInvoices $paymentTypes = false; $invoiceSent = false; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Get any provided option if (isset($_REQUEST['option'])) { $option = $_REQUEST['option']; diff --git a/models/admin/billing/invoicing.php b/models/admin/billing/invoicing.php index c0a296c..d44c0be 100644 --- a/models/admin/billing/invoicing.php +++ b/models/admin/billing/invoicing.php @@ -107,6 +107,10 @@ class GlmMembersAdmin_billing_invoicing //extends GlmDataAccounts $successMsg = false; $notification_types = false; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Get any provided option if ( isset( $_REQUEST['option'] ) ) { $option = $_REQUEST['option']; diff --git a/models/admin/billing/logs.php b/models/admin/billing/logs.php index 8263f93..e7a8805 100644 --- a/models/admin/billing/logs.php +++ b/models/admin/billing/logs.php @@ -101,6 +101,10 @@ class GlmMembersAdmin_billing_logs extends GlmDataNotifications $emailSent = false; $emailSentError = false; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Get any provided option if (isset($_REQUEST['option'])) { $option = $_REQUEST['option']; diff --git a/models/admin/billing/payments.php b/models/admin/billing/payments.php index 9a6041b..1edf13d 100644 --- a/models/admin/billing/payments.php +++ b/models/admin/billing/payments.php @@ -119,6 +119,10 @@ class GlmMembersAdmin_billing_payments extends GlmDataPayments $filterAccounts = false; $searchName = false; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Get any provided option if (isset($_REQUEST['option'])) { $option = $_REQUEST['option']; @@ -209,8 +213,7 @@ class GlmMembersAdmin_billing_payments extends GlmDataPayments case 'delete': $payment_id = filter_var( $_REQUEST['payment_id'], FILTER_VALIDATE_INT ); $BillingSupport = new GlmBillingSupport( $this->wpdb, $this->config ); - // Need to remove any line items for the payments alse - // echo '
$_REQUEST: ' . print_r( $_REQUEST, true ) . '
'; + // Need to remove any line items for the payments also $payments = $BillingSupport->removePaymentById( $payment_id ); if ($payments) { diff --git a/models/admin/billing/reports.php b/models/admin/billing/reports.php index 3487fb4..fb4bcca 100644 --- a/models/admin/billing/reports.php +++ b/models/admin/billing/reports.php @@ -113,6 +113,10 @@ class GlmMembersAdmin_billing_reports extends GlmDataTransactions $totalInvoices = 0; $totalPayments = 0; + // Enqueue GLMA Foundation + wp_enqueue_style( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/css/foundation-6.min.css' ); + wp_enqueue_script( 'Foundation6', GLM_MEMBERS_PLUGIN_URL . '/js/foundation-6.min.js' ); + // Get any provided option if ( isset( $_REQUEST['option'] ) ) { $option = $_REQUEST['option']; diff --git a/models/admin/member/billing.php b/models/admin/member/billing.php index 6b1d3f7..da3772d 100644 --- a/models/admin/member/billing.php +++ b/models/admin/member/billing.php @@ -72,7 +72,7 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling * * @return array Array containing status, suggested view, and any data */ - public function __construct ($wpdb, $config) + public function __construct ( $wpdb, $config ) { // Save WordPress Database object @@ -800,13 +800,10 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling case 'createPayment': - // echo '
$_REQUEST: ' . print_r( $_REQUEST, true ) . '
'; - $view = 'paymentProcess'; // if error - // $messages = '
'.print_r( $_REQUEST, true ).'
'; $account_id = filter_var( $_REQUEST['account_id'], FILTER_VALIDATE_INT ); $invoices = filter_var( $_REQUEST['invoices'], FILTER_VALIDATE_INT, array( 'flags' => FILTER_REQUIRE_ARRAY ) ); $amount = filter_var( $_REQUEST['amount'], FILTER_VALIDATE_FLOAT ); @@ -866,6 +863,11 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling } else { $paymentSuccess = true; } + if ( $this->ajaxSide ) { + header( 'Content-type:application/json;charset=utf-8', true ); + echo json_encode( $errors, true ); + exit; + } break; case 'pay_by_check': @@ -931,12 +933,18 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling // Set the file name for the view file. $view = 'makePayment'; + if ( $this->ajaxSide ) { + $view = 'makePaymentAjax'; + } break; case 'makepaymentadjustment': $view = 'makePaymentAdjustment'; + if ( $this->ajaxSide ) { + $view = 'makePaymentAdjustmentAjax'; + } // Get unpaid invoices $invoices = $BillingSupport->getUnPaidInvoicesByAccount( $accountID ); @@ -956,10 +964,20 @@ class GlmMembersAdmin_member_billing // extends GlmDataBilling if ( $account_id && $amount && $payment_method && !empty( $invoices ) ) { // Create new payment. - $payment_id = $BillingSupport->createPayment( $account_id, $amount, $this->config['alt_payment_method'][$payment_method], $payment_data ); + $payment_id = $BillingSupport->createPayment( $account_id, $amount, $payment_method, $payment_data ); - // Record the payment. - $BillingSupport->recordPayment( $payment_id, $account_id, $amount, $invoices, $this->config['transaction_numb']['Adjustment'] ); + if ( $payment_id ) { + // Record the payment. + $BillingSupport->recordPayment( $payment_id, $account_id, $amount, $invoices, $this->config['transaction_numb']['Payment'] ); + } + } else { + $payment_id = false; + } + if ( $this->ajaxSide ) { + header( 'Content-type:application/json;charset=utf-8', true ); + // echo json_encode( $_REQUEST, true ); + echo json_encode( $payment_id, true ); + exit; } break; diff --git a/models/admin/settings/billing.php b/models/admin/settings/billing.php index 1c3d1b6..519c64b 100644 --- a/models/admin/settings/billing.php +++ b/models/admin/settings/billing.php @@ -53,6 +53,7 @@ class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings */ public $settings = array(); + public $ajaxSide = false; /** * Constructor * @@ -78,7 +79,7 @@ class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings * * @return array Array containing status, suggested view, and any data */ - public function __construct ($wpdb, $config) + public function __construct ( $wpdb, $config ) { // Save WordPress Database object @@ -88,7 +89,7 @@ class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings $this->config = $config; // Run constructor for members data class - parent::__construct(false, false); + parent::__construct( $this->wpdb, $this->config ); } @@ -202,6 +203,11 @@ class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings $member_types_free_selected = array(); } + $view = 'billing'; + if ( $this->ajaxSide ) { + $view = 'billingAjax'; + } + // Compile template data $template_data = array( 'action' => $_REQUEST['glm_action'], @@ -222,7 +228,7 @@ class GlmMembersAdmin_settings_billing extends GlmDataBillingSettings 'status' => true, 'menuItemRedirect' => false, 'modelRedirect' => false, - 'view' => 'admin/settings/billing.html', + 'view' => 'admin/settings/' . $view . '.html', 'data' => $template_data ); diff --git a/setup/validActions.php b/setup/validActions.php index 4e9d895..bcb70b4 100644 --- a/setup/validActions.php +++ b/setup/validActions.php @@ -77,6 +77,7 @@ $glmMembersBillingAddOnValidActions = array( 'billingFlagExpiredUsers' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, 'billingFixActiveUsers' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, 'ajaxBillingInfo' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, + 'ajaxBillingSettings' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, ), 'management' => array( 'billing' => GLM_MEMBERS_BILLING_PLUGIN_SLUG, diff --git a/views/admin/billing/accountSearchForm.html b/views/admin/billing/accountSearchForm.html index 2d8ba41..2023884 100644 --- a/views/admin/billing/accountSearchForm.html +++ b/views/admin/billing/accountSearchForm.html @@ -83,33 +83,40 @@ jQuery(document).ready(function($) { -
-
- - - - +
+ Search Accounts +
+
+
+ + + +
+
+ + +
+
+ + +
+
+ + + + +
+
+
+ +
-
- Member Account:  - - -
-
- - - - -
-
- -
-
+ diff --git a/views/admin/billing/accounts.html b/views/admin/billing/accounts.html index cf0ceac..bb14509 100644 --- a/views/admin/billing/accounts.html +++ b/views/admin/billing/accounts.html @@ -1,22 +1,24 @@ {include file='admin/billing/header.html'} -
Accounts Export
+
-

Accounts

+
Accounts Export
+ +

Accounts

{include file='admin/billing/accountSearchForm.html'} -
+
-

Total found: {$totalAccounts}

+

Total found: {$totalAccounts}

{if $paging} {/if} -
-
- +
+ +
@@ -42,7 +44,7 @@ - + {if $t.boss.value} - +
ID {$t.anniversary_date.date} {$t.renewal_date.date}
{foreach $t.employees as $emp} @@ -84,166 +84,188 @@ {/if}
-
-{if $paging} - - -{/if} - - + {if $paging} + + + {/if} -{include file='admin/billing/exportBillingModal.html'} + - + + + {* Reveal for Billing Info *} +
+
+ {* Reveal for Billing Info Success *} +
+

Billing Info Updated!

+ +
+ {* Reveal for Billing Statements *} +
+ +
+ {* Reveal for Billing Payments *} +
+
+ {* Reveal for Billing View Invoice *} +
+
+ {* Ajax Loading Graphic *} + -
-
-
-

Billing Info Updated!

- -
-
-
-
-
-
-
- - {include file='admin/footer.html'} diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html index f94fdb3..a74c7ab 100644 --- a/views/admin/billing/editAccountAjax.html +++ b/views/admin/billing/editAccountAjax.html @@ -13,7 +13,6 @@
- @@ -34,75 +33,97 @@ {/if} {if !$settings.account_number_enabled}{/if} - + {include file='ui/f6/errorCallout.html'}
Account Information {* Name *} - {$fieldData = [ - 'data' => $data, - 'field' => 'ref_name', - 'label' => 'Name' + {$ui = [ + 'value' => $data.fieldData.ref_name, + 'field' => 'ref_name', + 'label' => 'Name', + 'placeholder' => 'Name', + 'required' => $data.fieldRequired.ref_name, + 'errorText' => 'Name is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {if !$lockedToMember} {if $settings.account_number_enabled} {* Account Number *} - {$fieldData = [ - 'data' => $data, - 'field' => 'account_number', - 'label' => 'Account Number' + {$ui = [ + 'value' => $data.fieldData.account_number, + 'field' => 'account_number', + 'label' => 'Account Number', + 'placeholder' => 'Account Number', + 'required' => $data.fieldRequired.account_number, + 'errorText' => 'Account Number is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {/if} {if !$settings.member_types_enabled} {* Payment Type *} - {$fieldData = [ - 'data' => $data, - 'field' => 'invoice_type', - 'label' => 'Payment Type' + {$ui = [ + 'value' => $data.fieldData.invoice_type.value, + 'field' => 'invoice_type', + 'label' => 'Payment Type', + 'list' => $data.fieldData.invoice_type.list, + 'l_label' => 'name', + 'l_value' => 'value', + 'l_blank' => false, + 'required' => $data.fieldRequired.invoice_type, + 'errorText' => 'Payment Type is Required' ]} - {include file='admin/ui/f6-select.html'} + {include file='ui/f6/select.html'} {/if} {if $settings.invoice_methods_enabled} {* Payment Type *} - {$fieldData = [ - 'data' => $data, - 'field' => 'invoice_type', - 'fields' => ['email_invoice' => 'By Email','usmail_invoice' => 'By US Email','fax_invoice' => 'By Fax'], - 'label' => 'Invoice Delivery Methods' + {$ui = [ + 'value' => [ + 'email_invoice' => $data.fieldData.invoice_type.value, + 'usmail_invoice' => $data.fieldData.usmail_invoice.value, + 'fax_invoice' => $data.fieldData.fax_invoice.value + ], + 'field' => 'invoice_type', + 'list' => ['email_invoice' => 'By Email','usmail_invoice' => 'By US Email','fax_invoice' => 'By Fax'], + 'label' => 'Invoice Delivery Methods', + 'required' => false, + 'errorText' => 'At least one Invoice Delivery Method is Required' ]} - {include file='admin/ui/f6-multicheckboxes.html'} + {include file='ui/f6/multicheckboxes.html'} {/if} {* Anniversary Date *} - {$fieldData = [ - 'data' => $data, - 'field' => 'anniversary_date', - 'label' => 'Anniversary Date' + {$ui = [ + 'value' => $data.fieldData.anniversary_date.date, + 'field' => 'anniversary_date', + 'label' => 'Anniversary Date', + 'placeholder' => 'Anniversary Date', + 'required' => $data.fieldRequired.anniversary_date, + 'errorText' => 'Anniversary Date is Required' ]} - {include file='admin/ui/f6-date.html'} + {include file='ui/f6/text.html'} {* Renewal Date *} - {$fieldData = [ - 'data' => $data, - 'field' => 'renewal_date', - 'label' => 'Renewal Date' + {$ui = [ + 'value' => $data.fieldData.renewal_date, + 'field' => 'renewal_date', + 'label' => 'Renewal Date', + 'placeholder' => 'Renewal Date', + 'required' => $data.fieldRequired.renewal_date, + 'errorText' => 'Renewal Date is Required' ]} - {include file='admin/ui/f6-date.html'} + {include file='ui/f6/text.html'} {/if} @@ -145,143 +166,191 @@ {* Billing Email *} {$ui = [ - 'value' => $data.fieldData.$field, + 'value' => $data.fieldData.email, 'field' => 'email', 'label' => 'Billing Email', - 'placeholder' => 'Email Address', + 'placeholder' => 'Billing Email', 'required' => $data.fieldRequired.email, - 'errorText' => 'Email Address is Required' + 'errorText' => 'Billing Email is Required' ]} {include file='ui/f6/text.html'} {* Billing Company *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_company', - 'label' => 'Billing Company', - 'required' => $data.fieldRequired.billing_company, - 'errorText' => 'Billing Company is Required' + {$ui = [ + 'value' => $data.fieldData.billing_company, + 'field' => 'billing_company', + 'label' => 'Billing Company', + 'placeholder' => 'Billing Company', + 'required' => $data.fieldRequired.billing_company, + 'errorText' => 'Billing Company is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Position *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_position', - 'label' => 'Billing Position' + {$ui = [ + 'value' => $data.fieldData.billing_position, + 'field' => 'billing_position', + 'label' => 'Billing Position', + 'placeholder' => 'Billing Position', + 'required' => $data.fieldRequired.billing_position, + 'errorText' => 'Billing Position is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {if $settings.billing_contact_name_enabled} {* Billing Contact Name *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_contact_name', - 'label' => 'Billing Contact Name' + {$ui = [ + 'value' => $data.fieldData.billing_contact_name, + 'field' => 'billing_contact_name', + 'label' => 'Billing Contact Name', + 'placeholder' => 'Billing Contact Name', + 'required' => $data.fieldRequired.billing_contact_name, + 'errorText' => 'Billing Contact Name is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {else} {* Billing First Name *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_fname', - 'label' => 'Billing First Name' + {$ui = [ + 'value' => $data.fieldData.billing_fname, + 'field' => 'billing_fname', + 'label' => 'Billing First Name', + 'placeholder' => 'Billing First Name', + 'required' => $data.fieldRequired.billing_fname, + 'errorText' => 'Billing First Name is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Last Name *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_lname', - 'label' => 'Billing Last Name' + {$ui = [ + 'value' => $data.fieldData.billing_lname, + 'field' => 'billing_lname', + 'label' => 'Billing Last Name', + 'placeholder' => 'Billing Last Name', + 'required' => $data.fieldRequired.billing_lname, + 'errorText' => 'Billing Last Name is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {/if} {* Billing Address 1 *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_addr1', - 'label' => 'Billing Address 1' + {$ui = [ + 'value' => $data.fieldData.billing_addr1, + 'field' => 'billing_addr1', + 'label' => 'Billing Address 1', + 'placeholder' => 'Billing Address 1', + 'required' => $data.fieldRequired.billing_addr1, + 'errorText' => 'Billing Address 1 is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Address 2 *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_addr2', - 'label' => 'Billing Address 2' + {$ui = [ + 'value' => $data.fieldData.billing_addr2, + 'field' => 'billing_addr2', + 'label' => 'Billing Address 2', + 'placeholder' => 'Billing Address 2', + 'required' => $data.fieldRequired.billing_addr2, + 'errorText' => 'Billing Address 2 is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing City *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_city', - 'label' => 'Billing City' + {$ui = [ + 'value' => $data.fieldData.billing_city, + 'field' => 'billing_city', + 'label' => 'Billing City', + 'placeholder' => 'Billing City', + 'required' => $data.fieldRequired.billing_city, + 'errorText' => 'Billing City is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {if $settings.billing_county_enabled} {* Billing County *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_county', - 'label' => 'Billing County' + {$ui = [ + 'value' => $data.fieldData.billing_county.value, + 'field' => 'billing_county', + 'label' => 'Billing County', + 'list' => $data.fieldData.billing_county.list, + 'l_label' => 'name', + 'l_value' => 'value', + 'l_blank' => false, + 'required' => $data.fieldRequired.billing_county, + 'errorText' => 'Billing County is Required' ]} - {include file='admin/ui/f6-select.html'} + {include file='ui/f6/select.html'} {else} {/if} {* Billing State *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_state', - 'label' => 'Billing State' + {$ui = [ + 'value' => $data.fieldData.billing_state.value, + 'field' => 'billing_state', + 'label' => 'Billing State', + 'list' => $data.fieldData.billing_state.list, + 'l_label' => 'name', + 'l_value' => 'value', + 'l_blank' => false, + 'required' => $data.fieldRequired.billing_state, + 'errorText' => 'Billing State is Required' ]} - {include file='admin/ui/f6-select.html'} + {include file='ui/f6/select.html'} {* Billing Zip *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_zip', - 'label' => 'Billing Zip' + {$ui = [ + 'value' => $data.fieldData.billing_zip, + 'field' => 'billing_zip', + 'label' => 'Billing Zip', + 'placeholder' => 'Billing Zip', + 'required' => $data.fieldRequired.billing_zip, + 'errorText' => 'Billing Zip is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Country *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_country', - 'label' => 'Billing Country' + {$ui = [ + 'value' => $data.fieldData.billing_country, + 'field' => 'billing_country', + 'label' => 'Billing Country', + 'placeholder' => 'Billing Country', + 'required' => $data.fieldRequired.billing_country, + 'errorText' => 'Billing Country is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Phone *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_phone', - 'label' => 'Billing Phone' + {$ui = [ + 'value' => $data.fieldData.billing_phone, + 'field' => 'billing_phone', + 'label' => 'Billing Phone', + 'placeholder' => 'Billing Phone', + 'required' => $data.fieldRequired.billing_phone, + 'errorText' => 'Billing Phone is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'} {* Billing Fax *} - {$fieldData = [ - 'data' => $data, - 'field' => 'billing_fax', - 'label' => 'Billing Fax' + {$ui = [ + 'value' => $data.fieldData.billing_fax, + 'field' => 'billing_fax', + 'label' => 'Billing Fax', + 'placeholder' => 'Billing Fax', + 'required' => $data.fieldRequired.billing_fax, + 'errorText' => 'Billing Fax is Required' ]} - {include file='admin/ui/f6-text.html'} + {include file='ui/f6/text.html'}
- + {include file='ui/f6/errorCallout.html'} + + - +
@@ -361,13 +430,14 @@ jQuery(document).ready(function($){ $(".glm-flash-updated").fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500).fadeIn(500).fadeOut(500); //$('#billingInfoForm') + var abide = new Foundation.Abide($('#billingInfoForm')); $(document) .on('invalid.zf.abide', function(ev,elem){ return false; - console.log('elem: ', elem); + // console.log('elem: ', elem); // $('#billingInfoForm').foundation('addErrorClasses', elem); - $('#billingInfoForm').foundation('requiredCheck', elem); - console.log( 'Field id '+ev.target.id+' is invalid' ); + // $('#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' ); @@ -405,5 +475,3 @@ jQuery(document).ready(function($){ }; }); - -{include file='admin/footer.html'} diff --git a/views/admin/billing/editInvoice.html b/views/admin/billing/editInvoice.html index 8026962..f730df3 100644 --- a/views/admin/billing/editInvoice.html +++ b/views/admin/billing/editInvoice.html @@ -1,277 +1,245 @@ {include file='admin/billing/header.html'} -{include file='admin/billing/subHeader.html'} - -{if $invoiceUpdated}Invoice Updated{/if} -{if $invoiceUpdateError}Invoice Update Error{/if} -{if $invoiceInsertError}Invoice Insert Error{/if} -{if $invoiceAdded}Invoice Added{/if} - -
-
- {if $invoice_id} - - - - - - - - - {else} - - {/if} -
-
- - {if !$invoice_id} -
-
- Billing Account -
-
- - - New Account -
-
- {/if} -
-
- Due Date +
+ + {if $invoiceUpdated}Invoice Updated{/if} + {if $invoiceUpdateError}Invoice Update Error{/if} + {if $invoiceInsertError}Invoice Insert Error{/if} + {if $invoiceAdded}Invoice Added{/if} + +
+ + {if $invoice_id} + + + + + + + + + {else} + + {/if} +
+
+
+ {if !$invoice_id} + + + + New Account + {/if}
-
+
+
-
-
-
- Notes -
-
- +
+ +
- -
-
-
-
- Add Line Item
- Create New Line Item
-
-
-
-   -
-
-
-
- Total Amount:     - +
+
+
+ Add Line Item
+ Create New Line Item +
+
+
+
+
+ Total Amount:     + +
+
$0.00
+
-
$0.00
-
-
-
- +
+
+ +
-
- -
-{* New Account Form - Dialog *} -
-

* required

-
- - - - - - - - - - - - - - - - - - - - - - - - {if $settings.billing_contact_name_enabled} - - - - - {else} - - - - - - - - - {/if} - - - - - - - - - - - - - {if $settings.billing_county_enabled} - - - - - {else} - - {/if} - - - - - - - - - - - - -
Member Name - -
Account Number - -
Anniversary Date - -
Renewal Date - -
Billing Email - -
Billing Contact Name - -
Billing First Name - -
Billing Last Name - -
Billing Address 1 - -
Billing Address 2 - -
Billing City - -
Billing County - + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ {if $settings.billing_contact_name_enabled} +
+ + +
+ {else} +
+ + +
+
+ + +
+ {/if} + +
+ + +
+
+ + +
+
+ + +
+ {if $settings.billing_county_enabled} +
+ + +
+ {else} + + {/if} +
+ + -
Billing State - -
Billing Zip - -
Billing Phone - -
-
-
-{* Enter a Line Item Form - jQueryUI dialog *} -
-

* Required!

-
- - - + +
+ + +
+
+ + +
+ + + + + + {* Enter a Line Item Form - jQueryUI dialog *} +
+

* Required!

+
+ + +
+
+
+ + +
+
+

+
+
+ +
+ + % +
+
+
+
+ +
+ {* Add new Invoice Type (Custom Line Item) Form *} +
+

* Required!

+
- + - - - + + + + + +
Invoice Type Parent - + {foreach $invoiceTypes as $inv} - {if $inv.parent.value == 0 && $parent != 0 && $inv.amount != '0.00'} - - {/if} - {$parent = $inv.parent.value} - {if $inv.parent.value == 0 && $inv.amount != '0.00'} - - {else if ($inv.parent.value == 0 && $inv.amount == '0.00' && $inv.dynamic_amount.value == 0)} - - {else if ($inv.parent.value == 0 && $inv.amount == '0.00')} - - {else if ($inv.parent.value != 0)} - + {if $inv.parent.value == 0} + {/if} {/foreach} -

-
Discount% Line Item Name
Amount
Numbers only (999.99)
- -
-{* Add new Invoice Type (Custom Line Item) Form *} -
-

* Required!

- - - - - - - - - - - - - -
Parent - -
Line Item Name
Amount
Numbers only (999.99)
-
+
+
+ }); + +
{include file='admin/footer.html'} diff --git a/views/admin/billing/exportBillingModal.html b/views/admin/billing/exportBillingModal.html index 130a709..19f4d35 100644 --- a/views/admin/billing/exportBillingModal.html +++ b/views/admin/billing/exportBillingModal.html @@ -2,7 +2,7 @@
- +
diff --git a/views/admin/billing/exportPaymentModal.html b/views/admin/billing/exportPaymentModal.html index 0f131fb..5b9441d 100644 --- a/views/admin/billing/exportPaymentModal.html +++ b/views/admin/billing/exportPaymentModal.html @@ -2,7 +2,7 @@ -
Show Active:
Show Pending:
Show Overdue:
+
Date Range Search: diff --git a/views/admin/billing/exportReportModal.html b/views/admin/billing/exportReportModal.html index e4047c6..adb5499 100644 --- a/views/admin/billing/exportReportModal.html +++ b/views/admin/billing/exportReportModal.html @@ -2,7 +2,7 @@ - +
+ + {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} + + {/if} + + + + {/foreach} + {/if} +
Payment Types diff --git a/views/admin/billing/header.html b/views/admin/billing/header.html index 7dd924c..14fb7b6 100644 --- a/views/admin/billing/header.html +++ b/views/admin/billing/header.html @@ -1,15 +1,65 @@
+

Billing

-

- Dashboard - Invoices - Payments - Accounts + + {*

-
+
  • Settings
    • + + + + + {* Reveal for Settings *} +
    +
    + {* Ajax Loading Graphic *} + + +
    diff --git a/views/admin/billing/index.html b/views/admin/billing/index.html index 561ec87..8854a1e 100644 --- a/views/admin/billing/index.html +++ b/views/admin/billing/index.html @@ -5,22 +5,22 @@ {include file='admin/billing/header.html'} {/if} -

    Accounts

    -
    Accounts Export
    - -Create Invoice -Make Payment - -{include file='admin/billing/accountSearchForm.html'} - - -{foreach $dashboards as $dashboard_title => $list} -
    - - -
    {$dashboard_title}
    -
    - +
    + +

    Accounts

    +
    +
    Accounts Export
    + Create Invoice + Make Payment +
    + + {include file='admin/billing/accountSearchForm.html'} + + + {foreach $dashboards as $dashboard_title => $list} +
    + {$dashboard_title} +
    @@ -76,62 +76,62 @@ {/if}
    Member Name
    -
    -
    -{/foreach} - -{include file='admin/billing/exportBillingModal.html'} - - - function accountLinksEmployeesSelected() { - accountEmployee = true; - console.log( 'accountHoverId: ', accountHoverId ); - $('#account-container-' + accountHoverId).addClass('glm-hidden'); - } - - function clearAccountLinks() { - accountLinksEmployeesSelected(); - accountHoverId = false; - accountEmployee = false; - } - - - }); - - +
    {include file='admin/footer.html'} diff --git a/views/admin/billing/invoices.html b/views/admin/billing/invoices.html index 2c26f58..342357c 100644 --- a/views/admin/billing/invoices.html +++ b/views/admin/billing/invoices.html @@ -1,70 +1,75 @@ {include file='admin/billing/header.html'} -{include file='admin/billing/subHeader.html'} - - -

    Invoices

    - -{if $invoiceSent}

    Invoice Sent

    {/if} - -
    - - - - - - - - -
    -
    - - - - -
    -
    - - - -
    -
    - - - -
    -
    - -
    -
    - +
    + +

    Invoices

    + + Create Invoice + {if $invoiceSent}

    Invoice Sent

    {/if} + + + + + + + + + + +
    + Search Invoices +
    +
    +
    + + + + +
    +
    + + + +
    +
    + + + +
    +
    + +
    +
    + +
    + +
    +
    -

    -

    Total found: {$totalInvoices}

    +

    Total found: {$totalInvoices}

    - {if $paging} - - - {/if} -
    + {if $paging} + + + {/if} +
    -
    - +
    - + - - - - + + + + @@ -83,8 +88,8 @@ - - +
    Invoice #Invoice # Member Name Invoice ForTimeDue DateAmount TotalBalanceTimeDue DateAmount TotalBalance
    {$t.amount_total} {$t.balance}
    -
    - {if $paging} - - - {/if} - - - -
    -
    - - - - - - Send an invoice to
    - Email Invoice Status
    + {if $paging} + + + {/if} +
    -
    - + }); + +
    {include file='admin/footer.html'} diff --git a/views/admin/billing/invoicing.html b/views/admin/billing/invoicing.html index 724a5b9..12e994f 100644 --- a/views/admin/billing/invoicing.html +++ b/views/admin/billing/invoicing.html @@ -1,145 +1,152 @@ {include file='admin/billing/header.html'} -

    Invoicing

    -{include file='admin/billing/invoicingSubHeader.html'} -
    - - - - - - -
    - {if $paymentTypes} -
    -
    - -
    - {/if} - {if $counties} -
    -
    - -
    - {/if} - {if $option == 'createLabels'} -
    -
    - - - -
    - {/if} - {if $option == 'sendEmails'} -
    -
    - {if $notification_types} - {foreach $notification_types as $notice} +
    + +

    Invoicing

    + {include file='admin/billing/invoicingSubHeader.html'} + + + + + + + + + +
    +
    + {if $paymentTypes} +
    +
    + +
    + {/if} + {if $counties} +
    +
    + +
    + {/if} + {if $option == 'createLabels'} +
    +
    - {/foreach} + + +
    {/if} + {if $option == 'sendEmails'} +
    +
    + {if $notification_types} + {foreach $notification_types as $notice} + + {/foreach} + {/if} +
    + {/if} +
    + + {if $option == 'createInvoices'} + + {elseif $option == 'printInvoices'} + + {elseif $option == 'createLabels'} + + {elseif $option == 'sendEmails'} + + {/if} +
    - {/if} -
    - - {if $option == 'createInvoices'} - - {elseif $option == 'printInvoices'} - - {elseif $option == 'createLabels'} - - {elseif $option == 'sendEmails'} - - {/if}
    -
    -
    -
    -

    Total found: {$totalAccounts}

    - {if $successMsg}

    {$successMsg}

    {/if} - {* Paging *} - {if $paging} - - - {/if} -
    -
    - - - - - {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} - - {/if} - - - - - {if isset( $accounts ) && !empty( $accounts )} - {foreach $accounts as $t} +
    +
    +

    Total found: {$totalAccounts}

    + {if $successMsg}

    {$successMsg}

    {/if} + {* Paging *} + {if $paging} + + + {/if} +
    +
    +
    Member Name Account Number Payment Type Balance Due
    + - + {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} - + {/if} - - + + - {/foreach} - {/if} -
    - - {$t.member_name} - - Member Name {$t.account_number} Account Number {$t.payment_type} {$t.balance_due|string_format:"%.2f"} Payment Type Balance Due
    -
    - {* Paging *} - {if $paging} - - - {/if} - - + + {if isset( $accounts ) && !empty( $accounts )} + {foreach $accounts as $t} +
    + + {$t.member_name} + + {$t.account_number} {$t.payment_type} {$t.balance_due|string_format:"%.2f"}
    + + {* Paging *} + {if $paging} + + + {/if} + + + {include file='admin/footer.html'} diff --git a/views/admin/billing/invoicingSubHeader.html b/views/admin/billing/invoicingSubHeader.html index b1c993a..33c9ea6 100644 --- a/views/admin/billing/invoicingSubHeader.html +++ b/views/admin/billing/invoicingSubHeader.html @@ -1,6 +1,14 @@ -

    - Create Invoices - Print Invoices - Create Labels - Send Emails -

    + diff --git a/views/admin/billing/makePaymentAdjustmentAjax.html b/views/admin/billing/makePaymentAdjustmentAjax.html new file mode 100644 index 0000000..ab1a1e8 --- /dev/null +++ b/views/admin/billing/makePaymentAdjustmentAjax.html @@ -0,0 +1,188 @@ +{* makePaymentAdjustment *} +{* This Form is used for uptravel billing member payments *} + + + +
    + + {if $paymentSuccess}Payment Completed{/if} + {if $paymentError}Error With Payment{/if} + + {if $messages} + {foreach $messages as $message} +
    {$message}
    + {/foreach} + {/if} + + {if $invoices} +
    + + + + + + + + + + {include file='ui/f6/errorCallout.html'} + +
    +
    Select Invoice
    +
    + {if $invoices} + {foreach $invoices as $invoice} + + {/foreach} + {/if} +
    +
    + + {$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' => 'payment_data', + 'label' => 'Payment Details', + 'placeholder' => 'Payment Details', + 'required' => false, + 'errorText' => 'Payment Details is Required' + ]} + {include file='ui/f6/text.html'} + +
    +
    Comment
    +
    + +
    +
    + + + + {include file='ui/f6/errorCallout.html'} + +
    + {else} + +

    You don't have any unpaid invoices!

    + + {/if} +
    + + diff --git a/views/admin/billing/makePaymentAjax.html b/views/admin/billing/makePaymentAjax.html new file mode 100644 index 0000000..2f74251 --- /dev/null +++ b/views/admin/billing/makePaymentAjax.html @@ -0,0 +1,187 @@ +{* Make Payment *} + + + +
    + + {if $paymentSuccess}Payment Completed{/if} + {if $paymentError}Error With Payment{/if} + + {if $messages} + {foreach $messages as $message} +
    {$message}
    + {/foreach} + {/if} + + +
    + {* *} + + + + + + + + + {include file='ui/f6/errorCallout.html'} + + + {if $invoices} +

    Payment Information

    + +
    +
    Select Invoice
    +
    + {if $invoices} + {foreach $invoices as $invoice} + + {/foreach} + {/if} +
    +
    + +
    +
    Amount
    +
    +
    +
    +
    + + {* Include the Payment Form template *} + {* Only if payments types are setup *} + {include file='common/billing/paymentForm.html'} + + + + {include file='ui/f6/errorCallout.html'} + + {else} + You don't have any unpaid invoices! + {/if} + +
    +
    + + diff --git a/views/admin/billing/payments.html b/views/admin/billing/payments.html index 6c257b8..78c976b 100644 --- a/views/admin/billing/payments.html +++ b/views/admin/billing/payments.html @@ -1,44 +1,54 @@ {include file='admin/billing/header.html'} -{include file='admin/billing/paymentHeader.html'} +
    -
    Payments Export
    - -

    Payments

    - -
    - - +
    +
    Payments Export
    + Make Payment +
    - - - - -
    -
    - From Date: - To Date: -
    -
    - Member Account:  - - -
    -
    - +

    Payments

    + + + + + + + + + + +
    + Search Payments +
    +
    +
    + From Date: +
    +
    + To Date: +
    +
    + Member Account:  + + +
    +
    + +
    +
    -
    +
    - {if $paging} - - - {/if} -
    + {if $paging} + + + {/if} +
    -
    - +
    @@ -72,59 +82,59 @@ {/if}
    Member Name
    -
    -{if $paging} - - -{/if} + {if $paging} + + + {/if} - + - + -{include file='admin/billing/exportPaymentModal.html'} + {include file='admin/billing/exportPaymentModal.html'} +
    {include file='admin/footer.html'} diff --git a/views/admin/billing/reports.html b/views/admin/billing/reports.html index 13b6ea3..81ca2dc 100644 --- a/views/admin/billing/reports.html +++ b/views/admin/billing/reports.html @@ -1,218 +1,221 @@ {include file='admin/billing/header.html'} -

    Invoicing

    -{include file='admin/billing/reportsSubHeader.html'} +
    -{if $option == 'reportGenerator'} -
    Report Export
    -{/if} +

    Invoicing

    + {include file='admin/billing/reportsSubHeader.html'} -
    - - - - - - {if $option == 'reportGenerator'} -
    - {if $paymentTypes} -
    -
    - +
    Report Export
    + {/if} + + + + + + + + + {if $option == 'reportGenerator'} +
    + {if $paymentTypes} +
    +
    + +
    + {/if} + {if $counties} +
    +
    + +
    + {/if} +
    + + + {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} + + + {/if} + + + +
    - {/if} - {if $counties} -
    -
    - + {foreach $actionTypeSel as $typeId => $typeLabel} + {/foreach} + {if isset( $settings.quickbooks_enabled ) && $settings.quickbooks_enabled} +
    + + {/if} +
    +
    +
    - {/if} -
    - - - {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} - - - {/if} - - - -
    -
    - - + + {/if} +
    + {if isset( $accounts ) && !empty( $accounts )} +
    + + + + + {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} + + {/if} + + + + + {foreach $accounts as $t} + + + {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} + + {/if} + + + {/foreach} - - {if isset( $settings.quickbooks_enabled ) && $settings.quickbooks_enabled} -
    - - {/if} +
    Member Name Account Number Payment Type Balance Due
    + + {$t.member_name} + + {$t.account_number} {$t.payment_type} + {if $t.balance_due == 'N/A'} + {$t.balance_due} + {else} + {$t.balance_due|string_format:"%.2f"} + {/if} +
    -
    - + {/if} + {if isset( $transactions ) && !empty( $transactions )} +
    + + + + + + + + + + + {foreach $transactions as $t} + + + + + + + + {/foreach} +
    Transaction Time Type Member Name Description Amount
    {$t.transaction_time.datetime} + {if $t.type == $tActionTypes.Invoice} + Invoice + {else} + Payment + {/if} + + + {$t.member_name} + + {$t.notes} + {if $t.type == 10} + {$t.current_invoice_total|string_format:"%.2f"} + {else} + {$t.current_payment_total|string_format:"%.2f"} + {/if} +
    + {/if} + {* Paging *} + {if $paging} + + + {/if} + + {if $option == 'reportGenerator'} +
    +
    Total Invoices: {$totalInvoices}
    +
    Total Payments: {$totalPayments}
    {/if} - {if $option == 'accountsByAge'} -

    over 60 days

    - {/if} -
    -
    -

    Total found: {$totalAccounts}

    - {* Paging *} - {if $paging} - - - {/if} -
    - {if isset( $accounts ) && !empty( $accounts )} -
    - - - - - {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} - - {/if} - - - - - {foreach $accounts as $t} - - - {if isset( $settings.account_number_enabled ) && $settings.account_number_enabled} - - {/if} - - - - {/foreach} -
    Member Name Account Number Payment Type Balance Due
    - - {$t.member_name} - - {$t.account_number} {$t.payment_type} - {if $t.balance_due == 'N/A'} - {$t.balance_due} - {else} - {$t.balance_due|string_format:"%.2f"} - {/if} -
    -
    - {/if} - {if isset( $transactions ) && !empty( $transactions )} -
    - - - - - - - - - - - {foreach $transactions as $t} - - - - - - - - {/foreach} -
    Transaction Time Type Member Name Description Amount
    {$t.transaction_time.datetime} - {if $t.type == $tActionTypes.Invoice} - Invoice - {else} - Payment - {/if} - - - {$t.member_name} - - {$t.notes} - {if $t.type == 10} - {$t.current_invoice_total|string_format:"%.2f"} - {else} - {$t.current_payment_total|string_format:"%.2f"} - {/if} -
    -
    - {/if} - {* Paging *} - {if $paging} - - - {/if} - -{if $option == 'reportGenerator'} -
    -
    Total Invoices: {$totalInvoices}
    -
    Total Payments: {$totalPayments}
    -
    -{/if} -{include file='admin/billing/exportReportModal.html'} + {include file='admin/billing/exportReportModal.html'} - + +
    {include file='admin/footer.html'} diff --git a/views/admin/billing/reportsSubHeader.html b/views/admin/billing/reportsSubHeader.html index 3ef9678..f19c9b1 100644 --- a/views/admin/billing/reportsSubHeader.html +++ b/views/admin/billing/reportsSubHeader.html @@ -1,8 +1,20 @@ -

    - Open Accounts - Closed Accounts - Accounts By Age - Report Generator - No Accounts - All Accounts -

    + diff --git a/views/admin/billing/subHeader.html b/views/admin/billing/subHeader.html index dc68cc7..5ce5455 100644 --- a/views/admin/billing/subHeader.html +++ b/views/admin/billing/subHeader.html @@ -1,6 +1,11 @@ -

    - Search Invoices - Create Invoice -

    +{* Invoices Sub Navigation *} + diff --git a/views/admin/settings/billingAjax.html b/views/admin/settings/billingAjax.html new file mode 100644 index 0000000..9f13de6 --- /dev/null +++ b/views/admin/settings/billingAjax.html @@ -0,0 +1,23 @@ + + +
    +
    +

    Main Settings

    +
    +
    +

    Payment Types

    +
    +
    +

    Notifications

    +
    +
    + + -- 2.17.1