WIP getting foundation abide to work

working on form validation.

diff --git a/classes/data/dataAccounts.php b/classes/data/dataAccounts.php
index f602db8..56d34e3 100644 (file)
--- 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 (file)
--- 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 @@
 </div>
 <div id="glmBillingPayment" class="medium reveal" data-reveal>
 </div>
+<div id="glmBillingView" class="large reveal" data-reveal>
+</div>
 <div id="glmLoading" class="" style="display:none; position: absolute; left: 50%; top: 50vh;width: 100%; height: 100%;z-index: 9999;">
     <img src="{$pluginAssetsUrl}loading25.gif">
 </div>

diff --git a/views/admin/billing/editAccount.html b/views/admin/billing/editAccount.html
index 0955c83..4f7a622 100644 (file)
--- a/views/admin/billing/editAccount.html
+++ b/views/admin/billing/editAccount.html
@@ -20,8 +20,6 @@
     {if $adminAjaxPassthru}
         <form id="billingInfoForm" action="{$ajaxUrl}?action=glm_members_admin_ajax" method="post">
             <input type="hidden" name="glm_action" value="ajaxBillingInfo" />
-
-            <input class="button button-primary" type="submit" value="{if $haveAccount}Save{else}Create{/if} Account">
     {else}
         <form action="{$thisUrl}?page=glm-members-admin-menu-member" method="post">
             <input type="hidden" name="page" value="glm-members-admin-menu-member" />

diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html
index 2ba6786..5985801 100644 (file)
--- a/views/admin/billing/editAccountAjax.html
+++ b/views/admin/billing/editAccountAjax.html
@@ -13,7 +13,6 @@
     <form id="billingInfoForm" action="{$ajaxUrl}?action=glm_members_admin_ajax" method="post" data-abide novalidate>
         <input type="hidden" name="glm_action" value="ajaxBillingInfo" />
 
-        <input class="button button-primary" type="submit" value="{if $haveAccount}Save{else}Create{/if} Account">
         <input type="hidden" name="member" value="{$memberID}" />
         <input type="hidden" name="ref_dest" value="{$memberID}" />
         <input type="hidden" name="option" value="account" />
@@ -35,236 +34,234 @@
         <fieldset class="fieldset">
             <legend>Account Information</legend>
 
-            {$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}
+
+                <div class="glm-billing-field">
+                    <div class="glm-billing-label{if $account.fieldRequired.boss} glm-required{/if}">Boss</div>
+                    <div class="glm-billing-input{if $account.fieldFail.boss} glm-form-bad-input{/if}" data-tabid="glm-name">
+                        <input id="billing-boss" type="checkbox" name="boss"{if $account.fieldData.boss.value} checked{/if}>
+                    {if $account.fieldFail.boss}<p>{$account.fieldFail.boss}</p>{/if}<br>
+                    </div>
+                </div>
 
-            {$field = 'account_number'}
-            {$fieldLabel = 'Account Number'}
-            {include file='admin/ui/f6-text.html'}
+                <div id="glm-emp-list" class="glm-billing-field">
+                    <div class="glm-billing-label">
+                        <strong>Associated Members/Employees</strong>
+                    </div>
+                    <div class="glm-billing-input">
+                        <input id="glm-billing-member-list" placeholder="Lookup Member">
+                        <div id="glm-billing-employees">
+                            {if $employees}
+                                {foreach $employees as $employee}
+                                    <div class="glm-billing-employee">
+                                        <input type="hidden" name="employees[{$employee.employee}]" value="1">
+                                        {$employee.employee_name}
+                                        <span class="glm-billing-employee-del dashicons dashicons-trash glm-right"></span>
+                                    </div>
+                                {/foreach}
+                            {/if}
+                        </div>
+                    </div>
+                </div>
 
-        {/if}
+            {/if}
 
-        {if !$settings.member_types_enabled}
+        </fieldset>
 
