Index: temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php
===================================================================
--- temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php	(revision 8476)
+++ temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php	(revision 8483)
@@ -61,92 +61,9 @@
 	// ÆþÎÏ¥¨¥é¡¼È½Äê
 	$objPage->arrErr = lfCheckError();
-	
+
+	// ¥¨¥é¡¼¤Ê¤·¤Î¾ì¹ç¤Ë¤Ï¥Ç¡¼¥¿¤ò¹¹¿·	
 	if(count($objPage->arrErr) == 0) {
-		// ÍøÍÑ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥Ï¥¤¥Õ¥ó¶èÀÚ¤ê¤ËÊÔ½¸¤¹¤ë
-		$convCnt = count($_POST["convenience"]);
-		if($convCnt > 0){
-			$convenience = $_POST["convenience"][0];
-			for($i = 1 ; $i < $convCnt ; $i++){
-				$convenience .= "-" . $_POST["convenience"][$i];
-			}
-		}
-		
-		// del_flg¤òºï½ü¤Ë¤·¤Æ¤ª¤¯
-		$del_sql = "UPDATE dtb_payment SET del_flg = 1 WHERE module_id = ? ";
-		$arrDel = array(MDL_EPSILON_ID);
-		$objQuery->query($del_sql, $arrDel);
-		
-		// ¥Ç¡¼¥¿ÅÐÏ¿
-		foreach($_POST["payment"] as $key => $val){
-			// ¥é¥ó¥¯¤ÎºÇÂçÃͤò¼èÆÀ¤¹¤ë
-			$max_rank = $objQuery->getone("SELECT max(rank) FROM dtb_payment");
-
-			// »ÙʧÊýË¡¥Ç¡¼¥¿¤ò¼èÆÀ			
-			$arrPaymentData = lfGetPaymentDB("AND memo03 = ?", array($val));
-			
-			// ¥¯¥ì¥¸¥Ã¥È¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥¯¥ì¥¸¥Ã¥È¤òÅÐÏ¿¤¹¤ë
-			if($val == 1){
-				(in_array(1, $_POST["credit"])) ? $visa = "1" : $visa = "0";
-				(in_array(2, $_POST["credit"])) ? $jcb = "1" : $jcb = "0";
-				$arrData = array(			
-					"payment_method" => "Epsilon¥¯¥ì¥¸¥Ã¥È"
-					,"fix" => 3
-					,"creator_id" => $objSess->member_id
-					,"create_date" => "now()"
-					,"update_date" => "now()"
-					,"upper_rule" => 500000
-					,"module_id" => MDL_EPSILON_ID
-					,"module_path" => MODULE_PATH . "mdl_epsilon/card.php"
-					,"memo01" => $_POST["code"]
-					,"memo02" => $_POST["url"]
-					,"memo03" => $val
-					,"memo04" => $visa . $jcb . "000-0000-00000"
-					,"del_flg" => "0"
-					,"charge_flg" => "2"
-					,"upper_rule_max" => CHARGE_MAX
-					
-				);
-			}
-
-			// ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥³¥ó¥Ó¥Ë¤òÅÐÏ¿¤¹¤ë
-			if($val == 2){
-				
-				// ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¤ßÁªÂò¤·¤¿¾ì¹ç¤Ë¤ÏÍøÍѾå¸Â¤ò30Ëü¤Ë¤¹¤ë¡£
-				if(count($_POST["convenience"]) == 1 and $_POST["convenience"][0] == 11) {
-					$upper_rule_max = SEVEN_CHARGE_MAX;
-					($arrPaymentData["upper_rule"] > $upper_rule_max or $arrPaymentData["upper_rule"] == "") ? $upper_rule = $upper_rule_max : $upper_rule = $arrPaymentData["upper_rule"];
-				}else{
-					$upper_rule_max = CHARGE_MAX;
-					$upper_rule = $upper_rule_max;
-				}
-				
-				$arrData = array(
-					"payment_method" => "Epsilon¥³¥ó¥Ó¥Ë"
-					,"fix" => 3
-					,"creator_id" => $objSess->member_id
-					,"create_date" => "now()"
-					,"update_date" => "now()"
-					,"upper_rule" => $upper_rule
-					,"module_id" => MDL_EPSILON_ID
-					,"module_path" => MODULE_PATH . "mdl_epsilon/convenience.php"
-					,"memo01" => $_POST["code"]
-					,"memo02" => $_POST["url"]
-					,"memo03" => $val
-					,"memo04" => "00100-0000-00000"
-					,"memo05" => $convenience
-					,"del_flg" => "0"
-					,"charge_flg" => "1"
-					,"upper_rule_max" => $upper_rule_max
-				);
-			}
-			
-			// ¥Ç¡¼¥¿¤¬Â¸ºß¤·¤Æ¤¤¤ì¤ÐUPDATE¡¢Ìµ¤±¤ì¤ÐINSERT
-			if(count($arrPaymentData) > 0){
-				$objQuery->update("dtb_payment", $arrData, " module_id = '" . MDL_EPSILON_ID . "' AND memo03 = '" . $val ."'");
-			}else{
-				$arrData["rank"] = $max_rank + 1;
-				$objQuery->insert("dtb_payment", $arrData);
-			}
-		}
+		// ¥Ç¡¼¥¿¹¹¿·
+		lfUpdPaymentDB();
 		
 		// javascript¼Â¹Ô
@@ -338,3 +255,96 @@
 }
 
