Index: /branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php
===================================================================
--- /branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	(revision 19864)
+++ /branches/version-2_5-dev/data/class_extends/helper_extends/SC_Helper_Customer_Ex.php	(revision 19864)
@@ -0,0 +1,38 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(CLASS_REALDIR . "helper/SC_Helper_Customer.php");
+
+/**
+ * CSV関連のヘルパークラス(拡張).
+ *
+ * LC_Helper_Customer をカスタマイズする場合はこのクラスを編集する.
+ *
+ * @package Helper
+ * @author LOCKON CO.,LTD.
+ * @version $Id:SC_Helper_DB_Ex.php 15532 2007-08-31 14:39:46Z nanasess $
+ */
+class SC_Helper_Customer_Ex extends SC_Helper_Customer {
+}
+?>
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 19864)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_Customer.php	(revision 19864)
@@ -0,0 +1,96 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+/**
+ * 会員情報の登録・編集・検索ヘルパークラス.
+ *
+ *
+ * @package Helper
+ * @author Hirokazu Fukuda
+ * @version $Id$
+ */
+class SC_Helper_Customer {
+    
+    
+    /**
+     * 会員編集登録処理を行う.
+     *
+     * @param array $array パラメータの配列
+     * @param array $arrRegistColumn 登録するカラムの配列
+     * @return void
+     */
+    function sfEditCustomerData($array, $arrRegistColumn) {
+        $objQuery =& SC_Query::getSingletonInstance();
+
+        foreach ($arrRegistColumn as $data) {
+            if ($data["column"] != "password") {
+                if($array[ $data['column'] ] != "") {
+                    $arrRegist[ $data["column"] ] = $array[ $data["column"] ];
+                } else {
+                    $arrRegist[ $data['column'] ] = NULL;
+                }
+            }
+        }
+        if (strlen($array["year"]) > 0 && strlen($array["month"]) > 0 && strlen($array["day"]) > 0) {
+            $arrRegist["birth"] = $array["year"] ."/". $array["month"] ."/". $array["day"] ." 00:00:00";
+        } else {
+            $arrRegist["birth"] = NULL;
+        }
+
+        //-- パスワードの更新がある場合は暗号化。（更新がない場合はUPDATE文を構成しない）
+        if ($array["password"] != DEFAULT_PASSWORD) $arrRegist["password"] = sha1($array["password"] . ":" . AUTH_MAGIC);
+        $arrRegist["update_date"] = "NOW()";
+
+        //-- 編集登録実行
+        $objQuery->update("dtb_customer", $arrRegist, "customer_id = ? ", array($array['customer_id']));
+    }
+    
+    /**
+     * 注文番号、利用ポイント、加算ポイントから最終ポイントを取得する.
+     *
+     * @param integer $order_id 注文番号
+     * @param integer $use_point 利用ポイント
+     * @param integer $add_point 加算ポイント
+     * @return array 最終ポイントの配列
+     */
+    function sfGetCustomerPoint($order_id, $use_point, $add_point) {
+        $objQuery =& SC_Query::getSingletonInstance();
+        $arrRet = $objQuery->select("customer_id", "dtb_order", "order_id = ?", array($order_id));
+        $customer_id = $arrRet[0]['customer_id'];
+        if ($customer_id != "" && $customer_id >= 1) {
+            if (USE_POINT !== false) {
+                $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id));
+                $point = $arrRet[0]['point'];
+                $total_point = $arrRet[0]['point'] - $use_point + $add_point;
+            } else {
+                $total_point = 0;
+                $point = 0;
+            }
+        } else {
+            $total_point = "";
+            $point = "";
+        }
+        return array($point, $total_point);
+    }
+    
+}
Index: /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 19860)
+++ /branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php	(revision 19864)
@@ -434,37 +434,4 @@
 
     /**
-     * 会員編集登録処理を行う.
-     *
-     * @param array $array パラメータの配列
-     * @param array $arrRegistColumn 登録するカラムの配列
-     * @return void
-     */
-    function sfEditCustomerData($array, $arrRegistColumn) {
-        $objQuery =& SC_Query::getSingletonInstance();
-
-        foreach ($arrRegistColumn as $data) {
-            if ($data["column"] != "password") {
-                if($array[ $data['column'] ] != "") {
-                    $arrRegist[ $data["column"] ] = $array[ $data["column"] ];
-                } else {
-                    $arrRegist[ $data['column'] ] = NULL;
-                }
-            }
-        }
-        if (strlen($array["year"]) > 0 && strlen($array["month"]) > 0 && strlen($array["day"]) > 0) {
-            $arrRegist["birth"] = $array["year"] ."/". $array["month"] ."/". $array["day"] ." 00:00:00";
-        } else {
-            $arrRegist["birth"] = NULL;
-        }
-
-        //-- パスワードの更新がある場合は暗号化。（更新がない場合はUPDATE文を構成しない）
-        if ($array["password"] != DEFAULT_PASSWORD) $arrRegist["password"] = sha1($array["password"] . ":" . AUTH_MAGIC);
-        $arrRegist["update_date"] = "NOW()";
-
-        //-- 編集登録実行
-        $objQuery->update("dtb_customer", $arrRegist, "customer_id = ? ", array($array['customer_id']));
-    }
-
-    /**
      * 受注番号、最終ポイント、加算ポイント、利用ポイントから「オーダー前ポイント」を取得する
      *
@@ -489,52 +456,6 @@
     }
     
-    /**
-     * 注文番号、利用ポイント、加算ポイントから最終ポイントを取得する.
-     *
-     * @param integer $order_id 注文番号
-     * @param integer $use_point 利用ポイント
-     * @param integer $add_point 加算ポイント
-     * @return array 最終ポイントの配列
-     */
-    function sfGetCustomerPoint($order_id, $use_point, $add_point) {
-        $objQuery =& SC_Query::getSingletonInstance();
-        $arrRet = $objQuery->select("customer_id", "dtb_order", "order_id = ?", array($order_id));
-        $customer_id = $arrRet[0]['customer_id'];
-        if ($customer_id != "" && $customer_id >= 1) {
-            if (USE_POINT !== false) {
-                $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id));
-                $point = $arrRet[0]['point'];
-                $total_point = $arrRet[0]['point'] - $use_point + $add_point;
-            } else {
-                $total_point = 0;
-                $point = 0;
-            }
-        } else {
-            $total_point = "";
-            $point = "";
-        }
-        return array($point, $total_point);
-    }
-
-    /**
-     * 顧客番号、利用ポイント、加算ポイントから最終ポイントを取得する.
-     *
-     * @param integer $customer_id 顧客番号
-     * @param integer $use_point 利用ポイント
-     * @param integer $add_point 加算ポイント
-     * @return array 最終ポイントの配列
-     */
-    function sfGetCustomerPointFromCid($customer_id, $use_point, $add_point) {
-        $objQuery =& SC_Query::getSingletonInstance();
-        if (USE_POINT !== false) {
-            $arrRet = $objQuery->select("point", "dtb_customer", "customer_id = ?", array($customer_id));
-            $point = $arrRet[0]['point'];
-            $total_point = $arrRet[0]['point'] - $use_point + $add_point;
-        } else {
-            $total_point = 0;
-            $point = 0;
-        }
-        return array($point, $total_point);
-    }
+
+
     /**
      * カテゴリツリーの取得を行う.
Index: /branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 19807)
+++ /branches/version-2_5-dev/data/class/SC_Fpdf.php	(revision 19864)
@@ -311,5 +311,5 @@
             $arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
             $this->arrDisp = $arrRet[0];
-            list($point) = SC_Helper_DB_Ex::sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']);
+            list($point) = SC_Helper_Customer_Ex::sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']);
             $this->arrDisp['point'] = $point;
 
@@ -318,5 +318,4 @@
             $arrRet = SC_Utils_Ex::sfSwapArray($arrRet);
             $this->arrDisp = array_merge($this->arrDisp, $arrRet);
-            #$objFormParam->setParam($arrRet);
 
             // その他支払い情報を表示
Index: /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 19828)
+++ /branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php	(revision 19864)
@@ -81,4 +81,5 @@
         $objDb = new SC_Helper_DB_Ex();
         $objDate = new SC_Date(1901);
+        $objCustomerHelper = new SC_Helper_Customer_Ex();
         $this->arrYear = $objDate->getYear();    //　日付プルダウン設定
         $this->arrMonth = $objDate->getMonth();
@@ -201,5 +202,5 @@
                     }
                     //-- 編集登録
-                    $objDb->sfEditCustomerData($this->arrForm, $arrRegistColumn);
+                    $objCustomerHelper->sfEditCustomerData($this->arrForm, $arrRegistColumn);
                 }
             }
Index: /branches/version-2_5-dev/data/require_classes.php
===================================================================
--- /branches/version-2_5-dev/data/require_classes.php	(revision 19814)
+++ /branches/version-2_5-dev/data/require_classes.php	(revision 19864)
@@ -59,3 +59,4 @@
 require_once(CLASS_EX_REALDIR . "helper_extends/SC_Helper_Purchase_Ex.php");
 require_once(CLASS_EX_REALDIR . "helper_extends/SC_Helper_Plugin_Ex.php");
+require_once(CLASS_EX_REALDIR . "helper_extends/SC_Helper_Customer_Ex.php");
 ?>