From 43f25f1b524de63c03a075e3bdf3475d4511d9f5 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 12 Jul 2019 15:57:57 -0400 Subject: [PATCH] Updating forms Updates for foundation 6 ui elements --- views/admin/billing/accountSearchForm.html | 32 +- views/admin/billing/accounts.html | 3 +- views/admin/billing/editAccountAjax.html | 4 +- views/admin/billing/editInvoice.html | 2 +- views/admin/billing/editNotificationType.html | 361 +++++++++--------- views/admin/billing/editPayment.html | 2 +- views/admin/billing/index.html | 6 +- views/admin/billing/invoiceTypes.html | 2 +- views/admin/billing/invoices.html | 6 +- views/admin/billing/invoicing.html | 16 +- views/admin/billing/notifications.html | 2 +- views/admin/billing/payments.html | 6 +- views/admin/billing/reports.html | 80 ++-- views/admin/billing/settings.html | 18 +- 14 files changed, 282 insertions(+), 258 deletions(-) diff --git a/views/admin/billing/accountSearchForm.html b/views/admin/billing/accountSearchForm.html index 2023884..9721511 100644 --- a/views/admin/billing/accountSearchForm.html +++ b/views/admin/billing/accountSearchForm.html @@ -83,40 +83,42 @@ jQuery(document).ready(function($) { -
+
Search Accounts -
-
+
+
+
- +
+
- +
+
-
- +
-
diff --git a/views/admin/billing/accounts.html b/views/admin/billing/accounts.html index 75021ff..08f9017 100644 --- a/views/admin/billing/accounts.html +++ b/views/admin/billing/accounts.html @@ -1,13 +1,12 @@ {include file='admin/billing/header.html'} -
+

Accounts

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

Total found: {$totalAccounts}

diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html index 25f2e82..597ccb1 100644 --- a/views/admin/billing/editAccountAjax.html +++ b/views/admin/billing/editAccountAjax.html @@ -35,7 +35,7 @@ {include file='ui/f6/errorCallout.html'} -
+
Account Information {* Name *} @@ -161,7 +161,7 @@
-
+
Billing Information {* Billing Email *} diff --git a/views/admin/billing/editInvoice.html b/views/admin/billing/editInvoice.html index 1b33ba0..2318aa4 100644 --- a/views/admin/billing/editInvoice.html +++ b/views/admin/billing/editInvoice.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+
{if $invoiceUpdated}Invoice Updated{/if} {if $invoiceUpdateError}Invoice Update Error{/if} diff --git a/views/admin/billing/editNotificationType.html b/views/admin/billing/editNotificationType.html index e516eea..0801ae1 100644 --- a/views/admin/billing/editNotificationType.html +++ b/views/admin/billing/editNotificationType.html @@ -6,7 +6,7 @@ {include file='admin/billing/header.html'} -
+
{* Set $data to $notification *} {* This is for using the UI elements *} @@ -57,193 +57,198 @@ {/if} -
- Notification - -
- - {* Name *} - {$ui = [ - 'value' => $data.fieldData.name, - 'field' => 'name', - 'label' => 'Name', - 'required' => $data.fieldRequired.name, - 'errorText' => 'Name is Required', - 'dataError' => $data.fieldFail.name - ]} - {include file='ui/f6/text.html'} - -
-
- Send Notification based on -
-
- -
-
+
+
+ +
+ Notification + + {* Name *} + {$ui = [ + 'value' => $data.fieldData.name, + 'field' => 'name', + 'label' => 'Name', + 'required' => $data.fieldRequired.name, + 'errorText' => 'Name is Required', + 'dataError' => $data.fieldFail.name + ]} + {include file='ui/f6/text.html'} +
-
- -
- - -
-
-
- {* Number *} - {$ui = [ - 'value' => $data.fieldData.send_date_number, - 'field' => 'send_date_number', - 'label' => 'Number', - 'pattern' => 'number', - 'required' => $data.fieldRequired.send_date_number, - 'errorText' => 'Number is Required to be numeric', - 'dataError' => $data.fieldFail.send_date_number - ]} - {include file='ui/f6/text.html'} -
-
- {* Period *} - {$ui = [ - 'value' => $data.fieldData.send_date_period, - 'field' => 'send_date_period', - 'label' => 'Period', - 'list' => $send_date_period, - 'l_blank' => false, - 'required' => $data.fieldRequired.send_date_period, - 'errorText' => 'Period is Required', - 'dataError' => $data.fieldFail.send_date_period - ]} - {include file='ui/f6/select.html'} -
-
- {* When *} - {$ui = [ - 'value' => $data.fieldData.send_date_when, - 'field' => 'send_date_when', - 'label' => 'When', - 'list' => $send_date_when, - 'l_blank' => false, - 'required' => $data.fieldRequired.send_date_when, - 'errorText' => 'When is Required', - 'dataError' => $data.fieldFail.send_date_when - ]} - {include file='ui/f6/select.html'} +
+ Send Notification based on
-
-
+
-
- -
- - +
+
+
+ +
+ + +
+
+
+ {* Number *} + {$ui = [ + 'value' => $data.fieldData.send_date_number, + 'field' => 'send_date_number', + 'label' => 'Number', + 'pattern' => 'number', + 'required' => $data.fieldRequired.send_date_number, + 'errorText' => 'Number is Required to be numeric', + 'dataError' => $data.fieldFail.send_date_number + ]} + {include file='ui/f6/text.html'} +
+
+ {* Period *} + {$ui = [ + 'value' => $data.fieldData.send_date_period, + 'field' => 'send_date_period', + 'label' => 'Period', + 'list' => $send_date_period, + 'l_blank' => false, + 'required' => $data.fieldRequired.send_date_period, + 'errorText' => 'Period is Required', + 'dataError' => $data.fieldFail.send_date_period + ]} + {include file='ui/f6/select.html'} +
+
+ {* When *} + {$ui = [ + 'value' => $data.fieldData.send_date_when, + 'field' => 'send_date_when', + 'label' => 'When', + 'list' => $send_date_when, + 'l_blank' => false, + 'required' => $data.fieldRequired.send_date_when, + 'errorText' => 'When is Required', + 'dataError' => $data.fieldFail.send_date_when + ]} + {include file='ui/f6/select.html'} +
-
- - {* Send Action *} - {$ui = [ - 'value' => $data.fieldData.send_action, - 'field' => 'send_action', - 'label' => 'Send Action', - 'list' => $send_action, - 'l_blank' => false, - 'required' => $data.fieldRequired.send_action, - 'errorText' => 'Send Action is Required', - 'dataError' => $data.fieldFail.send_action - ]} - {include file='ui/f6/select.html'} - +
+
+
+ +
+ + +
+
+
+ + {* Send Action *} + {$ui = [ + 'value' => $data.fieldData.send_action, + 'field' => 'send_action', + 'label' => 'Send Action', + 'list' => $send_action, + 'l_blank' => false, + 'required' => $data.fieldRequired.send_action, + 'errorText' => 'Send Action is Required', + 'dataError' => $data.fieldFail.send_action + ]} + {include file='ui/f6/select.html'} + +
+
-
-
- - {* To Email *} - {$ui = [ - 'value' => $data.fieldData.to_email, - 'field' => 'to_email', - 'label' => 'To Email', - 'pattern' => 'email', - 'required' => $data.fieldRequired.to_email, - 'errorText' => 'To Email is Required to be valid email', - 'helpText' => 'Leave this field blank to send notice to proper {$account.email} address', - 'dataError' => $data.fieldFail.to_email - ]} - {include file='ui/f6/text.html'} - - {* Subject *} - {$ui = [ - 'value' => $data.fieldData.subject, - 'field' => 'subject', - 'label' => 'Subject', - 'required' => $data.fieldRequired.subject, - 'errorText' => 'Subject is Required', - 'dataError' => $data.fieldFail.subject - ]} - {include file='ui/f6/text.html'} - - {* From *} - {$ui = [ - 'value' => $data.fieldData.from_header, - 'field' => 'from_header', - 'label' => 'From', - 'pattern' => 'email', - 'required' => $data.fieldRequired.from_header, - 'errorText' => 'From is Required to be valid email', - 'dataError' => $data.fieldFail.from_header - ]} - {include file='ui/f6/text.html'} - - {* Reply To *} - {$ui = [ - 'value' => $data.fieldData.replyto, - 'field' => 'replyto', - 'label' => 'Reply To', - 'required' => $data.fieldRequired.replyto, - 'errorText' => 'Reply To is Required', - 'dataError' => $data.fieldFail.replyto - ]} - {include file='ui/f6/text.html'} - - {* Message *} - {$ui = [ - 'value' => $data.fieldData.message, - 'field' => 'message', - 'label' => 'Message', - 'height' => '250', - 'required' => $data.fieldRequired.message, - 'errortext' => 'Message is Required', - 'dataError' => $data.fieldFail.message - ]} - {include file='ui/f6/editor.html'} - -
-
- -

Merge Tags

-

The "merge tags" listed below may be used in the E-Mail message content - to include certain information about the Account or Invoice. Be sure to - include the "{literal}{{/literal}" and "{literal}}{/literal}" and "$" characters exactly as show.

- - {html_table loop=$mergeTagsBilling cols=2 table_attr='border=0 width=400' caption='Billing Examples'} - - {html_table loop=$mergeTagsContact cols=2 table_attr='border=0 width=400' caption='Contact Examples'} - - {html_table loop=$mergeTagsInvoice cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Create Invoice'} - - {html_table loop=$mergeTagsPayment cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Received Payment'} - -
-
- - -
+ {* To Email *} + {$ui = [ + 'value' => $data.fieldData.to_email, + 'field' => 'to_email', + 'label' => 'To Email', + 'pattern' => 'email', + 'required' => $data.fieldRequired.to_email, + 'errorText' => 'To Email is Required to be valid email', + 'helpText' => 'Leave this field blank to send notice to proper {$account.email} address', + 'dataError' => $data.fieldFail.to_email + ]} + {include file='ui/f6/text.html'} + + {* Subject *} + {$ui = [ + 'value' => $data.fieldData.subject, + 'field' => 'subject', + 'label' => 'Subject', + 'required' => $data.fieldRequired.subject, + 'errorText' => 'Subject is Required', + 'dataError' => $data.fieldFail.subject + ]} + {include file='ui/f6/text.html'} + + {* From *} + {$ui = [ + 'value' => $data.fieldData.from_header, + 'field' => 'from_header', + 'label' => 'From', + 'pattern' => 'email', + 'required' => $data.fieldRequired.from_header, + 'errorText' => 'From is Required to be valid email', + 'dataError' => $data.fieldFail.from_header + ]} + {include file='ui/f6/text.html'} + + {* Reply To *} + {$ui = [ + 'value' => $data.fieldData.replyto, + 'field' => 'replyto', + 'label' => 'Reply To', + 'required' => $data.fieldRequired.replyto, + 'errorText' => 'Reply To is Required', + 'dataError' => $data.fieldFail.replyto + ]} + {include file='ui/f6/text.html'} + + {* Message *} + {$ui = [ + 'value' => $data.fieldData.message, + 'field' => 'message', + 'label' => 'Message', + 'height' => '250', + 'required' => $data.fieldRequired.message, + 'errortext' => 'Message is Required', + 'dataError' => $data.fieldFail.message + ]} + {include file='ui/f6/editor.html'} + + + + + +
+ + +
+ + Merge Tag Description + +

Merge Tags

+

The "merge tags" listed below may be used in the E-Mail message content + to include certain information about the Account or Invoice. Be sure to + include the "{literal}{{/literal}" and "{literal}}{/literal}" and "$" characters exactly as show.

+ + {html_table loop=$mergeTagsBilling cols=2 table_attr='border=0 width=400' caption='Billing Examples'} + + {html_table loop=$mergeTagsContact cols=2 table_attr='border=0 width=400' caption='Contact Examples'} + + {html_table loop=$mergeTagsInvoice cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Create Invoice'} + + {html_table loop=$mergeTagsPayment cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Received Payment'} + +
-
+
+
diff --git a/views/admin/billing/editPayment.html b/views/admin/billing/editPayment.html index ce94881..ac5727c 100644 --- a/views/admin/billing/editPayment.html +++ b/views/admin/billing/editPayment.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+
{if $paymentUpdated}Payment Updated{/if} {if $paymentUpdateError}Payment Update Error{/if} diff --git a/views/admin/billing/index.html b/views/admin/billing/index.html index a5b26f3..b023573 100644 --- a/views/admin/billing/index.html +++ b/views/admin/billing/index.html @@ -5,12 +5,12 @@ {include file='admin/billing/header.html'} {/if} -
+

Accounts

-
-
Accounts Export
+ diff --git a/views/admin/billing/invoiceTypes.html b/views/admin/billing/invoiceTypes.html index 711f333..85f715d 100644 --- a/views/admin/billing/invoiceTypes.html +++ b/views/admin/billing/invoiceTypes.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+

InvoiceTypes

diff --git a/views/admin/billing/invoices.html b/views/admin/billing/invoices.html index 762bbde..055437c 100644 --- a/views/admin/billing/invoices.html +++ b/views/admin/billing/invoices.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+

Invoices

@@ -16,7 +16,7 @@ -
+
Search Invoices
@@ -43,7 +43,7 @@
- +
diff --git a/views/admin/billing/invoicing.html b/views/admin/billing/invoicing.html index 45ffa0c..106c43a 100644 --- a/views/admin/billing/invoicing.html +++ b/views/admin/billing/invoicing.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+

Invoicing

{include file='admin/billing/invoicingSubHeader.html'} @@ -13,7 +13,7 @@ -
+
Filter
@@ -67,16 +67,16 @@ {/if}
{/if} -
- +
+ {if $option == 'createInvoices'} - + {elseif $option == 'printInvoices'} - + {elseif $option == 'createLabels'} - + {elseif $option == 'sendEmails'} - + {/if}
diff --git a/views/admin/billing/notifications.html b/views/admin/billing/notifications.html index 2eab5c7..1de25e5 100644 --- a/views/admin/billing/notifications.html +++ b/views/admin/billing/notifications.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+

NotificationTypes

diff --git a/views/admin/billing/payments.html b/views/admin/billing/payments.html index 0fa2326..1973e3c 100644 --- a/views/admin/billing/payments.html +++ b/views/admin/billing/payments.html @@ -1,6 +1,6 @@ {include file='admin/billing/header.html'} -
+

Payments

@@ -18,7 +18,7 @@ -
+
Search Payments
@@ -34,7 +34,7 @@
- +
diff --git a/views/admin/billing/reports.html b/views/admin/billing/reports.html index a9c1b5d..afb81c0 100644 --- a/views/admin/billing/reports.html +++ b/views/admin/billing/reports.html @@ -1,11 +1,11 @@ {include file='admin/billing/header.html'} -
+

Reports

{include file='admin/billing/reportsSubHeader.html'} {if $option == 'reportGenerator'} -
Report Export
+
Report Export
{/if}
@@ -16,7 +16,7 @@ {if $option == 'reportGenerator'} -
+
Filter Reports
@@ -24,12 +24,12 @@
{if $paymentTypes} -
+
{* Payment Types *} {$ui = [ 'value' => $smarty.request.invoice_types, - 'field' => 'invoice_type', + 'field' => 'invoice_types', 'label' => 'Payment Types', 'list' => $paymentTypes, 'l_label' => 'name', @@ -46,7 +46,7 @@ {/if} {if $counties} -
+
{* Counties *} {$ui = [ @@ -66,7 +66,7 @@
{/if} -
+
{* Member Name *} {$ui = [ @@ -92,37 +92,53 @@ {include file='ui/f6/text.html'} {/if} + {* From *} + {$ui = [ + 'value' => $smarty.request.from_date, + 'field' => 'from_date', + 'label' => 'From', + 'required' => false, + 'errorText' => 'From is Required', + 'dataError' => '' + ]} + {include file='ui/f6/text.html'} + + {* To *} + {$ui = [ + 'value' => $smarty.request.to_date, + 'field' => 'to_date', + 'label' => 'To', + 'required' => false, + 'errorText' => 'To is Required', + 'dataError' => '' + ]} + {include file='ui/f6/text.html'} + +
+
+ {* Transaction Types *} + {$ui = [ + 'value' => $smarty.request.transactionTypes, + 'field' => 'transactionTypes', + 'label' => 'Transaction Types', + 'list' => $actionTypeSel, + 'l_blank' => false, + 'l_size' => 10, + 'required' => false, + 'errorText' => 'Transaction Types is Required', + 'dataError' => '' + ]} + {include file='ui/f6/multiselect.html'} + +
+
+
-
-
- - - - -
-
- - - {if isset( $settings.quickbooks_enabled ) && $settings.quickbooks_enabled} -
- - {/if} -
-
- -
-
{/if} {if $option == 'accountsByAge'} diff --git a/views/admin/billing/settings.html b/views/admin/billing/settings.html index bc78afb..caa0539 100644 --- a/views/admin/billing/settings.html +++ b/views/admin/billing/settings.html @@ -4,7 +4,7 @@ {* Here we are setting $data so it can be used for the Foundation 6 UI Elements *} {$data = $billingSettings} -
+

Settings

@@ -43,7 +43,7 @@
-
+
Invoice Information {* Company Logo *} @@ -51,9 +51,10 @@ 'value' => $data.fieldData.company_logo, 'field' => 'company_logo', 'label' => 'Company Logo', + 'button' => 'Upload File', 'required' => $data.fieldRequired.company_logo, 'errorText' => 'Company Logo is Required', - 'helpText' => '
Best logo size: 400x200px. Must be jpeg or png.', + 'helpText' => '
Best logo size: 400x200px. Must be jpeg or png.', 'dataError' => $data.fieldFail.company_logo ]} {include file='ui/f6/image.html'} @@ -189,7 +190,7 @@
-
+
Membership Renewal Settings {* All Members Renew same day each year *} @@ -199,6 +200,7 @@ 'label' => 'All Members Renew same day each year', 'required' => $data.fieldRequired.renewal_day_static, '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 ]} {include file='ui/f6/checkbox.html'} @@ -245,7 +247,7 @@ 'pattern' => 'number', 'required' => $data.fieldRequired.days_before_renewal, 'errorText' => 'Days Before Renewal Date is Required to be a number', - 'helpText' => 'Days before Renewal Date to Allow Membership Renewal. Based on 1 year after renewal date.', + 'helpText' => 'Days before Renewal Date to Allow Membership Renewal. Based on 1 year after renewal date.', 'dataError' => $data.fieldFail.days_before_renewal ]} {include file='ui/f6/text.html'} @@ -258,7 +260,7 @@ 'pattern' => 'number', 'required' => $data.fieldRequired.days_after_expired, 'errorText' => 'Days After Renewal Date is Required to be a number', - 'helpText' => 'Days after Renewal Date to Expire Membership. Based on 1 year after renewal date.', + 'helpText' => 'Days after Renewal Date to Expire Membership. Based on 1 year after renewal date.', 'dataError' => $data.fieldFail.days_after_expired ]} {include file='ui/f6/text.html'} @@ -268,7 +270,7 @@ 'value' => $data.fieldData.receipt_text, 'field' => 'receipt_text', 'label' => 'Receipt Text', - 'height' => 100, + 'height' => 250, 'media' => false, 'quicktags' => false, 'required' => $data.fieldRequired.receipt_text, @@ -322,7 +324,7 @@
-
+
Advanced Settings {* Company Logo Width *} -- 2.17.1