-            {$field = 'invoice_type'}
-            {$fieldLabel = 'Payment Type'}
-            {include file='admin/ui/f6-select.html'}
+        <fieldset class="fieldset">
+            <legend>Billing Information</legend>
+
+            {* 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'}
 
-            <div class="">
-                <div class="glm-billing-label">Invoice Delivery Methods</div>
-                <div class="glm-billing-input" data-tabid="glm-invoice-method">
-                    <label for="email_invoice"><input id="email_invoice" type="checkbox" name="email_invoice" {if $account.fieldData.email_invoice.value}checked{/if} /> By Email</label>
-                    <label for="usmail_invoice"><input id="usmail_invoice" type="checkbox" name="usmail_invoice" {if $account.fieldData.usmail_invoice.value}checked{/if} /> By US mail</label>
-                    <label for="fax_invoice"><input id="fax_invoice" type="checkbox" name="fax_invoice" {if $account.fieldData.fax_invoice.value}checked{/if} /> By Fax</label>
-                </div>
-            </div>
+            {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'}
 
-        <div class="glm-billing-field glm-billing-left-half">
-            <div class="glm-billing-label{if $account.fieldRequired.anniversary_date} glm-required{/if}">Anniversary Date</div>
-            <div class="glm-billing-input{if $account.fieldFail.anniversary_date} glm-form-bad-input{/if}" data-tabid="glm-anniversary-date">
-                <input type="text" name="anniversary_date" value="{$account.fieldData.anniversary_date.date}" class="glm-form-text-input-medium">
-                {if $account.fieldFail.anniversary_date}<p>{$account.fieldFail.anniversary_date}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-right-half">
-            <div class="glm-billing-label{if $account.fieldRequired.renewal_date} glm-required{/if}">Renewal Date</div>
-            <div class="glm-billing-input{if $account.fieldFail.renewal_date} glm-form-bad-input{/if}" data-tabid="glm-renewal-date">
-                <input type="text" name="renewal_date" value="{$account.fieldData.renewal_date.date}" class="glm-form-text-input-medium">
-                {if $account.fieldFail.renewal_date}<p>{$account.fieldFail.renewal_date}</p>{/if}<br>
-            </div>
-        </div>
-    {/if}
-
-    {if $settings.allow_employees}
-
-        <div class="glm-billing-field">
-            <div class="glm-billing-label{if $account.fieldRequired.boss} glm-required{/if}">Boss</div>
-            <div class="glm-billing-input{if $account.fieldFail.boss} glm-form-bad-input{/if}" data-tabid="glm-name">
-                <input id="billing-boss" type="checkbox" name="boss"{if $account.fieldData.boss.value} checked{/if}>
-            {if $account.fieldFail.boss}<p>{$account.fieldFail.boss}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div id="glm-emp-list" class="glm-billing-field">
-            <div class="glm-billing-label">
-                <strong>Associated Members/Employees</strong>
-            </div>
-            <div class="glm-billing-input">
-                <input id="glm-billing-member-list" placeholder="Lookup Member">
-                <div id="glm-billing-employees">
-                    {if $employees}
-                        {foreach $employees as $employee}
-                            <div class="glm-billing-employee">
-                                <input type="hidden" name="employees[{$employee.employee}]" value="1">
-                                {$employee.employee_name}
-                                <span class="glm-billing-employee-del dashicons dashicons-trash glm-right"></span>
-                            </div>
-                        {/foreach}
-                    {/if}
-                </div>
-            </div>
-        </div>
-
-    {/if}
-
-    </fieldset>
-
-    <fieldset>
-        <legend>Billing Information</legend>
-
-        <div class="glm-billing-field">
-            <div class="glm-billing-label{if $account.fieldRequired.email} glm-required{/if}">Billing Email</div>
-            <div class="glm-billing-input{if $account.fieldFail.email} glm-form-bad-input{/if}" data-tabid="glm-email">
-                <input type="email" name="email" value="{$account.fieldData.email}" class="glm-form-text-input-medium"{if $account.fieldRequired.email} required{/if}>
-                {if $account.fieldFail.email}<p>{$account.fieldFail.email}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_company} glm-required{/if}">Billing Company</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_company} glm-form-bad-input{/if}" data-tabid="glm-billing-company">
-                <input type="text" name="billing_company" value="{$account.fieldData.billing_company}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_company} required{/if}>
-                {if $account.fieldFail.billing_company}<p>{$account.fieldFail.billing_company}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_position} glm-required{/if}">Billing Position</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_position} glm-form-bad-input{/if}" data-tabid="glm-billing-position">
-                <input type="text" name="billing_position" value="{$account.fieldData.billing_position}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_position} required{/if}>
-                {if $account.fieldFail.billing_position}<p>{$account.fieldFail.billing_position}</p>{/if}<br>
-            </div>
-        </div>
-
-
-        {if $settings.billing_contact_name_enabled}
-            <div class="glm-billing-field">
-                <div class="glm-billing-label{if $account.fieldRequired.billing_contact_name} glm-required{/if}">Billing Contact Name</div>
-                <div class="glm-billing-input{if $account.fieldFail.billing_contact_name} glm-form-bad-input{/if}" data-tabid="glm-billing-fname">
-                    <input type="text" name="billing_contact_name" value="{$account.fieldData.billing_contact_name}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_contact_name} required{/if}>
-                    {if $account.fieldFail.billing_contact_name}<p>{$account.fieldFail.billing_contact_name}</p>{/if}<br>
-                </div>
-            </div>
-        {else}
-            <div class="glm-billing-field glm-billing-left-half">
-                <div class="glm-billing-label{if $account.fieldRequired.billing_fname} glm-required{/if}">Billing First Name</div>
-                <div class="glm-billing-input{if $account.fieldFail.billing_fname} glm-form-bad-input{/if}" data-tabid="glm-billing-fname">
-                    <input type="text" name="billing_fname" value="{$account.fieldData.billing_fname}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_fname} required{/if}>
-                    {if $account.fieldFail.billing_fname}<p>{$account.fieldFail.billing_fname}</p>{/if}<br>
-                </div>
-            </div>
+            {if $settings.billing_county_enabled}
+                {* Billing County *}
+                {$fieldData = [
+                    'data'  => $data,
+                    'field' => 'billing_county',
+                    'label' => 'Billing County'
+                ]}
+                {include file='admin/ui/f6-select.html'}
+            {else}
+                <input type="hidden" name="billing_county" value="{$account.fieldData.billing_county.value}">
+            {/if}
+
+            {* Billing State *}
+            {$fieldData = [
+                'data'  => $data,
+                'field' => 'billing_state',
+                'label' => 'Billing State'
+            ]}
+            {include file='admin/ui/f6-select.html'}
 
