EC-CUBE 4.0.2 -> 4.0.3 テンプレート差分

gistfile1.txt

商品購入(Shopping/index.twig)

```diff
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>

```