jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368125 )
Change subject: Limit Silverpop group import to Opt In by default
......................................................................
Limit Silverpop group import to Opt In by default
(updating composer didn't fix the date :-()
Bug T160949
Change-Id: Iaa1877889ecece796ecb96128345170c7fcdb8b2
---
M composer.lock
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
M
sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
3 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index d15ed38..d6e7dcf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -88,7 +88,7 @@
"payment",
"payments"
],
- "time": "2016-02-17T00:44:20+00:00"
+ "time": "2016-02-17 00:53:20"
},
{
"name": "clio/clio",
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
- "time": "2017-04-17T14:11:55+00:00"
+ "time": "2017-04-17 14:11:55"
},
{
"name": "cogpowered/finediff",
@@ -2821,7 +2821,7 @@
"source": {
"type": "git",
"url":
"https://github.com/eileenmcnaughton/omnimail-silverpop.git";,
- "reference": "cd3933b8ee7b263d0472cc44d047b82f3ec4029c"
+ "reference": "c3248b3932e62cd2812aa3502d875b7c12c25c66"
},
"require": {
"league/csv": "^8.0",
@@ -2860,7 +2860,7 @@
"omnimail",
"silverpop"
],
- "time": "2017-07-17 20:03:43"
+ "time": "2017-07-27 02:53:46"
},
{
"name": "wikimedia/smash-pig",
diff --git
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
index 465a01a..fd9a6b7 100644
---
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
+++
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/CRM/Omnimail/Omnigroupmembers.php
@@ -35,8 +35,12 @@
$settings = CRM_Omnimail_Helper::getSettings();
$mailerCredentials = CRM_Omnimail_Helper::getCredentials($params);
+ $jobParameters = array();
+ if ($params['is_opt_in_only']) {
+ $jobParameters['exportType'] = 'OPT_IN';
+ }
- $request = Omnimail::create($params['mail_provider'],
$mailerCredentials)->getGroupMembers();
+ $request = Omnimail::create($params['mail_provider'],
$mailerCredentials)->getGroupMembers($jobParameters);
$startTimestamp = self::getStartTimestamp($params, $jobSettings);
$endTimestamp = self::getEndTimestamp(CRM_Utils_Array::value('end_date',
$params), $settings, $startTimestamp);
diff --git
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
index 0f179f6..0281f62 100644
---
a/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
+++
b/sites/default/civicrm/extensions/org.wikimedia.omnimail/api/v3/Omnigroupmember/Get.php
@@ -83,5 +83,11 @@
'country' => 'rml_country',
),
);
+ $params['is_opt_in_only'] = array(
+ 'type' => CRM_Utils_Type::T_BOOLEAN,
+ 'title' => ts('Opted in contacts only'),
+ 'description' => array('Restrict to opted in contacts'),
+ 'api.default' => 1,
+ );
}
--
To view, visit https://gerrit.wikimedia.org/r/368125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaa1877889ecece796ecb96128345170c7fcdb8b2
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