-            <div class="glm-billing-field glm-billing-right-half">
-                <div class="glm-billing-label{if $account.fieldRequired.billing_lname} glm-required{/if}">Billing Last Name</div>
-                <div class="glm-billing-input{if $account.fieldFail.billing_lname} glm-form-bad-input{/if}" data-tabid="glm-billing-lname">
-                    <input type="text" name="billing_lname" value="{$account.fieldData.billing_lname}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_lname} required{/if}>
-                    {if $account.fieldFail.billing_lname}<p>{$account.fieldFail.billing_lname}</p>{/if}<br>
-                </div>
-            </div>
-        {/if}
+            {* Billing Zip *}
+            {$fieldData = [
+                'data'  => $data,
+                'field' => 'billing_zip',
+                'label' => 'Billing Zip'
+            ]}
+            {include file='admin/ui/f6-text.html'}
 
-        <div class="glm-billing-field glm-billing-left-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_addr1} glm-required{/if}">Billing Address 1</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_addr1} glm-form-bad-input{/if}" data-tabid="glm-billing-addr1">
-                <input type="text" name="billing_addr1" value="{$account.fieldData.billing_addr1}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_addr1} required{/if}>
-                {if $account.fieldFail.billing_addr1}<p>{$account.fieldFail.billing_addr1}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-right-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_addr2} glm-required{/if}">Billing Address2</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_addr2} glm-form-bad-input{/if}" data-tabid="glm-billing-addr2">
-                <input type="text" name="billing_addr2" value="{$account.fieldData.billing_addr2}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_addr2} required{/if}>
-                {if $account.fieldFail.billing_addr2}<p>{$account.fieldFail.billing_addr2}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-left-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_city} glm-required{/if}">Billing City</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_city} glm-form-bad-input{/if}" data-tabid="glm-billing-city">
-                <input type="text" name="billing_city" value="{$account.fieldData.billing_city}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_city} required{/if}>
-                {if $account.fieldFail.billing_city}<p>{$account.fieldFail.billing_city}</p>{/if}<br>
-            </div>
-        </div>
-
-        {if $settings.billing_county_enabled}
-        <div class="glm-billing-field glm-billing-right-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_county} glm-required{/if}">Billing County</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_county} glm-form-bad-input{/if}" data-tabid="glm-billing-county">
-                <select name="billing_county"{if $account.fieldRequired.billing_county} required{/if}>
-                    <option value=""></option>
-                    {foreach $account.fieldData.billing_county.list as $s}
-                        <option value="{$s.value}"{if $account.fieldData.billing_county.value == $s.value} selected="selected"{/if}>
-                            {$s.name}
-                        </option>
-                    {/foreach}
-                </select>
-                {if $account.fieldFail.billing_county}<p>{$account.fieldFail.billing_county}</p>{/if}<br>
-            </div>
-        </div>
-        {else}
-        <input type="hidden" name="billing_county" value="{$account.fieldData.billing_county.value}">
-        {/if}
+            {* Billing Country *}
+            {$fieldData = [
+                'data'  => $data,
+                'field' => 'billing_country',
+                'label' => 'Billing Country'
+            ]}
+            {include file='admin/ui/f6-text.html'}
 
