From 1861ebbd8897bfde4cdff15d3371774800ec9bf4 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 20 Jun 2019 16:36:27 -0400 Subject: [PATCH] WIP getting foundation abide to work working on form validation. --- classes/data/dataAccounts.php | 2 +- views/admin/billing/accounts.html | 79 +++- views/admin/billing/editAccount.html | 2 - views/admin/billing/editAccountAjax.html | 427 +++++++++--------- .../admin/billing/makePaymentAdjustment.html | 14 +- views/admin/billing/statements.html | 2 +- views/admin/billing/viewInvoice.html | 36 +- 7 files changed, 309 insertions(+), 253 deletions(-) diff --git a/classes/data/dataAccounts.php b/classes/data/dataAccounts.php index f602db8..56d34e3 100644 --- a/classes/data/dataAccounts.php +++ b/classes/data/dataAccounts.php @@ -366,7 +366,7 @@ class GlmDataAccounts extends GlmDataAbstract 'p_table' => GLM_MEMBERS_PLUGIN_DB_PREFIX . 'counties', 'p_field' => 'name', 'p_orderby' => 'name', - 'p_blank' => false, + 'p_blank' => true, 'use' => 'a', 'required' => false, ), diff --git a/views/admin/billing/accounts.html b/views/admin/billing/accounts.html index e3e17c8..6033b63 100644 --- a/views/admin/billing/accounts.html +++ b/views/admin/billing/accounts.html @@ -151,28 +151,23 @@ $.ajax({ url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=ajaxBillingInfo&option=account&member=' + member, + cache: false, beforeSend: startAjax, complete: completeAjax, }) .done(function(resp){ - $modal.html(resp).foundation('open').trigger('resizeme.zp.reveal'); - $('#billingInfoForm').on('submit', function(){ - var data = $(this).serialize(); - $.ajax({ - url: '{$ajaxUrl}?action=glm_members_admin_ajax&' + data, - beforeSend: startAjax, - complete: completeAjax, - }).done(function(rsp){ - console.log( 'rsp:', rsp ); - var $sucessModal = $('#billingInfoSuccess'); - $sucessModal.foundation('open').trigger('resizeme.zp.reveal'); - }).fail(function(){ - console.log( 'error' ); - }); + $modal.html(resp).foundation('open').trigger('resizeme.zp.reveal'); + $(document).foundation(); + $('#billingInfoForm').on('submit', function(e){ + e.preventDefault(); + $('#billingInfoForm').foundation('validateForm'); + + + + console.log( 'data: ', data ); return false; }); - } - ); + }); return false; }); @@ -183,6 +178,7 @@ $.ajax({ url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=ajaxBillingInfo&option=list&member=' + member, + cache: false, beforeSend: startAjax, complete: completeAjax, }) @@ -194,6 +190,7 @@ var $modalPayment = $('#glmBillingPayment'); $.ajax({ url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=ajaxBillingInfo&option=makepaymentadjustment&member=' + member, + cache: false, beforeSend: startAjax, complete: completeAjax, }).done(function(resp){ @@ -205,7 +202,19 @@ }); $('.view').on('click', function(e){ e.preventDefault(); - console.log('view clicked'); + 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; }); @@ -214,6 +223,40 @@ }); $(document).foundation(); + + $('#billingInfoForm') + .on('invalid.zf.abide', function(ev,elem){ + console.log( 'Field id '+ev.target.id+' is invalid' ); + }) + .on('valid.zf.abide', function(ev,elem){ + console.log( 'field id '+elem.attr('name')+'is valid' ); + }) + .on('forminvalid.zf.abide', function(ev,frm){ + console.log( 'form id '+ev.target.id+'is invalid' ); + }) + .on('formvalid.zf.abide', function(ev,frm){ + console.log( 'form id '+frm.attr('id')+'is valid' ); + }) + .on('submit', function(ev){ + ev.preventDefault(); + var data = $('#billingInfoForm').serialize(); + console.log('data: ', data); + console.log('Submit for form id '+ev.target.id+' intercepted'); + $.ajax({ + url: '{$ajaxUrl}?action=glm_members_admin_ajax&' + data, + cache: false, + beforeSend: startAjax, + complete: completeAjax, + }).done(function(rsp){ + console.log( 'rsp:', rsp ); + var $sucessModal = $('#billingInfoSuccess'); + $sucessModal.foundation('open').trigger('resizeme.zp.reveal'); + }).fail(function(){ + console.log( 'error' ); + }); + return false; + }); + function startAjax(){ $('#glmLoading').show(); } @@ -239,6 +282,8 @@
+
+
diff --git a/views/admin/billing/editAccount.html b/views/admin/billing/editAccount.html index 0955c83..4f7a622 100644 --- a/views/admin/billing/editAccount.html +++ b/views/admin/billing/editAccount.html @@ -20,8 +20,6 @@ {if $adminAjaxPassthru}
- - {else} diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html index 2ba6786..5985801 100644 --- a/views/admin/billing/editAccountAjax.html +++ b/views/admin/billing/editAccountAjax.html @@ -13,7 +13,6 @@ - @@ -35,236 +34,234 @@
Account Information - {$field = 'ref_name'} - {$fieldLabel = 'Name'} + {* Name *} + {$fieldData = [ + 'data' => $data, + 'field' => 'ref_name', + 'label' => 'Name' + ]} {include file='admin/ui/f6-text.html'} - {if !$lockedToMember} - {if $settings.account_number_enabled} + {if !$lockedToMember} + {if $settings.account_number_enabled} + + {* Account Number *} + {$fieldData = [ + 'data' => $data, + 'field' => 'account_number', + 'label' => 'Account Number' + ]} + {include file='admin/ui/f6-text.html'} + + {/if} + + {if !$settings.member_types_enabled} + + {* Payment Type *} + {$fieldData = [ + 'data' => $data, + 'field' => 'invoice_type', + 'label' => 'Payment Type' + ]} + {include file='admin/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_inoice' => 'By Fax'], + 'label' => 'Invoice Delivery Methods' + ]} + {include file='admin/ui/f6-multicheckboxes.html'} + + {/if} + + {* Anniversary Date *} + {$fieldData = [ + 'data' => $data, + 'field' => 'anniversary_date', + 'label' => 'Anniversary Date' + ]} + {include file='admin/ui/f6-date.html'} + + {* Renewal Date *} + {$fieldData = [ + 'data' => $data, + 'field' => 'renewal_date', + 'label' => 'Renewal Date' + ]} + {include file='admin/ui/f6-date.html'} + + {/if} + + {if $settings.allow_employees} + +
+
Boss
+
+ + {if $account.fieldFail.boss}

{$account.fieldFail.boss}

{/if}
+
+
- {$field = 'account_number'} - {$fieldLabel = 'Account Number'} - {include file='admin/ui/f6-text.html'} +
+
+ Associated Members/Employees +
+
+ +
+ {if $employees} + {foreach $employees as $employee} +
+ + {$employee.employee_name} + +
+ {/foreach} + {/if} +
+
+
- {/if} + {/if} - {if !$settings.member_types_enabled} +
- {$field = 'invoice_type'} - {$fieldLabel = 'Payment Type'} - {include file='admin/ui/f6-select.html'} +
+ Billing Information + + {* Billing Email *} + {$fieldData = [ + 'data' => $data, + 'field' => 'email', + 'label' => 'Billing Email' + ]} + {include file='admin/ui/f6-text.html'} - {/if} + {* Billing Company *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_company', + 'label' => 'Billing Company' + ]} + {include file='admin/ui/f6-text.html'} - {if $settings.invoice_methods_enabled} + {* Billing Position *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_position', + 'label' => 'Billing Position' + ]} + {include file='admin/ui/f6-text.html'} -
-
Invoice Delivery Methods
-
- - - -
-
+ {if $settings.billing_contact_name_enabled} + + {* Billing Contact Name *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_contact_name', + 'label' => 'Billing Contact Name' + ]} + {include file='admin/ui/f6-text.html'} + {else} + {* Billing First Name *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_fname', + 'label' => 'Billing First Name' + ]} + {include file='admin/ui/f6-text.html'} + + {* Billing Last Name *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_lname', + 'label' => 'Billing Last Name' + ]} + {include file='admin/ui/f6-text.html'} + {/if} + + {* Billing Address 1 *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_addr1', + 'label' => 'Billing Address 1' + ]} + {include file='admin/ui/f6-text.html'} - {/if} + {* Billing Address 2 *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_addr2', + 'label' => 'Billing Address 2' + ]} + {include file='admin/ui/f6-text.html'} + {* Billing City *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_city', + 'label' => 'Billing City' + ]} + {include file='admin/ui/f6-text.html'} -
-
Anniversary Date
-
- - {if $account.fieldFail.anniversary_date}

{$account.fieldFail.anniversary_date}

{/if}
-
-
- -
-
Renewal Date
-
- - {if $account.fieldFail.renewal_date}

{$account.fieldFail.renewal_date}

{/if}
-
-
- {/if} - - {if $settings.allow_employees} - -
-
Boss
-
- - {if $account.fieldFail.boss}

{$account.fieldFail.boss}

{/if}
-
-
- -
-
- Associated Members/Employees -
-
- -
- {if $employees} - {foreach $employees as $employee} -
- - {$employee.employee_name} - -
- {/foreach} - {/if} -
-
-
- - {/if} - -
- -
- Billing Information - -
-
Billing Email
-
- - {if $account.fieldFail.email}

{$account.fieldFail.email}

{/if}
-
-
- -
-
Billing Company
-
- - {if $account.fieldFail.billing_company}

{$account.fieldFail.billing_company}

{/if}
-
-
- -
-
Billing Position
-
- - {if $account.fieldFail.billing_position}

{$account.fieldFail.billing_position}

{/if}
-
-
- - - {if $settings.billing_contact_name_enabled} -
-
Billing Contact Name
-
- - {if $account.fieldFail.billing_contact_name}

{$account.fieldFail.billing_contact_name}

{/if}
-
-
- {else} -
-
Billing First Name
-
- - {if $account.fieldFail.billing_fname}

