Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling to canvass for civicrm_engage #40

Merged
merged 1 commit into from
Jul 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions modules/civicrm_engage/Engage/Report/Form/WalkList.php
Original file line number Diff line number Diff line change
Expand Up @@ -632,9 +632,9 @@ function executePrintmode($rows) {
$groupRows[$groupCounts] = $groupRow;
}

// if admin settings have been defined to specify not to canvas people for a period change date to specified text
if ($config->get('civicrm_engage_no_canvas_period') > 0 && $dao->date_received > 0
&& ((strtotime("now") - strtotime($dao->date_received)) / 60 / 60 / 24 / 30) < $config->get('civicrm_engage_no_canvas_period')
// if admin settings have been defined to specify not to canvass people for a period change date to specified text
if ($config->get('civicrm_engage_no_canvass_period') > 0 && $dao->date_received > 0
&& ((strtotime("now") - strtotime($dao->date_received)) / 60 / 60 / 24 / 30) < $config->get('civicrm_engage_no_canvass_period')
) {
$dao->date_received = $config->get('civicrm_engage_no_canvass_text');
}
Expand Down
6 changes: 3 additions & 3 deletions modules/civicrm_engage/civicrm_engage.admin.inc
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ function civicrm_engage_admin_settings($form, $form_state) {
'#collapsible' => TRUE,
'#collapsed' => FALSE,
);
$form['last_donate']['civicrm_engage_no_canvas_period'] = array(
$form['last_donate']['civicrm_engage_no_canvass_period'] = array(
'#title' => t("Exclusion Period"),
'#type' => 'textfield',
'#description' => t('If you wish to leave someone alone for a period after their last donation please enter it here (in months). 0 means disabled'),
'#default_value' => $config->get('civicrm_engage_no_canvas_period'),
'#default_value' => $config->get('civicrm_engage_no_canvass_period'),
);
$form['last_donate']['civicrm_engage_no_canvass_text'] = array(
'#title' => t("Text when within exclusion period"),
'#type' => 'textfield',
'#description' => t('Text to put in if contact not to be canvassed'),
'#default_value' => $config->get('civicrm_engage_no_canvas_text'),
'#default_value' => $config->get('civicrm_engage_no_canvass_text'),
);
$form['break_settings'] = array(
'#type' => 'fieldset',
Expand Down
4 changes: 2 additions & 2 deletions modules/civicrm_engage/civicrm_engage.install
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ function civicrm_engage_update_last_removed() {
function civicrm_engage_update_1000() {
// Migrate variables to config.
$config = config('civicrm_engage.settings');
$config->set('civicrm_engage_no_canvas_period', update_variable_get('civicrm_engage_no_canvas_period', 0));
$config->set("civicrm_engage_no_canvas_text", update_variable_get('civicrm_engage_no_canvass_text', "Do Not Canvas"));
$config->set('civicrm_engage_no_canvass_period', update_variable_get('civicrm_engage_no_canvas_period', 0));
$config->set("civicrm_engage_no_canvass_text", update_variable_get('civicrm_engage_no_canvass_text', "Do Not Canvass"));
$config->set('civicrm_engage_groupbreak_odd_even', update_variable_get('civicrm_engage_groupbreak_odd_even', 1));
$config->set('civicrm_engage_groupbreak_street', update_variable_get('civicrm_engage_groupbreak_street', 1));
$config->set('civicrm_engage_groupbreak_city', update_variable_get('civicrm_engage_groupbreak_city', 1));
Expand Down
4 changes: 2 additions & 2 deletions modules/civicrm_engage/config/civicrm_engage.settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"_config_name": "civicrm_engage.settings",
"civicrm_engage_no_canvas_period": 0,
"civicrm_engage_no_canvas_text": "Do Not Canvas",
"civicrm_engage_no_canvass_period": 0,
"civicrm_engage_no_canvass_text": "Do Not Canvass",
"civicrm_engage_groupbreak_odd_even": 1,
"civicrm_engage_groupbreak_street": 1,
"civicrm_engage_groupbreak_city": 1,
Expand Down