Changeset 18758 for trunk/data/class/pages/admin/customer

Timestamp:

2010/07/20 13:25:33 (16 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

Location:

trunk/data/class/pages/admin/customer

Files:

• LC_Page_Admin_Customer.php (modified) (2 diffs)
• LC_Page_Admin_Customer_Edit.php (modified) (4 diffs)
• LC_Page_Admin_Customer_SearchCustomer.php (modified) (2 diffs)

trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -215 +215 @@
         // 登録メール再送
         if ($_POST['mode'] == "resend_mail") {
-            $arrRet = $objQuery->select("name01, name02, secret_key, email", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
+            $arrRet = $objQuery->select("name01, name02, secret_key, email, email_mobile", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
             if( is_array($arrRet) === true && count($arrRet) > 0 ){
 
                 $CONF = $objDb->sf_getBasisData();
                 $this->CONF = $CONF;
-                $objMailText = new SC_SiteView();
+                /**
+                 * 携帯メールアドレスが登録されていれば携帯サイトから仮会員登録したものと判定する。
+                 * TODO: とりあえずの簡易的な判定なので、将来的には判定ルーチンを修正した方が良い。
+                 */
+                if (!empty($arrRet[0]['email_mobile'])) {
+                    $objMailText = new SC_MobileView(false);
+                    $this->to_name01 = $arrRet[0]['name01'];
+                    $this->to_name02 = $arrRet[0]['name02'];
+                } else {
+                    $objMailText = new SC_SiteView(false);
+                }
                 $objMailText->assignobj($this);
                 $mailHelper = new SC_Helper_Mail_Ex();

trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -290 +290 @@
         if (strlen($array["email"]) > 0) {
             $array['email'] = strtolower($array['email']);
-            $sql = "SELECT customer_id FROM dtb_customer WHERE email ILIKE ? escape '#' AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
+            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
             $checkMail = ereg_replace( "_", "#_", $array["email"]);
-            $result = $this->objConn->getAll($sql, array($checkMail, $array["customer_id"]));
+            $result = $this->objConn->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
             if (count($result) > 0) {
                 $objErr->arrErr["email"] .= "※ すでに登録されているメールアドレスです。";
@@ -302 +302 @@
         if (strlen($array["email_mobile"]) > 0) {
             $array['email_mobile'] = strtolower($array['email_mobile']);
-            $sql = "SELECT customer_id FROM dtb_customer WHERE email_mobile ILIKE ? escape '#' AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
+            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
             $checkMail = ereg_replace( "_", "#_", $array["email_mobile"]);
-            $result = $this->objConn->getAll($sql, array($checkMail, $array["customer_id"]));
+            $result = $this->objConn->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
             if (count($result) > 0) {
                 $objErr->arrErr["email_mobile"] .= "※ すでに登録されているメールアドレス(モバイル)です。";
@@ -349 +349 @@
 
         // 取得範囲の指定(開始行番号、行数のセット)
-        $this->objQuery->setlimitoffset($page_max, $startno);
+        $this->objQuery->setLimitOffset($page_max, $startno);
         // 表示順序
         $order = "order_id DESC";
-        $this->objQuery->setorder($order);
+        $this->objQuery->setOrder($order);
         //購入履歴情報の取得
         $arrPurchaseHistory = $this->objQuery->select("*", "dtb_order", "customer_id=? AND del_flg = 0 ", array($customer_id));

trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php

@@ -3 +3 @@
  * This file is part of EC-CUBE
  *
- * Copyright(c) 2000-2008 LOCKON CO.,LTD. All Rights Reserved.
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
  *
  * http://www.lockon.co.jp/
@@ -149 +149 @@
 
                 // 取得範囲の指定(開始行番号、行数のセット)
-                $objQuery->setlimitoffset($page_max, $startno);
+                $objQuery->setLimitOffset($page_max, $startno);
                 // 表示順序
-                $objQuery->setorder($order);
+                $objQuery->setOrder($order);
                 // 検索結果の取得
                 $this->arrCustomer = $objQuery->select($col, $from, $where, $sqlval);