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

Finish unsharing hacks for contribution preferences form #13047

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Nov 1, 2018

Overview

This is (almost) the last of a series of updates to remove technical debt in the 'preferences' forms.

Before

Hacks to support non-spec settings for invoicing distributed in weird & wonderful places

After

Hacks constrained into the relevant form & commented

Technical Details

Most detail is in https://lab.civicrm.org/dev/core/issues/495

Comments

I have 2 issues still with this

  1. the wysiwig field isn't working properly for me - but I think it may be a local issue
  2. the help text on the financial_type_acl setting is lost - I'd rather tackle this as a follow up as we can establish metadata for it per the main DAO schema

I think it would be easier to merge #13046 first & I'll rebase this. It IS a bit of a hatchett job & is mostly about UI testing on the one form

@civibot
Copy link

civibot bot commented Nov 1, 2018

(Standard links)

@civibot civibot bot added the master label Nov 1, 2018
@mattwire
Copy link
Contributor

mattwire commented Nov 1, 2018

@eileenmcnaughton Please ping when this one is ready

@eileenmcnaughton
Copy link
Contributor Author

@mattwire it is ready but merging #13046 first & rebasing is cleaner

@eileenmcnaughton eileenmcnaughton force-pushed the settings_contribution_prefs branch from 017fbcd to 2f6c641 Compare November 1, 2018 11:07
@eileenmcnaughton
Copy link
Contributor Author

@mattwire @pradpnayak this is rebased now

* Process the form submission.
* Our standards for settings are to have a setting per value with defined metadata.
*
* Unfortunately the 'contribution_invoice_settings' has been added in non-compliance.
Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed, 'contribution_invoice_settings' is being stored in unusual way. Changing this now might cause problems for Sales tax or Deferred revenue since I believe they all rely on this setting.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

was I too grumpy in my code comments :-)

@pradpnayak
Copy link
Contributor

@eileenmcnaughton I tested this and it works very well now and also the field labels are not printed twice. Also checked 'contribution_invoice_settings' setting variable, it does hold all the Sales Tax settings. Thank you so much for code cleanup.

testing

However there is one issue like you mentioned
-- Help Text(?) for 'Enable Access Control by Financial Type'

The wysiwig field does show up on my machine.
screen shot 2018-11-01 at 16 59 37

I am not sure about the ACL test file if they have any meaning to this PR. But this is GOOD TO MERGE!

Thanks
Pradeep

@eileenmcnaughton
Copy link
Contributor Author

Thanks @pradpnayak once this is merged the things I / anyone prepared to help will ideally do are

  1. address the help text issue
  2. see if I can create the generic form per https://lab.civicrm.org/dev/core/issues/495
  3. update docs
  4. look at handling casing in a noisy but non-fail-y way
  5. if you want to put your PR up as an improvement I'll review & merge that
  6. audit settings / preferences forms to check for any failures

@eileenmcnaughton eileenmcnaughton merged commit 1d6f59e into civicrm:master Nov 1, 2018
@eileenmcnaughton eileenmcnaughton deleted the settings_contribution_prefs branch November 1, 2018 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants