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

CRM-18424 better amount label for repeat transactions #8157

Merged
merged 2 commits into from
May 18, 2016

Conversation

eileenmcnaughton
Copy link
Contributor

Note that this patch also does some minor consolidation, bringing actions that relate to the is_recur checkbox into the same function.

I made the total_amount label always present, but sometimes hidden. this saves us having to check for it and also gives is a place to store data
consistently. We have been moving towards greater DOM consistency on payment pages


Note that this patch also does some minor consolidation, bringing actions that relate to the is_recur checkbox into the same function.

I made the total_amount label always present, but sometimes hidden. this saves us having to check for it and also gives is a place to store data
consistently. We have been moving towards greater DOM consistency on payment pages
@monishdeb
Copy link
Member

monishdeb commented May 11, 2016

@eileenmcnaughton only one issue remaining -

  1. with quick-config membership options where first membership type option (say General MT) is optional for auto-renewal and set to default.
  2. On contribution page registration form, 'auto_renew' checkbox is hidden by default which is incorrect.
    As earlier since General MT is selected, it shows 'auto_renew' checkbox on page load. Although on membership option toggle it rightfully showup the auto_renew checkbox.

Everything else is working for Event,Membership Contribution price-set and quick-config priceset on online event (also checked the text change for additional participant) and contribution registration page.

On digging into it I found the showHideAutoRenew function was robust enough to be called in both a hide & a show situation.

So, yay, further minor simplification
function toggleRecur( ) {
var isRecur = cj('input[id="is_recur"]:checked');
var allowAutoRenew = {/literal}'{$allowAutoRenewMembership}'{literal};
if ( allowAutoRenew && cj("#auto_renew") ) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@monishdeb I think moving this showHideAutoRenew call up here (out of the later if) solves the regression problem you found. showHideAutoRenew is clever enough to ... show AND hide

@monishdeb
Copy link
Member

Yup worked for me

@monishdeb monishdeb merged commit 9688aea into civicrm:master May 18, 2016
@monishdeb monishdeb deleted the CRM-18424 branch May 18, 2016 08:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants