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

Do not crash admin while listing partially shipped orders #8718

Merged
merged 2 commits into from
Sep 22, 2017

Conversation

pamil
Copy link
Contributor

@pamil pamil commented Sep 21, 2017

Q A
Bug fix? yes
New feature? no
BC breaks? no
Related tickets fixes #8717; fixes #8719
License MIT

@pamil pamil added the Bug Fix label Sep 21, 2017
@pamil pamil added this to the 1.0 milestone Sep 21, 2017
@pamil pamil self-assigned this Sep 21, 2017
@@ -0,0 +1,4 @@
<span class="ui blue{% if attached is defined and attached == true %} top attached{% endif %} label">
Copy link
Member

@GSadee GSadee Sep 21, 2017

Choose a reason for hiding this comment

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

ready state is blue, maybe different colour? 🎉

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No idea though, partially shipped is something between ready & shipped, blue & green, clock & plane; the most important thing here is not to crash admin interface, I'm open for colour / icon suggestions though :)

Copy link
Contributor Author

@pamil pamil Sep 21, 2017

Choose a reason for hiding this comment

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

Like in payments, partially paid has the same colour as cancelled one. I'll make it the same here then 🗡

@GSadee
Copy link
Member

GSadee commented Sep 21, 2017

There is also missing template for a partially_refunded payment state

@pamil
Copy link
Contributor Author

pamil commented Sep 21, 2017

@GSadee colours & icons adjusted (for both partially refunded and partially shipped) 🎉

@@ -0,0 +1,4 @@
<span class="ui yellow{% if attached is defined and attached == true %} top attached{% endif %} label">
Copy link
Member

Choose a reason for hiding this comment

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

I know, I'm annoying and this is irrelevant, but cancelled state is yellow 😆

Copy link
Contributor Author

@pamil pamil Sep 21, 2017

Choose a reason for hiding this comment

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

Yeah, that's the same with partially paid and cancelled, which already exists for a while and nobody's been complaining :D

@GSadee GSadee merged commit d2c7f8f into Sylius:1.0 Sep 22, 2017
@GSadee
Copy link
Member

GSadee commented Sep 22, 2017

Thanks Kamil! 🌮

@pamil pamil deleted the 1.0-partially-shipped branch September 22, 2017 08:23
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.

None yet

2 participants