[Svn-src-all:1182] [version-2_5-dev 20070] #990(配送設定・支払方法設定の仕様変更)

[nanasess]

Subversion committed to /home/svn/open 20070
http://svn.ec-cube.net/open_trac/changeset/20070
┌────────────────────────────┐
│更新者　:  nanasess                                     │
│更新日時:  2011-02-02 18:10:09 +0900 (水, 02  2月 2011)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#990(配送設定・支払方法設定の仕様変更)
 * 配送設定に, 配送業者の説明を追加


Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
U   branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
U   branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping.php

変更: branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	2011-02-02 07:56:53 UTC (rev 20069)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl	2011-02-02 09:10:09 UTC (rev 20070)
@@ -44,6 +44,13 @@
       <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" /></td>
     </tr>
     <tr>
+      <th>説明</td>
+      <td colspan="3">
+      <!--{assign var=key value="remark"}-->
+      <span class="attention"><!--{$arrErr[$key]}--></span>
+      <textarea name="<!--{$arrForm[$key].keyname}-->" cols="60" rows="8" class="area60" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"><!--{$arrForm[$key].value|h}--></textarea></td>
+    </tr>
+    <tr>
       <th>伝票No.URL</td>
       <td colspan="3">
       <!--{assign var=key value="confirm_url"}-->

変更: branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	2011-02-02 07:56:53 UTC (rev 20069)
+++ branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php	2011-02-02 09:10:09 UTC (rev 20070)
@@ -132,6 +132,7 @@
                 $this->objFormParam->addParam('配送業者ID', 'deliv_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
                 $this->objFormParam->addParam("配送業者名", "name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
                 $this->objFormParam->addParam("名称", "service_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+                $this->objFormParam->addParam("説明", "remark", LLTEXT_LEN, "KVa", array("MAX_LENGTH_CHECK"));
                 $this->objFormParam->addParam("伝票No.確認URL", "confirm_url", STEXT_LEN, "n", array("URL_CHECK", "MAX_LENGTH_CHECK"), "http://");
                 $this->objFormParam->addParam("取扱商品種別", "product_type_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
                 $this->objFormParam->addParam("取扱支払方法", "payment_ids", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
@@ -169,6 +170,7 @@
         // 入力データを渡す。
         $sqlval['name'] = $arrRet['name'];
         $sqlval['service_name'] = $arrRet['service_name'];
+        $sqlval['remark'] = $arrRet['remark'];
         $sqlval['confirm_url'] = $arrRet['confirm_url'];
         $sqlval['product_type_id'] = $arrRet['product_type_id'];
         $sqlval['creator_id'] = $_SESSION['member_id'];
@@ -284,7 +286,7 @@
         $this->lfInitParam('edit');
 
         // 配送業者一覧の取得
-        $col = "deliv_id, name, service_name, confirm_url, product_type_id";
+        $col = "deliv_id, name, service_name, remark, confirm_url, product_type_id";
         $where = "deliv_id = ?";
         $table = "dtb_deliv";
         $arrRet = $objQuery->select($col, $table, $where, array($deliv_id));