Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 19983)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 20112)
@@ -244,12 +244,15 @@
             <!--お届け先ここまで-->
 
-            <h3>▼お支払方法・その他お問い合わせ</h3>
-            <table summary="お支払方法・その他お問い合わせ" class="delivname">
+            <h3>▼配送方法・お支払方法・その他お問い合わせ</h3>
+            <table summary="配送方法・お支払方法・その他お問い合わせ" class="delivname">
                 <tbody>
+                <tr>
+                    <th>配送方法</th>
+                    <td><!--{$arrDeliv[$arrData.deliv_id]|h}--></td>
+                </tr>
                 <tr>
                     <th>お支払方法</th>
                     <td><!--{$arrData.payment_method|h}--></td>
                 </tr>
-                <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け日、時間を表示しない） *}-->
                 <tr>
                     <th>その他お問い合わせ</th>
@@ -258,8 +261,4 @@
                 </tbody>
             </table>
-
-            <!--{if 'sfTSPrintOrderBox'|function_exists}-->
-                <!--{'sfTSPrintOrderBox'|call_user_func}-->
-            <!--{/if}-->
 
             <div class="tblareabtn">
Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20068)
+++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 20112)
@@ -21,4 +21,82 @@
  *}-->
 <!--▼CONTENTS-->
+<script type="text/javascript">//<![CDATA[
+    $(function() {
+        $('input[id^=deliv_]').click(function() {
+            var data = {};
+            data.mode = 'select_deliv';
+            data.deliv_id = $(this).val();
+            $.ajax({
+                type : 'POST',
+                url : location.pathname,
+                data: data,
+                cache : false,
+                dataType : 'json',
+                error : remoteException,
+                success : function(data, dataType) {
+                    if (data.error) {
+                        remoteException();
+                    } else {
+                        // 支払い方法の行を生成
+                        var payment_tbody = $('#payment tbody');
+                        payment_tbody.empty();
+                        for (var i in data.arrPayment) {
+                            // ラジオボタン
+                            var radio = $('<input type="radio" />')
+                                .attr('name', 'payment_id')
+                                .attr('id', 'pay_' + i)
+                                .val(data.arrPayment[i].payment_id);
+                            // ラベル
+                            var label = $('<label />')
+                                .attr('for', 'pay_' + i)
+                                .text(data.arrPayment[i].payment_method);
+                            // 行
+                            var tr = $('<tr />')
+                                .append($('<td />')
+                                        .addClass('centertd')
+                                        .append(radio))
+                                .append($('<td />').append(label));
+
+                            // 支払方法の画像が登録されている場合は表示
+                            if (data.img_show) {
+                                var payment_image = data.arrPayment[i].payment_image;
+                                $('th#payment_method').attr('colspan', 3);
+                                if (payment_image) {
+                                    var img = $('<img />').attr('src', '<!--{$smarty.const.IMAGE_SAVE_URLPATH}-->' + payment_image);
+                                    tr.append($('<td />').append(img));
+                                } else {
+                                    tr.append($('<td />'));
+                                }
+                            } else {
+                                $('th#payment_method').attr('colspan', 2);
+                            }
+
+                            tr.appendTo(payment_tbody);
+                        }
+                        // お届け時間を生成
+                        var deliv_time_id_select = $('select[id^=deliv_time_id]');
+                        deliv_time_id_select.empty();
+                        deliv_time_id_select.append($('<option />').text('指定なし').val(''));
+                        for (var i in data.arrDelivTime) {
+                            var option = $('<option />')
+                                .val(i)
+                                .text(data.arrDelivTime[i])
+                                .appendTo(deliv_time_id_select);
+                        }
+                    }
+                }
+            });
+        });
+
+        /**
+         * 通信エラー表示.
+         */
+        function remoteException(XMLHttpRequest, textStatus, errorThrown) {
+            alert('通信中にエラーが発生しました。カート画面に移動します。');
+            location.href = '<!--{$smarty.const.CART_URLPATH}-->';
+        }
+    });
+//]]>
+</script>
 <div id="under02column">
     <div id="under02column_shopping">
@@ -31,4 +109,34 @@
             <input type="hidden" name="mode" value="confirm" />
             <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+
+            <!--{assign var=key value="deliv_id"}-->
+            <!--{if $is_single_deliv}-->
+                <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value}-->" />
+            <!--{else}-->
+            <div class="payarea">
+                <h3>配送方法の指定</h3>
+                <p>配送方法をご選択ください。</p>
+
+                <!--{if $arrErr[$key] != ""}-->
+                <p class="attention"><!--{$arrErr[$key]}--></p>
+                <!--{/if}-->
+                <table summary="配送方法選択">
+                    <tr>
+                        <th>選択</th>
+                        <th colspan="2">配送方法</th>
+                    </tr>
+                    <!--{section name=cnt loop=$arrDeliv}-->
+                    <tr>
+                        <td class="centertd"><input type="radio" id="deliv_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrDeliv[cnt].deliv_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrDeliv[cnt].deliv_id|sfGetChecked:$arrForm[$key].value}--> />
+                        </td>
+                        <td>
+                            <label for="deliv_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrDeliv[cnt].name|h}--><!--{if $arrDeliv[cnt].remark != ""}--><p><!--{$arrDeliv[cnt].remark|h}--></p><!--{/if}--></label>
+                        </td>
+                    </tr>
+                    <!--{/section}-->
+                </table>
+            </div>
+            <!--{/if}-->
+
             <div class="payarea">
                 <h3>お支払方法の指定</h3>
@@ -39,15 +147,17 @@
                 <p class="attention"><!--{$arrErr[$key]}--></p>
                 <!--{/if}-->
-                <table summary="お支払方法選択">
-                    <tr>
+                <table summary="お支払方法選択" id="payment">
+                    <thead>
+                      <tr>
                         <th>選択</th>
-                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->">お支払方法</th>
-                    </tr>
-                    <!--{section name=cnt loop=$arrPayment}-->
-                    <tr>
-                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> />
-                        </td>
+                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->" id="payment_method">お支払方法</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <!--{section name=cnt loop=$arrPayment}-->
+                      <tr>
+                        <td class="centertd"><input type="radio" id="pay_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrPayment[cnt].payment_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrPayment[cnt].payment_id|sfGetChecked:$arrForm[$key].value}--> /></td>
                         <td>
-                            <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|h}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
+                          <label for="pay_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrPayment[cnt].payment_method|h}--><!--{if $arrPayment[cnt].note != ""}--><!--{/if}--></label>
                         </td>
                         <!--{if $img_show}-->
@@ -58,6 +168,7 @@
                             </td>
                         <!--{/if}-->
-                    </tr>
+                      </tr>
                     <!--{/section}-->
+                  </tbody>
                 </table>
             </div>
@@ -67,5 +178,5 @@
                 <h3>お届け時間の指定</h3>
                 <p>ご希望の方は、お届け時間を選択してください。</p>
-                <!--{foreach item=shippingItem name=shippingItem from=$shipping}-->
+                <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
                 <!--{assign var=index value=$smarty.foreach.shippingItem.index}-->
                 <div>
@@ -77,5 +188,5 @@
                         ご指定頂けません。
                     <!--{else}-->
-                        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                        <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
                             <option value="" selected="">指定なし</option>
                             <!--{html_options options=$arrDelivDate selected=$arrForm[$key].value}-->
@@ -90,5 +201,5 @@
                         <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
                     </select>
-                    <!--{if $isMultiple}-->
+                    <!--{if $is_multiple}-->
                         &nbsp;<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
                         &nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 19984)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/confirm.tpl	(revision 20112)
@@ -97,4 +97,9 @@
 <!--{/if}-->
 
+【配送方法】<br>
+<!--{$arrDeliv[$arrData.deliv_id]|h}--><br>
+
+<br>
+
 【お支払い方法】<br>
 <!--{$arrData.payment_method|h}--><br>
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 19984)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/payment.tpl	(revision 20112)
@@ -25,4 +25,6 @@
 <input type="hidden" name="mode" value="confirm">
 <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+<!--{assign var=key value="deliv_id"}-->
+<input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value}-->">
 ■お支払方法 <font color="#FF0000">*</font><br>
 <!--{assign var=key value="payment_id"}-->
@@ -39,5 +41,5 @@
 <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
 ■お届け時間の指定<br>
-<!--{foreach item=shippingItem name=shippingItem from=$shipping}-->
+<!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
 <!--{assign var=index value=$smarty.foreach.shippingItem.index}-->
 <!--★お届け日★-->
@@ -63,5 +65,5 @@
 </select>
 <br>
