Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/207896
Change subject: Merge master into deployment
......................................................................
Merge master into deployment
b3b3eaa817c340dbd5d5bd90db0c67ec93f41705 Fix stupid casting mistake
2001f76d0cd00f3d245be2488ae10be16bd05ab3 Add Astropay to Gateway Reconciliation
report
df6225ad075005cb303d7bcc0c73cf14c5ffa636 Protect thank-you job from nonfatal
exception
Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 0 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/96/207896/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index dc13118..c31093a 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -2029,36 +2029,6 @@
switch ( $formName ) {
case 'CRM_Contribute_Form_Contribution':
-<<<<<<< HEAD (59f03d Revert "Set up rules for hand-keyed contributions made
by En)
-=======
- // Only run this validation for users having the Engage role.
- if ( !wmf_civicrm_user_has_role( 'Engage Direct Mail' ) ) {
- break;
- }
-
- $engage_contribution_type_id = wmf_civicrm_get_civi_id(
'contribution_type_id', 'Engage' );
- if ( $fields['contribution_type_id'] !== $engage_contribution_type_id
) {
- $errors['contribution_type_id'] = t("Must use the \"Engage\"
contribution type.");
- }
-
- // Gift Source (sic field named "Campaign") is limited.
- $gift_source_field_name = wmf_civicrm_evil_get_custom_field_in_form(
'Campaign', $fields );
- if ( $gift_source_field_name ) {
- $allowed_sources = array(
- 'Combined Federal Campaign',
- 'Donor Advised Fund',
- 'Matching Gift',
- 'Payroll Deduction',
- );
- if ( !in_array( $fields[$gift_source_field_name], $allowed_sources
) ) {
- $errors[$gift_source_field_name] = t('Must choose a Gift
Source from the following list: ') . implode( ', ', $allowed_sources );
- }
- }
-
- $postmark_field_name = wmf_civicrm_evil_get_custom_field_in_form(
'postmark_date', $fields );
- // If the receive_date is in Dec or Jan, make sure we have a postmark
date,
- // to be generous to donors' tax stuff.
->>>>>>> BRANCH (538929 Merge "Protect thank-you job from nonfatal exception")
$date = strptime( $fields['receive_date'], "%m/%d/%Y" );
$azl_type_id = wmf_civicrm_get_civi_id( 'contribution_type_id',
"Arizona Lockbox" );
$custom_field_name = wmf_civicrm_evil_get_custom_field_in_form(
'postmark_date', $fields );
--
To view, visit https://gerrit.wikimedia.org/r/207896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I61767b28a93d8bb362c780904013b300bfab6471
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
