Changeset 20070

Timestamp:

2011/02/02 18:10:09 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110202075647-gfbrip1v1xbkqxr0

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/basis/delivery_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fdelivery_input.tpl
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 15297@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery_Input.php
data/class/pages/shopping/LC_Page_Shopping.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110202090829-68eh933jqw2fw3ci

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110202090956-vnxxjstny3w860q3

bzr:revno:

2798

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/basis/delivery_input.tpl ohkouchi@loop-az.jp-20110202090829-68eh933jqw2fw3ci
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php ohkouchi@loop-az.jp-20110202090829-68eh933jqw2fw3ci

bzr:timestamp:

2011-02-02 18:09:56.161999941 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-02T09:09:56.162000Z

Message:

#990(配送設定・支払方法設定の仕様変更)

• 配送設定に, 配送業者の説明を追加

Location:

branches/version-2_5-dev/data

Files:

• Smarty/templates/admin/basis/delivery_input.tpl (modified) (1 diff)
• class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl

@@ -43 +43 @@
       <span class="attention"><!--{$arrErr[$key]}--></span>
       <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>

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php

@@ -133 +133 @@
                 $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"));
@@ -170 +171 @@
         $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'];
@@ -285 +287 @@
 
         // 配送業者一覧の取得
-        $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";