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.

Sign up for GitHub

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

Jump to bottom

[Admin] Disallow promotions with empty action type and discount rule #3724

Merged
merged 1 commit into from
Aug 7, 2020
Merged

[Admin] Disallow promotions with empty action type and discount rule #3724

merged 1 commit into from
Aug 7, 2020

Conversation

cnorm35
Copy link
Contributor

@cnorm35 cnorm35 commented Jul 30, 2020

Description

Adds HTML5 form validations for Discount Rules and Adjustment Types for Promotions in the admin.

Chrome Screenshots:
Screen Shot 2020-07-30 at 3 45 08 PM
Screen Shot 2020-07-30 at 3 45 02 PM

Firefox Screenshots
Screen Shot 2020-07-30 at 3 44 13 PM
Screen Shot 2020-07-30 at 3 44 04 PM

Resolves #3707

Checklist:

  • [ x] I have followed Pull Request guidelines
  • [ x] I have added a detailed description into each commit message
  • I have updated Guides and README accordingly to this change (if needed)
  • [ x] I have added tests to cover this change (if needed)
  • [ x] I have attached screenshots to this PR for visual changes (if needed)

@aldesantis
Copy link
Member

@cnorm35 looking good, thanks! Could you squash the commits into one?

@cnorm35 cnorm35 force-pushed the disallow-empty-action-type-and-discount-rule branch from b1a8fed to 5eadf8c Compare July 31, 2020 14:12
@cnorm35
Copy link
Contributor Author

cnorm35 commented Jul 31, 2020

@aldesantis @spaghetticode just pushed the updates with the requested changes, let me know if there's anything else that should be updated.

@spaghetticode spaghetticode changed the title Disallow empty action type and discount rule [Admin] Disallow promotions with empty action type and discount rule Aug 7, 2020
spaghetticode
spaghetticode approved these changes Aug 7, 2020
View reviewed changes
Copy link
Member

@spaghetticode spaghetticode left a comment

Choose a reason for hiding this comment

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

@cnorm35 thank you 👍

@spaghetticode spaghetticode merged commit 1a4f85c into solidusio:master Aug 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aldesantis aldesantis aldesantis approved these changes

@spaghetticode spaghetticode spaghetticode approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Empty promotion action type to create can be send / isn't catched
3 participants
@cnorm35 @aldesantis @spaghetticode