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

Promotion start/expiration times #3158

Merged
merged 2 commits into from
Apr 8, 2019
Merged

Promotion start/expiration times #3158

merged 2 commits into from
Apr 8, 2019

Conversation

aldesantis
Copy link
Member

@aldesantis aldesantis commented Apr 2, 2019 •
edited
Loading

Description

Fixes the promotion form in the admin panel to also display the start and expiration times. This allows admins to change the exact time a promotion starts or expires.

Checklist:

  • I have followed Pull Request guidelines
  • I have added a detailed description into each commit message
  • I have updated Guides and README accordingly to this change (if needed)
  • I have added tests to cover this change (if needed)

@aldesantis aldesantis changed the title Allow admins to edit promotion start and expiration times Promotion start/expiration times Apr 2, 2019
tvdeyen
tvdeyen requested changes Apr 3, 2019
View reviewed changes
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.

I love that feature, but would like to have a change on the helper

backend/app/views/spree/admin/promotions/_form.html.erb Outdated Show resolved Hide resolved
backend/app/helpers/spree/admin/base_helper.rb Outdated Show resolved Hide resolved
@aldesantis
Copy link
Member Author

@tvdeyen updated! I called the argument with_time instead of your proposed time because I wanted it to be clear that it's a boolean flag and not a time instance you're supposed to pass. Let me know how it looks.

tvdeyen
tvdeyen approved these changes Apr 5, 2019
View reviewed changes
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 👍

aitbw
aitbw reviewed Apr 5, 2019
View reviewed changes
Copy link
Contributor

@aitbw aitbw left a comment

Choose a reason for hiding this comment

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

Fantastic work, @aldesantis! 👏

Is it possible for you to rebase against current master? Tests should be fixed by now 🙏

@aldesantis
Allow admins to edit promotion start and expiration times
2f24b2f 
The Spree::Promotion model takes start and expiration times into
account, so there's no reason we shouldn't allow admins to manage
the times when creating/editing a promotion.
@aldesantis
Display promotion start and expiration times in admin panel
91dcc75 
Admins can now specify the exact time a promotion starts or expires,
so we also need to display this information in the promotions list.
@aldesantis
Copy link
Member Author

@aitbw done!

aitbw
aitbw approved these changes Apr 6, 2019
View reviewed changes
Copy link
Contributor

@aitbw aitbw left a comment

Choose a reason for hiding this comment

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

👏

@kennyadsl kennyadsl merged commit 65fc8e5 into solidusio:master Apr 8, 2019
@kennyadsl
Copy link
Member

@aldesantis thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@houndci-bot houndci-bot houndci-bot left review comments

@aitbw aitbw aitbw approved these changes

@kennyadsl kennyadsl kennyadsl approved these changes

@tvdeyen tvdeyen tvdeyen 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.
5 participants
@aldesantis @kennyadsl @tvdeyen @houndci-bot @aitbw