From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Nov 2017 18:26:38 +0000 (-0500)
Subject: Updating for the data classes
X-Git-Tag: v1.0.0^2~218
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=897ef2a4dbaa487c78cc03f9687ecf0f8f5f0a22;p=WP-Plugins%2Fglm-member-db-billing.git

Updating for the data classes

Updating data classes for name changes.
---

diff --git a/classes/data/dataInvoiceTypes.php b/classes/data/dataInvoiceTypes.php
index 0b7a7d6..d1527fa 100644
--- a/classes/data/dataInvoiceTypes.php
+++ b/classes/data/dataInvoiceTypes.php
@@ -24,7 +24,7 @@
  *          @release SVN: $Id: dataMembers.php,v 1.0 2011/01/25 19:31:47 cscott
  *          Exp $
  */
-class GlmDataPaymentTypes extends GlmDataAbstract
+class GlmDataInvoiceTypes extends GlmDataAbstract
 {
 
     /**
@@ -107,7 +107,7 @@ class GlmDataPaymentTypes extends GlmDataAbstract
         /*
          * Table Name
          */
-        $this->table = GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX . 'payment_types';
+        $this->table = GLM_MEMBERS_BILLING_PLUGIN_DB_PREFIX . 'invoice_types';
 
         /*
          * Table Data Fields
@@ -122,50 +122,44 @@ class GlmDataPaymentTypes extends GlmDataAbstract
                 'use'       => 'a',
             ),
 
-            // Default Billing Period
+            // Invoice Type Name
             'name' => array(
                 'field' => 'name',
                 'type'  => 'text',
                 'use'   => 'a',
             ),
 
-            // Default Invoice Date
-            'qcode' => array(
-                'field' => 'qcode',
-                'type'  => 'text',
-                'use'   => 'a',
-            ),
-
-            // Notification From Email
-            'category' => array(
-                'field' => 'category',
-                'type'  => 'text',
-                'use'   => 'a',
+            // Parent
+            'parent' => array(
+                'field' => 'parent',
+                'type'  => 'integer',
+                'use'   => 'a'
             ),
 
-            // Notification Message
+            // Amount
             'amount' => array(
                 'field' => 'amount',
                 'type'  => 'text',
                 'use'   => 'a',
             ),
 
-            // Logo for Invioce PDF
-            'notes' => array(
-                'field' => 'notes',
-                'type'  => 'text',
-                'use'   => 'a',
+            // Recurring
+            'recurring'   => array(
+                'field'   => 'recurring',
+                'type'    => 'checkbox',
+                'default' => false,
+                'use'     => 'a',
             ),
 
-            // Name
-            'dynamic_amount' => array(
-                'field' => 'dynamic_amount',
+            // Recurrence
+            'recurrence' => array(
+                'field' => 'recurrence',
                 'type'  => 'text',
                 'use'   => 'a',
             ),
-
          );
 
+
     }
 
     /*
diff --git a/classes/data/dataSettings.php b/classes/data/dataSettings.php
index 6063294..4a1cdf2 100644
--- a/classes/data/dataSettings.php
+++ b/classes/data/dataSettings.php
@@ -122,34 +122,6 @@ class GlmDataBillingSettings extends GlmDataAbstract
                 'use'       => 'a',
             ),
 
-            // Default Billing Period
-            'billing_period' => array(
-                'field' => 'billing_period',
-                'type'  => 'text',
-                'use'   => 'a',
-            ),
-
-            // Default Invoice Date
-            'invoice_date' => array(
-                'field' => 'invoice_date',
-                'type'  => 'text',
-                'use'   => 'a',
-            ),
-
-            // Notification From Email
-            'notification_from' => array(
-                'field' => 'notification_from',
-                'type'  => 'text',
-                'use'   => 'a',
-            ),
-
-            // Notification Message
-            'notification_message' => array(
-                'field' => 'notification_message',
-                'type'  => 'text',
-                'use'   => 'a',
-            ),
-
             // Logo for Invioce PDF
             'company_logo' => array(
                 'field' => 'company_logo',
diff --git a/config/plugin.ini b/config/plugin.ini
index 6789aba..4c5d9f7 100644
--- a/config/plugin.ini
+++ b/config/plugin.ini
@@ -8,14 +8,31 @@
 [common]
 
 ; Billing Types
-billingType[1] = "Invoice"
-billingType[2] = "Payment"
-billingType[3] = "Adjustment"
-billingType[4] = "Comment"
+transaction_type[10] = "Invoice"
+transaction_type[20] = "Payment"
+transaction_type[30] = "Adjustment"
+transaction_type[40] = "Comment"
 
-; Payment Method
-paymentMethod[1] = "Check"
-paymentMethod[2] = "Credit Card"
-paymentMethod[3] = "Cash"
-paymentMethod[4] = "Other"
+; Payment Methods
+payment_method[10] = "Check"
+payment_method[20] = "Credit Card"
+payment_method[30] = "Cash"
+payment_method[40] = "Other"
 
+; Recurrences
+recurrence[10] = "Monthly"
+recurrence[20] = "Yearly"
+
+; Send Date Periods
+send_date_period[10] = "Day"
+send_date_period[20] = "Week"
+send_date_period[30] = "Month"
+send_date_period[40] = "Year"
+
+; Send Action
+send_action[10] = "Create Invoice"
+send_action[20] = "Received Payment"
+
+; Send Date When
+send_date_when[10] = "Before"
+send_date_when[20] = "After"