Changeset 18910 for branches/camp/camp-2_5-E/data/class/pages/admin

Timestamp:

2010/11/06 10:20:24 (16 years ago)

Author:

nanasess

Message:

Merged r18888:18901

Location:

branches/camp/camp-2_5-E

Files:

• . (modified) (1 prop)
• data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (1 diff)
• data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php (modified) (2 diffs)

branches/camp/camp-2_5-E/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php

@@ -67 +67 @@
         $objView = new SC_AdminView();
         $objSess = new SC_Session();
-        $objQuery = new SC_Query();
 
         // 認証可否の判定

branches/camp/camp-2_5-E/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php

@@ -68 +68 @@
         switch($_POST['mode']) {
             case 'delete':
-            // ランク付きレコードの削除
-            $objDb->sfDeleteRankRecord("dtb_payment", "payment_id", $_POST['payment_id']);
-            // 再表示
-            $this->reload();
-            break;
-        case 'up':
-            $objDb->sfRankUp("dtb_payment", "payment_id", $_POST['payment_id']);
-            // 再表示
-            $this->reload();
-            break;
-        case 'down':
-            $objDb->sfRankDown("dtb_payment", "payment_id", $_POST['payment_id']);
-            // 再表示
-            $this->reload();
-            break;
+                // ランク付きレコードの削除
+                $objDb->sfDeleteRankRecord("dtb_payment", "payment_id", $_POST['payment_id']);
+                // 再表示
+                $this->reload();
+                break;
+            case 'up':
+                $objDb->sfRankUp("dtb_payment", "payment_id", $_POST['payment_id']);
+                // 再表示
+                $this->reload();
+                break;
+            case 'down':
+                $objDb->sfRankDown("dtb_payment", "payment_id", $_POST['payment_id']);
+                // 再表示
+                $this->reload();
+                break;
         }
 
         $this->arrDelivList = $objDb->sfGetIDValueList("dtb_deliv", "deliv_id", "service_name");
-        $this->arrPaymentListFree = $this->lfGetPaymentList(2);
+        $this->arrPaymentListFree = $this->lfGetPaymentList();
 
         $objView->assignobj($this);
@@ -102 +102 @@
 
     // 配送業者一覧の取得
-    function lfGetPaymentList($fix = 1) {
+    function lfGetPaymentList() {
         $objQuery = new SC_Query();
         // 配送業者一覧の取得
         $col = "payment_id, payment_method, charge, rule, upper_rule, note, deliv_id, fix, charge_flg";
         $where = "del_flg = 0";
-    //  $where .= " AND fix = ?";
         $table = "dtb_payment";
         $objQuery->setOrder("rank DESC");