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

Improve text in "new promotions" form for better usability #2917

Merged
merged 1 commit into from
Oct 18, 2018
Merged

Improve text in "new promotions" form for better usability #2917

merged 1 commit into from
Oct 18, 2018

Conversation

michaelmichael
Copy link
Contributor

This commit fixes issues raised in #1960 with the following exceptions:

I didn't add a character counter to the description, just static text, so no bonus points. We can leave the issue open, and I can try resolving it later.

It looks like the following issues have been already fixed-ish:

Change the label "Base Calculator" to "Discount type"
Add the currency symbol into the grey box prepended to the currency input

"Base Calculator" had already been changed to "Calculated by", and the currency symbol was already prepended to the currency input field

screen shot 2018-10-13 at 7 37 31 pm

@michaelmichael michaelmichael changed the title Improve text in "new promotions" form for better usability, per issue 1960 Improve text in "new promotions" form for better usability Oct 14, 2018
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thank you. Great contribution. I bet a rebase with latest master will fix the build issue we have here.

Otherwise 👌

@michaelmichael
Copy link
Contributor Author

Thanks! Rebased.

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Thanks

Copy link
Contributor

@ericsaupe ericsaupe left a comment

Choose a reason for hiding this comment

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

Looks great! Would you mind squashing all these commits?

Add character limit to description on Promotions form

Add English translation for character limit

Change 'Add rule of type' to 'Discount rules' on promotions form. Change same in specs

Change 'Add rule of type' to 'Adjustment type'. Fix specs accordingly

Update promotion_adjustment_spec to match new verbiage for promotion UI

Change some headers to Title Case

Standardize code blocks, fix wrong syntax highlighting

Convert headings to sentence style capitalization

I made this change based on PR feedback.

Use bash for syntax highlighting instead of shell

shell does not provide syntax highlighting in GitHub's markdown.
Using bash will provide more accurate highlighting.

Remove 'General' title from top of promotions admin page

Add character limit to description on Promotions form

Add English translation for character limit

Change 'Add rule of type' to 'Discount rules' on promotions form. Change same in specs

Change 'Add rule of type' to 'Adjustment type'. Fix specs accordingly

Update promotion_adjustment_spec to match new verbiage for promotion UI

Dont need to lockdown autoprefixer-rails.
Copy link
Contributor

@ericsaupe ericsaupe left a comment

Choose a reason for hiding this comment

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

Thanks!

@kennyadsl kennyadsl merged commit f265506 into solidusio:master Oct 18, 2018
@kennyadsl
Copy link
Member

Thanks @michaelmichael, we need more PRs like this one!

@michaelmichael michaelmichael deleted the fix-issues-in-1960 branch October 18, 2018 20:41
@michaelmichael
Copy link
Contributor Author

Thanks guys. I didn't know contributing to Solidus would be so easy. Hope to contribute more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants