From c6821d8d450c4f6f16e4a619fcfc1becffd91dd4 Mon Sep 17 00:00:00 2001
From: "Matthew Wire (MJW Consulting)" <mjw@mjwconsult.co.uk>
Date: Tue, 12 Feb 2019 11:05:53 +0000
Subject: [PATCH] Contribution/ContributionRecur metadata updates for
 EntityForm

---
 CRM/Contribute/DAO/ContributionRecur.php    | 50 +++++++++++++++------
 xml/schema/Contribute/Contribution.xml      |  4 +-
 xml/schema/Contribute/ContributionRecur.xml | 46 ++++++++++++++-----
 3 files changed, 74 insertions(+), 26 deletions(-)

diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php
index e2011b92e1..05a29c5637 100644
--- a/CRM/Contribute/DAO/ContributionRecur.php
+++ b/CRM/Contribute/DAO/ContributionRecur.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d3bbedd50918aaf27f7177cceb6593b4)
+ * (GenCodeChecksum:1eb0ecd4aadee175dadb66464c06dd25)
  */
 
 /**
@@ -36,7 +36,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
   public $id;
 
   /**
-   * Foreign key to civicrm_contact.id .
+   * Foreign key to civicrm_contact.id.
    *
    * @var int unsigned
    */
@@ -269,14 +269,17 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
         'contact_id' => [
           'name' => 'contact_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Contact ID'),
-          'description' => ts('Foreign key to civicrm_contact.id .'),
+          'title' => ts('Contact'),
+          'description' => ts('Foreign key to civicrm_contact.id.'),
           'required' => TRUE,
           'table_name' => 'civicrm_contribution_recur',
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
+          'html' => [
+            'type' => 'EntityRef',
+          ],
         ],
         'amount' => [
           'name' => 'amount',
@@ -369,7 +372,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
         'start_date' => [
           'name' => 'start_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
-          'title' => ts('Recurring Contribution Started Date'),
+          'title' => ts('Start Date'),
           'description' => ts('The date the first scheduled recurring contribution occurs.'),
           'required' => TRUE,
           'table_name' => 'civicrm_contribution_recur',
@@ -378,13 +381,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Select Date',
-            'formatType' => 'activityDate',
+            'formatType' => 'activityDateTime',
           ],
         ],
         'create_date' => [
           'name' => 'create_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
-          'title' => ts('Recurring Contribution Created Date'),
+          'title' => ts('Created Date'),
           'description' => ts('When this recurring contribution record was created.'),
           'required' => TRUE,
           'table_name' => 'civicrm_contribution_recur',
@@ -393,13 +396,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Select Date',
-            'formatType' => 'activityDate',
+            'formatType' => 'activityDateTime',
           ],
         ],
         'modified_date' => [
           'name' => 'modified_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
-          'title' => ts('Recurring Contribution Modified Date'),
+          'title' => ts('Modified Date'),
           'description' => ts('Last updated date for this record. mostly the last time a payment was received'),
           'table_name' => 'civicrm_contribution_recur',
           'entity' => 'ContributionRecur',
@@ -407,13 +410,13 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'localizable' => 0,
           'html' => [
             'type' => 'Select Date',
-            'formatType' => 'activityDate',
+            'formatType' => 'activityDateTime',
           ],
         ],
         'cancel_date' => [
           'name' => 'cancel_date',
           'type' => CRM_Utils_Type::T_DATE + CRM_Utils_Type::T_TIME,
-          'title' => ts('Recurring Contribution Cancel Date'),
+          'title' => ts('Cancel Date'),
           'description' => ts('Date this recurring contribution was cancelled by contributor- if we can get access to it'),
           'table_name' => 'civicrm_contribution_recur',
           'entity' => 'ContributionRecur',
@@ -449,6 +452,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
         ],
         'payment_token_id' => [
           'name' => 'payment_token_id',
@@ -472,6 +478,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
         ],
         'invoice_id' => [
           'name' => 'invoice_id',
@@ -484,11 +493,14 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Text',
+          ],
         ],
         'contribution_status_id' => [
           'name' => 'contribution_status_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Recurring Contribution Status'),
+          'title' => ts('Status'),
           'import' => TRUE,
           'where' => 'civicrm_contribution_recur.contribution_status_id',
           'headerPattern' => '',
