[MediaWiki-commits] [Gerrit] WIP: moar fixes - change (wikimedia...crm)

[Adamw (Code Review)]

Adamw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/101458


Change subject: WIP: moar fixes
......................................................................

WIP: moar fixes

Change-Id: If95e77d2a1740c0fe03b60c1f6ae1e7a5a2f74c8
---
M sites/all/modules/offline2civicrm/offline2civicrm.install
M sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
M sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
3 files changed, 23 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/58/101458/1

diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.install 
b/sites/all/modules/offline2civicrm/offline2civicrm.install
index c0598d8..bd6f70c 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.install
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.install
@@ -67,18 +67,27 @@
         throw new Exception("Missing custom group 'Gift Information', " . 
$api->errorMsg());
     }
 
-    $success = $api->CustomField->create(array(
+    $api->CustomField->Get( array(
         'custom_group_id' => $custom_group->id,
         'name' => 'import_batch_number',
-        'column_name' => 'import_batch_number',
-        'label' => ts('Batch Number'),
-        'data_type' => 'String',
-        'html_type' => 'Text',
-        'is_active' => 1,
-        'is_searchable' => 1,
-        'is_view' => 1,
-    ));
-    if (!$success) {
-        throw new Exception($api->errorMsg());
+        'version' => 3,
+    ) );
+    $result = $api->values();
+
+    if ( empty($result) ) {
+        $success = $api->CustomField->create(array(
+            'custom_group_id' => $custom_group->id,
+            'name' => 'import_batch_number',
+            'column_name' => 'import_batch_number',
+            'label' => ts('Batch Number'),
+            'data_type' => 'String',
+            'html_type' => 'Text',
+            'is_active' => 1,
+            'is_searchable' => 1,
+            'is_view' => 1,
+        ));
+        if (!$success) {
+            throw new Exception($api->errorMsg());
+        }
     }
 }
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc 
b/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
index 7700cb3..d1bc73f 100644
--- a/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
+++ b/sites/all/modules/wmf_common/wmf_civicrm/recurring.inc
@@ -97,8 +97,8 @@
 
         'version' => 3,
     );
-    $result = $api->ContributionRecur->Create( $insert_params );
-    $contribution_recur_id = $result['id'];
+    $api->ContributionRecur->Create( $insert_params );
+    $contribution_recur_id = $api->id;
 
     // Link the contribution to the recurring payment
     //TODO catch error and print message
diff --git a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
index 9fd223b..99ca122 100644
--- a/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_common/wmf_civicrm/wmf_civicrm.module
@@ -1196,7 +1196,7 @@
 ) {
     $api = civicrm_api_classapi();
 
-    $success = $api->Contribution->Get(array('id' => $contribution_id));
+    $success = $api->Contribution->Get(array('id' => $contribution_id, 'debug' 
=> 1));
     if ( !$success || !$api->values ) {
         throw new WmfException( 'INVALID_MESSAGE', "No such contribution: 
$contribution_id, " . $api->errorMsg());
     }

-- 
To view, visit https://gerrit.wikimedia.org/r/101458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If95e77d2a1740c0fe03b60c1f6ae1e7a5a2f74c8
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Adamw <awi...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits