Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/342896 )
Change subject: WIP detect normalized paypal messages in queue consumer ...................................................................... WIP detect normalized paypal messages in queue consumer Needs tests Change-Id: Iabb137015452c8b77c75719b242eb2bc89112a5c --- M sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/96/342896/1 diff --git a/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php b/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php index e6ac6df..f04b9a2 100644 --- a/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php +++ b/sites/all/modules/queue2civicrm/recurring/RecurringQueueConsumer.php @@ -83,8 +83,12 @@ if ( isset( $msg['gateway'] ) && $msg['gateway'] === 'amazon' ) { // should not require special normalization } else if ( !isset( $msg[ 'contribution_tracking_id' ]) ) { - // we can safely assume we have a raw msg from paypal if contribution_tracking_id isn't set - $msg = $this->normalizePaypalMessage( $msg ); + $msg_normalized[ 'contribution_tracking_id' ] = recurring_get_contribution_tracking_id( $msg ); + // TODO: remove this after deploying audit and IPN updates to do message normalization there + if ( isset( $msg['payer_email'] ) ) { + // This is an old-school non-normalized PayPal message. + $msg = $this->normalizePaypalMessage( $msg ); + } } else { $msg['contribution_tracking_update'] = false; } @@ -125,7 +129,6 @@ // the subscription id $msg_normalized[ 'subscr_id' ] = $msg[ 'subscr_id' ]; $msg_normalized[ 'txn_type' ] = $msg[ 'txn_type' ]; - $msg_normalized[ 'contribution_tracking_id' ] = recurring_get_contribution_tracking_id( $msg ); $msg_normalized[ 'email' ] = $msg[ 'payer_email' ]; // Premium info -- To view, visit https://gerrit.wikimedia.org/r/342896 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabb137015452c8b77c75719b242eb2bc89112a5c Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits