From: Steve Sutton Date: Thu, 15 Mar 2018 20:50:15 +0000 (-0400) Subject: Trying to setup create invoices X-Git-Tag: v1.0.0^2~140 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=f838a80149cee2fca547edd5557a0ce073546bf9;p=WP-Plugins%2Fglm-member-db-billing.git Trying to setup create invoices Finally got to output the create invoice view file. --- 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 "
" . print_r($regSettings, true) . "
"; @@ -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/import.php b/models/admin/management/import.php new file mode 100644 index 0000000..3c40dce --- /dev/null +++ b/models/admin/management/import.php @@ -0,0 +1,166 @@ + + * @license http://www.gaslightmedia.com Gaslightmedia + * @release billing.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ + * @link http://dev.gaslightmedia.com/ + */ + +// Load Management Billing data abstract +require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php'; + +/** + * GlmMembersAdmin_management_import + * + * PHP version 5 + * + * @category Model + * @package GLM Member DB + * @author Chuck Scott + * @license http://www.gaslightmedia.com Gaslightmedia + * @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott + * Exp $ + */ +class GlmMembersAdmin_management_import // extends GlmDataBillingManagement +{ + + /** + * WordPress Database Object + * + * @var $wpdb + * @access public + */ + public $wpdb; + /** + * dbh Postgres database connection + * + * @var mixed + * @access public + */ + public $config; + /** + * settings used for the schema and tablenames + * + * @var mixed + * @access public + */ +// public $settings = array(); +// /** +// * billing +// * +// * @var bool +// * @access public +// */ +// public $billing = array(); + + /** + * Constructor + * + * This contructor performs the work for this model. This model returns + * an array containing the following. + * + * 'status' + * + * True if successfull and false if there was a fatal failure. + * + * 'view' + * + * A suggested view name that the contoller should use instead of the + * default view for this model or false to indicate that the default view + * should be used. + * + * 'data' + * + * Data that the model is returning for use in merging with the view to + * produce output. + * + * @wpdb object WordPress database object + * + * @return array Array containing status, suggested view, and any data + */ + public function __construct ($wpdb, $config) + { + + // Save WordPress Database object + $this->wpdb = $wpdb; + + // Save plugin configuration object + $this->config = $config; + + // Run constructor for members data class + // parent::__construct(false, false); + + } + + /** + * modelAction + * + * @param bool $actionData + * @access public + * @return void + */ + public function modelAction($actionData = false) + { + + $option = false; + $importResults = importResults; + + // General settings are always stored in a record with ID=1. + $id = 1; + + // Determine if current user can import billing + if (!current_user_can('glm_members_management')) { + return array( + 'status' => false, + 'menuItemRedirect' => 'error', + 'modelRedirect' => 'index', + 'view' => 'admin/error/index.html', + 'data' => array( + 'reason' => 'User does not have rights to import.' + ) + ); + } + + // Check for submission option + $option = ''; + if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') { + $option = $_REQUEST['option']; + } + + switch( $option ) { + + // Update the settings and redisplay the form + case 'submit': + + break; + + // Default is to get the current settings and display the form + default: + + break; + + } + + // Compile template data + $template_data = array( + 'importResults' => $importResults, + ); + + // Return status, suggested view, and data to controller + return array( + 'status' => true, + 'menuItemRedirect' => false, + 'modelRedirect' => false, + 'view' => 'admin/management/import.html', + 'data' => $template_data + ); + } +} +?> diff --git a/models/admin/management/transfer.php b/models/admin/management/transfer.php deleted file mode 100644 index 61fab85..0000000 --- a/models/admin/management/transfer.php +++ /dev/null @@ -1,166 +0,0 @@ - - * @license http://www.gaslightmedia.com Gaslightmedia - * @release billing.php,v 1.0 2014/10/31 19:31:47 cscott Exp $ - * @link http://dev.gaslightmedia.com/ - */ - -// Load Management Billing data abstract -require_once GLM_MEMBERS_BILLING_PLUGIN_CLASS_PATH.'/data/dataManagement.php'; - -/** - * GlmMembersAdmin_management_billing - * - * PHP version 5 - * - * @category Model - * @package GLM Member DB - * @author Chuck Scott - * @license http://www.gaslightmedia.com Gaslightmedia - * @release SVN: $Id: packaging.php,v 1.0 2011/01/25 19:31:47 cscott - * Exp $ - */ -class GlmMembersAdmin_management_transfer // extends GlmDataBillingManagement -{ - - /** - * WordPress Database Object - * - * @var $wpdb - * @access public - */ - public $wpdb; - /** - * dbh Postgres database connection - * - * @var mixed - * @access public - */ - public $config; - /** - * settings used for the schema and tablenames - * - * @var mixed - * @access public - */ -// public $settings = array(); -// /** -// * billing -// * -// * @var bool -// * @access public -// */ -// public $billing = array(); - - /** - * Constructor - * - * This contructor performs the work for this model. This model returns - * an array containing the following. - * - * 'status' - * - * True if successfull and false if there was a fatal failure. - * - * 'view' - * - * A suggested view name that the contoller should use instead of the - * default view for this model or false to indicate that the default view - * should be used. - * - * 'data' - * - * Data that the model is returning for use in merging with the view to - * produce output. - * - * @wpdb object WordPress database object - * - * @return array Array containing status, suggested view, and any data - */ - public function __construct ($wpdb, $config) - { - - // Save WordPress Database object - $this->wpdb = $wpdb; - - // Save plugin configuration object - $this->config = $config; - - // Run constructor for members data class - // parent::__construct(false, false); - - } - - /** - * modelAction - * - * @param bool $actionData - * @access public - * @return void - */ - public function modelAction($actionData = false) - { - - $option = false; - $importResults = importResults; - - // General settings are always stored in a record with ID=1. - $id = 1; - - // Determine if current user can import billing - if (!current_user_can('glm_members_management')) { - return array( - 'status' => false, - 'menuItemRedirect' => 'error', - 'modelRedirect' => 'index', - 'view' => 'admin/error/index.html', - 'data' => array( - 'reason' => 'User does not have rights to import.' - ) - ); - } - - // Check for submission option - $option = ''; - if (isset($_REQUEST['option']) && $_REQUEST['option'] == 'submit') { - $option = $_REQUEST['option']; - } - - switch( $option ) { - - // Update the settings and redisplay the form - case 'submit': - - break; - - // Default is to get the current settings and display the form - default: - - break; - - } - - // Compile template data - $template_data = array( - 'importResults' => $importResults, - ); - - // Return status, suggested view, and data to controller - return array( - 'status' => true, - 'menuItemRedirect' => false, - 'modelRedirect' => false, - 'view' => 'admin/management/import.html', - 'data' => $template_data - ); - } -} -?> 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/createInvoices.html b/views/admin/management/createInvoices.html new file mode 100644 index 0000000..a127aea --- /dev/null +++ b/views/admin/management/createInvoices.html @@ -0,0 +1,8 @@ +{include file='admin/management/header.html'} + +{include file='admin/management/subHeader.html'} + + +
+ +{include file='admin/management/footer.html'} diff --git a/views/admin/management/import.html b/views/admin/management/import.html deleted file mode 100644 index c9227fa..0000000 --- a/views/admin/management/import.html +++ /dev/null @@ -1,6 +0,0 @@ -{include file='admin/management/header.html'} - - -
- -{include file='admin/management/footer.html'} 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 @@

General Settings - Import Billing + class="glm-settings-tab nav-tab{if $option == ''} nav-tab-active{/if}">General Settings + Create Invoices