diff --git a/includes/utils.inc b/includes/utils.inc index 645ae9f98..28adc440c 100644 --- a/includes/utils.inc +++ b/includes/utils.inc @@ -77,8 +77,11 @@ function wf_crm_field_options($field, $context, $data) { elseif ($table == 'membership' && $name == 'num_terms') { $ret = drupal_map_assoc(range(1, 9)); } - elseif ($table == 'membership' && in_array($name, array('start_date_rules', 'end_date_rules'))) { - $ret = array(0 => t('Automatic'), 1 => t('User Select'), 2 => t('Relative to active membership end date')); + elseif ($table == 'membership' && $name == 'start_date_rules') { + $ret = array(0 => t('Automatic'), 1 => t('Selected date'), 2 => t('After the end date of selected membership(s)')); + } + elseif ($table == 'membership' && $name == 'end_date_rules') { + $ret = array(0 => t('Automatic'), 1 => t('Selected date'), 2 => t('Match the end date of selected membership(s)')); } // Aside from the above special cases, most lists can be fetched from api.getoptions else { diff --git a/includes/wf_crm_admin_help.inc b/includes/wf_crm_admin_help.inc index 7178e69aa..6f52c8f90 100644 --- a/includes/wf_crm_admin_help.inc +++ b/includes/wf_crm_admin_help.inc @@ -304,21 +304,20 @@ class wf_crm_admin_help { public static function membership_start_date_rules() { print '
'. - t('\'Automatic\' indicates that the start date will follow normal CiviCRM rules. i.e. New memberships will start immediately from date of sign-up and renewals will extend memberships.'). - '
'. - t('\'User select\' will create a new webform date component that the administrator can configure in many ways including adding a fixed or relative start or end date.').'
'. - ''. - t('\'Relative to active membership end date\' will modify the start date of the new membership as follows: -
It will first check whether the user has an existing membership of this type. If so it will follow the automatic membership rules.
-If the user does not have a membership of this type, it will create a new membership and then check if the user has any active memberships of the relevant types specified. If not then the system will follow automatic membership rules.
-If so it will set the start date of the new membership to be the day following the end date of the existing active membership.
-If the user currently has multiple relevant membership types the start date will be one day following the end date of the membership with the latest end date.
'); + t('Select "Automatic" to create/ renew membership following default calculation.'). + ''. + t('Select "Selected date" to add a start date field to the form.').'
'. + ''. + t('Select "After the end date of selected membership(s)" to start the new membership term after an active membership of the selected types').'
'; } public static function membership_end_date_rules() { print ''. - t('"Automatic" indicates that new membership end date will be calculated according to the start date and the membership duration'). - '
'; + t('Select "Automatic" to create/ renew membership following default calculation.'). + ''. + t('Select "Selected date" to add a end date field to the form.').'
'. + ''. + t('Select "Match the end date of selected membership(s)" to match the end date of the new membership term with the end date of an active membership of the selected types').'
'; } public static function membership_pro_rate_membership() {