@@ -499,6 +511,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'entity' => 'ContributionRecur',
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Select',
+          ],
           'pseudoconstant' => [
             'optionGroupName' => 'contribution_status',
             'optionEditPath' => 'civicrm/admin/options/contribution_status',
@@ -525,7 +540,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
         'cycle_day' => [
           'name' => 'cycle_day',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Number of Cycle Day'),
+          'title' => ts('Cycle Day'),
           'description' => ts('Day in the period when the payment should be charged e.g. 1st of month, 15th etc.'),
           'required' => TRUE,
           'default' => '1',
@@ -604,6 +619,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
           'FKClassName' => 'CRM_Financial_DAO_PaymentProcessor',
+          'html' => [
+            'type' => 'Select',
+          ],
         ],
         'financial_type_id' => [
           'name' => 'financial_type_id',
@@ -619,6 +637,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
           'FKClassName' => 'CRM_Financial_DAO_FinancialType',
+          'html' => [
+            'type' => 'Select',
+          ],
           'pseudoconstant' => [
             'table' => 'civicrm_financial_type',
             'keyColumn' => 'id',
@@ -657,6 +678,9 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO {
           'bao' => 'CRM_Contribute_BAO_ContributionRecur',
           'localizable' => 0,
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
+          'html' => [
+            'type' => 'Select',
+          ],
           'pseudoconstant' => [
             'table' => 'civicrm_campaign',
             'keyColumn' => 'id',
diff --git a/xml/schema/Contribute/Contribution.xml b/xml/schema/Contribute/Contribution.xml
index 5ea0ccc0fd..63b8d13023 100644
--- a/xml/schema/Contribute/Contribution.xml
+++ b/xml/schema/Contribute/Contribution.xml
@@ -31,8 +31,8 @@
     <dataPattern>/^\d+$/</dataPattern>
     <comment>FK to Contact ID</comment>
     <html>
-       <type>EntityRef</type>
-     </html>
+      <type>EntityRef</type>
+    </html>
     <add>1.3</add>
   </field>
   <foreignKey>
diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml
index 9a8e4ba9eb..f9594294a5 100644
--- a/xml/schema/Contribute/ContributionRecur.xml
+++ b/xml/schema/Contribute/ContributionRecur.xml
@@ -19,11 +19,14 @@
   </primaryKey>
   <field>
     <name>contact_id</name>
-    <title>Contact ID</title>
+    <title>Contact</title>
     <type>int unsigned</type>
     <required>true</required>
-    <comment>Foreign key to civicrm_contact.id .</comment>
+    <comment>Foreign key to civicrm_contact.id.</comment>
     <add>1.6</add>
+    <html>
+      <type>EntityRef</type>
+    </html>
   </field>
   <foreignKey>
     <name>contact_id</name>
@@ -100,42 +103,42 @@
   </field>
   <field>
     <name>start_date</name>
-    <title>Recurring Contribution Started Date</title>
+    <title>Start Date</title>
     <type>datetime</type>
     <required>true</required>
     <comment>The date the first scheduled recurring contribution occurs.</comment>
     <add>1.6</add>
     <html>
       <type>Select Date</type>
-      <formatType>activityDate</formatType>
+      <formatType>activityDateTime</formatType>
     </html>
   </field>
   <field>
     <name>create_date</name>
-    <title>Recurring Contribution Created Date</title>
+    <title>Created Date</title>
     <type>datetime</type>
     <required>true</required>
     <comment>When this recurring contribution record was created.</comment>
     <add>1.6</add>
     <html>
       <type>Select Date</type>
-      <formatType>activityDate</formatType>
+      <formatType>activityDateTime</formatType>
     </html>
   </field>
   <field>
     <name>modified_date</name>
-    <title>Recurring Contribution Modified Date</title>
+    <title>Modified Date</title>
     <type>datetime</type>
     <comment>Last updated date for this record. mostly the last time a payment was received</comment>
     <add>1.6</add>
     <html>
       <type>Select Date</type>
-      <formatType>activityDate</formatType>
+      <formatType>activityDateTime</formatType>
     </html>
   </field>
   <field>
     <name>cancel_date</name>
-    <title>Recurring Contribution Cancel Date</title>
+    <title>Cancel Date</title>
     <type>datetime</type>
     <comment>Date this recurring contribution was cancelled by contributor- if we can get access to it</comment>
     <add>1.6</add>
@@ -162,6 +165,9 @@
     <length>255</length>
     <comment>Possibly needed to store a unique identifier for this recurring payment order - if this is available from the processor??</comment>
     <add>1.6</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
     <name>payment_token_id</name>
@@ -184,6 +190,9 @@
     <length>255</length>
     <comment>unique transaction id. may be processor id, bank id + trans id, or account number + check number... depending on payment_method</comment>
     <add>1.6</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <field>
     <name>invoice_id</name>
@@ -192,6 +201,9 @@
     <length>255</length>
     <comment>unique invoice id, system generated or passed in</comment>
     <add>1.6</add>
+    <html>
+      <type>Text</type>
+    </html>
   </field>
   <index>
     <name>UI_contrib_trxn_id</name>
@@ -207,7 +219,7 @@
   </index>
   <field>
     <name>contribution_status_id</name>
-    <title>Recurring Contribution Status</title>
+    <title>Status</title>
     <type>int unsigned</type>
     <default>1</default>
     <import>true</import>
@@ -215,6 +227,9 @@
     <pseudoconstant>
       <optionGroupName>contribution_status</optionGroupName>
     </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <index>
     <name>index_contribution_status</name>
@@ -233,7 +248,7 @@
   </field>
   <field>
     <name>cycle_day</name>
-    <title>Number of Cycle Day</title>
+    <title>Cycle Day</title>
     <type>int unsigned</type>
     <default>1</default>
     <required>true</required>
@@ -301,6 +316,9 @@
     <type>int unsigned</type>
     <comment>Foreign key to civicrm_payment_processor.id</comment>
     <add>3.3</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
     <name>payment_processor_id</name>
@@ -338,6 +356,9 @@
       <keyColumn>id</keyColumn>
       <labelColumn>name</labelColumn>
     </pseudoconstant>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
     <name>financial_type_id</name>
@@ -377,6 +398,9 @@
       <labelColumn>title</labelColumn>
     </pseudoconstant>
     <add>4.1</add>
+    <html>
+      <type>Select</type>
+    </html>
   </field>
   <foreignKey>
     <name>campaign_id</name>
-- 
2.25.1