Changeset 18739

Timestamp:

2010/06/23 12:10:44 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20100623022146-0zy5htqn96ust7uf

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 15568@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_Edit.php
data/class/pages/entry/LC_Page_Entry.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry.php
data/class/pages/mypage/LC_Page_Mypage_Change.php 16070@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Change.php

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20100623031040-3rrnq10falxw42u7

bzr:revno:

1978

bzr:revprop:branch-nick:

branches/version-2_4-dev

bzr:root:

branches/version-2_4-dev

bzr:text-parents:

data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php ohkouchi@loop-az.jp-20100614081324-0g78bhcmvqs3d6ts
data/class/pages/entry/LC_Page_Entry.php ohkouchi@loop-az.jp-20100614081324-0g78bhcmvqs3d6ts
data/class/pages/mypage/LC_Page_Mypage_Change.php ohkouchi@loop-az.jp-20100614081324-0g78bhcmvqs3d6ts

bzr:timestamp:

2010-06-23 12:10:40.684999943 +0900

bzr:user-agent:

bzr2.1.2+bzr-svn1.0.2

svn:original-date:

2010-06-23T03:10:40.685000Z

Message:

検索条件を修正

Location:

branches/version-2_4-dev/data/class/pages

Files:

• admin/customer/LC_Page_Admin_Customer_Edit.php (modified) (2 diffs)
• entry/LC_Page_Entry.php (modified) (1 diff)
• mypage/LC_Page_Mypage_Change.php (modified) (1 diff)

branches/version-2_4-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php

@@ -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"] .= "※ すでに登録されているメールアドレス(モバイル)です。";

branches/version-2_4-dev/data/class/pages/entry/LC_Page_Entry.php

@@ -731 +731 @@
             $array["email"] = strtolower($array["email"]);
             $objQuery = new SC_Query();
-            $arrRet = $objQuery->select("email, update_date, del_flg", "dtb_customer","email = ? ORDER BY del_flg", array($array["email"]));
+            $arrRet = $objQuery->select("email, update_date, del_flg", "dtb_customer","email = ? OR email_mobile = ? ORDER BY del_flg", array($array["email"], $array["email"]));
 
             if(count($arrRet) > 0) {

branches/version-2_4-dev/data/class/pages/mypage/LC_Page_Mypage_Change.php

@@ -445 +445 @@
 
                 $email_cnt = $this->objQuery->count("dtb_customer",
-                                 "del_flg=0 AND " . $mailType . "= ?",
-                                  array($this->arrForm[$mailType]));
+                                 "del_flg=0 AND (email = ? OR email_mobile = ?) ",
+                                  array($this->arrForm[$mailType], $this->arrForm[$mailType]));
                 if ($email_cnt > 0){
                     $arrMailType2[$mailType] = false;