Update for new account

when adding a new account goto the account page.

diff --git a/views/admin/billing/editAccountAjax.html b/views/admin/billing/editAccountAjax.html
index 3d42d61..99bd4ba 100644 (file)
--- a/views/admin/billing/editAccountAjax.html
+++ b/views/admin/billing/editAccountAjax.html
@@ -270,7 +270,7 @@
             ]}
             {include file='ui/f6/text.html'}
 
-            {if $settings.billing_county_enabled}
+            {if $settings.billing_county_enabled && !empty($data.fieldData.billing_county.list)}
                 {* Billing County *}
                 {$ui = [
                     'value'     => $data.fieldData.billing_county.value,
@@ -362,6 +362,7 @@
 
     <script>
     jQuery(document).ready(function($){
+        var haveAccount = {if !empty($haveAccount)}true{else}false{/if};
 
         var accounts = [ {foreach $accounts as $m} { label: "{$m.ref_name|unescape:'html'|replace:'"':''}", value: "{$m.ref_name|unescape:'html'|replace:'"':''}", id: '{$m.id}' }, {/foreach} ];
         var isBoss = {if $account.fieldData.boss.value}true{else}false{/if};
@@ -455,6 +456,12 @@
                     var ref_name = rsp.fieldData.ref_name;
                     // kill this abide form
                     $('#billingInfoForm').foundation('_destroy');
+                    if ( haveAccount === false ) {
+                        // reload the page
+                        var billingAccountPageUrl = '{$adminUrl}?page=glm-members-admin-menu-billing&glm_action=accounts';
+                        window.location.href = billingAccountPageUrl;
+                        //console.log('billingAccountPageUrl: ', billingAccountPageUrl);
+                    }
                 } else {
                     return false;
                 }

diff --git a/views/admin/billing/settings.html b/views/admin/billing/settings.html
index ad02aa7..837a312 100644 (file)
--- a/views/admin/billing/settings.html
+++ b/views/admin/billing/settings.html
@@ -467,16 +467,20 @@
                             ]}
                             {include file='ui/f6/checkbox.html'}
 
-                            {* Enable Billing Counties *}
-                            {$ui = [
-                                'value'     => $data.fieldData.billing_county_enabled.value,
-                                'field'     => 'billing_county_enabled',
-                                'label'     => 'Enable Billing Counties',
-                                'required'  => $data.fieldRequired.billing_county_enabled,
-                                'errorText' => 'Enable Billing Counties is Required',
-                                'dataError' => $data.fieldFail.billing_county_enabled
-                            ]}
-                            {include file='ui/f6/checkbox.html'}
+                            {if $settings.enable_counties}
+                                {* Enable Billing Counties *}
+                                {$ui = [
+                                    'value'     => $data.fieldData.billing_county_enabled.value,
+                                    'field'     => 'billing_county_enabled',
+                                    'label'     => 'Enable Billing Counties',
+                                    'required'  => $data.fieldRequired.billing_county_enabled,
+                                    'errorText' => 'Enable Billing Counties is Required',
+                                    'dataError' => $data.fieldFail.billing_county_enabled
+                                ]}
+                                {include file='ui/f6/checkbox.html'}
+                            {else}
+                                <input type="hidden" name="billing_county_enabled" value="0">
+                            {/if}
 
                             {* Enable Billing Contact Name *}
                             {$ui = [