From c95977c3e249bf1dfed588eda848bb561e3f9105 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 1 Dec 2020 16:51:48 +1300 Subject: [PATCH] dev/financial#158 change UI parts of contribution soft schema to soft credit --- CRM/Contribute/DAO/ContributionSoft.php | 18 +++++++++--------- xml/schema/Contribute/ContributionSoft.xml | 14 +++++++------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CRM/Contribute/DAO/ContributionSoft.php b/CRM/Contribute/DAO/ContributionSoft.php index 3ab488c55d..261c59214e 100644 --- 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 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { '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 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { '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 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { '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 @@ class CRM_Contribute_DAO_ContributionSoft extends CRM_Core_DAO { '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 index 5f012de36d..fc1dac96ee 100644 --- a/xml/schema/Contribute/ContributionSoft.xml +++ b/xml/schema/Contribute/ContributionSoft.xml @@ -10,12 +10,12 @@ id contribution_soft_id - Soft Contribution ID + Soft Credit ID int unsigned true true - Soft Contribution ID - Soft Contribution ID + Soft Credit ID + Soft Credit ID 2.2 @@ -24,7 +24,7 @@ contribution_id - Soft Contribution - Contribution + Soft Credit - Contribution ID int unsigned true FK to contribution table. @@ -40,7 +40,7 @@ contact_id contribution_soft_contact_id - Contact ID + Soft Credit Contact ID int unsigned true true @@ -58,13 +58,13 @@ amount - Soft Contribution Amount + Soft Credit Amount decimal true true /total(.?am(ou)?nt)?/i /^\d+(\.\d{2})?$/ - Amount of this soft contribution. + Amount of this soft credit. 2.2 -- 2.25.1