Merge pull request #272 from compucorp/CIWEMB-254-fix-wrong-cf-fetching

CIWEMB-254: Fetch custom fields correctly
compucorp · Apr 5, 2023 · 4f2040e · 4f2040e
2 parents 7d1efaf + 40cce23
commit 4f2040e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 11 deletions.
diff --git a/CRM/ManualDirectDebit/Common/CollectionReminderSendFlagManager.php b/CRM/ManualDirectDebit/Common/CollectionReminderSendFlagManager.php
@@ -25,6 +25,7 @@ private static function getIsNotificationSentCustomFieldId() {
       return civicrm_api3('CustomField', 'getvalue', [
         'return' => 'id',
         'name' => 'is_notification_sent',
+        'custom_group_id' => 'direct_debit_collection_reminder_sendflag',
       ]);
     }
     catch (CRM_Core_Exception $e) {

diff --git a/CRM/ManualDirectDebit/Common/DirectDebitDataProvider.php b/CRM/ManualDirectDebit/Common/DirectDebitDataProvider.php
@@ -206,14 +206,16 @@ public static function getGroupIDByName($customGroupName) {
   /**
    * Gets id of custom field by name
    *
-   * @param $customFieldName
+   * @param string $customFieldName
+   * @param string $customGroupName
    *
    * @return int
    */
-  public static function getCustomFieldIdByName($customFieldName) {
+  public static function getCustomFieldIdByName($customFieldName, $customGroupName) {
     return civicrm_api3('CustomField', 'getvalue', [
       'return' => "id",
       'name' => $customFieldName,
+      'custom_group_id' => $customGroupName,
     ]);
   }
 

diff --git a/CRM/ManualDirectDebit/Common/MandateStorageManager.php b/CRM/ManualDirectDebit/Common/MandateStorageManager.php
@@ -24,7 +24,7 @@ class CRM_ManualDirectDebit_Common_MandateStorageManager {
    *
    */
   public function assignContributionMandate($contributionId, $mandateID) {
-    $mandateIdCustomFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("mandate_id");
+    $mandateIdCustomFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
 
     civicrm_api3('Contribution', 'create', [
       'id' => $contributionId,

diff --git a/CRM/ManualDirectDebit/Hook/BuildForm/CustomData.php b/CRM/ManualDirectDebit/Hook/BuildForm/CustomData.php
@@ -82,7 +82,7 @@ private function isAddOperation() {
    *  Hides 'DD ref' custom field
    */
   private function hideDdRef() {
-    $customFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("dd_ref");
+    $customFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('dd_ref', 'direct_debit_mandate');
     $ddRefElementNameId = $this->form->_groupTree[$this->directDebitMandateId]['fields'][$customFieldId]['element_name'];
     unset($this->form->_groupTree[$this->directDebitMandateId]['fields'][$customFieldId]);
     foreach ($this->form->_required as $requiredFieldsId => $requiredFieldsName) {

diff --git a/CRM/ManualDirectDebit/Hook/BuildForm/CustomDataByType.php b/CRM/ManualDirectDebit/Hook/BuildForm/CustomDataByType.php
@@ -54,7 +54,7 @@ private function checkIfDirectDebitInformationInGroupTree() {
    *  Hides Direct Debit Information if it`s empty
    */
   private function hideDirectDebitInformationIfEmpty() {
-    $customFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("mandate_id");
+    $customFieldId = CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
     $mandateIdValue = $this->customGroupTree[$this->directDebitInformationId]['fields'][$customFieldId]['element_value'];
 
     if (!isset($mandateIdValue) || empty($mandateIdValue)) {

diff --git a/CRM/ManualDirectDebit/Hook/PageRun/TabPage.php b/CRM/ManualDirectDebit/Hook/PageRun/TabPage.php
@@ -37,8 +37,9 @@ public function hideDirectDebitFields() {
    */
   private function isCustomFieldNeedToHide($contributionId) {
     $customFieldId = civicrm_api3('CustomField', 'getvalue', [
-      'return' => "id",
-      'name' => "mandate_id",
+      'return' => 'id',
+      'name' => 'mandate_id',
+      'custom_group_id' => 'direct_debit_information',
     ]);
 
     $mandateId = civicrm_api3('Contribution', 'getvalue', [

diff --git a/tests/phpunit/CRM/ManualDirectDebit/Common/DirectDebitDataProviderTest.php b/tests/phpunit/CRM/ManualDirectDebit/Common/DirectDebitDataProviderTest.php
@@ -15,7 +15,7 @@ class CRM_ManualDirectDebit_Common_DirectDebitDataProviderTest extends BaseHeadl
    * Tests getCustomFieldIdbyName function
    */
   public function testGetCustomFieldIdByName() {
-    $customFieldId = DirectDebitDataProvider::getCustomFieldIdByName('mandate_id');
+    $customFieldId = DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
     $this->assertNotNull($customFieldId);
   }
 

diff --git a/tests/phpunit/CRM/ManualDirectDebit/Common/MandateStorageManagerTest.php b/tests/phpunit/CRM/ManualDirectDebit/Common/MandateStorageManagerTest.php
@@ -131,7 +131,7 @@ public function testAssignContributionMandate() {
     $this->assertNotEmpty($contribution['values']);
 
     $mandateIdCustomFieldId =
-      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("mandate_id");
+      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
     $this->assertEquals($contribution['values'][0]['custom_' . $mandateIdCustomFieldId], $mandate->id);
   }
 
@@ -148,7 +148,7 @@ public function testChangeMandateForContribution() {
     $fabricatedContribution = $fabricatedContributionWithMandate['contribution'];
 
     $mandateIdCustomFieldId =
-      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("mandate_id");
+      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
 
     $contribution = civicrm_api3('Contribution', 'get', [
       'sequential' => 1,
@@ -192,7 +192,7 @@ public function testDeleteMandate() {
     $fabricatedContribution = $fabricatedContributionWithMandate['contribution'];
 
     $mandateIdCustomFieldId =
-      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName("mandate_id");
+      CRM_ManualDirectDebit_Common_DirectDebitDataProvider::getCustomFieldIdByName('mandate_id', 'direct_debit_information');
 
     $contribution = civicrm_api3('Contribution', 'get', [
       'sequential' => 1,