[Invoices] Display the shipping category. #11805
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
abdellani
force-pushed
the
fix-shipping-method-category-on-invoices-v3
branch
from
69c57ef
to
427d0f7
Compare
abdellani
force-pushed
the
fix-shipping-method-category-on-invoices-v3
branch
2 times, most recently
from
a4b2819
to
830d1d0
Compare
mkllnk
approved these changes
Nov 29, 2023
| %strong= "#{t(:shipping)} " | ||
| = "( #{t(:invoice_shipping_type)} #{raw(@order.shipping_method.name)} )" | ||
| %strong= "#{@order.shipping_method.category} : " | ||
| = "(#{raw(@order.shipping_method.name)})" |
There was a problem hiding this comment.
Does this have to be raw? I don't want enterprises to inject code via the shipping method name.
rioug
requested changes
Nov 30, 2023
| %strong= "#{t(:shipping)} " | ||
| = "( #{t(:invoice_shipping_type)} #{raw(@order.shipping_method.name)} )" | ||
| %strong= "#{@order.shipping_method.category} : " | ||
| = "(#{raw(@order.shipping_method.name)})" |
abdellani
force-pushed
the
fix-shipping-method-category-on-invoices-v3
branch
from
830d1d0
to
e449ef0
Compare
rioug
approved these changes
Dec 13, 2023
|
@abdellani this is perfect. A tiny comment: can we either remove the ":" or remove the brackets? It's a bit weird to have both, but otherwise all good, ready to merge here 💪
|
|
ok @RachL |
|
@RachL done |
|
@abdellani thanks! It looks like we need to rebase right? |
abdellani
force-pushed
the
fix-shipping-method-category-on-invoices-v3
branch
from
c65c0f2
to
ab85adf
Compare
abdellani
force-pushed
the
fix-shipping-method-category-on-invoices-v3
branch
from
ab85adf
to
2b1d792
Compare
|
@RachL |
RachL
added
pr-staged-fr
|
Perfect, merging! |
RachL
added
the
technical changes only
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What? Why?
What should we test?
Release notes
Changelog Category (reviewers may add a label for the release notes):
The title of the pull request will be included in the release notes.
Dependencies
Documentation updates