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

Fix incorrect money format being used #12126

Merged
merged 1 commit into from Feb 24, 2021
Merged

Fix incorrect money format being used #12126

merged 1 commit into from Feb 24, 2021

Conversation

kayue
Copy link
Contributor

@kayue kayue commented Dec 4, 2020

Only format accept currency as argument.
Fix #11941.

Q A
Branch? 1.8
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Related tickets fixes #11941
License MIT

A "Cart" menu/collector is added in Sylius 1.8, but this feature requires Channel to exist in the debugger/profiler's route, otherwise user will get the following error:

An exception has been thrown during the rendering of a template ("Channel could not be found! Tip: You can use the Web Debug Toolbar to switch between channels in development.").

The error is triggered by convertAndFormat() in the Twig file. Change it to format() fix the problem. I think it was meant to use format since method signature was incorrect also.

@kayue kayue requested a review from a team as a code owner December 4, 2020 10:32
@Zales0123 Zales0123 added the Bug Confirmed bugs or bugfixes. label Dec 4, 2020
@kayue
Copy link
Contributor Author

kayue commented Dec 18, 2020

Anything blocking this? Just want to make sure this will get merged in the next release. Thanks.

@kayue
Copy link
Contributor Author

kayue commented Dec 24, 2020

@pamil Could you include this into the next release? Clearly a bug and simple fix. Thanks.

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.

👍 Shouldn't it go to the 1.8 branch? It's clearly a bugfix :)

@kayue kayue changed the base branch from master to 1.8 January 8, 2021 08:49
@kayue kayue changed the base branch from 1.8 to master January 8, 2021 08:49
@kayue
Copy link
Contributor Author

kayue commented Jan 8, 2021

@Zales0123 do you want me to change the base to 1.8?

@kayue
Copy link
Contributor Author

kayue commented Jan 12, 2021

This didn't get merged in the last release 🤦

Ping @pamil @lchrusciel

@kayue
Copy link
Contributor Author

kayue commented Jan 26, 2021

Ping @pamil again. Think this is an easy bug fix.

@AdamKasp
Copy link
Contributor

The base of this pull-request was changed, you need fetch and reset your local branch
if you want to add new commits to this pull request. Reset before you pull, else commits
may become messed-up.

Unless you added new commits (to this branch) locally that you did not push yet,
execute git fetch origin && git reset "patch-5" to update your local branch.

Feel free to ask for assistance when you get stuck 👍

Only format accept currency as argument. 
Fix Sylius#11941.
@kayue
Copy link
Contributor Author

kayue commented Feb 24, 2021

Not sure what you mean, do you still want this branch to merge against 1.8?
There was no conflict in this PR so should be ready to merge anytime.

Anyway I have rebased the commit against the latest 1.8 branch.

@AdamKasp AdamKasp merged commit 10d94cb into Sylius:1.8 Feb 24, 2021
@AdamKasp
Copy link
Contributor

Thanks, @kayue! 🥇

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

Successfully merging this pull request may close these issues.

Potential broken sf debugger caused by Sylius Channel settings
4 participants