Ejegg has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/359630 )
Change subject: Temporarily stop storing invoice id ...................................................................... Temporarily stop storing invoice id Just commenting key lines out to make it easier to rebase the unique-ifying change ( I96b1cbc04da9f376f74 ) on top of it. Until then, it's more harmful than helpful to prevent the duplicates from being entered in CiviCRM Bug: T165918 Change-Id: Id30deb3ca050b8a3ca7dd9119f26cc04b7c29c5a --- M sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php M sites/all/modules/wmf_civicrm/wmf_civicrm.module 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/30/359630/1 diff --git a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php index 6028af3..7e625f6 100644 --- a/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php +++ b/sites/all/modules/queue2civicrm/tests/phpunit/DonationQueueTest.php @@ -61,7 +61,7 @@ 'financial_type' => 'Cash', 'contribution_status' => 'Completed', 'payment_instrument' => 'Credit Card: Visa', - 'invoice_id' => $message->get('order_id'), + // 'invoice_id' => $message->get('order_id'), $campaignField => '', ); $returnFields = array_keys( $expected ); @@ -101,7 +101,7 @@ 'financial_type' => 'Cash', 'contribution_status' => 'Completed', 'payment_instrument' => 'Credit Card: Visa', - 'invoice_id' => $message2->get('order_id'), + // 'invoice_id' => $message2->get('order_id'), $campaignField => 'Benefactor Gift', ); $this->assertArraySubset( $expected, $contribution2 ); diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module b/sites/all/modules/wmf_civicrm/wmf_civicrm.module index aba9dd1..1426931 100644 --- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module +++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module @@ -356,10 +356,10 @@ // Store the identifier we generated on payments if ( !empty( $msg['order_id'] ) ) { - $contribution['invoice_id'] = $msg['order_id']; + //$contribution['invoice_id'] = $msg['order_id']; // The invoice_id column has a unique constraint if ( $msg['recurring'] ) { - $contribution['invoice_id'] .= '|recur-' . UtcDate::getUtcTimestamp(); + //$contribution['invoice_id'] .= '|recur-' . UtcDate::getUtcTimestamp(); } } -- To view, visit https://gerrit.wikimedia.org/r/359630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id30deb3ca050b8a3ca7dd9119f26cc04b7c29c5a Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Ejegg <ej...@ejegg.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits