Updates while updating migcsa billing to latest on develop

Updates for migcsa

diff --git a/setup/databaseScripts/create_database_V0.0.32.sql b/setup/databaseScripts/create_database_V0.0.32.sql
index 102d3b5..2012bb6 100644 (file)
--- a/setup/databaseScripts/create_database_V0.0.32.sql
+++ b/setup/databaseScripts/create_database_V0.0.32.sql
@@ -256,7 +256,7 @@ CREATE TABLE {prefix}settings (
     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
+    invoice_methods_enabled BOOLEAN DEFAULT '0',           -- 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

diff --git a/setup/databaseScripts/update_database_V0.0.28.sql b/setup/databaseScripts/update_database_V0.0.28.sql
index 366a249..4ed0a14 100644 (file)
--- a/setup/databaseScripts/update_database_V0.0.28.sql
+++ b/setup/databaseScripts/update_database_V0.0.28.sql
@@ -26,4 +26,4 @@ ALTER TABLE {prefix}settings ADD billing_fields_required BOOLEAN DEFAULT '1';
 
 ----
 
-ALTER TABLE {prefix}settings ADD invoice_methods_enabled BOOLEAN DEFAULT '1';
+ALTER TABLE {prefix}settings ADD invoice_methods_enabled BOOLEAN DEFAULT '0';

diff --git a/views/admin/billing/header.html b/views/admin/billing/header.html
index a013938..912cd6d 100644 (file)
--- a/views/admin/billing/header.html
+++ b/views/admin/billing/header.html
@@ -5,8 +5,10 @@
         <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=invoices" class="nav-tab{if $thisAction==invoices} nav-tab-active{/if}">Invoices</a>
         <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=payments" class="nav-tab{if $thisAction==payments} nav-tab-active{/if}">Payments</a>
         <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=accounts" class="nav-tab{if $thisAction==accounts} nav-tab-active{/if}">Accounts</a>
-        <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=invoicing" class="nav-tab{if $thisAction==invoicing} nav-tab-active{/if}">Invoicing</a>
-        <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=reports" class="nav-tab{if $thisAction==reports} nav-tab-active{/if}">Reports</a>
+        {if isset( $billing_settings.renewal_day_static ) && $billing_settings.renewal_day_static}
+            <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=invoicing" class="nav-tab{if $thisAction==invoicing} nav-tab-active{/if}">Invoicing</a>
+            <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=reports" class="nav-tab{if $thisAction==reports} nav-tab-active{/if}">Reports</a>
+        {/if}
         <a href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=logs" class="nav-tab{if $thisAction==logs} nav-tab-active{/if}">Logs</a>
     </h2>
     <div id="glm-admin-content-container">

diff --git a/views/admin/billing/invoices.html b/views/admin/billing/invoices.html
index 16f301c..25ad124 100644 (file)
--- a/views/admin/billing/invoices.html
+++ b/views/admin/billing/invoices.html
@@ -80,8 +80,11 @@
                                     <a href="{$adminUrl}?page=glm-members-admin-menu-billing&glm_action=invoices&option=edit&id={$t.id}">Edit</a> |
                                 </span>
                                 <span class="account-dashboard-link">
-                                    <a href="{$thisUrl}?page={$thisPage}&glm_action=invoices&option=view&id={$t.id}">View</a> |
-                                    <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=createPDFInvoice&id={$t.id}">Print</a> |
+                                    {if isset( $billing_settings.invoice_pdf_enabled ) && $billing_settings.invoice_pdf_enabled}
+                                        <a href="{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=createPDFInvoice&id={$t.id}">Print</a> |
+                                    {else}
+                                        <a href="{$thisUrl}?page={$thisPage}&glm_action=invoices&option=view&id={$t.id}">View</a> |
+                                    {/if}
                                 </span>
                                 <span class="account-dashboard-link">
                                     {if $t.paid.value}

diff --git a/views/admin/billing/reports.html b/views/admin/billing/reports.html
index bdd7cc9..3627d24 100644 (file)
--- a/views/admin/billing/reports.html
+++ b/views/admin/billing/reports.html
@@ -47,10 +47,12 @@
                         <option value="{$typeId}"{if isset($smarty.request.transactionTypes) && in_array( $typeId, $smarty.request.transactionTypes )} selected{/if}>{$typeLabel}</option>
                     {/foreach}
                 </select>
-                <br />
-                <label>
-                    <input type="checkbox" id="qif" name="qif" /> Export QIF File
-                </label>
+                {if isset( $billing_settings.quickbooks_enabled ) && $billing_settings.quickbooks_enabled}
+                    <br />
+                    <label>
+                        <input type="checkbox" id="qif" name="qif" /> Export QIF File
+                    </label>
+                {/if}
             </div>
             <div class="billing-search-form-submit">
                 <input id="report_search" type="submit" value="Search">