-<!--{if $isMultiple}-->
+<!--{if $is_multiple}-->
     &nbsp;<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
     &nbsp;<!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}-->
Index: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/select_deliv.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/select_deliv.tpl	(revision 20112)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/select_deliv.tpl	(revision 20112)
@@ -0,0 +1,46 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form method="post" action="?">
+<input type="hidden" name="mode" value="select_deliv">
+<input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->">
+■配送方法 <font color="#FF0000">*</font><br>
+<!--{assign var=key value="deliv_id"}-->
+<!--{if $arrErr[$key] != ""}-->
+<font color="#FF0000"><!--{$arrErr[$key]}--></font>
+<!--{/if}-->
+<!--{section name=cnt loop=$arrDeliv}-->
+<input type="radio" name="<!--{$key}-->" value="<!--{$arrDeliv[cnt].deliv_id}-->" <!--{$arrDeliv[cnt].deliv_id|sfGetChecked:$arrForm[$key].value}-->>
+<!--{$arrDeliv[cnt].name|h}-->
+<br>
+<!--{/section}-->
+<br>
+
+<center><input type="submit" value="次へ"></center>
+</form>
+
+<form action="<!--{$tpl_back_url|h}-->" method="get">
+<center><input type="submit" name="return" value="戻る"></center>
+</form>
+
+<br>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 20014)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/confirm.tpl	(revision 20112)
@@ -232,26 +232,19 @@
             <!--お届け先ここまで-->
 
-            <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
+            <table summary="配送方法・お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname">
                 <thead>
                 <tr>
-                    <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>
+                    <th colspan="2">▼配送方法・お支払方法・お届け日時の指定・その他お問い合わせ</th>
                 </tr>
                 </thead>
                 <tbody>
                 <tr>
+                    <th>配送方法</th>
+                    <td><!--{$arrDeliv[$arrData.deliv_id]|h}--></td>
+                </tr>
+                <tr>
                     <th>お支払方法</th>
                     <td><!--{$arrData.payment_method|h}--></td>
                 </tr>
-                <!--{* 販売方法判定（ダウンロード販売のみの場合はお届け日、時間を表示しない） *}-->
-                <!--{if $cartdown != "2"}-->
-                <tr>
-                    <th>お届け日</th>
-                    <td><!--{$arrData.deliv_date|default:"指定なし"|h}--></td>
-                </tr>
-                <tr>
-                    <th>お届け時間</th>
-                    <td><!--{$arrData.deliv_time|default:"指定なし"|h}--></td>
-                </tr>
-                <!--{/if}-->
                 <tr>
                     <th>その他お問い合わせ</th>
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 20068)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/payment.tpl	(revision 20112)
@@ -21,4 +21,82 @@
  *}-->
 <!--▼CONTENTS-->
+<script type="text/javascript">//<![CDATA[
+    $(function() {
+        $('input[id^=deliv_]').click(function() {
+            var data = {};
+            data.mode = 'select_deliv';
+            data.deliv_id = $(this).val();
+            $.ajax({
+                type : 'POST',
+                url : location.pathname,
+                data: data,
+                cache : false,
+                dataType : 'json',
+                error : remoteException,
+                success : function(data, dataType) {
+                    if (data.error) {
+                        remoteException();
+                    } else {
+                        // 支払い方法の行を生成
+                        var payment_tbody = $('#payment tbody');
+                        payment_tbody.empty();
+                        for (var i in data.arrPayment) {
+                            // ラジオボタン
+                            var radio = $('<input type="radio" />')
+                                .attr('name', 'payment_id')
+                                .attr('id', 'pay_' + i)
+                                .val(data.arrPayment[i].payment_id);
+                            // ラベル
+                            var label = $('<label />')
+                                .attr('for', 'pay_' + i)
+                                .text(data.arrPayment[i].payment_method);
+                            // 行
+                            var tr = $('<tr />')
+                                .append($('<td />')
+                                        .addClass('centertd')
+                                        .append(radio))
+                                .append($('<td />').append(label));
+
+                            // 支払方法の画像が登録されている場合は表示
+                            if (data.img_show) {
+                                var payment_image = data.arrPayment[i].payment_image;
+                                $('th#payment_method').attr('colspan', 3);
+                                if (payment_image) {
+                                    var img = $('<img />').attr('src', '<!--{$smarty.const.IMAGE_SAVE_URLPATH}-->' + payment_image);
+                                    tr.append($('<td />').append(img));
+                                } else {
+                                    tr.append($('<td />'));
+                                }
+                            } else {
+                                $('th#payment_method').attr('colspan', 2);
+                            }
+
+                            tr.appendTo(payment_tbody);
+                        }
+                        // お届け時間を生成
+                        var deliv_time_id_select = $('select[id^=deliv_time_id]');
+                        deliv_time_id_select.empty();
+                        deliv_time_id_select.append($('<option />').text('指定なし').val(''));
+                        for (var i in data.arrDelivTime) {
+                            var option = $('<option />')
+                                .val(i)
+                                .text(data.arrDelivTime[i])
+                                .appendTo(deliv_time_id_select);
+                        }
+                    }
+                }
+            });
+        });
+
+        /**
+         * 通信エラー表示.
+         */
+        function remoteException(XMLHttpRequest, textStatus, errorThrown) {
+            alert('通信中にエラーが発生しました。カート画面に移動します。');
+            location.href = '<!--{$smarty.const.CART_URLPATH}-->';
+        }
+    });
+//]]>
+</script>
 <div id="under02column">
     <div id="under02column_shopping">
