Ejegg has uploaded a new change for review.

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

Change subject: Merge payments init messages
......................................................................

Merge payments init messages

This makes it possible for a second message with the same ct_id and
order_id to update the row in payments_initial. This must be deployed
before any change to send extra messages.

Bug: T137590
Change-Id: I3d7395a0a97426d08a3fb7a969b561e2b5c8360a
---
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/86/296186/1

diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module 
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index e5a631e..563ef9e 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -111,8 +111,16 @@
   $data = fredge_prep_data($body, 'payments_initial', $txnid, true);
   $dbs = wmf_civicrm_get_dbs();
   $dbs->push('fredge');
-  $id = db_insert('payments_initial')
-    ->fields($data)
+
+  $key = array(
+    'contribution_tracking_id' => $data['contribution_tracking_id'],
+    'order_id' => $data['order_id'],
+  );
+  unset( $data['contribution_tracking_id'] );
+  unset( $data['order_id'] );
+  db_merge( 'payments_initial' )
+    ->key( $key )
+    ->fields( $data )
     ->execute();
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d7395a0a97426d08a3fb7a969b561e2b5c8360a
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to