+
+// ¥Ç¡¼¥¿¤Î¹¹¿·½èÍý
+function lfUpdPaymentDB(){
+	global $objQuery;
+	
+// ÍøÍÑ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥Ï¥¤¥Õ¥ó¶èÀÚ¤ê¤ËÊÔ½¸¤¹¤ë
+	$convCnt = count($_POST["convenience"]);
+	if($convCnt > 0){
+		$convenience = $_POST["convenience"][0];
+		for($i = 1 ; $i < $convCnt ; $i++){
+			$convenience .= "-" . $_POST["convenience"][$i];
+		}
+	}
+	
+	// del_flg¤òºï½ü¤Ë¤·¤Æ¤ª¤¯
+	$del_sql = "UPDATE dtb_payment SET del_flg = 1 WHERE module_id = ? ";
+	$arrDel = array(MDL_EPSILON_ID);
+	$objQuery->query($del_sql, $arrDel);
+	
+	// ¥Ç¡¼¥¿ÅÐÏ¿
+	foreach($_POST["payment"] as $key => $val){
+		// ¥é¥ó¥¯¤ÎºÇÂçÃͤò¼èÆÀ¤¹¤ë
+		$max_rank = $objQuery->getone("SELECT max(rank) FROM dtb_payment");
+
+		// »ÙʧÊýË¡¥Ç¡¼¥¿¤ò¼èÆÀ			
+		$arrPaymentData = lfGetPaymentDB("AND memo03 = ?", array($val));
+		
+		// ¥¯¥ì¥¸¥Ã¥È¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥¯¥ì¥¸¥Ã¥È¤òÅÐÏ¿¤¹¤ë
+		if($val == 1){
+			(in_array(1, $_POST["credit"])) ? $visa = "1" : $visa = "0";
+			(in_array(2, $_POST["credit"])) ? $jcb = "1" : $jcb = "0";
+			$arrData = array(			
+				"payment_method" => "Epsilon¥¯¥ì¥¸¥Ã¥È"
+				,"fix" => 3
+				,"creator_id" => $objSess->member_id
+				,"create_date" => "now()"
+				,"update_date" => "now()"
+				,"upper_rule" => 500000
+				,"module_id" => MDL_EPSILON_ID
+				,"module_path" => MODULE_PATH . "mdl_epsilon/card.php"
+				,"memo01" => $_POST["code"]
+				,"memo02" => $_POST["url"]
+				,"memo03" => $val
+				,"memo04" => $visa . $jcb . "000-0000-00000"
+				,"del_flg" => "0"
+				,"charge_flg" => "2"
+				,"upper_rule_max" => CHARGE_MAX
+				
+			);
+		}
+
+		// ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥³¥ó¥Ó¥Ë¤òÅÐÏ¿¤¹¤ë
+		if($val == 2){
+			
+			// ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¤ßÁªÂò¤·¤¿¾ì¹ç¤Ë¤ÏÍøÍѾå¸Â¤ò30Ëü¤Ë¤¹¤ë¡£
+			if(count($_POST["convenience"]) == 1 and $_POST["convenience"][0] == 11) {
+				$upper_rule_max = SEVEN_CHARGE_MAX;
+				($arrPaymentData["upper_rule"] > $upper_rule_max or $arrPaymentData["upper_rule"] == "") ? $upper_rule = $upper_rule_max : $upper_rule = $arrPaymentData["upper_rule"];
+			}else{
+				$upper_rule_max = CHARGE_MAX;
+				$upper_rule = $upper_rule_max;
+			}
+			
+			$arrData = array(
+				"payment_method" => "Epsilon¥³¥ó¥Ó¥Ë"
+				,"fix" => 3
+				,"creator_id" => $objSess->member_id
+				,"create_date" => "now()"
+				,"update_date" => "now()"
+				,"upper_rule" => $upper_rule
+				,"module_id" => MDL_EPSILON_ID
+				,"module_path" => MODULE_PATH . "mdl_epsilon/convenience.php"
+				,"memo01" => $_POST["code"]
+				,"memo02" => $_POST["url"]
+				,"memo03" => $val
+				,"memo04" => "00100-0000-00000"
+				,"memo05" => $convenience
+				,"del_flg" => "0"
+				,"charge_flg" => "1"
+				,"upper_rule_max" => $upper_rule_max
+			);
+		}
+
+		// ¥Ç¡¼¥¿¤¬Â¸ºß¤·¤Æ¤¤¤ì¤ÐUPDATE¡¢Ìµ¤±¤ì¤ÐINSERT
+		if(count($arrPaymentData) > 0){
+			$objQuery->update("dtb_payment", $arrData, " module_id = '" . MDL_EPSILON_ID . "' AND memo03 = '" . $val ."'");
+		}else{
+			$arrData["rank"] = $max_rank + 1;
+			$objQuery->insert("dtb_payment", $arrData);
+		}
+	}
+}
+
 ?>