@@ -28,4 +106,33 @@
             <input type="hidden" name="mode" value="confirm" />
             <input type="hidden" name="uniqid" value="<!--{$tpl_uniqid}-->" />
+            <!--{assign var=key value="deliv_id"}-->
+            <!--{if $is_single_deliv}-->
+                <input type="hidden" name="<!--{$key}-->" value="<!--{$arrForm[$key].value}-->" />
+            <!--{else}-->
+            <div class="payarea">
+                <h3>配送方法の指定</h3>
+                <p>配送方法をご選択ください。</p>
+
+                <!--{if $arrErr[$key] != ""}-->
+                <p class="attention"><!--{$arrErr[$key]}--></p>
+                <!--{/if}-->
+                <table summary="配送方法選択">
+                    <tr>
+                        <th>選択</th>
+                        <th colspan="2">配送方法</th>
+                    </tr>
+                    <!--{section name=cnt loop=$arrDeliv}-->
+                    <tr>
+                        <td class="centertd"><input type="radio" id="deliv_<!--{$smarty.section.cnt.iteration}-->" name="<!--{$key}-->"  value="<!--{$arrDeliv[cnt].deliv_id}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" <!--{$arrDeliv[cnt].deliv_id|sfGetChecked:$arrForm[$key].value}--> />
+                        </td>
+                        <td>
+                            <label for="deliv_<!--{$smarty.section.cnt.iteration}-->"><!--{$arrDeliv[cnt].name|h}--><!--{if $arrDeliv[cnt].remark != ""}--><p><!--{$arrDeliv[cnt].remark|h}--></p><!--{/if}--></label>
+                        </td>
+                    </tr>
+                    <!--{/section}-->
+                </table>
+            </div>
+            <!--{/if}-->
+
             <div class="payarea">
                 <h3>お支払方法の指定</h3>
@@ -36,9 +143,12 @@
                 <p class="attention"><!--{$arrErr[$key]}--></p>
                 <!--{/if}-->
-                <table summary="お支払方法選択">
+                <table summary="お支払方法選択" id="payment">
+                  <thead>
                     <tr>
                         <th>選択</th>
-                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->">お支払方法</th>
-                    </tr>
+                        <th colspan="<!--{if !$img_show}-->2<!--{else}-->3<!--{/if}-->" id="payment_method">お支払方法</th>
+                    </tr>
+                  </thead>
+                  <tbody>
                     <!--{section name=cnt loop=$arrPayment}-->
                     <tr>
@@ -57,4 +167,5 @@
                     </tr>
                     <!--{/section}-->
+                  </tbody>
                 </table>
             </div>
@@ -64,7 +175,7 @@
                 <h3>お届け時間の指定</h3>
                 <p>ご希望の方は、お届け時間を選択してください。</p>
-                <!--{foreach item=shippingItem name=shippingItem from=$shipping}-->
+                <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
                 <!--{assign var=index value=$smarty.foreach.shippingItem.index}-->
-                <!--{if $isMultiple}-->
+                <!--{if $is_multiple}-->
                 <div>
                         &nbsp;<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}--><br />