Changeset 19694 for branches/version-2_5-dev/data/class

Timestamp:

2010/11/30 14:24:27 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19693

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/basis/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment.tpl
data/Smarty/templates/admin/basis/payment_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment_input.tpl
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 15298@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 15304@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment_Input.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2424

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-11-30 14:24:21.989000082 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-30T05:24:21.989000Z

Message:

#823 商品種別によってカートを分ける

• 支払方法設定画面から配送業者の設定を削除

Location:

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

Files:

• LC_Page_Admin_Basis_Payment.php (modified) (1 diff)
• LC_Page_Admin_Basis_Payment_Input.php (modified) (2 diffs)

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

@@ -107 +107 @@
     }
 
-    // 配送業者一覧の取得
+    /**
+     * 支払方法一覧の取得.
+     */
     function lfGetPaymentList() {
         $objQuery = new SC_Query();
-        // 配送業者一覧の取得
-        $col = "payment_id, payment_method, charge, rule, upper_rule, note, deliv_id, fix, charge_flg";
+        $col = "payment_id, payment_method, charge, rule, upper_rule, note, fix, charge_flg";
         $where = "del_flg = 0";
         $table = "dtb_payment";

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

@@ -143 +143 @@
         }
 
-        $this->arrDelivList = $objDb->sfGetIDValueList("dtb_deliv", "deliv_id", "service_name");
         $this->arrForm = $this->objFormParam->getFormParamList();
 
@@ -173 +172 @@
         $this->objFormParam->addParam("利用条件(～円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("利用条件(～円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
-        $this->objFormParam->addParam("配送サービス", "deliv_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         $this->objFormParam->addParam("固定", "fix");
     }