Index: /branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18023)
+++ /branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18037)
@@ -32,5 +32,5 @@
 /* ペイジェント決済モジュール連携用 */
 if (file_exists(MODULE_PATH . 'mdl_paygent/include.php') === TRUE) {
-  require_once(MODULE_PATH . 'mdl_paygent/include.php');
+    require_once(MODULE_PATH . 'mdl_paygent/include.php');
 }
 
@@ -184,40 +184,5 @@
             $this->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id);
             break;
-        /* F-REGI決済モジュール連携用 */
-        case 'fregi_status':
-            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
-            $this->fregi_err = $objFregiConfig->getSaleInfo($order_id, $this->arrDisp);
-            $this->lfGetOrderData($order_id);
-            break;
-        case 'fregi_card':
-            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
-            $this->fregi_card_err = $objFregiConfig->setCardInfo($_POST['card_status'], $order_id, $this->arrDisp);
-            $this->lfGetOrderData($order_id);
-            break;
-        /* SPS決済モジュール連携用 */
-        case 'sps_request':
-            $objErr = new SC_CheckError($_POST);
-            $objErr->doFunc(array("年","sps_year"), array('EXIST_CHECK'));
-            $objErr->doFunc(array("月","sps_month"), array('EXIST_CHECK'));
-            $objErr->doFunc(array("日","sps_date"), array('EXIST_CHECK'));
-            $objErr->doFunc(array("売上・返金日", "sps_year", "sps_month", "sps_date"), array("CHECK_DATE"));
-            if ($objErr->arrErr) {
-                $this->arrErr = $objErr->arrErr;
-                break;
-            }
-            $sps_return = sfSpsRequest( $order_id, $_POST['request_type'] );
-            // DBから受注情報を再読込
-            $this->lfGetOrderData($order_id);
-            $this->tpl_onload = "window.alert('".$sps_return."');";
-            break;
-
-        /* GMOPG連携用 */
-        case 'gmopg_order_edit':
-            require_once(MODULE_PATH . 'mdl_gmopg/class/LC_Mdl_GMOPG_OrderEdit.php');
-            $objGMOOrderEdit = new LC_MDL_GMOPG_OrderEdit;
-            $this->gmopg_order_edit_result = $objGMOOrderEdit->proccess();
-            $this->lfGetOrderData($order_id);
-            break;
-        // 商品削除
+        /* 商品削除*/
         case 'delete_product':
             $delete_no = $_POST['delete_no'];
@@ -235,5 +200,5 @@
             $this->lfReCheek($arrData, $arrInfo);
             break;
-        // 商品追加ポップアップより商品選択後、商品情報取得
+        /* 商品追加ポップアップより商品選択後、商品情報取得*/
         case 'select_product_detail':
             // POST情報で上書き
@@ -241,9 +206,7 @@
             if (!empty($_POST['add_product_id'])) {
                 $this->lfInsertProduct($_POST['add_product_id'], $_POST['add_classcategory_id1'], $_POST['add_classcategory_id2']);
-
             } elseif (!empty($_POST['edit_product_id'])) {
                 $this->lfUpdateProduct($_POST['edit_product_id'], $_POST['edit_classcategory_id1'], $_POST['edit_classcategory_id2'], $_POST['no']);
             }
-
             $arrData = $_POST;
             foreach ($this->arrForm AS $key=>$val) {
@@ -255,4 +218,39 @@
             }
             $this->lfReCheek($arrData, $arrInfo);
+            break;
+        /* F-REGI決済モジュール連携用 */
+        case 'fregi_status':
+            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
+            $this->fregi_err = $objFregiConfig->getSaleInfo($order_id, $this->arrDisp);
+            $this->lfGetOrderData($order_id);
+            break;
+        case 'fregi_card':
+            $objFregiConfig = new LC_Page_Mdl_Fregi_Config();
+            $this->fregi_card_err = $objFregiConfig->setCardInfo($_POST['card_status'], $order_id, $this->arrDisp);
+            $this->lfGetOrderData($order_id);
+            break;
+        /* SPS決済モジュール連携用 */
+        case 'sps_request':
+            $objErr = new SC_CheckError($_POST);
+            $objErr->doFunc(array("年","sps_year"), array('EXIST_CHECK'));
+            $objErr->doFunc(array("月","sps_month"), array('EXIST_CHECK'));
+            $objErr->doFunc(array("日","sps_date"), array('EXIST_CHECK'));
+            $objErr->doFunc(array("売上・返金日", "sps_year", "sps_month", "sps_date"), array("CHECK_DATE"));
+            if ($objErr->arrErr) {
+                $this->arrErr = $objErr->arrErr;
+                break;
+            }
+            $sps_return = sfSpsRequest( $order_id, $_POST['request_type'] );
+            // DBから受注情報を再読込
+            $this->lfGetOrderData($order_id);
+            $this->tpl_onload = "window.alert('".$sps_return."');";
+            break;
+
+        /* GMOPG連携用 */
+        case 'gmopg_order_edit':
+            require_once(MODULE_PATH . 'mdl_gmopg/class/LC_Mdl_GMOPG_OrderEdit.php');
+            $objGMOOrderEdit = new LC_MDL_GMOPG_OrderEdit;
+            $this->gmopg_order_edit_result = $objGMOOrderEdit->proccess();
+            $this->lfGetOrderData($order_id);
             break;
         default:
@@ -301,5 +299,4 @@
     }
 
-
     /**
      * デストラクタ.
@@ -313,5 +310,5 @@
     /* パラメータ情報の初期化 */
     function lfInitParam() {
-        
+
         // お客様情報
         $this->objFormParam->addParam("顧客名1", "order_name01", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
@@ -342,4 +339,5 @@
         $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
         $this->objFormParam->addParam("電話番号3", "deliv_tel03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK"));
+
 
         // 受注商品情報
@@ -491,5 +489,4 @@
         $this->arrErr = $this->lfCheckError();
     }
-
     /* DB登録処理 */
     function lfRegistData($order_id) {
@@ -605,5 +602,5 @@
             $sqlval['customer_id'] = '0';
         }
-        
+
         unset($sqlval['order_id']); 
         unset($sqlval['total_point']);
@@ -647,9 +644,9 @@
         $objQuery->insert("dtb_order", $sqlval);
         $order_id = $objQuery->currval('dtb_order', 'order_id'); 
-        
+
         // 受注テーブルの名称列を更新
         $objDb = new SC_Helper_DB_Ex();
         $objDb->sfUpdateOrderNameCol($order_id);
-        
+
         // 受注詳細データの更新
         $arrDetail = $this->objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));
@@ -675,5 +672,4 @@
     }
 
