Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153552
Change subject: Revert "Transaction around recurring Globalcollect charge"
......................................................................
Revert "Transaction around recurring Globalcollect charge"
This partially reverts commit 8f27f54579705d52494fb72660e9a2d06a990fbc.
We don't want to roll back the entire transaction, because the subscription
record is updated with failure info, for example.
Change-Id: If316d4f7d639e7035f1472455428c245b631224e
---
M sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/52/153552/1
diff --git
a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
index 4789d56..39c450e 100644
--- a/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
+++ b/sites/all/modules/recurring_globalcollect/recurring_globalcollect.module
@@ -260,12 +260,13 @@
foreach ($contribution_batch as $contribution_recur)
{
try {
- WmfDatabase::transactionalCall(
- 'recurring_globalcollect_charge',
- array( $contribution_recur->id, $options )
- );
+ $status = recurring_globalcollect_charge($contribution_recur->id,
$options);
- $succeeded[] = $contribution_recur;
+ if ($status) {
+ $succeeded[] = $contribution_recur;
+ } else {
+ $failed[] = $contribution_recur;
+ }
}
catch ( WmfException $e )
{
--
To view, visit https://gerrit.wikimedia.org/r/153552
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If316d4f7d639e7035f1472455428c245b631224e
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
