Merge pull request #19085 from eileenmcnaughton/words

dev/financial#158 change UI parts of contribution soft schema to soft credit
civicrm · Dec 11, 2020 · 14730b9 · 14730b9
2 parents afba51f + c95977c
commit 14730b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:3bbe2837f1b310d77d79614a4fd5a9af)
+ * (GenCodeChecksum:1b1f93e7a667240fc671ccaab6293ee4)
  */
 
 /**
@@ -32,7 +32,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
   public static $_log = TRUE;
 
   /**
-   * Soft Contribution ID
+   * Soft Credit ID
    *
    * @var int
    */
@@ -53,7 +53,7 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO {
   public $contact_id;
 
   /**
-   * Amount of this soft contribution.
+   * Amount of this soft credit.
    *
    * @var float
    */
@@ -141,8 +141,8 @@ public static function &fields() {
         'contribution_soft_id' => [
           'name' => 'id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Soft Contribution ID'),
-          'description' => ts('Soft Contribution ID'),
+          'title' => ts('Soft Credit ID'),
+          'description' => ts('Soft Credit ID'),
           'required' => TRUE,
           'import' => TRUE,
           'where' => 'civicrm_contribution_soft.id',
@@ -156,7 +156,7 @@ public static function &fields() {
         'contribution_id' => [
           'name' => 'contribution_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Soft Contribution - Contribution'),
+          'title' => ts('Soft Credit - Contribution ID'),
           'description' => ts('FK to contribution table.'),
           'required' => TRUE,
           'where' => 'civicrm_contribution_soft.contribution_id',
@@ -170,7 +170,7 @@ public static function &fields() {
         'contribution_soft_contact_id' => [
           'name' => 'contact_id',
           'type' => CRM_Utils_Type::T_INT,
-          'title' => ts('Contact ID'),
+          'title' => ts('Soft Credit Contact ID'),
           'description' => ts('FK to Contact ID'),
           'required' => TRUE,
           'import' => TRUE,
@@ -188,8 +188,8 @@ public static function &fields() {
         'amount' => [
           'name' => 'amount',
           'type' => CRM_Utils_Type::T_MONEY,
-          'title' => ts('Soft Contribution Amount'),
-          'description' => ts('Amount of this soft contribution.'),
+          'title' => ts('Soft Credit Amount'),
+          'description' => ts('Amount of this soft credit.'),
           'required' => TRUE,
           'precision' => [
             20,

diff --git a/xml/schema/Contribute/ContributionSoft.xml b/xml/schema/Contribute/ContributionSoft.xml
@@ -10,12 +10,12 @@
   <field>
     <name>id</name>
     <uniqueName>contribution_soft_id</uniqueName>
-    <title>Soft Contribution ID</title>
+    <title>Soft Credit ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <import>true</import>
-    <title>Soft Contribution ID</title>
-    <comment>Soft Contribution ID</comment>
+    <title>Soft Credit ID</title>
+    <comment>Soft Credit ID</comment>
     <add>2.2</add>
   </field>
   <primaryKey>
@@ -24,7 +24,7 @@
   </primaryKey>
   <field>
     <name>contribution_id</name>
-    <title>Soft Contribution - Contribution</title>
+    <title>Soft Credit - Contribution ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <comment>FK to contribution table.</comment>
@@ -40,7 +40,7 @@
   <field>
     <name>contact_id</name>
     <uniqueName>contribution_soft_contact_id</uniqueName>
-    <title>Contact ID</title>
+    <title>Soft Credit Contact ID</title>
     <type>int unsigned</type>
     <required>true</required>
     <import>true</import>
@@ -58,13 +58,13 @@
   </foreignKey>
   <field>
     <name>amount</name>
-    <title>Soft Contribution Amount</title>
+    <title>Soft Credit Amount</title>
     <type>decimal</type>
     <required>true</required>
     <import>true</import>
     <headerPattern>/total(.?am(ou)?nt)?/i</headerPattern>
     <dataPattern>/^\d+(\.\d{2})?$/</dataPattern>
-    <comment>Amount of this soft contribution.</comment>
+    <comment>Amount of this soft credit.</comment>
     <add>2.2</add>
   </field>
   <field>