-
     function lfInsertProduct($product_id, $classcategory_id1, $classcategory_id2) {
         $arrProduct = $this->lfGetProductsClass($product_id, $classcategory_id1, $classcategory_id2);
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/order/disp.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/order/disp.tpl	(revision 17994)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/order/disp.tpl	(revision 18037)
@@ -24,261 +24,259 @@
 <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_header.tpl"}-->
 
-  <h2>受注詳細</h2>
-
-  <table class="form">
-    <tr>
-      <th>対応状況</th>
-      <td>
-        <!--{if $arrForm.delete.value == 1}-->削除済み
+<h2>受注詳細</h2>
+
+<table class="form">
+    <tr>
+        <th>対応状況</th>
+        <td>
+            <!--{if $arrForm.delete.value == 1}-->削除済み
+            <!--{else}-->
+            <!--{assign var=status value=`$arrForm.status.value`}-->
+            <!--{$arrORDERSTATUS[$status]}-->
+            <!--{/if}-->
+        </td>
+    </tr>
+    <tr>
+        <th>発送日</th>
+        <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td>
+    </tr>
+</table>
+
+<h3>お客様情報</h3>
+<table class="form">
+    <tr>
+        <th>注文番号</th>
+        <td><!--{$arrForm.order_id.value}--></td>
+    </tr>
+    <tr>
+        <th>受注日</th>
+        <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
+    </tr>
+    <tr>
+        <th>顧客ID</th>
+        <td>
+        <!--{if $arrForm.customer_id.value > 0}-->
+            <!--{$arrForm.customer_id.value}-->
         <!--{else}-->
-        <!--{assign var=status value=`$arrForm.status.value`}-->
-        <!--{$arrORDERSTATUS[$status]}-->
+            （非会員）
         <!--{/if}-->
-      </td>
-    </tr>
-    <tr>
-      <th>発送日</th>
-      <td><!--{$arrForm.commit_date|sfDispDBDate|default:"未発送"}--></td>
-    </tr>
-  </table>
-
-  <h3>お客様情報</h3>
-  <table class="form">
-    <tr>
-      <th>注文番号</th>
-      <td><!--{$arrForm.order_id.value}--></td>
-    </tr>
-    <tr>
-      <th>受注日</th>
-      <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
-    </tr>
-    <tr>
-      <th>顧客ID</th>
-      <td>
-      <!--{if $arrForm.customer_id.value > 0}-->
-        <!--{$arrForm.customer_id.value}-->
-      <!--{else}-->
-        （非会員）
-      <!--{/if}-->
-      </td>
-    </tr>
-    <tr>
-      <th>顧客名</th>
-      <td><!--{$arrForm.order_name01.value|escape}--> <!--{$arrForm.order_name02.value|escape}--></td>
-    </tr>
-    <tr>
-      <th>顧客名（カナ）</th>
-      <td><!--{$arrForm.order_kana01.value|escape}--> <!--{$arrForm.order_kana02.value|escape}--></td>
-    </tr>
-    <tr>
-      <th>メールアドレス</th>
-      <td><a href="mailto:<!--{$arrForm.order_email.value|escape}-->"><!--{$arrForm.order_email.value|escape}--></a></td>
-    </tr>
-    <tr>
-      <th>TEL</th>
-      <td><!--{$arrForm.order_tel01.value}-->-<!--{$arrForm.order_tel02.value}-->-<!--{$arrForm.order_tel03.value}--></td>
-    </tr>
-    <tr>
-      <th>住所</th>
-      <td>
-        〒<!--{$arrForm.order_zip01.value}-->-<!--{$arrForm.order_zip02.value}--><br />
-        <!--{assign var=key value=$arrForm.order_pref.value}-->
-        <!--{$arrPref[$key]}--><!--{$arrForm.order_addr01.value}--><!--{$arrForm.order_addr02.value}-->
-      </td>
-    </tr>
-    <tr>
-      <th>備考</th>
-      <td><!--{$arrForm.message.value|escape|nl2br}--></td>
-    </tr>
-  </table>
-
-  <!--▼配送先情報ここから-->
-  <h3>配送先情報</h3>
-  <table class="form">
-    <tr>
-      <th>お名前</th>
-      <td>
-        <!--{assign var=key1 value="deliv_name01"}-->
-        <!--{assign var=key2 value="deliv_name02"}-->
-        <!--{$arrForm[$key1].value|escape}-->
-        <!--{$arrForm[$key2].value|escape}-->
-      </td>
-    </tr>
-    <tr>
-      <th>お名前（カナ）</th>
-      <td>
-        <!--{assign var=key1 value="deliv_kana01"}-->
-        <!--{assign var=key2 value="deliv_kana02"}-->
-        <!--{$arrForm[$key1].value|escape}-->
-        <!--{$arrForm[$key2].value|escape}-->
-      </td>
-    </tr>
-    <tr>
-      <th>郵便番号</th>
-      <td>
-        <!--{assign var=key1 value="deliv_zip01"}-->
-        <!--{assign var=key2 value="deliv_zip02"}-->
-        〒<!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->
-      </td>
-    </tr>
-    <tr>
-      <th>TEL</th>
-      <td>
-        <!--{assign var=key1 value="deliv_tel01"}-->
-        <!--{assign var=key2 value="deliv_tel02"}-->
-        <!--{assign var=key3 value="deliv_tel03"}-->
-        <!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->-<!--{$arrForm[$key3].value|escape}-->
-      </td>
-    </tr>
-    <tr>
-      <th>住所</th>
-      <td>
-        <!--{assign var=pref value=`$arrForm.deliv_pref.value`}-->
-        <!--{$arrPref[$pref]}-->
-        <!--{assign var=key value="deliv_addr01"}-->
-        <!--{$arrForm[$key].value|escape}-->
-        <!--{assign var=key value="deliv_addr02"}-->
-        <!--{$arrForm[$key].value|escape}-->
-      </td>
-    </tr>
-  </table>
-  <!--▲配送先情報ここまで-->  
-
-  <h3>受注商品情報</h3>
-  <table class="list">
-    <tr>
-      <th class="id">商品コード</th>
-      <th class="name">商品名/規格1/規格2</th>
-      <th class="price">単価</th>
-      <th class="qty">数量</th>
-      <th class="price">小計</th>
+        </td>
+    </tr>
+    <tr>
+        <th>顧客名</th>
+        <td><!--{$arrForm.order_name01.value|escape}--> <!--{$arrForm.order_name02.value|escape}--></td>
+    </tr>
+    <tr>
+        <th>顧客名（カナ）</th>
+        <td><!--{$arrForm.order_kana01.value|escape}--> <!--{$arrForm.order_kana02.value|escape}--></td>
+    </tr>
+    <tr>
+        <th>メールアドレス</th>
+        <td><a href="mailto:<!--{$arrForm.order_email.value|escape}-->"><!--{$arrForm.order_email.value|escape}--></a></td>
+    </tr>
+    <tr>
+        <th>TEL</th>
+        <td><!--{$arrForm.order_tel01.value}-->-<!--{$arrForm.order_tel02.value}-->-<!--{$arrForm.order_tel03.value}--></td>
+    </tr>
+    <tr>
+        <th>住所</th>
+        <td>
+            〒<!--{$arrForm.order_zip01.value}-->-<!--{$arrForm.order_zip02.value}--><br />
+            <!--{assign var=key value=$arrForm.order_pref.value}-->
+            <!--{$arrPref[$key]}--><!--{$arrForm.order_addr01.value}--><!--{$arrForm.order_addr02.value}-->
+        </td>
+    </tr>
+    <tr>
+        <th>備考</th>
+        <td><!--{$arrForm.message.value|escape|nl2br}--></td>
+    </tr>
+</table>
+
+<!--▼配送先情報ここから-->
+<h3>配送先情報</h3>
+<table class="form">
+    <tr>
+        <th>お名前</th>
+        <td>
+            <!--{assign var=key1 value="deliv_name01"}-->
+            <!--{assign var=key2 value="deliv_name02"}-->
+            <!--{$arrForm[$key1].value|escape}-->
+            <!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>お名前（カナ）</th>
+        <td>
+            <!--{assign var=key1 value="deliv_kana01"}-->
+            <!--{assign var=key2 value="deliv_kana02"}-->
+            <!--{$arrForm[$key1].value|escape}-->
+            <!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>郵便番号</th>
+        <td>
+            <!--{assign var=key1 value="deliv_zip01"}-->
+            <!--{assign var=key2 value="deliv_zip02"}-->
+            〒<!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>TEL</th>
+        <td>
+            <!--{assign var=key1 value="deliv_tel01"}-->
+            <!--{assign var=key2 value="deliv_tel02"}-->
+            <!--{assign var=key3 value="deliv_tel03"}-->
+            <!--{$arrForm[$key1].value|escape}-->-<!--{$arrForm[$key2].value|escape}-->-<!--{$arrForm[$key3].value|escape}-->
+        </td>
+    </tr>
+    <tr>
+        <th>住所</th>
+        <td>
+            <!--{assign var=pref value=`$arrForm.deliv_pref.value`}-->
+            <!--{$arrPref[$pref]}-->
+            <!--{assign var=key value="deliv_addr01"}-->
+            <!--{$arrForm[$key].value|escape}-->
+            <!--{assign var=key value="deliv_addr02"}-->
+            <!--{$arrForm[$key].value|escape}-->
+        </td>
+    </tr>
+</table>
+<!--▲配送先情報ここまで-->
+
+<h3>受注商品情報</h3>
+<table class="list">
+    <tr>
+        <th class="id">商品コード</th>
+        <th class="name">商品名/規格1/規格2</th>
+        <th class="price">単価</th>
+        <th class="qty">数量</th>
+        <th class="price">小計</th>
     </tr>
     <!--{section name=cnt loop=$arrForm.quantity.value}-->
     <!--{assign var=key value="`$smarty.section.cnt.index`"}-->
     <tr>
-      <td><!--{$arrForm.product_code.value[$key]|escape}--></td>
-      <td><!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}--></td>
-      <td class="right"><!--{if $arrForm.price.value[$key] != 0}--><!--{$arrForm.price.value[$key]|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
-      <td class="center"><!--{$arrForm.quantity.value[$key]|escape}--></td>
-      <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
-      <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
-      <td class="right"><!--{if $price != 0}--><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
+        <td><!--{$arrForm.product_code.value[$key]|escape}--></td>
+        <td><!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}--></td>
+        <td class="right"><!--{if $arrForm.price.value[$key] != 0}--><!--{$arrForm.price.value[$key]|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
+        <td class="center"><!--{$arrForm.quantity.value[$key]|escape}--></td>
+        <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
+        <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
+        <td class="right"><!--{if $price != 0}--><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円<!--{else}-->無料<!--{/if}--></td>
     </tr>
     <!--{/section}-->
     <tr>
-      <th colspan="4" class="right">小計</th>
-      <td align="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
-    </tr>
-    <tr>
-      <th colspan="4" class="right">ポイント値引き</th>
-      <td align="right"><!--{assign var=point_discount value="`$arrForm.use_point.value*$smarty.const.POINT_VALUE`"}--><!--{$point_discount|number_format}-->円</td>
+        <th colspan="4" class="right">小計</th>
+        <td align="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">ポイント値引き</th>
+        <td align="right"><!--{assign var=point_discount value="`$arrForm.use_point.value*$smarty.const.POINT_VALUE`"}--><!--{$point_discount|number_format}-->円</td>
     </tr>
     <!--{assign var=discount value="`$arrForm.discount.value`"}-->
     <!--{if $discount != "" && $discount > 0}-->
-               <tr>
-      <th colspan="4" class="right">値引き</th>
-      <td align="right"><!--{$discount|number_format}-->円</td>
+                         <tr>
+        <th colspan="4" class="right">値引き</th>
+        <td align="right"><!--{$discount|number_format}-->円</td>
     </tr>
     <!--{/if}-->
     <tr>
-      <th colspan="4" class="right">送料</th>
-      <td align="right"><!--{assign var=key value="deliv_fee"}--><!--{$arrForm[$key].value|escape|number_format}--> 円</td>
-    </tr>
-    <tr>
-      <th colspan="4" class="right">手数料</th>
-      <td align="right"><!--{assign var=key value="charge"}-->
+        <th colspan="4" class="right">送料</th>
+        <td align="right"><!--{assign var=key value="deliv_fee"}--><!--{$arrForm[$key].value|escape|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">手数料</th>
+        <td align="right"><!--{assign var=key value="charge"}-->
     <span class="attention"><!--{$arrErr[$key]}--></span><!--{$arrForm[$key].value|escape|number_format}--> 円</td>
     </tr>
     <tr>
-      <th colspan="4" class="right">合計</th>
-      <td align="right"><!--{$arrForm.total.value|number_format}--> 円</td>
-    </tr>
-    <tr>
-      <th colspan="4" class="right">お支払い合計</th>
-      <td align="right"><!--{$arrForm.payment_total.value|number_format}--> 円</td>
-    </tr>
-    <tr>
-      <th colspan="4" class="right">使用ポイント</th>
-      <td align="right"><!--{assign var=key value="use_point"}--><!--{if $arrForm[$key].value != ""}--><!--{$arrForm[$key].value|number_format}--><!--{else}-->0<!--{/if}--> pt</td>
+        <th colspan="4" class="right">合計</th>
+        <td align="right"><!--{$arrForm.total.value|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">お支払い合計</th>
+        <td align="right"><!--{$arrForm.payment_total.value|number_format}--> 円</td>
+    </tr>
+    <tr>
+        <th colspan="4" class="right">使用ポイント</th>
+        <td align="right"><!--{assign var=key value="use_point"}--><!--{if $arrForm[$key].value != ""}--><!--{$arrForm[$key].value|number_format}--><!--{else}-->0<!--{/if}--> pt</td>
     </tr>
     <!--{if $arrForm.birth_point.value > 0}-->
     <tr>
-      <th colspan="4" class="right">お誕生日ポイント</th>
-      <td align="right">
-      <!--{$arrForm.birth_point.value|number_format}-->
-       pt</td>
+        <th colspan="4" class="right">お誕生日ポイント</th>
+        <td align="right">
+        <!--{$arrForm.birth_point.value|number_format}-->
+         pt</td>
     </tr>
     <!--{/if}-->
     <tr>
-      <th colspan="4" class="right">加算ポイント</th>
-      <td align="right">
-      <!--{$arrForm.add_point.value|default:0|number_format}-->
-       pt</td>
-    </tr>
-    <tr>
-      <!--{if $arrForm.customer_id.value > 0}-->
-      <th colspan="4" class="right">現在ポイント</th>
-      <td align="right">
-      <!--{$arrForm.point.value|number_format}-->
-       pt</td>
-      <!--{else}-->
-      <th colspan="4" class="right">現在ポイント</th><td align="center">（なし）</td>
-      <!--{/if}-->
+        <th colspan="4" class="right">加算ポイント</th>
+        <td align="right">
+        <!--{$arrForm.add_point.value|default:0|number_format}-->
+         pt</td>
+    </tr>
+    <tr>
+        <!--{if $arrForm.customer_id.value > 0}-->
+        <th colspan="4" class="right">現在ポイント</th>
+        <td align="right">
+        <!--{$arrForm.point.value|number_format}-->
+         pt</td>
+        <!--{else}-->
+        <th colspan="4" class="right">現在ポイント</th><td align="center">（なし）</td>
+        <!--{/if}-->
     </tr>
     <!--{*
     <tr>
-      <th colspan="4" class="right">反映後ポイント（ポイントの変更は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。）</th>
-      <td align="right">
-        <span class="attention"><!--{$arrErr.total_point}--></span>
-        <!--{$arrForm.total_point.value|number_format}-->
-         pt
-      </td>
+        <th colspan="4" class="right">反映後ポイント（ポイントの変更は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。）</th>
+        <td align="right">
+            <span class="attention"><!--{$arrErr.total_point}--></span>
+            <!--{$arrForm.total_point.value|number_format}-->
+             pt
+        </td>
     </tr>
     *}-->
-  </table>
-
-  <table class="form">
-    <tr>
-      <th>お支払方法</th>
-      <td>
-        <!--{assign var=payment_id value="`$arrForm.payment_id.value`"}-->
-        <!--{$arrPayment[$payment_id]|escape}-->
-      </td>
+</table>
+
+<table class="form">
+    <tr>
+        <th>お支払方法</th>
+        <td>
+            <!--{assign var=payment_id value="`$arrForm.payment_id.value`"}-->
+            <!--{$arrPayment[$payment_id]|escape}-->
+        </td>
     </tr>
     <!--{if $arrForm.payment_info.value|@count > 0}-->
     <tr>
-      <th><!--{$arrForm.payment_typ.valuee}-->情報</th>
-      <td>
-        <!--{foreach key=key item=item from=$arrForm.payment_info.value}-->
-        <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
-        <!--{/foreach}-->
-      </td>
+        <th><!--{$arrForm.payment_typ.valuee}-->情報</th>
+        <td>
+            <!--{foreach key=key item=item from=$arrForm.payment_info.value}-->
+            <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
+            <!--{/foreach}-->
+        </td>
     </tr>
     <!--{/if}-->
     <tr>
-      <th>時間指定</th>
-      <td>
-        <!--{assign var=deliv_time_id value="`$arrForm.deliv_time_id.value`"}-->
-        <!--{$arrDelivTime[$deliv_time_id]|default:"指定なし"}-->
-      </td>
-    </tr>
-    <tr>
-      <th>配達日指定</th>
-      <td>
-        <!--{assign var=key value="deliv_date"}-->
-        <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
-        <!--{$arrForm[$key].value|default:"指定なし"}-->
-      </td>
-    </tr>
-    <tr>
-      <th>メモ</th>
-      <td>
-        <!--{assign var=key value="note"}-->
-        <!--{$arrForm[$key].value|escape|nl2br}-->
-      </td>
-    </tr>
-  </table>
-
-</form>
+        <th>時間指定</th>
+        <td>
+            <!--{assign var=deliv_time_id value="`$arrForm.deliv_time_id.value`"}-->
+            <!--{$arrDelivTime[$deliv_time_id]|default:"指定なし"}-->
+        </td>
+    </tr>
+    <tr>
+        <th>配達日指定</th>
+        <td>
+            <!--{assign var=key value="deliv_date"}-->
+            <!--{if $arrErr[$key]}--><span class="attention"><!--{$arrErr[$key]}--></span><!--{/if}-->
+            <!--{$arrForm[$key].value|default:"指定なし"}-->
+        </td>
+    </tr>
+    <tr>
+        <th>メモ</th>
+        <td>
+            <!--{assign var=key value="note"}-->
+            <!--{$arrForm[$key].value|escape|nl2br}-->
+        </td>
+    </tr>
+</table>
 
 <!--{include file="`$smarty.const.TEMPLATE_ADMIN_DIR`admin_popup_footer.tpl"}-->
Index: /branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl
===================================================================
--- /branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl	(revision 17994)
+++ /branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl	(revision 18037)
@@ -24,28 +24,28 @@
 <script type="text/javascript">
 <!--
-  function fnEdit(customer_id) {
-    document.form1.action = '<!--{$smarty.const.URL_DIR}-->admin/customer/edit.php';
-    document.form1.mode.value = "edit"
-    document.form1['edit_customer_id'].value = customer_id;
-    document.form1.submit();
-    return false;
-  }
-
-  function fnCopyFromOrderData() {
-    df = document.form1;
-    df.deliv_name01.value = df.order_name01.value;
-    df.deliv_name02.value = df.order_name02.value;
-    df.deliv_kana01.value = df.order_kana01.value;
-    df.deliv_kana02.value = df.order_kana02.value;
-    df.deliv_zip01.value = df.order_zip01.value;
-    df.deliv_zip02.value = df.order_zip02.value;
-    df.deliv_tel01.value = df.order_tel01.value;
-    df.deliv_tel02.value = df.order_tel02.value;
-    df.deliv_tel03.value = df.order_tel03.value;
-    df.deliv_pref.value = df.order_pref.value;
-    df.deliv_addr01.value = df.order_addr01.value;
-    df.deliv_addr02.value = df.order_addr02.value;
-  }
-
+    function fnEdit(customer_id) {
+        document.form1.action = '<!--{$smarty.const.URL_DIR}-->admin/customer/edit.php';
+        document.form1.mode.value = "edit"
+        document.form1['edit_customer_id'].value = customer_id;
+        document.form1.submit();
+        return false;
+    }
+
+    function fnCopyFromOrderData() {
+        df = document.form1;
+
+        df.deliv_name01.value = df.order_name01.value;
+        df.deliv_name02.value = df.order_name02.value;
+        df.deliv_kana01.value = df.order_kana01.value;
+        df.deliv_kana02.value = df.order_kana02.value;
+        df.deliv_zip01.value = df.order_zip01.value;
+        df.deliv_zip02.value = df.order_zip02.value;
+        df.deliv_tel01.value = df.order_tel01.value;
+        df.deliv_tel02.value = df.order_tel02.value;
+        df.deliv_tel03.value = df.order_tel03.value;
+        df.deliv_pref.value = df.order_pref.value;
+        df.deliv_addr01.value = df.order_addr01.value;
+        df.deliv_addr02.value = df.order_addr02.value;
+    }
 
 //-->
@@ -64,35 +64,36 @@
 <input type="hidden" id="no" name="no" value="" />
 <input type="hidden" id="delete_no" name="delete_no" value="" />
+
 <div id="order" class="contents-main">
-  <!--{* ペイジェントモジュール連携用 *}-->
-  <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order.tpl}-->
-  <!--{if file_exists($path)}-->
-    <!--{include file=$path}-->
-  <!--{/if}-->
-  
-  <!--▼お客様情報ここから-->
-  <table class="form">
-    <!--{if $tpl_mode != 'add'}-->
-    <tr>
-      <th>帳票出力</th>
-      <td><a href="./" onClick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票を出力するにはこちらをクリックして下さい。</a></td>
-    </tr>
+    <!--{* ペイジェントモジュール連携用 *}-->
+    <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order.tpl}-->
+    <!--{if file_exists($path)}-->
+        <!--{include file=$path}-->
     <!--{/if}-->
-    <tr>
-      <th>対応状況</th>
-      <td>
-        <!--{assign var=key value="status"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-          <option value="">選択してください</option>
-          <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}-->
-        </select>
-      </td>
-    </tr>
-    <tr>
-      <th>発送日</th>
-      <td><!--{$arrForm.commit_date|sfDispDBDate|default:"未発送"}--></td>
-    </tr>
-  </table>
+    
+    <!--▼お客様情報ここから-->
+    <table class="form">
+        <!--{if $tpl_mode != 'add'}-->
+        <tr>
+            <th>帳票出力</th>
+            <td><a href="./" onClick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','1000','800'); return false;">帳票を出力するにはこちらをクリックして下さい。</a></td>
+        </tr>
+        <!--{/if}-->
+        <tr>
+            <th>対応状況</th>
+            <td>
+                <!--{assign var=key value="status"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="">選択してください</option>
+                    <!--{html_options options=$arrORDERSTATUS selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <th>発送日</th>
+            <td><!--{$arrForm.commit_date|sfDispDBDate|default:"未発送"}--></td>
+        </tr>
+    </table>
 
 						<!--{* GMOPG連携用 *}-->
@@ -108,390 +109,371 @@
 						<!--{/if}-->
 
-  <!--{* F-REGI決済モジュール用 *}-->
-  <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_fregi/fregi_order.tpl}-->
-  <!--{if file_exists($path)}-->
-    <!--{include file=$path}-->
-  <!--{/if}-->
-
-  <!--{foreach key=key item=item from=$arrSearchHidden}-->
-  <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
-  <!--{/foreach}-->
-  <h2>お客様情報</h2>
-  <table class="form">
-    <!--{if $tpl_mode != 'add'}-->
-    <tr>
-      <th>注文番号</th>
-      <td><!--{$arrForm.order_id.value}--></td>
-    </tr>
-    <tr>
-      <th>受注日</th>
-      <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
-    </tr>
-    <tr>
-      <th>顧客ID</th>
-      <td>
-        <!--{if $arrForm.customer_id.value > 0}-->
-          <!--{$arrForm.customer_id.value}-->
-        <!--{else}-->
-          （非会員）
+    <!--{* F-REGI決済モジュール用 *}-->
+    <!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_fregi/fregi_order.tpl}-->
+    <!--{if file_exists($path)}-->
+        <!--{include file=$path}-->
+    <!--{/if}-->
+
+    <!--{foreach key=key item=item from=$arrSearchHidden}-->
+    <input type="hidden" name="<!--{$key}-->" value="<!--{$item|escape}-->" />
+    <!--{/foreach}-->
+    <h2>お客様情報</h2>
+    <table class="form">
+        <!--{if $tpl_mode != 'add'}-->
+        <tr>
+            <th>注文番号</th>
+            <td><!--{$arrForm.order_id.value}--></td>
+        </tr>
+        <tr>
+            <th>受注日</th>
+            <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td>
+        </tr>
+        <tr>
+            <th>顧客ID</th>
+            <td>
+                <!--{if $arrForm.customer_id.value > 0}-->
+                    <!--{$arrForm.customer_id.value}-->
+                <!--{else}-->
+                    （非会員）
+                <!--{/if}-->
+            </td>
+        </tr>
         <!--{/if}-->
-      </td>
-    </tr>
+        <tr>
+            <th>顧客名</th>
+            <td>
+                <!--{assign var=key1 value="order_name01"}-->
+                <!--{assign var=key2 value="order_name02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>顧客名（カナ）</th>
+            <td>
+                <!--{assign var=key1 value="order_kana01"}-->
+                <!--{assign var=key2 value="order_kana02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>メールアドレス</th>
+            <td>
+                <!--{assign var=key1 value="order_email"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="30" class="box30" />
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{assign var=key1 value="order_tel01"}-->
+                <!--{assign var=key2 value="order_tel02"}-->
+                <!--{assign var=key3 value="order_tel03"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <span class="attention"><!--{$arrErr[$key3]}--></span>
+                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+            </td>
+        </tr>
+        <tr>
+            <th>住所</th>
+            <td>
+                <!--{assign var=key1 value="order_zip01"}-->
+                <!--{assign var=key2 value="order_zip02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                〒
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                 - 
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
+                <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01');" /><br />
+                <!--{assign var=key value="order_pref"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{assign var=key value="order_addr01"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <!--{assign var=key value="order_addr02"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+        <tr>
+            <th>備考</th>
+            <td><!--{$arrForm.message|escape|nl2br}--></td>
+        </tr>
+    </table>
+    <!--▲お客様情報ここまで-->
+
+    <!--▼配送先情報ここから-->
+    <h2>配送先情報
+        <input type="button" name="input_from_order_data" value="上記お客様情報をコピー" onclick="fnCopyFromOrderData();" />
+    </h2>
+    <table class="form">
+        <tr>
+            <th>お名前</th>
+            <td>
+                <!--{assign var=key1 value="deliv_name01"}-->
+                <!--{assign var=key2 value="deliv_name02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>お名前（カナ）</th>
+            <td>
+                <!--{assign var=key1 value="deliv_kana01"}-->
+                <!--{assign var=key2 value="deliv_kana02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
+            </td>
+        </tr>
+        <tr>
+            <th>TEL</th>
+            <td>
+                <!--{assign var=key1 value="deliv_tel01"}-->
+                <!--{assign var=key2 value="deliv_tel02"}-->
+                <!--{assign var=key3 value="deliv_tel03"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--></span>
+                <span class="attention"><!--{$arrErr[$key2]}--></span>
+                <span class="attention"><!--{$arrErr[$key3]}--></span>
+                <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+                <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" /> - 
+                <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
+            </td>
+        </tr>
+        <tr>
+            <th>住所</th>
+            <td>
+                <!--{assign var=key1 value="deliv_zip01"}-->
+                <!--{assign var=key2 value="deliv_zip02"}-->
+                <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
+                〒
+                <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" />
+                 - 
+                <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="6" class="box6" />
+                <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01');" /><br />
+                <!--{assign var=key value="deliv_pref"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">都道府県を選択</option>
+                    <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
+                </select><br />
+                <!--{assign var=key value="deliv_addr01"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
+                <!--{assign var=key value="deliv_addr02"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+            </td>
+        </tr>
+    </table>
+    <!--▲配送先情報ここまで-->
+
+    <!--▼受注商品情報ここから-->
+    <h2 id="order_products">
+        <a name="order_products">受注商品情報</a>
+        <input type="button" name="cheek" value="計算結果の確認" onclick="fnModeSubmit('cheek','anchor_key','order_products');" />
+        <input type="button" name="add_product" value="商品の追加" onclick="win03('./product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+    </h2>
+    <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
+            <span class="attention"><!--{$arrErr.product_id}--></span>
+            <span class="attention"><!--{$arrErr.quantity}--></span>
+            <span class="attention"><!--{$arrErr.price}--></span>
     <!--{/if}-->
-    <tr>
-      <th>顧客名</th>
-      <td>
-        <!--{assign var=key1 value="order_name01"}-->
-        <!--{assign var=key2 value="order_name02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-      </td>
-    </tr>
-    <tr>
-      <th>顧客名（カナ）</th>
-      <td>
-        <!--{assign var=key1 value="order_kana01"}-->
-        <!--{assign var=key2 value="order_kana02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-      </td>
-    </tr>
-    <tr>
-      <th>メールアドレス</th>
-      <td>
-        <!--{assign var=key1 value="order_email"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--></span>
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="30" class="box30" />
-      </td>
-    </tr>
-    <tr>
-      <th>TEL</th>
-      <td>
-        <!--{assign var=key1 value="order_tel01"}-->
-        <!--{assign var=key2 value="order_tel02"}-->
-        <!--{assign var=key3 value="order_tel03"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--></span>
-        <span class="attention"><!--{$arrErr[$key2]}--></span>
-        <span class="attention"><!--{$arrErr[$key3]}--></span>
-        <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
-        <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" /> - 
-        <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
-      </td>
-    </tr>
-    <tr>
-      <th>住所</th>
-      <td>
-        <!--{assign var=key1 value="order_zip01"}-->
-        <!--{assign var=key2 value="order_zip02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        〒
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box6" />
-         - 
-        <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" />
-        <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'order_zip01', 'order_zip02', 'order_pref', 'order_addr01');" /><br />
-        <!--{assign var=key value="order_pref"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-          <option value="" selected="">都道府県を選択</option>
-          <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
-        </select><br />
-        <!--{assign var=key value="order_addr01"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" /><br />
-        <!--{assign var=key value="order_addr02"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
-      </td>
-    </tr>
-    <tr>
-      <th>備考</th>
-      <td><!--{$arrForm.message|escape|nl2br}--></td>
-    </tr>
-  </table>
-  <!--▲お客様情報ここまで-->
-
-  <!--▼配送先情報ここから-->
-  <h2>配送先情報</h2>
-  <table class="form">
-    <tr>
-      <th>お名前</th>
-      <td>
-        <!--{assign var=key1 value="deliv_name01"}-->
-        <!--{assign var=key2 value="deliv_name02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-      </td>
-    </tr>
-    <tr>
-      <th>お名前（カナ）</th>
-      <td>
-        <!--{assign var=key1 value="deliv_kana01"}-->
-        <!--{assign var=key2 value="deliv_kana02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="15" class="box15" />
-        <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" size="15" class="box15" />
-      </td>
-    </tr>
-    <tr>
-      <th>郵便番号</th>
-      <td>
-        <!--{assign var=key1 value="deliv_zip01"}-->
-        <!--{assign var=key2 value="deliv_zip02"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
-        〒
-        <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box6" />
-         - 
-        <input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" />
-        <input type="button" name="address_input" value="住所入力" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01');" />
-      </td>
-    </tr>
-    <tr>
-      <th>TEL</th>
-      <td>
-        <!--{assign var=key1 value="deliv_tel01"}-->
-        <!--{assign var=key2 value="deliv_tel02"}-->
-        <!--{assign var=key3 value="deliv_tel03"}-->
-        <span class="attention"><!--{$arrErr[$key1]}--></span>
-        <span class="attention"><!--{$arrErr[$key2]}--></span>
-        <span class="attention"><!--{$arrErr[$key3]}--></span>
-        <input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
-        <input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" /> - 
-        <input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
-      </td>
-    </tr>
-    <tr>
-      <th>住所</th>
-      <td>
-      <table border="0" cellspacing="0" cellpadding="0" summary=" ">
-        <tr>
-        <td>
-          <!--{assign var=key value="deliv_pref"}-->
-          <span class="attention"><!--{$arrErr[$key]}--></span>
-          <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-          <option value="" selected="">都道府県を選択</option>
-          <!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
-          </select>
-        </td>
-        </tr>
-        <tr><td height="5"></td></tr>
-        <tr class="fs10n">
-          <td>
-          <!--{assign var=key value="deliv_addr01"}-->
-          <span class="attention"><!--{$arrErr[$key]}--></span>
-          <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
-          </td>
-          </tr>
-          <tr><td height="5"></td></tr>
-          <tr class="fs10n">
-            <td>
-            <!--{assign var=key value="deliv_addr02"}-->
-            <span class="attention"><!--{$arrErr[$key]}--></span>
-            <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" size="60" class="box60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
-            </td>
-          </tr>
-      </table>
-      </td>
-    </tr>
-  </table>
-  <!--▲配送先情報ここまで-->
-
-  <!--▼受注商品情報ここから-->
-  <h2 id="order_products">
-    受注商品情報
-    <input type="button" name="cheek" value="計算結果の確認" onclick="fnModeSubmit('cheek','anchor_key','order_products');" />
-    <input type="button" name="add_product" value="商品の追加" onclick="win03('./product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
-  </h2>
-  <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}-->
-      <span class="attention"><!--{$arrErr.product_id}--></span>
-      <span class="attention"><!--{$arrErr.quantity}--></span>
-      <span class="attention"><!--{$arrErr.price}--></span>
-  <!--{/if}-->
-  <table class="list" id="order-edit-products">
-    <tr>
-      <th class="id">商品コード</th>
-      <th class="name">商品名/規格1/規格2</th>
-      <th class="price">単価</th>
-      <th class="qty">数量</th>
-      <th class="price">税込み価格</th>
-      <th class="price">小計</th>
-    </tr>
-    <!--{section name=cnt loop=$arrForm.quantity.value}-->
-    <!--{assign var=key value="`$smarty.section.cnt.index`"}-->
-    <tr>
-      <td>
-        <!--{$arrForm.product_code.value[$key]|escape}-->
-        <input type="hidden" name="product_code[<!--{$key}-->]" value="<!--{$arrForm.product_code.value[$key]}-->" id="product_code_<!--{$key}-->" />
-      </td>
-      <td>
-        <!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}-->
-        <input type="hidden" name="product_name[<!--{$key}-->]" value="<!--{$arrForm.product_name.value[$key]}-->" id="product_name_<!--{$key}-->" />
-        <input type="hidden" name="classcategory_name1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name1.value[$key]}-->" id="classcategory_name1_<!--{$key}-->" />
-        <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
-        <br />
-        <input type="button" name="change" value="変更" onclick="win03('./product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
-        <!--{if $product_count > 1}-->
-        <input type="button" name="delete" value="削除" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');" />
+    <table class="list" id="order-edit-products">
+        <tr>
+            <th class="id">商品コード</th>
+            <th class="name">商品名/規格1/規格2</th>
+            <th class="price">単価</th>
+            <th class="qty">数量</th>
+            <th class="price">税込み価格</th>
+            <th class="price">小計</th>
+        </tr>
+        <!--{section name=cnt loop=$arrForm.quantity.value}-->
+        <!--{assign var=key value="`$smarty.section.cnt.index`"}-->
+        <tr>
+            <td>
+                <!--{$arrForm.product_code.value[$key]|escape}-->
+                <input type="hidden" name="product_code[<!--{$key}-->]" value="<!--{$arrForm.product_code.value[$key]}-->" id="product_code_<!--{$key}-->" />
+            </td>
+            <td>
+                <!--{$arrForm.product_name.value[$key]|escape}-->/<!--{$arrForm.classcategory_name1.value[$key]|escape|default:"(なし)"}-->/<!--{$arrForm.classcategory_name2.value[$key]|escape|default:"(なし)"}-->
+                <input type="hidden" name="product_name[<!--{$key}-->]" value="<!--{$arrForm.product_name.value[$key]}-->" id="product_name_<!--{$key}-->" />
+                <input type="hidden" name="classcategory_name1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name1.value[$key]}-->" id="classcategory_name1_<!--{$key}-->" />
+                <input type="hidden" name="classcategory_name2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_name2.value[$key]}-->" id="classcategory_name2_<!--{$key}-->" />
+                <br />
+                <input type="button" name="change" value="変更" onclick="win03('./product_select.php?no=<!--{$key}--><!--{if $tpl_order_id}-->&order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " />
+                <!--{if $product_count > 1}-->
+                    <input type="button" name="delete" value="削除" onclick="fnSetFormVal('form1', 'delete_no', <!--{$key}-->); fnModeSubmit('delete_product','anchor_key','order_products');" />
+                <!--{/if}-->
+            <input type="hidden" name="product_id[<!--{$key}-->]" value="<!--{$arrForm.product_id.value[$key]}-->" id="product_id_<!--{$key}-->" />
+            <input type="hidden" name="point_rate[<!--{$key}-->]" value="<!--{$arrForm.point_rate.value[$key]}-->" id="point_rate_<!--{$key}-->" />
+            <input type="hidden" name="classcategory_id1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_id1.value[$key]}-->" id="classcategory_id1_<!--{$key}-->" />
+            <input type="hidden" name="classcategory_id2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_id2.value[$key]}-->" id="classcategory_id2_<!--{$key}-->" />
+            </td>
+            <td align="center"><input type="text" name="price[<!--{$key}-->]" value="<!--{$arrForm.price.value[$key]|escape}-->" size="6" class="box6" maxlength="<!--{$arrForm.price.length}-->" id="price_<!--{$key}-->"/> 円</td>
+            <td align="center"><input type="text" name="quantity[<!--{$key}-->]" value="<!--{$arrForm.quantity.value[$key]|escape}-->" size="3" class="box3" maxlength="<!--{$arrForm.quantity.length}-->"/></td>
+            <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
+            <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
+            <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td>
+            <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
+        </tr>
+        <!--{/section}-->
+        <tr>
+            <th colspan="5" class="right">小計</th>
+            <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">値引</th>
+            <td class="right">
+                <!--{assign var=key value="discount"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">送料</th>
+            <td class="right">
+                <!--{assign var=key value="deliv_fee"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">手数料</th>
+            <td class="right">
+                <!--{assign var=key value="charge"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">合計</th>
+            <td class="right">
+                <span class="attention"><!--{$arrErr.total}--></span>
+                <!--{$arrForm.total.value|number_format}--> 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">お支払い合計</th>
+            <td class="right">
+                <span class="attention"><!--{$arrErr.payment_total}--></span>
+                <!--{$arrForm.payment_total.value|number_format}-->
+                 円
+            </td>
+        </tr>
+        <tr>
+            <th colspan="5" class="right">使用ポイント</th>
+            <td class="right">
+                <!--{assign var=key value="use_point"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape|number_format|default:0}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="5" class="box6" />
+                 pt
+            </td>
+        </tr>
+        <!--{if $arrForm.birth_point.value > 0}-->
+        <tr>
+            <th colspan="5" class="right">お誕生日ポイント</th>
+            <td class="right">
+                <!--{$arrForm.birth_point.value|number_format}-->
+                 pt
+            </td>
+        </tr>
         <!--{/if}-->
-      <input type="hidden" name="product_id[<!--{$key}-->]" value="<!--{$arrForm.product_id.value[$key]}-->" id="product_id_<!--{$key}-->" />
-      <input type="hidden" name="point_rate[<!--{$key}-->]" value="<!--{$arrForm.point_rate.value[$key]}-->" id="point_rate_<!--{$key}-->" />
-      <input type="hidden" name="classcategory_id1[<!--{$key}-->]" value="<!--{$arrForm.classcategory_id1.value[$key]}-->" id="classcategory_id1_<!--{$key}-->" />
-      <input type="hidden" name="classcategory_id2[<!--{$key}-->]" value="<!--{$arrForm.classcategory_id2.value[$key]}-->" id="classcategory_id2_<!--{$key}-->" />
-      </td>
-      <td align="center"><input type="text" name="price[<!--{$key}-->]" value="<!--{$arrForm.price.value[$key]|escape}-->" size="6" class="box6" maxlength="<!--{$arrForm.price.length}-->" id="price_<!--{$key}-->"/> 円</td>
-      <td align="center"><input type="text" name="quantity[<!--{$key}-->]" value="<!--{$arrForm.quantity.value[$key]|escape}-->" size="3" class="box3" maxlength="<!--{$arrForm.quantity.length}-->"/></td>
-      <!--{assign var=price value=`$arrForm.price.value[$key]`}-->
-      <!--{assign var=quantity value=`$arrForm.quantity.value[$key]`}-->
-      <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td>
-      <td><!--{$price|sfPreTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td>
-    </tr>
-    <!--{/section}-->
-    <tr>
-      <th colspan="5" class="right">小計</th>
-      <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">値引</th>
-      <td class="right">
-        <!--{assign var=key value="discount"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"  size="5" class="box6" />
-         円
-      </td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">送料</th>
-      <td class="right">
-        <!--{assign var=key value="deliv_fee"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"  size="5" class="box6" />
-         円
-      </td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">手数料</th>
-      <td class="right">
-        <!--{assign var=key value="charge"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"  size="5" class="box6" />
-         円
-      </td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">合計</th>
-      <td class="right">
-        <span class="attention"><!--{$arrErr.total}--></span>
-        <!--{$arrForm.total.value|number_format}--> 円
-      </td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">お支払い合計</th>
-      <td class="right">
-        <span class="attention"><!--{$arrErr.payment_total}--></span>
-        <!--{$arrForm.payment_total.value|number_format}-->
-         円
-      </td>
-    </tr>
-    <tr>
-      <th colspan="5" class="right">使用ポイント</th>
-      <td class="right">
-        <!--{assign var=key value="use_point"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|escape|number_format|default:0}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"  size="5" class="box6" />
-         pt
-      </td>
-    </tr>
-    <!--{if $arrForm.birth_point.value > 0}-->
-    <tr>
-      <th colspan="5" class="right">お誕生日ポイント</th>
-      <td class="right">
-        <!--{$arrForm.birth_point.value|number_format}-->
-         pt
-      </td>
-    </tr>
-    <!--{/if}-->
-    <tr>
-      <th colspan="5" class="right">加算ポイント</th>
-      <td class="right">
-        <!--{$arrForm.add_point.value|number_format|default:0}-->
-         pt
-      </td>
-    </tr>
-    <tr>
-      <!--{if $arrForm.customer_id > 0}-->
-      <th colspan="5" class="right">現在ポイント（ポイントの修正は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。）</th>
-      <td class="right">
-        <!--{$arrForm.point.value|number_format}-->
-         pt
-      </td>
-      <!--{else}-->
-      <th colspan="5" class="right">現在ポイント</th><td align="center">（なし）</td>
-      <!--{/if}-->
-    </tr>
-  </table>
-
-  <table class="form">
-    <tr>
-      <th>お支払方法<br /><span class="attention">（お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</span></th>
-      <td>
-        <!--{assign var=key value="payment_id"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
-          <option value="" selected="">選択してください</option>
-          <!--{html_options options=$arrPayment selected=$arrForm[$key].value}-->
-        </select>
-      </td>
-    </tr>
-
-    <!--{if $arrForm.payment_info|@count > 0}-->
-    <tr>
-      <th><!--{$arrForm.payment_type}-->情報</th>
-      <td>
-        <!--{foreach key=key item=item from=$arrForm.payment_info}-->
-        <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
-        <!--{/foreach}-->
-      </td>
-    </tr>
-    <!--{/if}-->
-    
-    <tr>
-      <th>時間指定</th>
-      <td>
-        <!--{assign var=key value="deliv_time_id"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">  
-          <option value="" selected="0">指定無し</option>
-          <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
-        </select>
-      </td>
-    </tr>
-    <!--{assign var=key value="deliv_date"}-->
-    <tr>
-      <th>配達日指定</th>
-      <td>
+        <tr>
+            <th colspan="5" class="right">加算ポイント</th>
+            <td class="right">
+                <!--{$arrForm.add_point.value|number_format|default:0}-->
+                 pt
+            </td>
+        </tr>
+        <tr>
+            <!--{if $arrForm.customer_id > 0}-->
+            <th colspan="5" class="right">現在ポイント（ポイントの修正は<a href="?" onclick="return fnEdit('<!--{$arrForm.customer_id.value}-->');">顧客編集</a>から手動にてお願い致します。）</th>
+            <td class="right">
+                <!--{$arrForm.point.value|number_format}-->
+                 pt
+            </td>
+            <!--{else}-->
+            <th colspan="5" class="right">現在ポイント</th><td align="center">（なし）</td>
+            <!--{/if}-->
+        </tr>
+    </table>
+
+    <table class="form">
+        <tr>
+            <th>お支払方法<br /><span class="attention">（お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</span></th>
+            <td>
+                <!--{assign var=key value="payment_id"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="">選択してください</option>
+                    <!--{html_options options=$arrPayment selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
+
+        <!--{if $arrForm.payment_info|@count > 0}-->
+        <tr>
+            <th><!--{$arrForm.payment_type}-->情報</th>
+            <td>
+                <!--{foreach key=key item=item from=$arrForm.payment_info}-->
+                <!--{if $key != "title"}--><!--{if $item.name != ""}--><!--{$item.name}-->：<!--{/if}--><!--{$item.value}--><br/><!--{/if}-->
+                <!--{/foreach}-->
+            </td>
+        </tr>
+        <!--{/if}-->
+        
+        <tr>
+            <th>時間指定</th>
+            <td>
+                <!--{assign var=key value="deliv_time_id"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+                    <option value="" selected="0">指定無し</option>
+                    <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
+                </select>
+            </td>
+        </tr>
         <!--{assign var=key value="deliv_date"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <!--{$arrForm[$key].value|default:"指定なし"}-->
-      </td>
-    </tr>
-    <tr>
-      <th>メモ</th>
-      <td>
-        <!--{assign var=key value="note"}-->
-        <span class="attention"><!--{$arrErr[$key]}--></span>
-        <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea></td>
-      </td>
-    </tr>
-  </table>
-  <!--▲受注商品情報ここまで-->
-
-  <div class="btn">
-    <!--{if count($arrSearchHidden) > 0}-->
-    <button type="button" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_ORDER}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></button>
-    <!--{/if}-->
-    <button type="submit" onclick="return fnConfirm();"><span>この内容で登録する</span></button>
-  </div>
+        <tr>
+            <th>配達日指定</th>
+            <td>
+                <!--{assign var=key value="deliv_date"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <!--{$arrForm[$key].value|default:"指定なし"}-->
+            </td>
+        </tr>
+        <tr>
+            <th>メモ</th>
+            <td>
+                <!--{assign var=key value="note"}-->
+                <span class="attention"><!--{$arrErr[$key]}--></span>
+                <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|escape}--></textarea></td>
+            </td>
+        </tr>
+    </table>
+    <!--▲受注商品情報ここまで-->
+
+    <div class="btn">
+        <!--{if count($arrSearchHidden) > 0}-->
+        <button type="button" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_ORDER}-->'); fnModeSubmit('search','',''); return false;"><span>検索画面に戻る</span></button>
+        <!--{/if}-->
+        <button type="submit" onclick="return fnConfirm();"><span>この内容で登録する</span></button>
+    </div>
 
 </div>