-        <div class="glm-billing-field glm-billing-{if $settings.billing_county_enabled}left{else}right{/if}-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_state} glm-required{/if}">Billing State</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_state} glm-form-bad-input{/if}" data-tabid="glm-billing-state">
-                <select name="billing_state"{if $account.fieldRequired.billing_state} required{/if}>
-                    <option value=""></option>
-                    {foreach $account.fieldData.billing_state.list as $s}
-                        <option value="{$s.value}"{if $account.fieldData.billing_state.value == $s.value} selected="selected"{/if}>
-                            {$s.name}
-                        </option>
-                    {/foreach}
-                </select>
-                {if $account.fieldFail.billing_state}<p>{$account.fieldFail.billing_state}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-{if $settings.billing_county_enabled}right{else}left{/if}-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_zip} glm-required{/if}">Billing Zip</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_zip} glm-form-bad-input{/if}" data-tabid="glm-billing-zip">
-                <input type="text" name="billing_zip" value="{$account.fieldData.billing_zip}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_zip} required{/if}>
-                {if $account.fieldFail.billing_zip}<p>{$account.fieldFail.billing_zip}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-{if $settings.billing_county_enabled}left{else}right{/if}-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_country} glm-required{/if}">Billing Country</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_country} glm-form-bad-input{/if}" data-tabid="glm-billing-country">
-                <input type="text" name="billing_country" value="{$account.fieldData.billing_country}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_country} required{/if}>
-            {if $account.fieldFail.billing_country}<p>{$account.fieldFail.billing_country}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-{if $settings.billing_county_enabled}right{else}left{/if}-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_phone} glm-required{/if}">Billing Phone</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_phone} glm-form-bad-input{/if}" data-tabid="glm-billing-phone">
-                <input type="text" name="billing_phone" value="{$account.fieldData.billing_phone}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_phone} required{/if}>
-                {if $account.fieldFail.billing_phone}<p>{$account.fieldFail.billing_phone}</p>{/if}<br>
-            </div>
-        </div>
-
-        <div class="glm-billing-field glm-billing-{if $settings.billing_county_enabled}left{else}right{/if}-half">
-            <div class="glm-billing-label{if $account.fieldRequired.billing_fax} glm-required{/if}">Billing Fax</div>
-            <div class="glm-billing-input{if $account.fieldFail.billing_fax} glm-form-bad-input{/if}" data-tabid="glm-billing-fax">
-                <input type="text" name="billing_fax" value="{$account.fieldData.billing_fax}" class="glm-form-text-input-medium"{if $account.fieldRequired.billing_fax} required{/if}>
-                {if $account.fieldFail.billing_fax}<p>{$account.fieldFail.billing_fax}</p>{/if}<br>
-            </div>
-        </div>
+            {* 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'}
 
         </fieldset>
 

diff --git a/views/admin/billing/makePaymentAdjustment.html b/views/admin/billing/makePaymentAdjustment.html
index ea02de2..ba1fd22 100644 (file)
--- 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}
+    <button class="close-button" data-close aria-label="Close" type="button">
+        <span aria-hidden="true">&times;</span>
+    </button>
+{/if}
 
 <div id="billing-payment-form" class="glm-billing-form">
 
