From a5ba7c40629197268466b4a2457856056235f01f Mon Sep 17 00:00:00 2001 From: KarinG Date: Tue, 12 May 2020 17:02:22 -0600 Subject: [PATCH] Clarify definition of amount field in civicrm_contribution_recur table. --- CRM/Contribute/DAO/ContributionRecur.php | 6 +++--- CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl | 2 ++ xml/schema/Contribute/ContributionRecur.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index 060a304ed0..192721f6e6 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:d0c493bb1a98e2b75ebaceb330a40fb4) + * (GenCodeChecksum:1c6a0e2a296ffbb530eee381975b9d17) */ /** @@ -43,7 +43,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { public $contact_id; /** - * Amount to be contributed or charged each recurrence. + * Amount to be collected (including any sales tax) by payment processor each recurrence. * * @var float */ @@ -294,7 +294,7 @@ class CRM_Contribute_DAO_ContributionRecur extends CRM_Core_DAO { 'name' => 'amount', 'type' => CRM_Utils_Type::T_MONEY, 'title' => ts('Amount'), - 'description' => ts('Amount to be contributed or charged each recurrence.'), + 'description' => ts('Amount to be collected (including any sales tax) by payment processor each recurrence.'), 'required' => TRUE, 'precision' => [ 20, diff --git a/CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl index 0628764183..0621e8fb19 100644 --- a/CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.27.alpha1.mysql.tpl @@ -1 +1,3 @@ {* file to handle db changes in 5.27.alpha1 during upgrade *} + +ALTER TABLE `civicrm_contribution_recur` CHANGE `amount` `amount` DECIMAL( 20,2 ) COMMENT 'Amount to be collected (including any sales tax) by payment processor each recurrence.'; diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml index 3ac72066ca..d5295ff455 100644 --- a/xml/schema/Contribute/ContributionRecur.xml +++ b/xml/schema/Contribute/ContributionRecur.xml @@ -41,7 +41,7 @@ Amount decimal true - Amount to be contributed or charged each recurrence. + Amount to be collected (including any sales tax) by payment processor each recurrence. 1.6 Text -- 2.25.1