Index: branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 21982)
+++ branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping.php	(revision 21993)
@@ -184,5 +184,8 @@
                 if (SC_Utils_Ex::isBlank($this->arrErr)) {
                     $this->lfRegistData($this->tpl_uniqid, $objPurchase, $objCustomer, $objFormParam);
-                    $objPurchase->setShipmentItemTempForSole($objCartSess);
+
+                    $arrParams = $objFormParam->getHashArray();
+                    $shipping_id = $arrParams['deliv_check'] == '1' ? 1 : 0;
+                    $objPurchase->setShipmentItemTempForSole($objCartSess, $shipping_id);
 
                     $objSiteSess->setRegistFlag();
Index: branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 21965)
+++ branches/version-2_12-dev/data/Smarty/templates/default/shopping/confirm.tpl	(revision 21993)
@@ -177,95 +177,93 @@
         <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
         <!--{foreach item=shippingItem from=$arrShipping name=shippingItem}-->
-            <!--{if $shippingItem.shipping_id !== null }-->
-                <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
-                <!--{if $is_multiple}-->
-                    <table summary="ご注文内容確認">
-                        <col width="10%" />
-                        <col width="60%" />
-                        <col width="20%" />
-                        <col width="10%" />
-                        <tr>
-                            <th scope="col">商品写真</th>
-                            <th scope="col">商品名</th>
-                            <th scope="col">単価</th>
-                            <th scope="col">数量</th>
-                            <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                            <th scope="col">小計</th>
-                            *}-->
-                        </tr>
-                        <!--{foreach item=item from=$shippingItem.shipment_item}-->
-                            <tr>
-                                <td class="alignC">
-                                    <a
-                                        <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
-                                        <!--{/if}-->
-                                    >
-                                        <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
-                                </td>
-                                <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
-                                    <!--{if $item.productsClass.classcategory_name1 != ""}-->
-                                        <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
-                                    <!--{/if}-->
-                                    <!--{if $item.productsClass.classcategory_name2 != ""}-->
-                                        <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
-                                    <!--{/if}-->
-                                </td>
-                                <td class="alignR">
-                                    <!--{$item.price|sfCalcIncTax|number_format}-->円
-                                </td>
-                                <td class="alignC"><!--{$item.quantity}--></td>
-                                <!--{* XXX 購入小計と誤差が出るためコメントアウト
-                                <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
-                                *}-->
-                            </tr>
-                        <!--{/foreach}-->
-                    </table>
-                <!--{/if}-->
-
-                <table summary="お届け先確認" class="delivname">
-                    <col width="30%" />
-                    <col width="70%" />
-                    <tbody>
-                        <tr>
-                            <th scope="row">お名前</th>
-                            <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
-                        </tr>
-                        <tr>
-                        <th scope="row">お名前(フリガナ)</th>
-                            <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">郵便番号</th>
-                            <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">住所</th>
-                            <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">電話番号</th>
-                            <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">FAX番号</th>
-                            <td>
-                                <!--{if $shippingItem.shipping_fax01 > 0}-->
-                                    <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+        <h3>お届け先<!--{if $is_multiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3>
+        <!--{if $is_multiple}-->
+            <table summary="ご注文内容確認">
+                <col width="10%" />
+                <col width="60%" />
+                <col width="20%" />
+                <col width="10%" />
+                <tr>
+                    <th scope="col">商品写真</th>
+                    <th scope="col">商品名</th>
+                    <th scope="col">単価</th>
+                    <th scope="col">数量</th>
+                    <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                    <th scope="col">小計</th>
+                    *}-->
+                </tr>
+                <!--{foreach item=item from=$shippingItem.shipment_item}-->
+                    <tr>
+                        <td class="alignC">
+                            <a
+                                <!--{if $item.productsClass.main_image|strlen >= 1}--> href="<!--{$smarty.const.IMAGE_SAVE_URLPATH}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" class="expansion" target="_blank"
                                 <!--{/if}-->
