Index: /branches/dev/data/Smarty/templates/admin/mail/index.tpl
===================================================================
--- /branches/dev/data/Smarty/templates/admin/mail/index.tpl (revision 11626)
+++ /branches/dev/data/Smarty/templates/admin/mail/index.tpl (revision 11627)
@@ -264,5 +264,5 @@
| ¥¥ã¥ó¥Ú¡¼¥ó |
-
+ |
|
+ ¥á¡¼¥ë¥¢¥É¥ì¥¹¼ïÊÌ |
+
+
+ |
@@ -380,8 +384,8 @@
| # |
- ²ñ°÷ÈÖ¹æ |
- ̾Á° |
- ¥á¡¼¥ë¥¢¥É¥ì¥¹ |
- ¥á¡¼¥ë¥¢¥É¥ì¥¹(·ÈÂÓÍÑ) |
+ ²ñ°÷ÈÖ¹æ |
+ ¼õÃíÈÖ¹æ |
+ ̾Á° |
+ ¥á¡¼¥ë¥¢¥É¥ì¥¹ |
´õ˾ÇÛ¿® |
ÅÐÏ¿Æü |
Index: /branches/dev/data/class/SC_CustomerList.php
===================================================================
--- /branches/dev/data/class/SC_CustomerList.php (revision 11624)
+++ /branches/dev/data/class/SC_CustomerList.php (revision 11627)
@@ -140,6 +140,32 @@
//¡¡E-MAIL
if (strlen($this->arrSql['email']) > 0) {
+
+ $search_all = 'all';
+ $search_pc = 'email';
+ $search_mobile = 'email_mobile';
+
//¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
$this->arrSql['email'] = explode(",", $this->arrSql['email']);
+
+ //¡¡¥á¡¼¥ë¼ïÊÌ
+ if ( is_array( $this->arrSql['mail_type'] ) ){
+
+ if(in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && !in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+ // PC¤Î¤ß¸¡º÷
+ $search_patern = $search_pc;
+ } else if(!in_array(MAIL_TYPE_PC, $this->arrSql['mail_type']) && in_array(MAIL_TYPE_MOBILE, $this->arrSql['mail_type'])) {
+ // ¥â¥Ð¥¤¥ë¤Î¤ß¸¡º÷
+ $search_patern = $search_mobile;
+ } else {
+ // Á´¸¡º÷
+ $search_patern = $search_all;
+ }
+
+ } else {
+ // Á´¸¡º÷
+ $search_patern = $search_all;
+ }
+
+
$sql_where = "";
foreach($this->arrSql['email'] as $val) {
@@ -147,14 +173,16 @@
//¸¡º÷¾ò·ï¤ò´Þ¤Þ¤Ê¤¤
if($this->arrSql['not_emailinc'] == '1') {
+
if($sql_where == "") {
- $sql_where .= "dtb_customer.email NOT ILIKE ? ";
+ $sql_where .= "(dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
} else {
- $sql_where .= "AND dtb_customer.email NOT ILIKE ? ";
+ $sql_where .= "AND (dtb_customer.email NOT ILIKE ? OR dtb_customer.email_maile NOT ILIKE ?) ";
}
+
} else {
if($sql_where == "") {
- $sql_where .= "dtb_customer.email ILIKE ? ";
+ $sql_where .= "(dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?) ";
} else {
- $sql_where .= "OR dtb_customer.email ILIKE ? ";
+ $sql_where .= "OR (dtb_customer.email ILIKE ? OR dtb_customer.email_maile ILIKE ?) ";
}
}
@@ -164,23 +192,5 @@
$this->setWhere($sql_where);
}
-
- //¡¡·ÈÂÓÍѥ᡼¥ë¥¢¥É¥ì¥¹
- if (strlen($this->arrSql['email_mobile']) > 0) {
- //¥«¥ó¥Þ¶èÀÚ¤ê¤ÇÊ£¿ô¤Î¾ò·ï»ØÄê²Äǽ¤Ë
- $this->arrSql['email_mobile'] = explode(",", $this->arrSql['email_mobile']);
- $sql_where = "";
- foreach($this->arrSql['email_mobile'] as $val) {
- $val = trim($val);
- if($sql_where == "") {
- $sql_where .= "dtb_customer.email_mobile ILIKE ? ";
- } else {
- $sql_where .= "OR dtb_customer.email_mobile ILIKE ? ";
- }
- $this->arrVal[] = $this->addSearchStr($val);
- }
- $this->setWhere($sql_where);
- }
-
-
+
//¡¡HTML-mail
if ( $mode == 'magazine' ){
Index: /branches/dev/data/conf/conf.php
===================================================================
--- /branches/dev/data/conf/conf.php (revision 11609)
+++ /branches/dev/data/conf/conf.php (revision 11627)
@@ -680,4 +680,13 @@
);
+/*¡¡¥á¡¼¥ë¥¢¥É¥ì¥¹¼ïÊÌ¡¡*/
+define ("MAIL_TYPE_PC",1);
+define ("MAIL_TYPE_MOBILE",1);
+$arrMailType = array(
+ MAIL_TYPE_PC => "¥Ñ¥½¥³¥óÍÑ¥¢¥É¥ì¥¹",
+ MAIL_TYPE_MOBILE => "·ÈÂÓÍÑ¥¢¥É¥ì¥¹",
+ );
+
+
/*¡¡1¹Ô¿ô¡¡*/
$arrPageRows = array(
Index: /branches/dev/html/admin/mail/inc_mailmagazine.php
===================================================================
--- /branches/dev/html/admin/mail/inc_mailmagazine.php (revision 11625)
+++ /branches/dev/html/admin/mail/inc_mailmagazine.php (revision 11627)
@@ -44,5 +44,4 @@
array( "column" => "job", "convert" => "" ),
array( "column" => "email", "convert" => "a" ),
- array( "column" => "email_mobile", "convert" => "a" ),
array( "column" => "htmlmail", "convert" => "n" ),
array( "column" => "customer", "convert" => "" ),
@@ -75,6 +74,8 @@
,array( "column" => "buy_total_from", "convert" => "n" )
,array( "column" => "buy_total_to", "convert" => "n" )
- ,array( "column" => "campaign_id", "convert" => "" )
- );
+ ,array( "column" => "campaign_id", "convert" => "" )
+ ,array( "column" => "mail_type", "convert" => "a" )
+
+ );
//--------------------------------------------------------------------------------------------------------------------------------------
Index: /branches/dev/html/admin/mail/index.php
===================================================================
--- /branches/dev/html/admin/mail/index.php (revision 11623)
+++ /branches/dev/html/admin/mail/index.php (revision 11627)
@@ -27,4 +27,6 @@
global $arrSex;
$this->arrSex = $arrSex;
+ global $arrMailType;
+ $this->arrMailType = $arrMailType;
global $arrPageRows;
$this->arrPageRows = $arrPageRows;
@@ -92,4 +94,13 @@
}
$list_data['job_disp'] = $job_disp;
+ }
+
+ // ¥á¡¼¥ë¼ïÊ̤ÎÊÑ´¹
+ if (count($list_data['mail_type']) > 0) {
+ foreach($list_data['mail_type'] as $key => $val){
+ $list_data['mail_type'][$key] = $objPage->arrMailType[$val];
+ $mail_type_disp .= $list_data['mail_type'][$key] . " ";
+ }
+ $list_data['mail_type_disp'] = $mail_type_disp;
}