@@ -130,4 +136,6 @@ jQuery(document).ready(function($){
 });
 </script>
 
-{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 (file)
--- 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}
                                 <a class="print" data-member="{$memberID}" href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=createPDFInvoice&id={$transaction.type_id}" target="_blank">Print</a>
                             {else}
-                                <a class="view" data-member="{$memberID}" href="{$thisUrl}?page={$thisPage}&glm_action=billing&option=view&member={$memberID}&id={$transaction.type_id}">View</a>
+                                <a class="view" data-member="{$memberID}" data-id="{$transaction.type_id}" href="{$thisUrl}?page={$thisPage}&glm_action=billing&option=view&member={$memberID}&id={$transaction.type_id}">View</a>
                             {/if}
                         </td>
                     </tr>

diff --git a/views/admin/billing/viewInvoice.html b/views/admin/billing/viewInvoice.html
index 8d9bd0a..06f466c 100644 (file)
--- 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'}
+    <button class="close-button" data-close aria-label="Close" type="button">
+        <span aria-hidden="true">&times;</span>
+    </button>
 {/if}
 
-<div style="max-width: 850px;">
-    {if $fromMemberMenu && $balance_due}
-        <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$memberID}&option=makepayment" class="button button-secondary glm-right">Pay Invoice</a>
-    {/if}
+    <div style="max-width: 850px;">
+        {if $fromMemberMenu && $balance_due}
+            <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=billing&member={$memberID}&option=makepayment" class="button button-secondary glm-right">Pay Invoice</a>
+        {/if}
 
-    <div class="button button-secondary graph-print glm-right" data-areaToPrint="PrintArea">Print</div>
-    <div id="PrintArea" style="padding: 10px;">
-    {$invoiceHtml}
+        <div class="button button-secondary graph-print glm-right" data-areaToPrint="PrintArea">Print</div>
+        <div id="PrintArea" style="padding: 10px;">
+        {$invoiceHtml}
+        </div>
     </div>
-</div>
 
 <script src="{$jsUrl}/PrintArea/jquery.PrintArea.js" type="text/JavaScript" language="javascript"></script>
 <script>
@@ -38,4 +44,6 @@ jQuery(document).ready(function($) {
     });
 });
 </script>
-{include file='admin/footer.html'}
+{if !$adminAjaxPassthru}
+    {include file='admin/footer.html'}
+{/if}