More db updates for billing.
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Nov 2018 21:31:00 +0000 (16:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Nov 2018 21:31:00 +0000 (16:31 -0500)
Adding county to the billing account table.
Adding more settings and management options for the plugin.

14 files changed:
classes/data/dataAccounts.php
classes/data/dataManagement.php
classes/data/dataSettings.php
index.php
models/admin/billing/invoicing.php
models/admin/management/importAccounts.php
setup/databaseScripts/create_database_V0.0.28.sql [deleted file]
setup/databaseScripts/create_database_V0.0.29.sql [new file with mode: 0644]
setup/databaseScripts/dbVersions.php
setup/databaseScripts/update_database_V0.0.28.sql
setup/databaseScripts/update_database_V0.0.29.sql [new file with mode: 0644]
views/admin/billing/editAccount.html
views/admin/management/billing.html
views/admin/settings/billing.html

index e12270c..632baae 100644 (file)
@@ -340,6 +340,18 @@ class GlmDataAccounts extends GlmDataAbstract
                 'required' => false,
             ),
 
+            // Billing County
+            'billing_county' => array(
+                'field'     => 'billing_county',
+                'type'      => 'pointer',
+                'p_table'   => GLM_MEMBERS_PLUGIN_DB_PREFIX .  'counties',
+                'p_field'   => 'name',
+                'p_orderby' => 'name',
+                'p_blank'   => false,
+                'use'       => 'a',
+                'required'  => false,
+            ),
+
             // Customer Profile Id
             // 'customer_profile_id' => array(
             //     'field'    => 'customer_profile_id',
index d930f0a..5bb8f29 100644 (file)
@@ -218,6 +218,13 @@ class GlmDataBillingManagement extends GlmDataAbstract
                 'use' => 'a'
             ),
 
+            // Use uptra invoice template
+            'uptravel_invoice_template' => array(
+                'field' => 'uptravel_invoice_template',
+                'type'  => 'checkbox',
+                'use'   => 'a',
+            ),
+
         );
 
     }
index 024d052..7022bd1 100644 (file)
@@ -272,6 +272,41 @@ class GlmDataBillingSettings extends GlmDataAbstract
                 'use'   => 'a',
             ),
 
+            // Renewal Date static
+            'renewal_day_static' => array(
+                'field' => 'renewal_day_static',
+                'type'  => 'checkbox',
+                'use'   => 'a',
+            ),
+
+            // Billing Counties enabled
+            'billing_county_enabled' => array(
+                'field' => 'billing_county_enabled',
+                'type'  => 'checkbox',
+                'use'   => 'a',
+            ),
+
+            // Renewal Day
+            'renewal_day' => array(
+                'field' => 'renewal_day',
+                'type'  => 'text',
+                'use'   => 'a',
+            ),
+
+            // Renewal Month
+            'renewal_month' => array(
+                'field' => 'renewal_month',
+                'type'  => 'text',
+                'use'   => 'a',
+            ),
+
+            // Create PDF invoices
+            'invoice_pdf_enabled' => array(
+                'field' => 'invoice_pdf_enabled',
+                'type'  => 'checkbox',
+                'use'   => 'a',
+            ),
+
          );
 
     }
index cf9bf47..1d49158 100644 (file)
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@
  *  version from this plugin.
  */
 define('GLM_MEMBERS_BILLING_PLUGIN_VERSION', '1.0.16');
-define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.28');
+define('GLM_MEMBERS_BILLING_PLUGIN_DB_VERSION', '0.0.29');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
 define('GLM_MEMBERS_BILLING_PLUGIN_MIN_MEMBERS_REQUIRED_VERSION', '2.8.0');
index d5aafc6..653cca1 100644 (file)
@@ -112,7 +112,7 @@ class GlmMembersAdmin_billing_invoicing //extends GlmDataAccounts
         $BillingSupport = new GlmBillingSupport( $this->wpdb, $this->config );
         $Accounts       = new GlmDataAccounts( $this->wpdb, $this->config );
 
-        echo '<pre>$_REQUEST: ' . print_r( $_REQUEST, true ) . '</pre>';
+        // echo '<pre>$_REQUEST: ' . print_r( $_REQUEST, true ) . '</pre>';
 
         if ( isset( $_REQUEST['invoice_types'] ) ) {
 
@@ -123,7 +123,8 @@ class GlmMembersAdmin_billing_invoicing //extends GlmDataAccounts
 
         if ( isset( $_REQUEST['counties'] ) ) {
 
-            // $wParts[] = "T.";
+            $countiesSelected = $_REQUEST['counties'];
+            $wParts[] = "T.billing_county IN (" . implode(',', $countiesSelected ) . ")";
 
         }
 
@@ -137,7 +138,7 @@ class GlmMembersAdmin_billing_invoicing //extends GlmDataAccounts
             switch( $option2 ) {
             case 'Create Invoices':
                 $accounts = $Accounts->getSimpleAccountList( $where );
-                echo '<pre>$accounts: ' . print_r( $accounts, true ) . '</pre>';
+                // echo '<pre>$accounts: ' . print_r( $accounts, true ) . '</pre>';
                 foreach ( $accounts as $account ) {
                     // Get the invoice type
                     $invoiceType = $BillingSupport->getInvoiceTypeById( $account['invoice_type'] );
index c924574..9fedbb5 100644 (file)
@@ -145,7 +145,7 @@ SELECT M.member_id,M.billing_contact,M.account_number,
        PT.name as payment_type,M.process_email as email, M.member_name,
        MA.email_invoice, MA.usmail_invoice, MA.fax_invoice,
        M.mailing_address,M.mailing_city_id,M.mailing_state_id,M.mailing_zip,
-       M.street,M.city_id,M.state_id,M.zip
+       M.street,M.city_id,M.state_id,M.zip,M.region
   FROM members.member M
 LEFT OUTER JOIN members.member_account MA ON ( MA.member_id = M.member_id )
 LEFT OUTER JOIN members.payment_types PT ON ( MA.payment_type = PT.id )
@@ -182,6 +182,23 @@ $getCity = $dbh->prepare(
        FROM members.city
       WHERE city_id = :id"
 );
+$getRegion = $dbh->prepare(
+    "SELECT region_name
+       FROM members.region
+      WHERE region_id = :id"
+);
+
+function getCountyId( $wpdb, $county_name )
+{
+    return $wpdb->get_var(
+        $wpdb->prepare(
+            "SELECT id
+               FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "counties
+              WHERE name = %s",
+            $county_name
+        )
+    );
+}
 
 foreach ( $members as $member ) {
 
@@ -204,7 +221,7 @@ foreach ( $members as $member ) {
 
         //$refName = ( $member['billing_contact'] ) ? $member['billing_contact'] : $member['member_name'];
         $refName = $member['member_name'];
-        $city = $state = '';
+        $city = $state = $county = '';
 
         if ( $member['mailing_address'] ) {
             $addr1 = $member['mailing_address'];
@@ -224,18 +241,25 @@ foreach ( $members as $member ) {
             $city  = $member['city'];
             $state = $member['state'];
             if ( $member['city_id'] ) {
-                $getCity->bindParam( ':id', $member['city_id'] );
+                $getCity->bindParam( ':id', $member['city_id'], PDO::PARAM_INT );
                 $getCity->execute();
                 $city  = $getCity->fetchColumn();
             }
             if ( $member['state_id'] ) {
-                $getState->bindParam( ':id', $member['state_id'] );
+                $getState->bindParam( ':id', $member['state_id'], PDO::PARAM_INT );
                 $getState->execute();
                 $state  = $getState->fetchColumn();
             }
             $zip   = $member['zip'];
         }
 
+        if ( $member['region'] ) {
+            $getRegion->bindParam( ':id', $member['region'], PDO::PARAM_INT );
+            $getRegion->execute();
+            $countyName = $getRegion->fetchColumn();
+            $county = getCountyId( $this->wpdb, $countyName );
+        }
+
         $accountData = array(
             'ref_dest'        => $newMemberId,
             'ref_name'        => $refName,
@@ -251,6 +275,7 @@ foreach ( $members as $member ) {
             'billing_city'    => $city,
             'billing_state'   => $state,
             'billing_zip'     => $zip,
+            'billing_county'  => $county,
         );
         $accountDataFormat = array(
             '%d', // ref_dest
@@ -267,6 +292,7 @@ foreach ( $members as $member ) {
             '%s', // billing_city
             '%s', // billing_state
             '%s', // billing_zip
+            '%s', // billing_county
         );
 
         $importResults .= '<pre>$accountData: ' . print_r( $accountData, true ) . '</pre>';
diff --git a/setup/databaseScripts/create_database_V0.0.28.sql b/setup/databaseScripts/create_database_V0.0.28.sql
deleted file mode 100644 (file)
index b46f1af..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
--- Gaslight Media Billing Module
--- File Created: 11/19/2018
--- Database Version: 0.0.27
--- Database Creation Script
---
--- To permit each query below to be executed separately,
--- all queries must be separated by a line with four dashes
---
--- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES ****
---
-
--- Billing Accounts
-CREATE TABLE {prefix}accounts (
-    id INT NOT NULL AUTO_INCREMENT,
-    archived BOOLEAN DEFAULT '0',                          -- Marks account as archived
-    ref_dest INT NOT NULL,                                 -- reference to member id
-    ref_name TINYTEXT NOT NULL,                            -- Name of reference member
-    invoice_type INT NOT NULL DEFAULT '0',                 -- Ref to Invoice Type id
-    billing_fname TINYTEXT NULL,                           -- Billing First Name
-    billing_lname TINYTEXT NULL,                           -- Billing Last Name
-    billing_company TINYTEXT NULL,                         -- Billing Company Name
-    billing_position TINYTEXT NULL,                        -- Billing Title/Position
-    billing_addr1 TINYTEXT NULL,                           -- Billing Address 1
-    billing_addr2 TINYTEXT NULL,                           -- Billing Address 2
-    billing_city TINYTEXT NULL,                            -- Billing City
-    billing_state TINYTEXT NULL,                           -- Billing State
-    billing_zip TINYTEXT NULL,                             -- Billing Zip
-    billing_country TINYTEXT NULL,                         -- Billing Country
-    billing_phone TINYTEXT NULL,                           -- Billing Phone
-    billing_fax TINYTEXT NULL,                             -- Billing Fax
-    anniversary_date DATE NULL,                            -- anniversary date
-    renewal_date DATE NULL,                                -- renewal date of account
-    payment_data TEXT NULL,                                -- stored payment data
-    customer_profile_id TINYTEXT NULL,                     -- Customer Profile Id (Authorize.net)
-    payment_profile_id TINYTEXT NULL,                      -- Payment Profile Id (Authorize.net)
-    payment_profile_card TINYTEXT NULL,                    -- Payment Profile Card (Authorize.net)
-    email TINYTEXT NULL,                                   -- billing email
-    boss BOOLEAN DEFAULT '0',                              -- Boss flag
-    account_number TINYTEXT NULL,                          -- Account Number
-    email_invoice BOOLEAN DEFAULT '0',                     -- Invoice by email
-    usmail_invoice BOOLEAN DEFAULT '0',                    -- Invoice by US Mail
-    fax_invoice BOOLEAN DEFAULT '0',                       -- Invoice by Fax
-    PRIMARY KEY (id),
-    INDEX(ref_dest),
-    INDEX(ref_name(20)),
-    INDEX(email(20)),
-    INDEX(invoice_type),
-    INDEX(renewal_date)
-);
-
-----
-
--- transactions
-CREATE TABLE {prefix}transactions (
-    id INT NOT NULL AUTO_INCREMENT,
-    type INT NOT NULL,                                     -- type of transaction (payment,invoice,etc)
-    type_id INT NOT NULL,                                  -- reference to type id
-    account INT NOT NULL,                                  -- reference to account id
-    transaction_time DATETIME NOT NULL,                    -- datetime for the transaction
-    current_invoice_total DECIMAL(8, 2) NOT NULL,          -- invoice total
-    current_payment_total DECIMAL(8, 2) NOT NULL,          -- payment total
-    PRIMARY KEY (id),
-    INDEX(account),
-    INDEX(type_id),
-    INDEX(transaction_time)
-);
-
-----
-
--- Invoices
-CREATE TABLE {prefix}invoices (
-    id INT NOT NULL AUTO_INCREMENT,
-    transaction_time DATETIME NOT NULL,                    -- datetime for the invoice
-    account INT NOT NULL,                                  -- ref to account id
-    amount_total DECIMAL(8, 2) NOT NULL,                   -- total amount for invoice
-    balance DECIMAL(8, 2) NOT NULL,                        -- balance for this invoice
-    due_date DATE NOT NULL,                                -- Due date for this invoice
-    paid BOOLEAN DEFAULT '0',                              -- true/false if invoice is paid
-    notes TINYTEXT,                                        -- notes for this invoice
-    renewal BOOLEAN DEFAULT '0',                           -- true/false if a renewal
-    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
-    recurrence INT NULL DEFAULT 0,                         -- recurrence type
-    PRIMARY KEY (id),
-    INDEX(account),
-    INDEX(transaction_time),
-    INDEX(due_date)
-);
-
-----
-
--- Line Item Types
-CREATE TABLE {prefix}invoice_types (
-    id INT NOT NULL AUTO_INCREMENT,
-    name TINYTEXT NOT NULL,                                -- name
-    parent INT NOT NULL DEFAULT 0,                         -- 0 if top level otherwise ref to another line_item_type as it's parent
-    member_type INT NOT NULL DEFAULT 0,                    -- Member Type assigned Default 0
-    amount DECIMAL(8,2) NOT NULL DEFAULT '0.00',           -- amount
-    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
-    recurrence INT NULL DEFAULT 0,                         -- recurrence type
-    dynamic_amount BOOLEAN DEFAULT '0',                    -- true/false if amount is dynamic
-    qcode TINYTEXT NULL,                                   -- qcode for quickbooks
-    category TINYTEXT NULL,                                -- quickbooks category
-    PRIMARY KEY (id)
-);
-
-----
-
--- Line Items
-CREATE TABLE {prefix}line_items (
-    id INT NOT NULL AUTO_INCREMENT,
-    invoice INT NOT NULL,                                  -- reference to invoice
-    line_item_type INT NOT NULL,                           -- reference to line item type
-    account INT NULL DEFAULT 0,                            -- ref to account id (renewal or employee)
-    name TEXT NOT NULL,                                    -- line item name
-    amount DECIMAL(8,2) DEFAULT '0.00',                    -- line item amount per item
-    quantity INT DEFAULT 1,                                -- quantity
-    total DECIMAL(8,2) DEFAULT '0.00',                     -- line item total
-    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
-    recurrence INT NULL DEFAULT 0,                         -- recurrence type
-    created DATE NULL,                                     -- Date this line item was first created
-    first_due_date DATE NULL,                              -- The first due date for this item
-    next_due_date DATE NULL,                               -- Next Due Date for this item
-    PRIMARY KEY (id),
-    INDEX(account),
-    INDEX(created),
-    INDEX(first_due_date),
-    INDEX(next_due_date)
-);
-
-----
-
--- payments
-CREATE TABLE {prefix}payments (
-    id INT NOT NULL AUTO_INCREMENT,
-    transaction_time DATETIME NOT NULL,                    -- datetime of payment
-    account INT NOT NULL,                                  -- ref to account table
-    amount DECIMAL(8, 2) NOT NULL,                         -- payment amount
-    payment_method TINYTEXT NOT NULL,                      -- payment method
-    payment_data TINYTEXT NULL,                            -- additional payment info
-    PRIMARY KEY (id)
-);
-
-----
-
--- pdfs
-CREATE TABLE {prefix}pdfs (
-    id INT NOT NULL AUTO_INCREMENT,
-    ref_type INT NOT NULL,                                 -- reference type
-    ref_dest INT NOT NULL,                                 -- reference types id
-    pdf MEDIUMTEXT NOT NULL,                               -- saved pdf
-    PRIMARY KEY (id)
-);
-
-----
-
--- Notification Types
-CREATE TABLE {prefix}notification_types (
-    id INT NOT NULL AUTO_INCREMENT,
-    name TINYTEXT NOT NULL,                                -- name
-    to_email TINYTEXT NULL,                                -- To email
-    from_header TINYTEXT NOT NULL,                         -- from headers
-    replyto TINYTEXT NULL,                                 -- reply-to headers
-    subject TINYTEXT NOT NULL,                             -- Subject
-    message TEXT NOT NULL,                                 -- Message
-    send_by_date BOOLEAN NULL DEFAULT '0',                 -- true/false send by date based on due date
-    send_by_action BOOLEAN NULL DEFAULT '0',               -- send notice based on an action
-    send_action INT NULL DEFAULT 0,                        -- (create invoice or receive payment)
-    send_date_number INT NULL DEFAULT 0,                   -- number to apply to send by date
-    send_date_period INT NULL DEFAULT 0,                   -- (days,weeks,months,years)
-    send_date_when INT NULL DEFAULT 0,                     -- (before or after)
-    PRIMARY KEY (id)
-);
-
-----
-
--- Notifications
-CREATE TABLE {prefix}notifications (
-    id INT NOT NULL AUTO_INCREMENT,
-    notification_type INT NOT NULL,                        -- ref to notification type
-    account INT NOT NULL,                                  -- ref to account
-    from_replyto TINYTEXT NOT NULL,                        -- from reply-to header
-    subject TEXT NOT NULL,                                 -- subject
-    message TEXT NOT NULL,                                 -- message
-    date_sent DATETIME NOT NULL,                           -- Date the notice was sent
-    email_sent TINYTEXT NOT NULL,                          -- email used
-    PRIMARY KEY (id)
-);
-
-----
-
--- Notification Queue
-CREATE TABLE {prefix}notification_queue (
-    id INT NOT NULL AUTO_INCREMENT,
-    notification_type INT NOT NULL,                        -- ref to notification type
-    account INT NOT NULL,                                  -- ref to account
-    queued_time DATETIME NOT NULL,                         -- Creation time
-    processed_time DATETIME NULL,                          -- The time this queue was processed. (sent out)
-    PRIMARY KEY (id),
-    INDEX (notification_type),
-    INDEX (account),
-    INDEX (queued_time),
-    INDEX (processed_time)
-);
-
-----
-
--- Gateway Settings
-CREATE TABLE {prefix}gateway_settings (
-    id INT NOT NULL AUTO_INCREMENT,
-    name TEXT NOT NULL,
-    login_id TINYTEXT NOT NULL,
-    transaction_key TINYTEXT NOT NULL,
-    PRIMARY KEY (id)
-);
-
-----
-
--- Invoice Payments
-CREATE TABLE {prefix}invoice_payments (
-    id INT NOT NULL AUTO_INCREMENT,
-    invoice INT NOT NULL,                                  -- reference to invoice id
-    payment INT NOT NULL,                                  -- reference to payment id
-    amount DECIMAL(8, 2) NOT NULL,                         -- payment amount
-    PRIMARY KEY (id),
-    INDEX(invoice)
-);
-
-----
-
--- Settings
-CREATE TABLE {prefix}settings (
-    id INT NOT NULL AUTO_INCREMENT,
-    company_logo TINYTEXT NULL,                            -- Image logo
-    company_logo_height INT NULL,                          -- Logo Height (only used if creating pdf)
-    company_name TINYTEXT NULL,                            -- Company Name
-    company_name2 TINYTEXT NULL,                           -- Company Name 2
-    company_addr1 TINYTEXT NULL,                           -- Company Address 1
-    company_addr2 TINYTEXT NULL,                           -- Company Address 2
-    company_city TINYTEXT NULL,                            -- Company City
-    company_state TINYTEXT NULL,                           -- Company State
-    company_zip TINYTEXT NULL,                             -- Company Zip
-    company_phone TINYTEXT NULL,                           -- Company Phone
-    company_email TINYTEXT NULL,                           -- Company Email
-    company_url TINYTEXT NULL,                             -- Company URL
-    payment_terms TEXT NULL,                               -- Payment Terms
-    days_before_renewal INT NULL,                          -- Number of days before renewal date to allow renewals
-    days_after_expired INT NULL,                           -- Number of days after renewal date expired
-    allow_membership_choice BOOLEAN DEFAULT '0',           -- If memberships can choose their membership levels when they renew
-    allow_employees BOOLEAN DEFAULT '0',                   -- If memberships have employees
-    member_types_enabled BOOLEAN DEFAULT '1',              -- member types determine invoice types
-    quickbooks_enabled BOOLEAN DEFAULT '0',                -- QuickBooks enabled
-    member_billing_enabled BOOLEAN DEFAULT '1',            -- Member have access to billing info tab
-    billing_fields_required BOOLEAN DEFAULT '1',           -- Require Billing Fields
-    invoice_methods_enabled BOOLEAN DEFAULT '1',           -- Enable Uptra invoice methods
-    PRIMARY KEY (id)
-);
-
-----
-
--- Set default billing Settings entry
-INSERT INTO {prefix}settings
-    ( id, days_before_renewal ,days_after_expired, member_types_enabled, quickbooks_enabled, member_billing_enabled )
-    VALUES
-    ( 1, 90, 30, true, false, true );
-
-----
-
--- Management
-CREATE TABLE {prefix}management (
-    id INT NOT NULL AUTO_INCREMENT,
-    payment_methods SMALLINT NULL,                              -- Payment methods available for all registrations - Bitmap - see payment_method in plugin.ini
-    proc_methods SMALLINT NULL,                                 -- Credit Cart payment processing methods available - Bitmap - see proc_method in plugin.ini
-    cc_accepts SMALLINT NULL,                                   -- Credit Cards Accepted - Bitmap - See credit_card in plugin.ini
-    -- Authorize.net Credentials
-    authorize_net_login TINYTEXT NULL,
-    authorize_net_key TINYTEXT NULL,
-    authorize_net_test TINYINT NULL,                            -- Authorize.net test mode - List - see proc_test_mode in plugin.ini
-    authorize_net_conf BOOLEAN NULL,                            -- Flag to send payment confirmation Email from Authorize.net
-    authorize_net_merchant_email TINYTEXT NULL,                 -- E-Mail Authorize.net will send copy of confirmation E-Mail
-    -- Merchant Solutions Credentials
-    merchant_solutions_acctid TINYTEXT NULL,                    -- Merchant Solutions credentials
-    merchant_solutions_merchantpin TINYTEXT NULL,
-    merchant_solutions_test TINYINT NULL,                       -- Merchant Solutions test mode - List - see proc_test_mode in plugin.ini
-    merchant_solutions_conf BOOLEAN NULL,                       -- Flag to send payment confirmation Email
-    merchant_solutions_merchant_email TINYTEXT NULL,            -- Merchant Solutions will send copy of confirmation E-Mail
-    PRIMARY KEY (id)
-);
-
-----
-
--- Set default billing Management entry
-INSERT INTO {prefix}management
-    ( id )
-    VALUES
-    ( 1 );
-
-----
-
--- Employees table
-CREATE TABLE {prefix}employees (
-    id INT NOT NULL AUTO_INCREMENT,
-    account INT NOT NULL,                                      -- Account Id
-    employee INT NOT NULL,                                     -- Employee Account Id
-    PRIMARY KEY (id)
-);
diff --git a/setup/databaseScripts/create_database_V0.0.29.sql b/setup/databaseScripts/create_database_V0.0.29.sql
new file mode 100644 (file)
index 0000000..81c6d61
--- /dev/null
@@ -0,0 +1,313 @@
+-- Gaslight Media Billing Module
+-- File Created: 11/19/2018
+-- Database Version: 0.0.27
+-- Database Creation Script
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+--
+-- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES ****
+--
+
+-- Billing Accounts
+CREATE TABLE {prefix}accounts (
+    id INT NOT NULL AUTO_INCREMENT,
+    archived BOOLEAN DEFAULT '0',                          -- Marks account as archived
+    ref_dest INT NOT NULL,                                 -- reference to member id
+    ref_name TINYTEXT NOT NULL,                            -- Name of reference member
+    invoice_type INT NOT NULL DEFAULT '0',                 -- Ref to Invoice Type id
+    billing_fname TINYTEXT NULL,                           -- Billing First Name
+    billing_lname TINYTEXT NULL,                           -- Billing Last Name
+    billing_company TINYTEXT NULL,                         -- Billing Company Name
+    billing_position TINYTEXT NULL,                        -- Billing Title/Position
+    billing_addr1 TINYTEXT NULL,                           -- Billing Address 1
+    billing_addr2 TINYTEXT NULL,                           -- Billing Address 2
+    billing_city TINYTEXT NULL,                            -- Billing City
+    billing_county INT NULL,                               -- Billing County
+    billing_state TINYTEXT NULL,                           -- Billing State
+    billing_zip TINYTEXT NULL,                             -- Billing Zip
+    billing_country TINYTEXT NULL,                         -- Billing Country
+    billing_phone TINYTEXT NULL,                           -- Billing Phone
+    billing_fax TINYTEXT NULL,                             -- Billing Fax
+    anniversary_date DATE NULL,                            -- anniversary date
+    renewal_date DATE NULL,                                -- renewal date of account
+    payment_data TEXT NULL,                                -- stored payment data
+    customer_profile_id TINYTEXT NULL,                     -- Customer Profile Id (Authorize.net)
+    payment_profile_id TINYTEXT NULL,                      -- Payment Profile Id (Authorize.net)
+    payment_profile_card TINYTEXT NULL,                    -- Payment Profile Card (Authorize.net)
+    email TINYTEXT NULL,                                   -- billing email
+    boss BOOLEAN DEFAULT '0',                              -- Boss flag
+    account_number TINYTEXT NULL,                          -- Account Number
+    email_invoice BOOLEAN DEFAULT '0',                     -- Invoice by email
+    usmail_invoice BOOLEAN DEFAULT '0',                    -- Invoice by US Mail
+    fax_invoice BOOLEAN DEFAULT '0',                       -- Invoice by Fax
+    PRIMARY KEY (id),
+    INDEX(ref_dest),
+    INDEX(ref_name(20)),
+    INDEX(email(20)),
+    INDEX(invoice_type),
+    INDEX(renewal_date),
+    INDEX(billing_county(20))
+);
+
+----
+
+-- transactions
+CREATE TABLE {prefix}transactions (
+    id INT NOT NULL AUTO_INCREMENT,
+    type INT NOT NULL,                                     -- type of transaction (payment,invoice,etc)
+    type_id INT NOT NULL,                                  -- reference to type id
+    account INT NOT NULL,                                  -- reference to account id
+    transaction_time DATETIME NOT NULL,                    -- datetime for the transaction
+    current_invoice_total DECIMAL(8, 2) NOT NULL,          -- invoice total
+    current_payment_total DECIMAL(8, 2) NOT NULL,          -- payment total
+    PRIMARY KEY (id),
+    INDEX(account),
+    INDEX(type_id),
+    INDEX(transaction_time)
+);
+
+----
+
+-- Invoices
+CREATE TABLE {prefix}invoices (
+    id INT NOT NULL AUTO_INCREMENT,
+    transaction_time DATETIME NOT NULL,                    -- datetime for the invoice
+    account INT NOT NULL,                                  -- ref to account id
+    amount_total DECIMAL(8, 2) NOT NULL,                   -- total amount for invoice
+    balance DECIMAL(8, 2) NOT NULL,                        -- balance for this invoice
+    due_date DATE NOT NULL,                                -- Due date for this invoice
+    paid BOOLEAN DEFAULT '0',                              -- true/false if invoice is paid
+    notes TINYTEXT,                                        -- notes for this invoice
+    renewal BOOLEAN DEFAULT '0',                           -- true/false if a renewal
+    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
+    recurrence INT NULL DEFAULT 0,                         -- recurrence type
+    PRIMARY KEY (id),
+    INDEX(account),
+    INDEX(transaction_time),
+    INDEX(due_date)
+);
+
+----
+
+-- Line Item Types
+CREATE TABLE {prefix}invoice_types (
+    id INT NOT NULL AUTO_INCREMENT,
+    name TINYTEXT NOT NULL,                                -- name
+    parent INT NOT NULL DEFAULT 0,                         -- 0 if top level otherwise ref to another line_item_type as it's parent
+    member_type INT NOT NULL DEFAULT 0,                    -- Member Type assigned Default 0
+    amount DECIMAL(8,2) NOT NULL DEFAULT '0.00',           -- amount
+    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
+    recurrence INT NULL DEFAULT 0,                         -- recurrence type
+    dynamic_amount BOOLEAN DEFAULT '0',                    -- true/false if amount is dynamic
+    qcode TINYTEXT NULL,                                   -- qcode for quickbooks
+    category TINYTEXT NULL,                                -- quickbooks category
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Line Items
+CREATE TABLE {prefix}line_items (
+    id INT NOT NULL AUTO_INCREMENT,
+    invoice INT NOT NULL,                                  -- reference to invoice
+    line_item_type INT NOT NULL,                           -- reference to line item type
+    account INT NULL DEFAULT 0,                            -- ref to account id (renewal or employee)
+    name TEXT NOT NULL,                                    -- line item name
+    amount DECIMAL(8,2) DEFAULT '0.00',                    -- line item amount per item
+    quantity INT DEFAULT 1,                                -- quantity
+    total DECIMAL(8,2) DEFAULT '0.00',                     -- line item total
+    recurring BOOLEAN DEFAULT '0',                         -- true/false if recurring
+    recurrence INT NULL DEFAULT 0,                         -- recurrence type
+    created DATE NULL,                                     -- Date this line item was first created
+    first_due_date DATE NULL,                              -- The first due date for this item
+    next_due_date DATE NULL,                               -- Next Due Date for this item
+    PRIMARY KEY (id),
+    INDEX(account),
+    INDEX(created),
+    INDEX(first_due_date),
+    INDEX(next_due_date)
+);
+
+----
+
+-- payments
+CREATE TABLE {prefix}payments (
+    id INT NOT NULL AUTO_INCREMENT,
+    transaction_time DATETIME NOT NULL,                    -- datetime of payment
+    account INT NOT NULL,                                  -- ref to account table
+    amount DECIMAL(8, 2) NOT NULL,                         -- payment amount
+    payment_method TINYTEXT NOT NULL,                      -- payment method
+    payment_data TINYTEXT NULL,                            -- additional payment info
+    PRIMARY KEY (id)
+);
+
+----
+
+-- pdfs
+CREATE TABLE {prefix}pdfs (
+    id INT NOT NULL AUTO_INCREMENT,
+    ref_type INT NOT NULL,                                 -- reference type
+    ref_dest INT NOT NULL,                                 -- reference types id
+    pdf MEDIUMTEXT NOT NULL,                               -- saved pdf
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Notification Types
+CREATE TABLE {prefix}notification_types (
+    id INT NOT NULL AUTO_INCREMENT,
+    name TINYTEXT NOT NULL,                                -- name
+    to_email TINYTEXT NULL,                                -- To email
+    from_header TINYTEXT NOT NULL,                         -- from headers
+    replyto TINYTEXT NULL,                                 -- reply-to headers
+    subject TINYTEXT NOT NULL,                             -- Subject
+    message TEXT NOT NULL,                                 -- Message
+    send_by_date BOOLEAN NULL DEFAULT '0',                 -- true/false send by date based on due date
+    send_by_action BOOLEAN NULL DEFAULT '0',               -- send notice based on an action
+    send_action INT NULL DEFAULT 0,                        -- (create invoice or receive payment)
+    send_date_number INT NULL DEFAULT 0,                   -- number to apply to send by date
+    send_date_period INT NULL DEFAULT 0,                   -- (days,weeks,months,years)
+    send_date_when INT NULL DEFAULT 0,                     -- (before or after)
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Notifications
+CREATE TABLE {prefix}notifications (
+    id INT NOT NULL AUTO_INCREMENT,
+    notification_type INT NOT NULL,                        -- ref to notification type
+    account INT NOT NULL,                                  -- ref to account
+    from_replyto TINYTEXT NOT NULL,                        -- from reply-to header
+    subject TEXT NOT NULL,                                 -- subject
+    message TEXT NOT NULL,                                 -- message
+    date_sent DATETIME NOT NULL,                           -- Date the notice was sent
+    email_sent TINYTEXT NOT NULL,                          -- email used
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Notification Queue
+CREATE TABLE {prefix}notification_queue (
+    id INT NOT NULL AUTO_INCREMENT,
+    notification_type INT NOT NULL,                        -- ref to notification type
+    account INT NOT NULL,                                  -- ref to account
+    queued_time DATETIME NOT NULL,                         -- Creation time
+    processed_time DATETIME NULL,                          -- The time this queue was processed. (sent out)
+    PRIMARY KEY (id),
+    INDEX (notification_type),
+    INDEX (account),
+    INDEX (queued_time),
+    INDEX (processed_time)
+);
+
+----
+
+-- Gateway Settings
+CREATE TABLE {prefix}gateway_settings (
+    id INT NOT NULL AUTO_INCREMENT,
+    name TEXT NOT NULL,
+    login_id TINYTEXT NOT NULL,
+    transaction_key TINYTEXT NOT NULL,
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Invoice Payments
+CREATE TABLE {prefix}invoice_payments (
+    id INT NOT NULL AUTO_INCREMENT,
+    invoice INT NOT NULL,                                  -- reference to invoice id
+    payment INT NOT NULL,                                  -- reference to payment id
+    amount DECIMAL(8, 2) NOT NULL,                         -- payment amount
+    PRIMARY KEY (id),
+    INDEX(invoice)
+);
+
+----
+
+-- Settings
+CREATE TABLE {prefix}settings (
+    id INT NOT NULL AUTO_INCREMENT,
+    company_logo TINYTEXT NULL,                            -- Image logo
+    company_logo_height INT NULL,                          -- Logo Height (only used if creating pdf)
+    company_name TINYTEXT NULL,                            -- Company Name
+    company_name2 TINYTEXT NULL,                           -- Company Name 2
+    company_addr1 TINYTEXT NULL,                           -- Company Address 1
+    company_addr2 TINYTEXT NULL,                           -- Company Address 2
+    company_city TINYTEXT NULL,                            -- Company City
+    company_state TINYTEXT NULL,                           -- Company State
+    company_zip TINYTEXT NULL,                             -- Company Zip
+    company_phone TINYTEXT NULL,                           -- Company Phone
+    company_email TINYTEXT NULL,                           -- Company Email
+    company_url TINYTEXT NULL,                             -- Company URL
+    payment_terms TEXT NULL,                               -- Payment Terms
+    days_before_renewal INT NULL,                          -- Number of days before renewal date to allow renewals
+    days_after_expired INT NULL,                           -- Number of days after renewal date expired
+    allow_membership_choice BOOLEAN DEFAULT '0',           -- If memberships can choose their membership levels when they renew
+    allow_employees BOOLEAN DEFAULT '0',                   -- If memberships have employees
+    member_types_enabled BOOLEAN DEFAULT '1',              -- member types determine invoice types
+    quickbooks_enabled BOOLEAN DEFAULT '0',                -- QuickBooks enabled
+    member_billing_enabled BOOLEAN DEFAULT '1',            -- Member have access to billing info tab
+    billing_fields_required BOOLEAN DEFAULT '1',           -- Require Billing Fields
+    invoice_methods_enabled BOOLEAN DEFAULT '1',           -- Enable Uptra invoice methods
+    renewal_day_static BOOLEAN DEFAULT '0',                -- Renewal dates are same day every year
+    renewal_day INT NULL,                                  -- Day of the month for renewals
+    renewal_month INT NULL,                                -- Month of year for renewals
+    billing_county_enabled BOOLEAN DEFAULT '0',            -- Billing uses county field
+    invoice_pdf_enabled BOOLEAN DEFAULT '0',               -- Create PDF invoices
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Set default billing Settings entry
+INSERT INTO {prefix}settings
+    ( id, days_before_renewal ,days_after_expired, member_types_enabled, quickbooks_enabled, member_billing_enabled )
+    VALUES
+    ( 1, 90, 30, true, false, true );
+
+----
+
+-- Management
+CREATE TABLE {prefix}management (
+    id INT NOT NULL AUTO_INCREMENT,
+    payment_methods SMALLINT NULL,                              -- Payment methods available for all registrations - Bitmap - see payment_method in plugin.ini
+    proc_methods SMALLINT NULL,                                 -- Credit Cart payment processing methods available - Bitmap - see proc_method in plugin.ini
+    cc_accepts SMALLINT NULL,                                   -- Credit Cards Accepted - Bitmap - See credit_card in plugin.ini
+    -- Authorize.net Credentials
+    authorize_net_login TINYTEXT NULL,
+    authorize_net_key TINYTEXT NULL,
+    authorize_net_test TINYINT NULL,                            -- Authorize.net test mode - List - see proc_test_mode in plugin.ini
+    authorize_net_conf BOOLEAN NULL,                            -- Flag to send payment confirmation Email from Authorize.net
+    authorize_net_merchant_email TINYTEXT NULL,                 -- E-Mail Authorize.net will send copy of confirmation E-Mail
+    -- Merchant Solutions Credentials
+    merchant_solutions_acctid TINYTEXT NULL,                    -- Merchant Solutions credentials
+    merchant_solutions_merchantpin TINYTEXT NULL,
+    merchant_solutions_test TINYINT NULL,                       -- Merchant Solutions test mode - List - see proc_test_mode in plugin.ini
+    merchant_solutions_conf BOOLEAN NULL,                       -- Flag to send payment confirmation Email
+    merchant_solutions_merchant_email TINYTEXT NULL,            -- Merchant Solutions will send copy of confirmation E-Mail
+    uptravel_invoice_template BOOLEAN DEFAULT '0',              -- Use uptravel template for invoices.
+    PRIMARY KEY (id)
+);
+
+----
+
+-- Set default billing Management entry
+INSERT INTO {prefix}management
+    ( id )
+    VALUES
+    ( 1 );
+
+----
+
+-- Employees table
+CREATE TABLE {prefix}employees (
+    id INT NOT NULL AUTO_INCREMENT,
+    account INT NOT NULL,                                      -- Account Id
+    employee INT NOT NULL,                                     -- Employee Account Id
+    PRIMARY KEY (id)
+);
index 97ffdf1..b3f0ccd 100644 (file)
@@ -42,5 +42,6 @@ $glmMembersBillingDbVersions = array(
     '0.0.26' => array('version' => '0.0.26', 'tables' => 15),
     '0.0.27' => array('version' => '0.0.27', 'tables' => 15, 'date' => '11/19/2018'),
     '0.0.28' => array('version' => '0.0.28', 'tables' => 15, 'date' => '11/27/2018'),
+    '0.0.29' => array('version' => '0.0.29', 'tables' => 15, 'date' => '11/29/2018'),
 );
 
index 8a8575a..366a249 100644 (file)
@@ -1,6 +1,6 @@
 -- Gaslight Media Billing Database
--- File Created: 11/19/2018
--- Database Version: 0.0.27
+-- File Created: 11/27/2018
+-- Database Version: 0.0.28
 --
 -- To permit each query below to be executed separately,
 -- all queries must be separated by a line with four dashes
diff --git a/setup/databaseScripts/update_database_V0.0.29.sql b/setup/databaseScripts/update_database_V0.0.29.sql
new file mode 100644 (file)
index 0000000..d8d6773
--- /dev/null
@@ -0,0 +1,40 @@
+-- Gaslight Media Billing Database
+-- File Created: 11/29/2018
+-- Database Version: 0.0.29
+--
+-- To permit each query below to be executed separately,
+-- all queries must be separated by a line with four dashes
+
+-- Update the accounts table
+ALTER TABLE {prefix}accounts ADD billing_county INT NULL;
+
+----
+
+CREATE INDEX billing_county ON {prefix}accounts (billing_county(20));
+
+----
+
+-- Update the settings table
+ALTER TABLE {prefix}settings ADD renewal_day_static BOOLEAN DEFAULT '0';
+
+----
+
+ALTER TABLE {prefix}settings ADD renewal_day INT NULL;
+
+----
+
+ALTER TABLE {prefix}settings ADD renewal_month INT NULL;
+
+----
+
+ALTER TABLE {prefix}settings ADD billing_county_enabled BOOLEAN DEFAULT '0';
+
+----
+
+ALTER TABLE {prefix}settings ADD invoice_pdf_enabled BOOLEAN DEFAULT '0';
+
+----
+
+-- Update the Management table
+ALTER TABLE {prefix}management ADD uptravel_invoice_template BOOLEAN DEFAULT '0';
+
index 311fd81..b64012c 100644 (file)
             </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}
+
+        <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}>
             </div>
         </div>
 
-        <div class="glm-billing-field glm-billing-left-half">
+        <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}>
             </div>
         </div>
 
-        <div class="glm-billing-field glm-billing-right-half">
+        <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}>
             </div>
         </div>
 
-        <div class="glm-billing-field glm-billing-left-half">
+        <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}>
             </div>
         </div>
 
-        <div class="glm-billing-field glm-billing-right-half">
+        <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}>
index 4a29629..08954ac 100644 (file)
@@ -23,6 +23,7 @@
                         <td></td>
                         <th><p>Payment</p></th>
                     </tr>
+
                     <tr>
                         <th class="glm-nowrap-left-align{if $regSettings.fieldRequired.payment_methods} glm­-required{/if}">Payment Methods:</th>
                         <td {if $regSettings.fieldFail.payment_methods}class="glm­form­bad­input" data­tabid="glm-reg-payment-methods"{/if}>
                         </td>
                     </tr>
 
+                    <tr>
+                        <td></td>
+                        <th><p>Templates</p></th>
+                    </tr>
+
+                    <tr>
+                        <th style="text-align: right;" {if $regSettings.fieldRequired.uptravel_invoice_template} class="glm-required"}{/if}>
+                        </th>
+                        <td>
+                            <input type="checkbox" name="uptravel_invoice_template"{if $regSettings.fieldData.uptravel_invoice_template.value} checked="checked"{/if}>
+                            Use UPTRA invoice Template
+                        </td>
+                    </tr>
+
                 </table>
                 <input type="submit" value="Update Settings" class="button-primary">
 
index f64d0f9..8607368 100644 (file)
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.allow_membership_choice} class="glm-required"}{/if}>
-                                Allow Membership Choice When renewing
                             </th>
                             <td>
                                 <input type="checkbox" name="allow_membership_choice"{if $billingSettings.fieldData.allow_membership_choice.value} checked="checked"{/if}>
+                                Allow Membership Choice When renewing
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.allow_employees} class="glm-required"}{/if}>
-                                Allow Employees
                             </th>
                             <td>
                                 <input type="checkbox" name="allow_employees"{if $billingSettings.fieldData.allow_employees.value} checked="checked"{/if}>
+                                Allow Employees
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.member_types_enabled} class="glm-required"}{/if}>
-                                Use member types in Invoice Types
                             </th>
                             <td>
                                 <input type="checkbox" name="member_types_enabled"{if $billingSettings.fieldData.member_types_enabled.value} checked="checked"{/if}>
+                                Use member types in Invoice Types
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.quickbooks_enabled} class="glm-required"}{/if}>
-                                Enable Quickbooks
                             </th>
                             <td>
                                 <input type="checkbox" name="quickbooks_enabled"{if $billingSettings.fieldData.quickbooks_enabled.value} checked="checked"{/if}>
