-
Notifications
You must be signed in to change notification settings - Fork 648
4.0.2 4.0.3差分
Chihiro Adachi edited this page Sep 2, 2019
·
1 revision
商品購入
diff --git a/src/Eccube/Resource/template/default/Shopping/index.twig b/src/Eccube/Resource/template/default/Shopping/index.twig
index 48a937a..a49da89 100644
--- a/src/Eccube/Resource/template/default/Shopping/index.twig
+++ b/src/Eccube/Resource/template/default/Shopping/index.twig
@@ -1,9 +1,9 @@
{#
This file is part of EC-CUBE
-Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
-http://www.lockon.co.jp/
+http://www.ec-cube.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
@@ -299,7 +299,7 @@ file that was distributed with this source code.
<div class="ec-imageGrid">
<div class="ec-imageGrid__img"><img src="{{ asset((orderItem.product is null ? null : orderItem.product.MainListImage)|no_image_product, 'save_image') }}" alt="{{ orderItem.productName }}"></div>
<div class="ec-imageGrid__content">
- <p>{{ orderItem.productName }}</p>
+ <p>{{ orderItem.productName }}{{ is_reduced_tax_rate(orderItem) ? '※'|trans }}</p>
{% if orderItem.productClass is not null and orderItem.productClass.classCategory1 %}
<p>{{ orderItem.productClass.classCategory1.className.name }}：{{ orderItem.productClass.classCategory1 }}</p>
{% endif %}
@@ -312,6 +312,7 @@ file that was distributed with this source code.
</li>
{% endfor %}
</ul>
+ <p>{{ '※ は軽減税率対象商品です。'|trans }}</p>
</div>
<div class="ec-orderDelivery__address">
<p>{{ ''|trans }}{{ shipping.name01 }} {{ shipping.name02 }} ({{ shipping.kana01 }} {{ shipping.kana02 }}){{ ' 様'|trans }}</p>
@@ -395,12 +396,29 @@ file that was distributed with this source code.
<dt>{{ '送料'|trans }}</dt>
<dd>{{ Order.deliveryFeeTotal|price }}</dd>
</dl>
+ {% if Order.taxable_discount < 0 %}
<dl class="ec-totalBox__spec">
<dt>{{ '値引き'|trans }}</dt>
- <dd>{{ (0 - Order.discount)|price }}</dd>
+ <dd>{{ Order.taxable_discount|price }}</dd>
</dl>
- <div class="ec-totalBox__total">{{ '合計'|trans }}<span class="ec-totalBox__price">{{ Order.total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
+ {% endif %}
+ <div class="ec-totalBox__total">{{ '合計'|trans }}<span class="ec-totalBox__price">{{ Order.taxable_total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
+ {% for rate, total in Order.taxable_total_by_tax_rate %}
+ <dl class="ec-totalBox__taxRate">
+ <dt>{{ '税率 %rate% %対象'|trans({ '%rate%': rate }) }}</dt>
+ <dd>{{ total|price }}</dd>
+ </dl>
+ {% endfor %}
+ {% for item in Order.tax_free_discount_items %}
+ {% if loop.first %}<div class="ec-totalBox__total"></div>{% endif %}
+ <dl class="ec-totalBox__spec">
+ <dt>{{ item.product_name }}</dt>
+ <dd>{{ item.total_price|price }}</dd>
+ </dl>
+ {% endfor %}
+ <div class="ec-totalBox__paymentTotal">{{ 'お支払い合計'|trans }}<span class="ec-totalBox__price">{{ Order.payment_total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
{% if BaseInfo.isOptionPoint and Order.Customer is not null %}
+ <div class="ec-totalBox__pointBlock">
<dl class="ec-totalBox__spec">
<dt>{{ 'ご利用ポイント'|trans }}</dt>
<dd>{{ Order.UsePoint|number_format }} pt</dd>
@@ -409,6 +427,7 @@ file that was distributed with this source code.
<dt><span class="ec-font-bold">{{ '加算ポイント'|trans }}</span></dt>
<dd><span class="ec-font-bold">{{ Order.AddPoint|number_format }} pt</span></dd>
</dl>
+ </div>
{% endif %}
<div class="ec-totalBox__btn">
<button type="submit" class="ec-blockBtn--action">{{ '確認する'|trans }}</button>
商品購入/ご注文確認
diff --git a/src/Eccube/Resource/template/default/Shopping/confirm.twig b/src/Eccube/Resource/template/default/Shopping/confirm.twig
index 45e9644..1859ff6 100644
--- a/src/Eccube/Resource/template/default/Shopping/confirm.twig
+++ b/src/Eccube/Resource/template/default/Shopping/confirm.twig
@@ -1,9 +1,9 @@
{#
This file is part of EC-CUBE
-Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
-http://www.lockon.co.jp/
+http://www.ec-cube.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
@@ -91,7 +91,7 @@ file that was distributed with this source code.
<div class="ec-imageGrid">
<div class="ec-imageGrid__img"><img src="{{ asset((orderItem.product is null ? null : orderItem.product.MainListImage)|no_image_product, 'save_image') }}" alt="{{ orderItem.productName }}"></div>
<div class="ec-imageGrid__content">
- <p>{{ orderItem.productName }}</p>
+ <p>{{ orderItem.productName }}{% if is_reduced_tax_rate(orderItem) %}{{ '※'|trans }}{% endif %}</p>
{% if orderItem.productClass is not null and orderItem.productClass.classCategory1 %}
<p>{{ orderItem.productClass.classCategory1.className.name }}：{{ orderItem.productClass.classCategory1 }}</p>
{% endif %}
@@ -104,6 +104,7 @@ file that was distributed with this source code.
</li>
{% endfor %}
</ul>
+ <p>{{ '※ は軽減税率対象商品です。'|trans }}</p>
</div>
<div class="ec-orderDelivery__address">
<p>{{ ''|trans }}{{ shipping.name01 }} {{ shipping.name02 }} ({{ shipping.kana01 }} {{ shipping.kana02 }}){{ ' 様'|trans }}</p>
@@ -177,12 +178,29 @@ file that was distributed with this source code.
<dt>{{ '送料'|trans }}</dt>
<dd>{{ Order.deliveryFeeTotal|price }}</dd>
</dl>
+ {% if Order.taxable_discount < 0 %}
<dl class="ec-totalBox__spec">
<dt>{{ '値引き'|trans }}</dt>
- <dd>{{ (0 - Order.discount)|price}}</dd>
+ <dd>{{ Order.taxable_discount|price }}</dd>
</dl>
- <div class="ec-totalBox__total">{{ '合計'|trans }}<span class="ec-totalBox__price">{{ Order.total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
+ {% endif %}
+ <div class="ec-totalBox__total">{{ '合計'|trans }}<span class="ec-totalBox__price">{{ Order.taxable_total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
+ {% for rate, total in Order.taxable_total_by_tax_rate %}
+ <dl class="ec-totalBox__taxRate">
+ <dt>{{ '税率 %rate% %対象'|trans({ '%rate%': rate }) }}</dt>
+ <dd>{{ total|price }}</dd>
+ </dl>
+ {% endfor %}
+ {% for item in Order.tax_free_discount_items %}
+ {% if loop.first %}<div class="ec-totalBox__total"></div>{% endif %}
+ <dl class="ec-totalBox__spec">
+ <dt>{{ item.product_name }}</dt>
+ <dd>{{ item.total_price|price }}</dd>
+ </dl>
+ {% endfor %}
+ <div class="ec-totalBox__paymentTotal">{{ 'お支払い合計'|trans }}<span class="ec-totalBox__price">{{ Order.payment_total|price }}</span><span class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
{% if BaseInfo.isOptionPoint and Order.Customer is not null %}
+ <div class="ec-totalBox__pointBlock">
<dl class="ec-totalBox__spec">
<dt>{{ 'ご利用ポイント'|trans }}</dt>
<dd>{{ Order.UsePoint|number_format }} pt</dd>
@@ -191,6 +209,7 @@ file that was distributed with this source code.
<dt><span class="ec-font-bold">{{ '加算ポイント'|trans }}</span></dt>
<dd><span class="ec-font-bold">{{ Order.AddPoint|number_format }} pt</span></dd>
</dl>
+ </div>
{% endif %}
<div class="ec-totalBox__btn">
<button type="submit" class="ec-blockBtn--action">{{ '注文する'|trans }}</button>
MYページ/購入履歴詳細
diff --git a/src/Eccube/Resource/template/default/Mypage/history.twig b/src/Eccube/Resource/template/default/Mypage/history.twig
index ce97770..aa21e0b 100755
--- a/src/Eccube/Resource/template/default/Mypage/history.twig
+++ b/src/Eccube/Resource/template/default/Mypage/history.twig
@@ -1,9 +1,9 @@
{#
This file is part of EC-CUBE
-Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
-http://www.lockon.co.jp/
+http://www.ec-cube.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
@@ -45,11 +45,11 @@ file that was distributed with this source code.
{% if BaseInfo.isOptionPoint %}
<div class="ec-definitions">
<dt>{{ 'ご利用ポイント'|trans }}</dt>
- <dd>{{ Order.usePoint }} pt</dd>
+ <dd>{{ Order.usePoint|number_format }} pt</dd>
</div>
<div class="ec-definitions">
<dt>{{ '加算ポイント'|trans }}</dt>
- <dd>{{ Order.addPoint }} pt</dd>
+ <dd>{{ Order.addPoint|number_format }} pt</dd>
</div>
{% endif %}
@@ -77,7 +77,7 @@ file that was distributed with this source code.
<a href="{{ url('product_detail', {'id': orderItem.Product.id}) }}">{{ orderItem.productName }}</a>
{% else %}
{{ orderItem.productName }}
- {% endif %} ×{{ orderItem.quantity }}
+ {% endif %} ×{{ orderItem.quantity }} {{ is_reduced_tax_rate(orderItem) ? '※'|trans }}
</p>
{% if orderItem.ProductClass is not null %}
{% if orderItem.ProductClass.ClassCategory1 is not null %}
@@ -99,6 +99,7 @@ file that was distributed with this source code.
</div>
</div>
{% endfor %}
+ <p>{{ '※ は軽減税率対象商品です。'|trans }}</p>
<div class="ec-orderDelivery__address">
<p>{{ Shipping.name01 }} {{ Shipping.name02 }}
({{ Shipping.kana01 }} {{ Shipping.kana02 }})</p>
@@ -129,7 +130,7 @@ file that was distributed with this source code.
<div class="ec-rectHeading">
<h2>{{ 'お問い合わせ'|trans }}</h2>
</div>
- <p>{{ Order.message|nl2br|default('記載なし'|trans) }}</p>
+ <p>{{ Order.message|default('記載なし'|trans)|nl2br }}</p>
</div>
<div class="ec-orderMails">
<div class="ec-rectHeading">
@@ -160,13 +161,29 @@ file that was distributed with this source code.
<dt>{{ '送料'|trans }}</dt>
<dd>{{ Order.delivery_fee_total|price }}</dd>
</dl>
- {% if Order.discount > 0 %}
- <dl class="ec-totalBox__spec">
- <dt>{{ '値引き'|trans }}</dt>
- <dd>{{ (0 - Order.discount)|price }}</dd>
- </dl>
+ {% if Order.taxable_discount < 0 %}
+ <dl class="ec-totalBox__spec">
+ <dt>{{ '値引き'|trans }}</dt>
+ <dd>{{ Order.taxable_discount|price }}</dd>
+ </dl>
{% endif %}
<div class="ec-totalBox__total">{{ '合計'|trans }}<span
+ class="ec-totalBox__price">{{ Order.taxable_total|price }}</span><span
+ class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
+ {% for rate, total in Order.taxable_total_by_tax_rate %}
+ <dl class="ec-totalBox__taxRate">
+ <dt>{{ '税率 %rate% %対象'|trans({ '%rate%': rate }) }}</dt>
+ <dd>{{ total|price }}</dd>
+ </dl>
+ {% endfor %}
+ {% for item in Order.tax_free_discount_items %}
+ {% if loop.first %}<div class="ec-totalBox__total"></div>{% endif %}
+ <dl class="ec-totalBox__spec">
+ <dt>{{ item.product_name }}</dt>
+ <dd>{{ item.total_price|price }}</dd>
+ </dl>
+ {% endfor %}
+ <div class="ec-totalBox__paymentTotal">{{ '合計'|trans }}<span
class="ec-totalBox__price">{{ Order.payment_total|price }}</span><span
class="ec-totalBox__taxLabel">{{ '税込'|trans }}</span></div>
{% if stockOrder %}
注文受付メール(テキスト)
diff --git a/src/Eccube/Resource/template/default/Mail/order.twig b/src/Eccube/Resource/template/default/Mail/order.twig
index 1c749cf..2426fa5 100644
--- a/src/Eccube/Resource/template/default/Mail/order.twig
+++ b/src/Eccube/Resource/template/default/Mail/order.twig
@@ -1,9 +1,9 @@
{#
This file is part of EC-CUBE
-Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
-http://www.lockon.co.jp/
+http://www.ec-cube.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
@@ -17,12 +17,13 @@ この度はご注文いただき誠にありがとうございます。下記
ご請求金額
************************************************
-ご注文日時：{{ Order.create_date|date_sec }}
+ご注文日時：{{ Order.order_date|date_sec }}
ご注文番号：{{ Order.order_no }}
お支払い合計：{{ Order.payment_total|price}}
お支払い方法：{{ Order.payment_method }}
{% if BaseInfo.isOptionPoint and Order.Customer is not null %}
-ご利用ポイント：{{ Order.usePoint }} pt
+ご利用ポイント：{{ Order.usePoint|number_format }} pt
+加算ポイント：{{ Order.addPoint|number_format }} pt
{% endif %}
お問い合わせ：{{ Order.message }}
@@ -33,22 +34,30 @@ ご注文商品明細
{% for OrderItem in Order.MergedProductOrderItems %}
商品コード：{{ OrderItem.product_code }}
-商品名：{{ OrderItem.product_name }} {{ OrderItem.classcategory_name1 }} {{ OrderItem.classcategory_name2 }}
-小計：{{ OrderItem.total_price|price }}
+商品名：{{ OrderItem.product_name }} {{ OrderItem.classcategory_name1 }} {{ OrderItem.classcategory_name2 }} {{ is_reduced_tax_rate(OrderItem) ? '※' }}
+単価：{{ OrderItem.price_inctax|price }}
数量：{{ OrderItem.quantity|number_format }}
{% endfor %}
-
+※は軽減税率対象商品です。
-------------------------------------------------
小 計：{{ Order.subtotal|price }}
-
手数料：{{ Order.charge|price }}
送 料：{{ Order.delivery_fee_total|price}}
-{% if Order.discount > 0 %}
-値引き：{{ (0 - Order.discount)|price}}
+{% if Order.taxable_discount < 0 %}
+値引き：{{ Order.taxable_discount|price }}
{% endif %}
+-------------------------------------------------
+合 計：{{ Order.taxable_total|price }}
+ {% for rate, total in Order.taxable_total_by_tax_rate %}
+ ({{ rate }} %対象：{{ total|price }})
+ {% endfor %}
+{% for item in Order.tax_free_discount_items %}
+-------------------------------------------------
+{{ item.product_name }}：{{ item.total_price|price }}
+{% endfor %}
============================================
-合 計：{{ Order.payment_total|price }}
+お支払い合計：{{ Order.payment_total|price }}
************************************************
ご注文者情報
注文受付メール(HTML)
diff --git a/src/Eccube/Resource/template/default/Mail/order.html.twig b/src/Eccube/Resource/template/default/Mail/order.html.twig
index c391b55..21aeec9 100644
--- a/src/Eccube/Resource/template/default/Mail/order.html.twig
+++ b/src/Eccube/Resource/template/default/Mail/order.html.twig
@@ -1,9 +1,9 @@
{#
This file is part of EC-CUBE
-Copyright(c) LOCKON CO.,LTD. All Rights Reserved.
+Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
-http://www.lockon.co.jp/
+http://www.ec-cube.co.jp/
For the full copyright and license information, please view the LICENSE
file that was distributed with this source code.
@@ -35,12 +35,13 @@ file that was distributed with this source code.
<hr style="border-top: 3px double #8c8b8b;">
ご請求金額<br/>
<hr style="border-top: 3px double #8c8b8b;">
- ご注文日時：{{ Order.create_date|date_sec }}<br/>
+ ご注文日時：{{ Order.order_date|date_sec }}<br/>
ご注文番号：{{ Order.order_no }}<br/>
お支払い合計：{{ Order.payment_total|price }}<br/>
お支払い方法：{{ Order.payment_method }}<br/>
{% if BaseInfo.isOptionPoint and Order.Customer is not null %}
- ご利用ポイント：{{ Order.usePoint }} pt<br/>
+ ご利用ポイント：{{ Order.usePoint|number_format }} pt<br/>
+ 加算ポイント：{{ Order.addPoint|number_format }} pt<br/>
{% endif %}
お問い合わせ：{{ Order.message }}<br/>
<br/>
@@ -49,21 +50,30 @@ file that was distributed with this source code.
<hr style="border-top: 3px double #8c8b8b;">
{% 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.product_name }} {{ OrderItem.classcategory_name1 }} {{ OrderItem.classcategory_name2 }} {{ is_reduced_tax_rate(OrderItem) ? '※' }}<br/>
+ 単価：{{ OrderItem.price_inctax|price }}<br/>
数量：{{ OrderItem.quantity|number_format }}<br/>
<br/>
{% endfor %}
+ ※は軽減税率対象商品です。
<hr style="border-top: 2px dashed #8c8b8b;">
小 計：{{ Order.subtotal|price }}<br/>
- <br/>
手数料：{{ Order.charge|price }}<br/>
送 料：{{ Order.delivery_fee_total|price }}<br/>
- {% if Order.discount > 0 %}
- 値引き：{{ (0 - Order.discount)|price }}<br/>
+ {% if Order.taxable_discount < 0 %}
+ 値引き：{{ Order.taxable_discount|price }}<br/>
{% endif %}
<hr style="border-top: 1px dotted #8c8b8b;">
- 合 計：{{ Order.payment_total|price }}<br/>
+ 合 計：{{ Order.taxable_total|price }}<br/>
+ {% for rate, total in Order.taxable_total_by_tax_rate %}
+ ({{ rate }} %対象：{{ total|price }})<br/>
+ {% endfor %}
+ {% for item in Order.tax_free_discount_items %}
+ <hr style="border-top: 1px dotted #8c8b8b;">
+ {{ item.product_name }}：{{ item.total_price|price }}<br/>
+ {% endfor %}
+ <hr style="border-top: 1px dotted #8c8b8b;">
+ お支払い合計：{{ Order.payment_total|price }}
<br/>
<hr style="border-top: 3px double #8c8b8b;">
ご注文者情報<br/>