[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix duplicate check logic

2017-07-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/367682 )

Change subject: Fix duplicate check logic
..


Fix duplicate check logic

Bug: T171349
Change-Id: I547e40b74bb3a3b4216436bc6f63f11c402618f9
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index a692882..2540666 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -452,7 +452,7 @@
 $invoice_id = $contribution['invoice_id'];
 $duplicate = civicrm_api3( "Contribution", "getSingle", array( 
"invoice_id" => $invoice_id ) );
 }
-if ( $duplicate ) {
+if ( $duplicate && array_key_exists('id', $duplicate ) ) {
 $contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
 watchdog( 'wmf_civicrm', 'Found duplicate invoice ID, changing 
this one to ' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
 $contribution_result = civicrm_api3( "Contribution", "Create", 
$contribution );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I547e40b74bb3a3b4216436bc6f63f11c402618f9
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Fix duplicate check logic

2017-07-25 Thread Mepps (Code Review) 
Mepps has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/367682 )

Change subject: Fix duplicate check logic
..

Fix duplicate check logic

Bug: T171349
Change-Id: I547e40b74bb3a3b4216436bc6f63f11c402618f9
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/82/367682/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index a692882..ceb3392 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -452,7 +452,7 @@
 $invoice_id = $contribution['invoice_id'];
 $duplicate = civicrm_api3( "Contribution", "getSingle", array( 
"invoice_id" => $invoice_id ) );
 }
-if ( $duplicate ) {
+if ( !$duplicate['is_error'] ) {
 $contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
 watchdog( 'wmf_civicrm', 'Found duplicate invoice ID, changing 
this one to ' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
 $contribution_result = civicrm_api3( "Contribution", "Create", 
$contribution );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I547e40b74bb3a3b4216436bc6f63f11c402618f9
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Mepps 

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