From aada1df504e86d27958904046a783ef5aaddd4e5 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 6 Apr 2018 11:03:53 -0400
Subject: [PATCH] Fix conflict with same validAction ajax call as
 registrations.

Need to keep ajax admin call names unique.
---
 models/admin/ajax/{account.php => billingAccount.php} | 2 +-
 setup/validActions.php                                | 2 +-
 views/admin/billing/editInvoice.html                  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename models/admin/ajax/{account.php => billingAccount.php} (98%)

diff --git a/models/admin/ajax/account.php b/models/admin/ajax/billingAccount.php
similarity index 98%
rename from models/admin/ajax/account.php
rename to models/admin/ajax/billingAccount.php
index c9347ed..306d570 100644
--- a/models/admin/ajax/account.php
+++ b/models/admin/ajax/billingAccount.php
@@ -21,7 +21,7 @@ require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH . '/data/dataAccounts.php';
  * an AJAX call that goes through the WorPress AJAX Handler.
  *
  */
-class GlmMembersAdmin_ajax_account extends GlmDataAccounts
+class GlmMembersAdmin_ajax_billingAccount extends GlmDataAccounts
 {
 
     /**
diff --git a/setup/validActions.php b/setup/validActions.php
index 7407416..d0b1626 100644
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -62,7 +62,7 @@ $glmMembersBillingAddOnValidActions = array(
         'ajax' => array(
             'setupQueue'         => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
             'runQueue'           => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
-            'account'            => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
+            'billingAccount'     => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
             'invoices'           => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
             'invoiceTypes'       => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
             'createNewInvoices'  => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
diff --git a/views/admin/billing/editInvoice.html b/views/admin/billing/editInvoice.html
index 99f4d6d..0be2545 100644
--- a/views/admin/billing/editInvoice.html
+++ b/views/admin/billing/editInvoice.html
@@ -453,7 +453,7 @@ jQuery(document).ready(function($){
         if ( valid ) {
             // console.log( newAccountForm.serialize() );
             $.ajax({
-                url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=account&option=add',
+                url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=billingAccount&option=add',
                 cache: false,
                 type: 'POST',
                 data: newAccountForm.serialize(),
@@ -535,7 +535,7 @@ jQuery(document).ready(function($){
             url: '{$ajaxUrl}',
             cache: false,
             type: 'GET',
-            data: 'action=glm_members_admin_ajax&glm_action=account&option=list',
+            data: 'action=glm_members_admin_ajax&glm_action=billingAccount&option=list',
             encode: true,
             dataType: 'json'
         }).done(function(msg){
@@ -595,7 +595,7 @@ jQuery(document).ready(function($){
             url: '{$ajaxUrl}',
             cache: false,
             type: 'GET',
-            data: 'action=glm_members_admin_ajax&glm_action=account&option=listNonAccounts',
+            data: 'action=glm_members_admin_ajax&glm_action=billingAccount&option=listNonAccounts',
             encode: true,
             dataType: 'json'
         }).done(function(msg){
-- 
2.17.1