From f838a80149cee2fca547edd5557a0ce073546bf9 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 15 Mar 2018 16:50:15 -0400
Subject: [PATCH] Trying to setup create invoices

Finally got to output the create invoice view file.
---
 models/admin/management/billing.php              | 16 +++++++++++++---
 .../management/{transfer.php => import.php}      |  4 ++--
 setup/validActions.php                           |  3 +--
 .../{import.html => createInvoices.html}         |  2 ++
 views/admin/management/subHeader.html            |  6 +++---
 5 files changed, 21 insertions(+), 10 deletions(-)
 rename models/admin/management/{transfer.php => import.php} (97%)
 rename views/admin/management/{import.html => createInvoices.html} (75%)

diff --git a/models/admin/management/billing.php b/models/admin/management/billing.php
index 9456246..37c05dd 100644
--- a/models/admin/management/billing.php
+++ b/models/admin/management/billing.php
@@ -113,6 +113,7 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement
         $settingsUpdated     = false;
         $settingsUpdateError = false;
         $regSettings         = false;
+        $view                = 'billing';
 
         // General settings are always stored in a record with ID=1.
         $id = 1;
@@ -132,10 +133,14 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement
 
         // Check for submission option
         $option = '';
-        if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') {
+        if (isset($_REQUEST['option'])) {
             $option = $_REQUEST['option'];
         }
 
+        if ( !isset( $option ) ) {
+            $option = '';
+        }
+
         switch( $option ) {
 
             // Update the settings and redisplay the form
@@ -156,6 +161,10 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement
 
                 break;
 
+            case 'createInvoices':
+                $view = 'createInvoices';
+                break;
+
             // Default is to get the current settings and display the form
             default:
 
@@ -188,7 +197,8 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement
         $template_data = array(
             'regSettings'         => $regSettings,
             'settingsUpdated'     => $settingsUpdated,
-            'settingsUpdateError' => $settingsUpdateError
+            'settingsUpdateError' => $settingsUpdateError,
+            'option'              => $option,
         );
 
         // echo "<pre>" . print_r($regSettings, true) . "</pre>";
@@ -198,7 +208,7 @@ class GlmMembersAdmin_management_billing extends GlmDataBillingManagement
             'status'           => true,
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
-            'view'             => 'admin/management/billing.html',
+            'view'             => 'admin/management/' . $view . '.html',
             'data'             => $template_data
         );
     }
diff --git a/models/admin/management/transfer.php b/models/admin/management/import.php
similarity index 97%
rename from models/admin/management/transfer.php
rename to models/admin/management/import.php
index 61fab85..3c40dce 100644
--- a/models/admin/management/transfer.php
+++ b/models/admin/management/import.php
@@ -17,7 +17,7 @@
 require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php';
 
 /**
- * GlmMembersAdmin_management_billing
+ * GlmMembersAdmin_management_import
  *
  * PHP version 5
  *
@@ -28,7 +28,7 @@ require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php';
  *            @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott
  *            Exp $
  */
-class GlmMembersAdmin_management_transfer // extends GlmDataBillingManagement
+class GlmMembersAdmin_management_import // extends GlmDataBillingManagement
 {
 
     /**
diff --git a/setup/validActions.php b/setup/validActions.php
index a5fbdb8..c83fa54 100644
--- a/setup/validActions.php
+++ b/setup/validActions.php
@@ -66,8 +66,7 @@ $glmMembersBillingAddOnValidActions = array(
             'invoiceTypes' => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
         ),
         'management' => array(
-            'billing'       => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
-            'transfer' => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
+            'billing' => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
         ),
         'settings' => array(
             'billing'           => GLM_MEMBERS_BILLING_PLUGIN_SLUG,
diff --git a/views/admin/management/import.html b/views/admin/management/createInvoices.html
similarity index 75%
rename from views/admin/management/import.html
rename to views/admin/management/createInvoices.html
index c9227fa..a127aea 100644
--- a/views/admin/management/import.html
+++ b/views/admin/management/createInvoices.html
@@ -1,5 +1,7 @@
 {include file='admin/management/header.html'}
 
+{include file='admin/management/subHeader.html'}
+
 <table class="glm-admin-table glm-settings-table">
 </table>
 
diff --git a/views/admin/management/subHeader.html b/views/admin/management/subHeader.html
index 9b0d5b8..c46a790 100644
--- a/views/admin/management/subHeader.html
+++ b/views/admin/management/subHeader.html
@@ -1,7 +1,7 @@
 
 <h2 class="nav-tab-wrapper" style="margin-bottom: 1em;">
     <a href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=billing"
-    class="glm-settings-tab nav-tab nav-tab-active">General Settings</a>
-    <a href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=transfer"
-    class="glm-settings-tab nav-tab nav-tab-active">Import Billing</a>
+    class="glm-settings-tab nav-tab{if $option == ''} nav-tab-active{/if}">General Settings</a>
+    <a href="{$thisUrl}?page=glm-members-admin-menu-management&glm_action=billing&option=createInvoices"
+    class="glm-settings-tab nav-tab{if $option == 'createInvoices'} nav-tab-active{/if}">Create Invoices</a>
 </h2>
-- 
2.17.1