From 692cd347eb0800444ad2e646c501eee6c72db97c Mon Sep 17 00:00:00 2001
From: Jaap Jansma <jaap.jansma@civicoop.org>
Date: Mon, 4 Nov 2019 20:44:58 +0100
Subject: [PATCH] fixed bug with contribution data source and contact id

---
 Civi/DataProcessor/Source/Contribution/ContributionSource.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Civi/DataProcessor/Source/Contribution/ContributionSource.php b/Civi/DataProcessor/Source/Contribution/ContributionSource.php
index 05f62a7d..62a33c23 100644
--- a/Civi/DataProcessor/Source/Contribution/ContributionSource.php
+++ b/Civi/DataProcessor/Source/Contribution/ContributionSource.php
@@ -39,7 +39,7 @@ class ContributionSource extends AbstractCivicrmEntitySource {
 
     // Create the contribution soft data flow and data flow description
     $this->contributionSoftDataFlow = new SqlTableDataFlow('civicrm_contribution_soft', $this->getSourceName().'_contribution_soft');
-    DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Contribute_DAO_ContributionSoft', $this->contributionSoftDataFlow->getDataSpecification(), array('id'), '', 'contribution_soft_', E::ts('Soft :: '));
+    DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Contribute_DAO_ContributionSoft', $this->contributionSoftDataFlow->getDataSpecification(), array('id'), 'contribution_soft_', 'contribution_soft_', E::ts('Soft :: '));
   }
 
 
@@ -143,7 +143,7 @@ class ContributionSource extends AbstractCivicrmEntitySource {
     $aliasPrefix = $this->getSourceName().'_';
 
     DataSpecificationUtils::addDAOFieldsToDataSpecification($daoClass, $dataSpecification, $fieldsToSkip, '', $aliasPrefix);
-    DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Contribute_DAO_ContributionSoft', $dataSpecification, array('id', 'contribution_id'), 'contribution_soft_', $aliasPrefix, E::ts('Soft :: '));
+    DataSpecificationUtils::addDAOFieldsToDataSpecification('CRM_Contribute_DAO_ContributionSoft', $dataSpecification, array('id', 'contribution_id'), 'contribution_soft_', $aliasPrefix.'_contribution_soft_', E::ts('Soft :: '));
   }
 
   /**
-- 
GitLab