Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347772 )
Change subject: Get rid of subscription paths
......................................................................
Get rid of subscription paths
No need to change these in the UI, and most were'nt actually wired
up any more.
Change-Id: I21e379fb840c9578079726ff2f63818aaf8a7d28
---
M sites/all/modules/queue2civicrm/banner_history/banner_history.module
M sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
M sites/all/modules/queue2civicrm/recurring/recurring.module
M sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
M sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
5 files changed, 3 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/72/347772/1
diff --git
a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
index b3f4f11..07f5752 100644
--- a/sites/all/modules/queue2civicrm/banner_history/banner_history.module
+++ b/sites/all/modules/queue2civicrm/banner_history/banner_history.module
@@ -32,15 +32,6 @@
' queue and placed in a table.</p>' ),
);
- $form['banner_history_queue'] = array(
- '#type' => 'textfield',
- '#title' => t( 'Subscription path' ),
- '#required' => true,
- '#default_value' => variable_get(
- 'banner_history_queue', 'banner-history' ),
- '#description' => t( 'Queue for banner history log ID
associations' ),
- );
-
$form['banner_history_batch'] = array(
'#type' => 'textfield',
'#title' => t( 'Batch size' ),
@@ -77,10 +68,8 @@
$config = Configuration::createForView();
Context::initWithLogger( $config, 'banner_history' );
- $queue = variable_get( 'banner_history_queue', 'banner-history' );
-
$qc = new BannerHistoryQueueConsumer(
- $queue,
+ 'banner-history',
variable_get( 'banner_history_batch_time', 0 ),
variable_get( 'banner_history_batch', 0 )
);
diff --git a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
index 2c99b58..593be09 100644
--- a/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
+++ b/sites/all/modules/queue2civicrm/fredge/wmf_fredge_qc.module
@@ -33,23 +33,6 @@
'#default_value' => variable_get('fredge_qc_disable', false),
);
- $form['fredge_payments_init_queue'] = array(
- '#type' => 'textfield',
- '#title' => t('Payments-init queue name'),
- '#required' => TRUE,
- '#default_value' => variable_get('fredge_payments_init_queue',
'payments-init'),
- '#description' => t('Config key under data-store for payments-init queue'),
- );
-
- $form['fredge_payments_antifraud_queue'] = array(
- '#type' => 'textfield',
- '#title' => t('Payments-antifraud queue name'),
- '#required' => TRUE,
- '#default_value' => variable_get('fredge_payments_antifraud_queue',
'payments-antifraud'),
- '#description' => t('Config key under data-store for payments-antifraud
queue'),
- );
-// payments-antifraud
-
$form['fredge_batch_time'] = array(
'#type' => 'textfield',
'#title' => t('Job time limit (in seconds)'),
@@ -77,14 +60,14 @@
$cycle_time = variable_get('fredge_batch_time', 0) / 2;
$paymentsInitConsumer = new PaymentsInitQueueConsumer(
- variable_get('fredge_payments_init_queue', 'payments-init'),
+ 'payments-init',
$cycle_time
);
$processed = $paymentsInitConsumer->dequeueMessages();
$fraudQueueConsumer = new AntifraudQueueConsumer(
- variable_get('fredge_payments_antifraud_queue', 'payments-antifraud'),
+ 'payments-antifraud',
$cycle_time
);
diff --git a/sites/all/modules/queue2civicrm/recurring/recurring.module
b/sites/all/modules/queue2civicrm/recurring/recurring.module
index 106e2b7..37419d3 100644
--- a/sites/all/modules/queue2civicrm/recurring/recurring.module
+++ b/sites/all/modules/queue2civicrm/recurring/recurring.module
@@ -48,14 +48,6 @@
'#markup' => t('<p>The recurring queue contains notifications pertaining
to subscription donations, such as monthly payments, cancellation,and
expiration.</p>'),
);
- $form['recurring_subscription'] = array(
- '#type' => 'textfield',
- '#title' => t('Subscription path'),
- '#required' => TRUE,
- '#default_value' => variable_get('recurring_subscription',
'/queue/donations_recurring'),
- '#description' => t( 'Queue to watch for recurring notifications' ),
- );
-
$form['recurring_batch'] = array(
'#type' => 'select',
'#title' => t('Cron batch size'),
diff --git a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
index 1f5bfea..368d423 100644
--- a/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
+++ b/sites/all/modules/queue2civicrm/refund/wmf_refund_qc.module
@@ -37,14 +37,6 @@
'#default_value' => variable_get('refund_disable', false),
);
- $form['refund_queue'] = array(
- '#type' => 'textfield',
- '#title' => t('Subscription path'),
- '#required' => TRUE,
- '#default_value' => variable_get('refund_queue', '/queue/refund'),
- '#description' => t('Queue for refund notifications'),
- );
-
$form['refund_batch'] = array(
'#type' => 'select',
'#title' => t('Cron batch size'),
diff --git
a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
index af396de..acea526 100644
--- a/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
+++ b/sites/all/modules/queue2civicrm/unsubscribe/wmf_unsubscribe_qc.module
@@ -38,14 +38,6 @@
'#description' => t('<p>Contacts in the unsubscribe queue are processed by
marking them as opt-out in the CRM.</p>'),
);
- $form['unsubscribe_queue'] = array(
- '#type' => 'textfield',
- '#title' => t('Subscription path'),
- '#required' => TRUE,
- '#default_value' => variable_get('unsubscribe_queue',
'/queue/unsubscribe'),
- '#description' => t('Queue for unsubscribe items'),
- );
-
$form['unsubscribe_batch'] = array(
'#type' => 'select',
'#title' => t('Cron batch size'),
--
To view, visit https://gerrit.wikimedia.org/r/347772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21e379fb840c9578079726ff2f63818aaf8a7d28
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
