Add html templates #1377
Merged
Add html templates #1377
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
|
LGTM. 👍 |
| <tr> | ||
| <td><%= item.variant.sku %></td> | ||
| <td><%= raw(item.variant.product.name) %></td> | ||
| <td><%= raw(item.variant.options_text) -%></td> |
There was a problem hiding this comment.
I don't believe that these two should use raw. It is user input, so I don't think it should be trusted.
There was a problem hiding this comment.
If text formatting is the reason for using raw, we probably should use sanitize here.
There was a problem hiding this comment.
I used raw because i copied from
Like in other html templates, i don't use sanitize, the only thing to do is escape the text.
tvdeyen
approved these changes
Jun 13, 2017
Move the html template from ShippedMailer to CartonMailer (ref solidusio@9ff3f31)
DanielePalombo
force-pushed
the
add-html-templates
branch
from
7f0754e to
5d6533c
Compare
|
Conflicts are fixed. CHANGELOG updated. |
tvdeyen
reviewed
Jun 13, 2017
| @@ -21,13 +21,13 @@ | |||
| <% @reimbursement.return_items.exchange_requested.each do |return_item| %> | |||
| <tr> | |||
| <td> | |||
| <%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %> | |||
| <%= return_item.variant.sku %> <%=return_item.variant.name %> <%= "(#{return_item.variant.options_text})" if return_item.variant.options_text.present? %> | |||
The product informations in email templates was not escaped because was used `raw` method.
DanielePalombo
force-pushed
the
add-html-templates
branch
from
99d6d23 to
682f6ae
Compare
|
Updated. Thanks! |
gmacdougall
pushed a commit
that referenced
this pull request
Jul 1, 2017
Resolves #1377 Conflicts: CHANGELOG.md
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.
Add shipped_email.html.erb
When the ShipmentMailer's template was moved under CartonMailer, only the text format was moved.
ref 9ff3f31
I change the test from:
expect(shipment_email.body).not_to include(%{Out of Stock})
in favour of
expect(shipment_email).not_to have_body_text(%{Out of Stock})
for use the default_part_body method.
Add inventory_cancellation_email.html.erb based on https://github.com/solidusio/solidus/blob/c5b9e0242291a2249ea62b046cc973b530957d51/core/app/views/spree/order_mailer/inventory_cancellation_email.text.erb