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

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

Merged
merged 2 commits into from Jan 17, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -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/>
@@ -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}}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.