+                                Enable Quickbooks
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.member_billing_enabled} class="glm-required"}{/if}>
-                                Enable Members billing tab (for members)
                             </th>
                             <td>
                                 <input type="checkbox" name="member_billing_enabled"{if $billingSettings.fieldData.member_billing_enabled.value} checked="checked"{/if}>
+                                Enable Members billing tab (for members)
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.billing_fields_required} class="glm-required"}{/if}>
-                                Require Billing Fields
                             </th>
                             <td>
                                 <input type="checkbox" name="billing_fields_required"{if $billingSettings.fieldData.billing_fields_required.value} checked="checked"{/if}>
+                                Require Billing Fields
                             </td>
                         </tr>
 
                         <tr>
                             <th style="text-align: right;" {if $billingSettings.fieldRequired.invoice_methods_enabled} class="glm-required"}{/if}>
-                                Enable Invoice Methods
                             </th>
                             <td>
                                 <input type="checkbox" name="invoice_methods_enabled"{if $billingSettings.fieldData.invoice_methods_enabled.value} checked="checked"{/if}>
+                                Enable Invoice Methods
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.billing_county_enabled} class="glm-required"}{/if}>
+                            </th>
+                            <td>
+                                <input type="checkbox" name="billing_county_enabled"{if $billingSettings.fieldData.billing_county_enabled.value} checked="checked"{/if}>
+                                Enable Billing Counties
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.renewal_day_static} class="glm-required"}{/if}>
+                            </th>
+                            <td>
+                                <input type="checkbox" name="renewal_day_static"{if $billingSettings.fieldData.renewal_day_static.value} checked="checked"{/if}>
+                                All Members renewal same day each year
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.invoice_pdf_enabled} class="glm-required"}{/if}>
+                            </th>
+                            <td>
+                                <input type="checkbox" name="invoice_pdf_enabled"{if $billingSettings.fieldData.invoice_pdf_enabled.value} checked="checked"{/if}>
+                                Create PDF Invoices
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.renewal_day} class="glm-required"}{/if}>
+                                Renewal Day of Month<br>
+                                Must be a number
+                            </th>
+                            <td {if $billingSettings.fieldFail.renewal_day}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
+                                <input
+                                    type="text"
+                                    name="renewal_day"
+                                    value="{$billingSettings.fieldData.renewal_day}"
+                                    class="glm-form-text-input-short"
+                                    pattern="([0-9])*"
+                                    />
+                            {if $billingSettings.fieldFail.renewal_day}<p>{$billingSettings.fieldFail.renewal_day}</p>{/if}<br>
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <th style="text-align: right;" {if $billingSettings.fieldRequired.renewal_month} class="glm-required"}{/if}>
+                                Renewal Month of Year<br>
+                                Must be a number
+                            </th>
+                            <td {if $billingSettings.fieldFail.renewal_month}class="glm-form-bad-input" data-tabid="glm-company-name2"{/if}>
+                                <input
+                                    type="text"
+                                    name="renewal_month"
+                                    value="{$billingSettings.fieldData.renewal_month}"
+                                    class="glm-form-text-input-short"
+                                    pattern="([0-9])*"
+                                    />
+                            {if $billingSettings.fieldFail.renewal_month}<p>{$billingSettings.fieldFail.renewal_month}</p>{/if}<br>
                             </td>
                         </tr>