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

Order refund admin show rebuild #309

Merged
merged 3 commits into from
Jun 11, 2021
Merged

Order refund admin show rebuild #309

merged 3 commits into from
Jun 11, 2021

Conversation

Tomanhez
Copy link
Contributor

@Tomanhez Tomanhez commented Jun 10, 2021 •
edited
Loading

New:
Screenshot 2021-06-10 at 15 05 05

@Tomanhez Tomanhez requested a review from a team as a code owner June 10, 2021 07:40
@Tomanhez Tomanhez force-pushed the order-refund-admin-show-fix branch 2 times, most recently from 541171d to e566409 Compare June 10, 2021 12:38
@Zales0123 Zales0123 added Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.). UX/UI Issues and PRs aimed at improving User eXperience and User Interface. labels Jun 10, 2021
Zales0123
Zales0123 reviewed Jun 10, 2021
View reviewed changes
Copy link
Member

@Zales0123 Zales0123 left a comment

Choose a reason for hiding this comment

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

Also button styling is quite poor :( we should make it more consistent with buttons on regular Sylius' payments 🐎

src/Resources/views/SyliusAdminBundle/Order/Show/_payments.html.twig Outdated Show resolved Hide resolved
src/Resources/views/SyliusAdminBundle/Order/Show/_refund.html.twig Outdated Show resolved Hide resolved
src/Resources/views/SyliusAdminBundle/Order/Show/_refund.html.twig Outdated Show resolved Hide resolved
src/Resources/views/SyliusAdminBundle/Order/Show/_refund.html.twig Outdated Show resolved Hide resolved
tests/Behat/Page/Admin/Order/ShowPage.php Outdated Show resolved Hide resolved
@Tomanhez Tomanhez force-pushed the order-refund-admin-show-fix branch 4 times, most recently from 38910b2 to 600e7ef Compare June 11, 2021 06:04
@Tomanhez Tomanhez force-pushed the order-refund-admin-show-fix branch from 600e7ef to c68ee60 Compare June 11, 2021 06:18
@Tomanhez Tomanhez force-pushed the order-refund-admin-show-fix branch from c68ee60 to 2467d2b Compare June 11, 2021 06:21
GSadee
GSadee approved these changes Jun 11, 2021
View reviewed changes
tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/_payments.html.twig
@@ -0,0 +1,18 @@
{% if order.hasPayments %}
Copy link
Member

Choose a reason for hiding this comment

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

We should link these templates with src/Resources/templates/bundles/*

@GSadee GSadee merged commit 68ecef0 into Sylius:master Jun 11, 2021
@GSadee
Copy link
Member

GSadee commented Jun 11, 2021

Thank you, Tomasz! 🥇

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

@Zales0123 Zales0123 Zales0123 left review comments

@GSadee GSadee GSadee approved these changes

Assignees
No one assigned
Labels
Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.). UX/UI Issues and PRs aimed at improving User eXperience and User Interface.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Tomanhez @GSadee @Zales0123