Merge pull request #19525 from eileenmcnaughton/member_soft

[civicrm-core.git] / CRM / Member / DAO / Membership.php

diff --git a/CRM/Member/DAO/Membership.php b/CRM/Member/DAO/Membership.php
index 382fb5ba70d10e83492056f138857840f47fb3f0..3a2d32ac728e7d334e5cb8ca2b27e88a26768d2f 100644 (file)
--- a/CRM/Member/DAO/Membership.php
+++ b/CRM/Member/DAO/Membership.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Member/Membership.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:d7667a8f99b6f74f97eb5d167a10588a)
+ * (GenCodeChecksum:5be0e02d65ec73885d938398aac05a29)
  */
 
 /**
@@ -15,6 +15,7 @@
 class CRM_Member_DAO_Membership extends CRM_Core_DAO {
   const EXT = 'civicrm';
   const TABLE_ADDED = '1.5';
+  const COMPONENT = 'CiviMember';
 
   /**
    * Static instance to hold the table name.
@@ -50,7 +51,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
   ];
 
   /**
-   * Membership Id
+   * Membership ID
    *
    * @var int
    */
@@ -205,7 +206,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'name' => 'id',
           'type' => CRM_Utils_Type::T_INT,
           'title' => ts('Membership ID'),
-          'description' => ts('Membership Id'),
+          'description' => ts('Membership ID'),
           'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_membership.id',
@@ -215,6 +216,9 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'entity' => 'Membership',
           'bao' => 'CRM_Member_BAO_Membership',
           'localizable' => 0,
+          'html' => [
+            'type' => 'Number',
+          ],
           'add' => '1.5',
         ],
         'membership_contact_id' => [
@@ -235,13 +239,14 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'FKClassName' => 'CRM_Contact_DAO_Contact',
           'html' => [
             'type' => 'EntityRef',
+            'label' => ts("Contact"),
           ],
           'add' => '1.5',
         ],
         'membership_type_id' => [
           'name' => 'membership_type_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Membership Type Id'),
+          'title' => ts('Membership Type ID'),
           'description' => ts('FK to Membership Type'),
           'required' => TRUE,
           'import' => TRUE,
@@ -346,7 +351,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
         'status_id' => [
           'name' => 'status_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Membership Status Id'),
+          'title' => ts('Status ID'),
           'description' => ts('FK to Membership Status'),
           'required' => TRUE,
           'import' => TRUE,
@@ -360,6 +365,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'FKClassName' => 'CRM_Member_DAO_MembershipStatus',
           'html' => [
             'type' => 'Select',
+            'label' => ts("Status"),
           ],
           'pseudoconstant' => [
             'table' => 'civicrm_membership_status',
@@ -417,6 +423,9 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'bao' => 'CRM_Member_BAO_Membership',
           'localizable' => 0,
           'FKClassName' => 'CRM_Member_DAO_Membership',
+          'html' => [
+            'label' => ts("Primary Member"),
+          ],
           'add' => '1.7',
         ],
         'max_related' => [
@@ -474,7 +483,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
         'membership_recur_id' => [
           'name' => 'contribution_recur_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Membership Recurring Contribution'),
+          'title' => ts('Recurring Contribution ID'),
           'description' => ts('Conditional foreign key to civicrm_contribution_recur id. Each membership in connection with a recurring contribution carries a foreign key to the recurring contribution record. This assumes we can track these processor initiated events.'),
           'where' => 'civicrm_membership.contribution_recur_id',
           'export' => TRUE,
@@ -483,12 +492,15 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'bao' => 'CRM_Member_BAO_Membership',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contribute_DAO_ContributionRecur',
+          'html' => [
+            'label' => ts("Recurring Contribution"),
+          ],
           'add' => '3.3',
         ],
         'member_campaign_id' => [
           'name' => 'campaign_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Campaign'),
+          'title' => ts('Campaign ID'),
           'description' => ts('The campaign for which this membership is attached.'),
           'import' => TRUE,
           'where' => 'civicrm_membership.campaign_id',
@@ -500,11 +512,7 @@ class CRM_Member_DAO_Membership extends CRM_Core_DAO {
           'FKClassName' => 'CRM_Campaign_DAO_Campaign',
           'html' => [
             'type' => 'Select',
-          ],
-          'pseudoconstant' => [
-            'table' => 'civicrm_campaign',
-            'keyColumn' => 'id',
-            'labelColumn' => 'title',
+            'label' => ts("Campaign"),
           ],
           'add' => '3.4',
         ],