Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/financial#158 change UI parts of contribution soft schema to soft credit #19085

Merged
merged 1 commit into from
Dec 11, 2020
Merged

dev/financial#158 change UI parts of contribution soft schema to soft credit #19085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions CRM/Contribute/DAO/ContributionSoft.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* Generated from xml/schema/CRM/Contribute/ContributionSoft.xml
* DO NOT EDIT. Generated by CRM_Core_CodeGen
* (GenCodeChecksum:3bbe2837f1b310d77d79614a4fd5a9af)
* (GenCodeChecksum:1b1f93e7a667240fc671ccaab6293ee4)
*/

/**
Expand All @@ -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
*/
Expand All @@ -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
*/
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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,
Expand All @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions xml/schema/Contribute/ContributionSoft.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down