[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Log more and catch errors on duplicate invoice ID

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

Change subject: Log more and catch errors on duplicate invoice ID
..


Log more and catch errors on duplicate invoice ID

TODO: tests

Bug: T171349
Change-Id: I0e71426e21fc3f642aab34aa3adfd304f01ec5ff
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 23 insertions(+), 10 deletions(-)

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



diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 025335e..a692882 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -443,21 +443,34 @@
   watchdog('wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r($contribution_result, TRUE), NULL, 
WATCHDOG_DEBUG);
 }
 catch (CiviCRM_API3_Exception $e) {
+watchdog( 'wmf_civicrm', 'Error inserting contribution: ' . 
$e->getMessage(), NULL, WATCHDOG_INFO );
 $duplicate = null;
-if (array_key_exists('invoice_id', $contribution)) {
-$invoice_id = $contribution['invoice_id'];
-$duplicate = civicrm_api3("Contribution", "getSingle", 
array("invoice_id" => $invoice_id));
+
+try {
+if ( array_key_exists( 'invoice_id', $contribution ) ) {
+watchdog( 'wmf_civicrm', 'Checking for duplicate on invoice ID 
' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
+$invoice_id = $contribution['invoice_id'];
+$duplicate = civicrm_api3( "Contribution", "getSingle", array( 
"invoice_id" => $invoice_id ) );
+}
+if ( $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 );
+watchdog( 'wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r( $contribution_result, TRUE ), NULL, 
WATCHDOG_DEBUG );
+$msg['contribution_tags'][] = 'DuplicateInvoiceId';
+} else {
+throw new WmfException(
+'INVALID_MESSAGE',
+'Cannot create contribution, civi error!',
+$e->getExtraParams()
+);
+}
 }
-if ($duplicate){
-$contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
-$contribution_result = civicrm_api3("Contribution", "Create", 
$contribution);
-$msg['contribution_tags'][] = 'DuplicateInvoiceId';
-}
-else {
+catch ( CiviCRM_API3_Exception $eInner ) {
 throw new WmfException(
 'INVALID_MESSAGE',
 'Cannot create contribution, civi error!',
-$e->getExtraParams()
+$eInner->getExtraParams()
 );
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e71426e21fc3f642aab34aa3adfd304f01ec5ff
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: Cdentinger 
Gerrit-Reviewer: Eileen 
Gerrit-Reviewer: Katie Horn 
Gerrit-Reviewer: Mepps 
Gerrit-Reviewer: XenoRyet 
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]: Log more and catch errors on duplicate invoice ID

2017-07-21 Thread Ejegg (Code Review) 
Ejegg has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/366964 )

Change subject: Log more and catch errors on duplicate invoice ID
..

Log more and catch errors on duplicate invoice ID

TODO: tests

Bug: T171349
Change-Id: I0e71426e21fc3f642aab34aa3adfd304f01ec5ff
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 23 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/64/366964/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 025335e..a692882 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -443,21 +443,34 @@
   watchdog('wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r($contribution_result, TRUE), NULL, 
WATCHDOG_DEBUG);
 }
 catch (CiviCRM_API3_Exception $e) {
+watchdog( 'wmf_civicrm', 'Error inserting contribution: ' . 
$e->getMessage(), NULL, WATCHDOG_INFO );
 $duplicate = null;
-if (array_key_exists('invoice_id', $contribution)) {
-$invoice_id = $contribution['invoice_id'];
-$duplicate = civicrm_api3("Contribution", "getSingle", 
array("invoice_id" => $invoice_id));
+
+try {
+if ( array_key_exists( 'invoice_id', $contribution ) ) {
+watchdog( 'wmf_civicrm', 'Checking for duplicate on invoice ID 
' . $contribution['invoice_id'], NULL, WATCHDOG_INFO );
+$invoice_id = $contribution['invoice_id'];
+$duplicate = civicrm_api3( "Contribution", "getSingle", array( 
"invoice_id" => $invoice_id ) );
+}
+if ( $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 );
+watchdog( 'wmf_civicrm', 'Contribution result from 
civicrm_contribution_add(): ' . print_r( $contribution_result, TRUE ), NULL, 
WATCHDOG_DEBUG );
+$msg['contribution_tags'][] = 'DuplicateInvoiceId';
+} else {
+throw new WmfException(
+'INVALID_MESSAGE',
+'Cannot create contribution, civi error!',
+$e->getExtraParams()
+);
+}
 }
-if ($duplicate){
-$contribution['invoice_id'] = $contribution['invoice_id'] . 
'|dup-' . UtcDate::getUtcTimeStamp();
-$contribution_result = civicrm_api3("Contribution", "Create", 
$contribution);
-$msg['contribution_tags'][] = 'DuplicateInvoiceId';
-}
-else {
+catch ( CiviCRM_API3_Exception $eInner ) {
 throw new WmfException(
 'INVALID_MESSAGE',
 'Cannot create contribution, civi error!',
-$e->getExtraParams()
+$eInner->getExtraParams()
 );
 }
 }

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

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

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