From 631d205e15be0d663eef1e013b3294524207cb76 Mon Sep 17 00:00:00 2001
From: Kiyoshi Yamamura <kiyoshi.yamamura@cule.jp>
Date: Wed, 8 Mar 2017 18:15:35 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=B9=E3=81=AE=E5=8F=82=E7=85=A7=E5=85=88=E3=81=AB=E8=AA=A4?=
 =?UTF-8?q?=E3=82=8A=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/template/admin/Order/edit.twig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig
index a7978f304e4..7b8459b043b 100644
--- a/src/Eccube/Resource/template/admin/Order/edit.twig
+++ b/src/Eccube/Resource/template/admin/Order/edit.twig
@@ -94,7 +94,7 @@ $(function() {
 
         var data = $(this).data();
         shipment_idx = data.idx;
-        
+
         shipmentItem_idx = 0;
         for(i = 0; i < shipping_details_count.length; i++) { 
             if (shipping_details_count[i].idx == shipment_idx) {
@@ -517,7 +517,7 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
             {% endif %}
             {% for shippingForm in form.Shippings %}
             {% set shippingIndex = loop.index0 %}
-            <div id="shipping_info_box--{{ shippingIndex }}" class="box accordion">
+            <div id="shipping_info_box--{{ shippingForm.vars.name }}" class="box accordion">
                 <div id="shipping_info_box__toggle--{{ shippingIndex }}" class="box-header toggle active">
                     <h3 class="box-title">お届け先情報{% if form.Shippings|length > 1 %}({{ loop.index }}){% endif %}<svg class="cb cb-angle-down icon_down"> <use xlink:href="#cb-angle-down" /></svg></h3>
                 </div><!-- /.box-header -->
@@ -525,11 +525,11 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
                     <div id="shipping_info_list--{{ shippingIndex }}" class="order_list">
                         <div class="btn_area">
                             <ul id="shipping_info_list__menu--{{ shippingIndex }}">
-                                <li><a class="btn btn-default copyCustomerToShippingButton" data-idx="{{ shippingIndex }}">注文者情報をコピー</a></li>
+                                <li><a class="btn btn-default copyCustomerToShippingButton" data-idx="{{ shippingForm.vars.name }}">注文者情報をコピー</a></li>
                                 {% if BaseInfo.optionMultipleShipping %}
-                                <li><a class="btn btn-default" data-toggle="modal" data-target="#searchProductModal" data-idx="{{ shippingIndex }}">商品の追加</a></li>
+                                <li><a class="btn btn-default" data-toggle="modal" data-target="#searchProductModal" data-idx="{{ shippingForm.vars.name }}">商品の追加</a></li>
                                 {% if form.Shippings|length > 1 %}
-                                    <li><button type="button" class="btn btn-default delete_delivery" data-idx="{{ shippingIndex }}">お届け先情報を削除</button></li>
+                                    <li><button type="button" class="btn btn-default delete_delivery" data-idx="{{ shippingForm.vars.name }}">お届け先情報を削除</button></li>
                                 {% endif %}
                                 {% endif %}
                             </ul>
@@ -537,7 +537,7 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
 
                         {% if BaseInfo.optionMultipleShipping %}
                         <div class="tableish"
-                             id="shipment_item_list{{ shippingIndex }}"
+                             id="shipment_item_list{{ shippingForm.vars.name }}"
                              data-prototype="
                              {% filter escape %}
                                      {{ include('Order/shipment_item_prototype.twig', { 'shipmentItemForm': shippingForm.ShipmentItems.vars.prototype }) }}

From 4252410add74455139a19e7c53eacf92df1a32df Mon Sep 17 00:00:00 2001
From: Kiyoshi Yamamura <kiyoshi.yamamura@cule.jp>
Date: Thu, 9 Mar 2017 09:56:50 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF?=
 =?UTF-8?q?=E3=82=B9=E3=81=AE=E5=8F=82=E7=85=A7=E5=85=88=E3=81=AB=E8=AA=A4?=
 =?UTF-8?q?=E3=82=8A=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/template/admin/Order/edit.twig | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig
index 7b8459b043b..b15664e2796 100644
--- a/src/Eccube/Resource/template/admin/Order/edit.twig
+++ b/src/Eccube/Resource/template/admin/Order/edit.twig
@@ -516,8 +516,8 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
             <div id="shipping_info__button_new"><button type="submit" class="btn btn-default" name="mode" value="add_delivery">お届け先を新規追加</button></div>
             {% endif %}
             {% for shippingForm in form.Shippings %}
-            {% set shippingIndex = loop.index0 %}
-            <div id="shipping_info_box--{{ shippingForm.vars.name }}" class="box accordion">
+            {% set shippingIndex = shippingForm.vars.name %}
+            <div id="shipping_info_box--{{ shippingIndex }}" class="box accordion">
                 <div id="shipping_info_box__toggle--{{ shippingIndex }}" class="box-header toggle active">
                     <h3 class="box-title">お届け先情報{% if form.Shippings|length > 1 %}({{ loop.index }}){% endif %}<svg class="cb cb-angle-down icon_down"> <use xlink:href="#cb-angle-down" /></svg></h3>
                 </div><!-- /.box-header -->
@@ -525,11 +525,11 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
                     <div id="shipping_info_list--{{ shippingIndex }}" class="order_list">
                         <div class="btn_area">
                             <ul id="shipping_info_list__menu--{{ shippingIndex }}">
-                                <li><a class="btn btn-default copyCustomerToShippingButton" data-idx="{{ shippingForm.vars.name }}">注文者情報をコピー</a></li>
+                                <li><a class="btn btn-default copyCustomerToShippingButton" data-idx="{{ shippingIndex }}">注文者情報をコピー</a></li>
                                 {% if BaseInfo.optionMultipleShipping %}
-                                <li><a class="btn btn-default" data-toggle="modal" data-target="#searchProductModal" data-idx="{{ shippingForm.vars.name }}">商品の追加</a></li>
+                                <li><a class="btn btn-default" data-toggle="modal" data-target="#searchProductModal" data-idx="{{ shippingIndex }}">商品の追加</a></li>
                                 {% if form.Shippings|length > 1 %}
-                                    <li><button type="button" class="btn btn-default delete_delivery" data-idx="{{ shippingForm.vars.name }}">お届け先情報を削除</button></li>
+                                    <li><button type="button" class="btn btn-default delete_delivery" data-idx="{{ shippingIndex }}">お届け先情報を削除</button></li>
                                 {% endif %}
                                 {% endif %}
                             </ul>
@@ -537,7 +537,7 @@ var setModeAndSubmit = function(mode, keyname, keyid) {
 
                         {% if BaseInfo.optionMultipleShipping %}
                         <div class="tableish"
-                             id="shipment_item_list{{ shippingForm.vars.name }}"
+                             id="shipment_item_list{{ shippingIndex }}"
                              data-prototype="
                              {% filter escape %}
                                      {{ include('Order/shipment_item_prototype.twig', { 'shipmentItemForm': shippingForm.ShipmentItems.vars.prototype }) }}