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

注文受付メールの消費税の記載を削除 #4060

Merged
merged 2 commits into from
Jan 17, 2019
Merged

注文受付メールの消費税の記載を削除 #4060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56bd085
fix 受注受付メール（単価 -> 小計）
okazy Dec 22, 2018
7313392
fix 受注受付メール（うち消費税の削除）
okazy Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/default/Mail/order.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ file that was distributed with this source code.
{% for OrderItem in Order.MergedProductOrderItems %}
商品コード：{{ OrderItem.product_code }}<br/>
商品名：{{ OrderItem.product_name }} {{ OrderItem.classcategory_name1 }} {{ OrderItem.classcategory_name2 }}<br/>
単価：{{ OrderItem.total_price|price }}<br/>
小計：{{ OrderItem.total_price|price }}<br/>
数量：{{ OrderItem.quantity|number_format }}<br/>
<br/>
{% endfor %}
<hr style="border-top: 2px dashed #8c8b8b;">
小　計：{{ Order.subtotal|price }}{% if Order.tax > 0 %}(うち消費税 {{ Order.tax|price }}){% endif %}<br/>
小　計：{{ Order.subtotal|price }}<br/>
<br/>
手数料：{{ Order.charge|price }}<br/>
送　料：{{ Order.delivery_fee_total|price }}<br/>
Expand Down
4 changes: 2 additions & 2 deletions src/Eccube/Resource/template/default/Mail/order.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ file that was distributed with this source code.
{% for OrderItem in Order.MergedProductOrderItems %}
商品コード：{{ OrderItem.product_code }}
商品名：{{ OrderItem.product_name }} {{ OrderItem.classcategory_name1 }} {{ OrderItem.classcategory_name2 }}
単価：{{ OrderItem.total_price|price }}
小計：{{ OrderItem.total_price|price }}
数量：{{ OrderItem.quantity|number_format }}

{% endfor %}

-------------------------------------------------
小　計：{{ Order.subtotal|price }}{% if Order.tax > 0 %}(うち消費税 {{ Order.tax|price }}){% endif %}
小　計：{{ Order.subtotal|price }}

手数料：{{ Order.charge|price }}
送　料：{{ Order.delivery_fee_total|price}}
Expand Down