-                            </td>
-                        </tr>
-                    <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
-                        <tr>
-                            <th scope="row">お届け日</th>
-                            <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">お届け時間</th>
-                            <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
-                        </tr>
-                    <!--{/if}-->
-                    </tbody>
-                </table>
-		    <!--{/if}-->
+                            >
+                                <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$item.productsClass.name|h}-->" /></a>
+                        </td>
+                        <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br />
+                            <!--{if $item.productsClass.classcategory_name1 != ""}-->
+                                <!--{$item.productsClass.class_name1}-->：<!--{$item.productsClass.classcategory_name1}--><br />
+                            <!--{/if}-->
+                            <!--{if $item.productsClass.classcategory_name2 != ""}-->
+                                <!--{$item.productsClass.class_name2}-->：<!--{$item.productsClass.classcategory_name2}-->
+                            <!--{/if}-->
+                        </td>
+                        <td class="alignR">
+                            <!--{$item.price|sfCalcIncTax|number_format}-->円
+                        </td>
+                        <td class="alignC"><!--{$item.quantity}--></td>
+                        <!--{* XXX 購入小計と誤差が出るためコメントアウト
+                        <td class="alignR"><!--{$item.total_inctax|number_format}-->円</td>
+                        *}-->
+                    </tr>
+                <!--{/foreach}-->
+            </table>
+        <!--{/if}-->
+
+        <table summary="お届け先確認" class="delivname">
+            <col width="30%" />
+            <col width="70%" />
+            <tbody>
+                <tr>
+                    <th scope="row">お名前</th>
+                    <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お名前(フリガナ)</th>
+                    <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">郵便番号</th>
+                    <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">住所</th>
+                    <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">電話番号</th>
+                    <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">FAX番号</th>
+                    <td>
+                        <!--{if $shippingItem.shipping_fax01 > 0}-->
+                            <!--{$shippingItem.shipping_fax01}-->-<!--{$shippingItem.shipping_fax02}-->-<!--{$shippingItem.shipping_fax03}-->
+                        <!--{/if}-->
+                    </td>
+                </tr>
+            <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}-->
+                <tr>
+                    <th scope="row">お届け日</th>
+                    <td><!--{$shippingItem.shipping_date|default:"指定なし"|h}--></td>
+                </tr>
+                <tr>
+                    <th scope="row">お届け時間</th>
+                    <td><!--{$shippingItem.shipping_time|default:"指定なし"|h}--></td>
+                </tr>
+            <!--{/if}-->
+            </tbody>
+        </table>
         <!--{/foreach}-->
         <!--{/if}-->
Index: branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 21965)
+++ branches/version-2_12-dev/data/Smarty/templates/default/shopping/payment.tpl	(revision 21993)
@@ -205,36 +205,34 @@
             <p class="non-select-msg">まずはじめに、配送方法を選択ください。</p>
             <!--{foreach item=shippingItem name=shippingItem from=$arrShipping}-->
-			<!--{if $shippingItem.shipping_id !== null }-->
-                <!--{assign var=index value=$shippingItem.shipping_id}-->
-                <div class="delivdate top">
-                    <!--{if $is_multiple}-->
-                        <span class="st">▼<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
-                        <!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}--></span><br/>
-                    <!--{/if}-->
-                    <!--★お届け日★-->
-                    <!--{assign var=key value="deliv_date`$index`"}-->
-                    <span class="attention"><!--{$arrErr[$key]}--></span>
-                    お届け日：
-                    <!--{if !$arrDelivDate}-->
-                        ご指定頂けません。
-                    <!--{else}-->
-                        <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-                            <option value="" selected="">指定なし</option>
-                            <!--{assign var=shipping_date_value value=$arrForm[$key].value|default:$shippingItem.shipping_date}-->
-                            <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
-                        </select>&nbsp;
-                    <!--{/if}-->
-                    <!--★お届け時間★-->
-                    <!--{assign var=key value="deliv_time_id`$index`"}-->
-                    <span class="attention"><!--{$arrErr[$key]}--></span>
-                    お届け時間：
+            <!--{assign var=index value=$shippingItem.shipping_id}-->
+            <div class="delivdate top">
+                <!--{if $is_multiple}-->
+                    <span class="st">▼<!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}-->
+                    <!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}--></span><br/>
+                <!--{/if}-->
+                <!--★お届け日★-->
+                <!--{assign var=key value="deliv_date`$index`"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                お届け日：
+                <!--{if !$arrDelivDate}-->
+                    ご指定頂けません。
+                <!--{else}-->
                     <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
                         <option value="" selected="">指定なし</option>
-                        <!--{assign var=shipping_time_value value=$arrForm[$key].value|default:$shippingItem.time_id}-->
-                        <!--{html_options options=$arrDelivTime selected=$shipping_time_value}-->
-                    </select>
-                </div>
-            <!--{/if}-->
-			<!--{/foreach}-->
+                        <!--{assign var=shipping_date_value value=$arrForm[$key].value|default:$shippingItem.shipping_date}-->
+                        <!--{html_options options=$arrDelivDate selected=$shipping_date_value}-->
+                    </select>&nbsp;
+                <!--{/if}-->
+                <!--★お届け時間★-->
+                <!--{assign var=key value="deliv_time_id`$index`"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                お届け時間：
+                <select name="<!--{$key}-->" id="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">指定なし</option>
+                    <!--{assign var=shipping_time_value value=$arrForm[$key].value|default:$shippingItem.time_id}-->
+                    <!--{html_options options=$arrDelivTime selected=$shipping_time_value}-->
+                </select>
+            </div>
+            <!--{/foreach}-->
         </div>
         <!--{/if}-->