Index: /branches/dev/html/admin/customer/index.php
===================================================================
--- /branches/dev/html/admin/customer/index.php	(revision 11533)
+++ /branches/dev/html/admin/customer/index.php	(revision 11606)
@@ -132,6 +132,4 @@
 		$objQuery->conn->query($sql, array($_POST["edit_customer_id"]));
 	}
-	$sql = "DELETE FROM dtb_customer_mail WHERE email = ?";
-	$objQuery->conn->query($sql, array($result_customer[0]["email"]));
 }
 if ($_POST['mode'] == "search" || $_POST['mode'] == "csv"  || $_POST['mode'] == "delete" || $_POST['mode'] == "delete_all") {
@@ -218,6 +216,4 @@
 				$objQuery->conn->query($sql, array($_POST["del_customer_id"]));
 			}
-			$sql = "DELETE FROM dtb_customer_mail WHERE email = ?";
-			$objQuery->conn->query($sql, array($result_customer[0]["email"]));	
 			
 			break;
Index: /branches/dev/html/admin/customer/edit.php
===================================================================
--- /branches/dev/html/admin/customer/edit.php	(revision 11558)
+++ /branches/dev/html/admin/customer/edit.php	(revision 11606)
@@ -80,4 +80,5 @@
 							 array(  "column" => "reminder",	"convert" => "n" ),
 							 array(  "column" => "reminder_answer", "convert" => "aKV" ),
+							 array(  "column" => "mailmaga_flg", "convert" => "n" ),						 
 							 array(  "column" => "note",		"convert" => "aKV" ),
 							 array(  "column" => "point",		"convert" => "n" ),
@@ -106,6 +107,5 @@
 
 	//--¡¡¸ÜµÒ¥Ç¡¼¥¿¼èÆÀ
-	$sql = "SELECT A.*, B.mail_flag FROM dtb_customer AS A LEFT OUTER JOIN dtb_customer_mail AS B USING(email)
-			 WHERE A.del_flg = 0 AND A.customer_id = ?";
+	$sql = "SELECT * FROM dtb_customer WHERE del_flg = 0 AND customer_id = ?";
 	$result = $objConn->getAll($sql, array($_POST["edit_customer_id"]));
 	$objPage->list_data = $result[0];
@@ -207,21 +207,9 @@
 
 	$arrRegist["update_date"] = "Now()";
-	$arrRegistMail["update_date"] = "Now()";
-	$arrRegistMail["mail_flag"] = $array["mail_flag"];
-	$arrRegistMail['email'] = $array['email'];
+
 	//-- ÊÔ½¸ÅÐÏ¿¼Â¹Ô
 	$objConn->query("BEGIN");
 	$objQuery->Insert("dtb_customer", $arrRegist, "customer_id = '" .addslashes($array["customer_id"]). "'");
-	
-	//-- ¥á¥ë¥Þ¥¬ÅÐÏ¿
-	$mailmaga = $objQuery->getAll("SELECT * FROM dtb_customer_mail WHERE email = ?", $array["edit_email"]);
-	
-	if(count($mailmaga) > 0 ){
-		$objQuery->Update("dtb_customer_mail", $arrRegistMail, "email = '" .addslashes($array["edit_email"]). "'");
-	}else{
-		$arrRegistMail["create_date"] = "Now()";
-		//$arrRegist["create_date"] = date( "Y/m/d H:i:s", time());
-		$objQuery->Insert("dtb_customer_mail", $arrRegistMail);
-	}
+
 	$objConn->query("COMMIT");
 }