{$account.fieldFail.billing_fname}

{/if}
-
-
+ {if $settings.billing_county_enabled} + {* Billing County *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_county', + 'label' => 'Billing County' + ]} + {include file='admin/ui/f6-select.html'} + {else} + + {/if} + + {* Billing State *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_state', + 'label' => 'Billing State' + ]} + {include file='admin/ui/f6-select.html'} -
-
Billing Last Name
-
- - {if $account.fieldFail.billing_lname}

{$account.fieldFail.billing_lname}

{/if}
-
-
- {/if} + {* Billing Zip *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_zip', + 'label' => 'Billing Zip' + ]} + {include file='admin/ui/f6-text.html'} -
-
Billing Address 1
-
- - {if $account.fieldFail.billing_addr1}

{$account.fieldFail.billing_addr1}

{/if}
-
-
- -
-
Billing Address2
-
- - {if $account.fieldFail.billing_addr2}

{$account.fieldFail.billing_addr2}

{/if}
-
-
- -
-
Billing City
-
- - {if $account.fieldFail.billing_city}

{$account.fieldFail.billing_city}

{/if}
-
-
- - {if $settings.billing_county_enabled} -
-
Billing County
-
- - {if $account.fieldFail.billing_county}

{$account.fieldFail.billing_county}

{/if}
-
-
- {else} - - {/if} + {* Billing Country *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_country', + 'label' => 'Billing Country' + ]} + {include file='admin/ui/f6-text.html'} -
-
Billing State
-
- - {if $account.fieldFail.billing_state}

{$account.fieldFail.billing_state}

{/if}
-
-
- -
-
Billing Zip
-
- - {if $account.fieldFail.billing_zip}

{$account.fieldFail.billing_zip}

{/if}
-
-
- -
-
Billing Country
-
- - {if $account.fieldFail.billing_country}

{$account.fieldFail.billing_country}

{/if}
-
-
- -
-
Billing Phone
-
- - {if $account.fieldFail.billing_phone}

{$account.fieldFail.billing_phone}

{/if}
-
-
- -
-
Billing Fax
-
- - {if $account.fieldFail.billing_fax}

{$account.fieldFail.billing_fax}

{/if}
-
-
+ {* Billing Phone *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_phone', + 'label' => 'Billing Phone' + ]} + {include file='admin/ui/f6-text.html'} + + {* Billing Fax *} + {$fieldData = [ + 'data' => $data, + 'field' => 'billing_fax', + 'label' => 'Billing Fax' + ]} + {include file='admin/ui/f6-text.html'}
diff --git a/views/admin/billing/makePaymentAdjustment.html b/views/admin/billing/makePaymentAdjustment.html index ea02de2..ba1fd22 100644 --- a/views/admin/billing/makePaymentAdjustment.html +++ b/views/admin/billing/makePaymentAdjustment.html @@ -1,8 +1,14 @@ {* makePaymentAdjustment *} {* This Form is used for uptravel billing member payments *} -{include file='admin/member/header.html'} -{include file='admin/billing/memberBillingSubHeader.html'} +{if !$adminAjaxPassthru} + {include file='admin/member/header.html'} + {include file='admin/billing/memberBillingSubHeader.html'} +{else} + +{/if}
@@ -130,4 +136,6 @@ jQuery(document).ready(function($){ }); -{include file='admin/footer.html'} +{if !$adminAjaxPassthru} + {include file='admin/footer.html'} +{/if} diff --git a/views/admin/billing/statements.html b/views/admin/billing/statements.html index 8bbee6b..22886a0 100644 --- a/views/admin/billing/statements.html +++ b/views/admin/billing/statements.html @@ -145,7 +145,7 @@ {if isset( $settings.invoice_pdf_enabled ) && $settings.invoice_pdf_enabled} Print {else} - View + View {/if} diff --git a/views/admin/billing/viewInvoice.html b/views/admin/billing/viewInvoice.html index 8d9bd0a..06f466c 100644 --- a/views/admin/billing/viewInvoice.html +++ b/views/admin/billing/viewInvoice.html @@ -1,21 +1,27 @@ -{if $fromMemberMenu} - {include file='admin/member/header.html'} - {include file='admin/billing/memberBillingSubHeader.html'} +{if !$adminAjaxPassthru} + {if $fromMemberMenu} + {include file='admin/member/header.html'} + {include file='admin/billing/memberBillingSubHeader.html'} + {else} + {include file='admin/billing/header.html'} + {include file='admin/billing/subHeader.html'} + {/if} {else} - {include file='admin/billing/header.html'} - {include file='admin/billing/subHeader.html'} + {/if} -
- {if $fromMemberMenu && $balance_due} - Pay Invoice - {/if} +
+ {if $fromMemberMenu && $balance_due} + Pay Invoice + {/if} -
Print
-
- {$invoiceHtml} +
Print
+
+ {$invoiceHtml} +
-
-{include file='admin/footer.html'} +{if !$adminAjaxPassthru} + {include file='admin/footer.html'} +{/if} -- 2.17.1