forked from colemanw/webform_civicrm
-
Notifications
You must be signed in to change notification settings - Fork 0
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
BASW-131: Membership end date rules #6
Open
nishant-bhorodia
wants to merge
3
commits into
7.x-4.x
Choose a base branch
from
BASW-131-membership-end-date-rules
base: 7.x-4.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -77,7 +77,7 @@ function wf_crm_field_options($field, $context, $data) { | |
elseif ($table == 'membership' && $name == 'num_terms') { | ||
$ret = drupal_map_assoc(range(1, 9)); | ||
} | ||
elseif ($table == 'membership' && $name == 'start_date_rules') { | ||
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')); | ||
} | ||
// Aside from the above special cases, most lists can be fetched from api.getoptions | ||
|
@@ -99,7 +99,7 @@ function wf_crm_field_options($field, $context, $data) { | |
// Pass data into api.getoptions for contextual filtering | ||
$params += wf_crm_aval($data, "$ent:$c:$table:$n", array()); | ||
// We need the same options as membership_type_id for start_date_memberships | ||
if($params['field'] == 'start_date_memberships') { | ||
if (in_array($params['field'], array('start_date_memberships', 'end_date_memberships'))) { | ||
$params['field'] = 'membership_type_id'; | ||
} | ||
} | ||
|
@@ -1186,20 +1186,7 @@ function wf_crm_get_fields($var = 'fields') { | |
'value' => 1, | ||
'empty_option' => t('Enter Dates Manually'), | ||
); | ||
// Membership Date Rule Fields | ||
$fields['membership_start_date_rules'] = array( | ||
'name' => t('Start Date'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'value' => 0, | ||
'exposed_empty_option' => '- ' . t('Automatic') . ' -', | ||
); | ||
$fields['membership_start_date_memberships'] = array ( | ||
'name' => t('Select Membership Types'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'extra' => array('multiple' => 1), | ||
); | ||
|
||
if (isset($sets['contribution'])) { | ||
$fields['membership_fee_amount'] = array( | ||
'name' => t('Membership Fee'), | ||
|
@@ -1242,6 +1229,37 @@ function wf_crm_get_fields($var = 'fields') { | |
'empty_option' => t('None'), | ||
); | ||
} | ||
// Membership Date Rule Fields | ||
$fields['membership_start_date_rules'] = array( | ||
'name' => t('Start Date'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'value' => 0, | ||
'exposed_empty_option' => t('Automatic'), | ||
); | ||
$fields['membership_start_date_memberships'] = array ( | ||
'name' => t('Select Membership Types'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'extra' => array('multiple' => 1), | ||
); | ||
$fields['membership_end_date_rules'] = array( | ||
'name' => t('End Date'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'value' => 0, | ||
'exposed_empty_option' => t('Automatic'), | ||
); | ||
$fields['membership_end_date_memberships'] = array ( | ||
'name' => t('Select Membership Types'), | ||
'type' => 'select', | ||
'expose_list' => TRUE, | ||
'extra' => array('multiple' => 1), | ||
); | ||
$fields['membership_pro_rate_membership'] = array( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. since this field is not related to the commit, it should not be here, and while it is fine for this PR, I think it is important to not do that when you open the PR against webform_civicrm core repo. |
||
'name' => t('Pro-rate Price of Membership'), | ||
'type' => 'checkbox', | ||
); | ||
} | ||
// CiviGrant fields | ||
if (isset($sets['grant'])) { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe membership_start_date_rules_memberships is more clear, same for end_date_rules