Index: /branches/feature-module-paygent/html/test/naka/test.php
===================================================================
--- /branches/feature-module-paygent/html/test/naka/test.php	(revision 14676)
+++ /branches/feature-module-paygent/html/test/naka/test.php	(revision 15180)
@@ -1,8 +1,18 @@
 <?php
 
+/**
+ * 
+ * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ * 
+ */
 require_once("../../require.php");
 
-gfDebugLog($_GET);
+$objSiteSess = new SC_SiteSession();
+$objCartSess = new SC_CartSession();
+$objQuery = new SC_Query();
 
+sfPrintR($_SESSION);
 
 ?>
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.php
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.php	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.php	(revision 15180)
@@ -84,4 +84,6 @@
 $objPage = sfPaygentDisp($objPage, $payment_id);
 
+// »ÙÊ§²ó¿ô
+$objPage->arrPaymentClass = $arrPaymentClass;
 $objPage->arrForm = $objFormParam->getFormParamList();
 $objView->assignobj($objPage);
@@ -92,4 +94,5 @@
 function lfInitParam() {
 	global $objFormParam;
+	$objFormParam->addParam("»ÙÊ§²ó¿ô", "payment_class", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
 	$objFormParam->addParam("¥«¡¼¥ÉÈÖ¹æ1", "card_no01", CREDIT_NO_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
 	$objFormParam->addParam("¥«¡¼¥ÉÈÖ¹æ2", "card_no02", CREDIT_NO_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.php
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.php	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.php	(revision 15180)
@@ -25,9 +25,12 @@
 $objSiteInfo = $objView->objSiteInfo;
 $arrInfo = $objSiteInfo->data;
-
 // ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
 $objFormParam = new SC_FormParam();
+
+// °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆÉ¹þ
+$arrData = sfGetOrderTemp($uniqid);
+
 // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-lfInitParam();
+lfInitParam($arrData);
 // POSTÃÍ¤Î¼èÆÀ
 $objFormParam->setParam($_POST);
@@ -76,4 +79,5 @@
 }
 
+
 $objDate = new SC_Date();
 $objDate->setStartYear(RELEASE_YEAR);
@@ -92,7 +96,7 @@
 //-------------------------------------------------------------------------------------------------------
 /* ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½ */
-function lfInitParam() {
+function lfInitParam($arrData) {
 	global $objFormParam;
-	$objFormParam->addParam("¥Í¥Ã¥È¥Ð¥ó¥¯", "bank_code", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));	
+	$objFormParam->addParam("¶âÍ»µ¡´Ø", "bank_code", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));	
 	$objFormParam->addParam("ÍøÍÑ¼ÔÀ«", "customer_family_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_name01']);
 	$objFormParam->addParam("ÍøÍÑ¼ÔÌ¾", "customer_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_name02']);
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.php
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.php	(revision 15162)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.php	(revision 15180)
@@ -90,68 +90,25 @@
 /* ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½ */
 function lfInitParam($objFormParam) {
-	$objFormParam->addParam("·ÀÌó¥³¡¼¥É", "code", INT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-	$objFormParam->addParam("ÀÜÂ³ÀèURL", "url", URL_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "URL_CHECK"));
+	$objFormParam->addParam("¥Þ¡¼¥Á¥ã¥ó¥ÈID", "merchant_id", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+	$objFormParam->addParam("ÀÜÂ³ID", "connect_id", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+	$objFormParam->addParam("ÀÜÂ³¥Ñ¥¹¥ï¡¼¥É", "connect_password", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));	
+	$objFormParam->addParam("»ÙÊ§´ü¸ÂÆü", "conveni_limit_date", 2, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+	$objFormParam->addParam("»ÙÊ§´ü¸ÂÆü", "atm_limit_date", 2, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+	$objFormParam->addParam("»ÙÊ§ÀâÌÀÊ¸", "payment_detail", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK", "KANA_CHECK"), "¥ª¥ó¥é¥¤¥ó¥·¥ç¥Ã¥Ô¥ó¥°");	
 	$objFormParam->addParam("ÍøÍÑ·èºÑ", "payment", "", "", array("EXIST_CHECK"));
-	$objFormParam->addParam("ÍøÍÑ¥¯¥ì¥¸¥Ã¥È", "credit");	
-	$objFormParam->addParam("ÍøÍÑ¥³¥ó¥Ó¥Ë", "convenience");	
 	return $objFormParam;
 }
-
+	
 // ¥¨¥é¡¼¥Á¥§¥Ã¥¯¤ò¹Ô¤¦
 function lfCheckError(){
 	global $objFormParam;
-	
 	$arrErr = $objFormParam->checkError();
-	
-	// ÍøÍÑ¥¯¥ì¥¸¥Ã¥È¡¢ÍøÍÑ¥³¥ó¥Ó¥Ë¤Î¥¨¥é¡¼¥Á¥§¥Ã¥¯
-	$arrChkPay = $_POST["payment"];
-	foreach((array)$arrChkPay as $key => $val){
-		// ÍøÍÑ¥¯¥ì¥¸¥Ã¥È
-		if($val == 1 and count($_POST["credit"]) <= 0){
-			$arrErr["credit"] = "ÍøÍÑ¥¯¥ì¥¸¥Ã¥È¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£<br />";
-		}
-		// ÍøÍÑ¥³¥ó¥Ó¥Ë
-		if($val == 2 and count($_POST["convenience"]) <= 0){
-			$arrErr["convenience"] = "ÍøÍÑ¥³¥ó¥Ó¥Ë¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£<br />";
-		}
-	}
-
-	// sslÂÐ±þÈ½Äê
-	if(!extension_loaded('openssl') and ereg( "^https://", $_POST["url"] )){
-		$arrErr["url"] = "¤³¤Î¥µ¡¼¥Ð¡¼¤ÏSSL¤ËÂÐ±þ¤·¤Æ¤¤¤Þ¤»¤ó¡£<br>http¤ÇÀÜÂ³¤·¤Æ¤¯¤À¤µ¤¤¡£";
-	}
-
-	// ÀÜÂ³¥Á¥§¥Ã¥¯¤ò¹Ô¤¦
-	if(count($arrErr) == 0) $arrErr = lfChkConnect();
-
+	if($_POST['conveni_limit_date'] != "" && !($_POST['conveni_limit_date'] >= 1 &&  $_POST['conveni_limit_date'] <= 60)) {
+			$arrErr['conveni_limit_date'] = "¢¨ »ÙÊ§´ü¸ÂÆü¤Ï¡¢1¡Á60Æü¤Þ¤Ç¤Î´Ö¤ÇÀßÄê¤·¤Æ¤¯¤À¤µ¤¤¡£<br>";
+	}
+	if($_POST['atm_limit_date'] != "" && !($_POST['atm_limit_date'] >= 0 &&  $_POST['atm_limit_date'] <= 60)) {
+			$arrErr['atm_limit_date'] = "¢¨ »ÙÊ§´ü¸ÂÆü¤Ï¡¢0¡Á60Æü¤Þ¤Ç¤Î´Ö¤ÇÀßÄê¤·¤Æ¤¯¤À¤µ¤¤¡£<br>";
+	}
 	return $arrErr;
-}
-
-// ÀÜÂ³¥Á¥§¥Ã¥¯¤ò¹Ô¤¦
-function lfChkConnect(){
-	global $objQuery;
-	global $objPage;
-	
-	$arrRet = array();
-	
-	// ¥á¡¼¥ë¥¢¥É¥ì¥¹¼èÆÀ
-	$email = $objQuery->getone("SELECT email03 FROM dtb_baseinfo");
-
-	// ·ÀÌó¥³¡¼¥É	
-	(in_array(1, (array)$_POST["payment"])) ? $cre = "1" : $cre = "0";
-	(in_array(2, (array)$_POST["payment"])) ? $con = "1" : $con = "0";
-	$st_code = $cre . "0" . $con . "00-0000-00000";
-	
-	// Á÷¿®¥Ç¡¼¥¿À¸À®
-	$arrSendData = array(
-		'contract_code' => $_POST["code"],		// ·ÀÌó¥³¡¼¥É
-		'user_id' => "connect_test",			// ¥æ¡¼¥¶ID
-		'user_name' => "ÀÜÂ³¥Æ¥¹¥È",			// ¥æ¡¼¥¶Ì¾
-		'user_mail_add' => $email,				// ¥á¡¼¥ë¥¢¥É¥ì¥¹
-		'st_code' => $st_code,					// ·èºÑ¶èÊ¬
-		'process_code' => '3',					// ½èÍý¶èÊ¬(¸ÇÄê)
-		'xml' => '1',							// ±þÅú·Á¼°(¸ÇÄê)
-	);
-	return $arrRet;	
 }
 
@@ -161,51 +118,38 @@
 	
 	//¥Ç¡¼¥¿¤ò¼èÆÀ
-	$arrRet = lfGetPaymentDB(MDL_PAYGENT_ID, "AND del_flg = '0'");
-	
-	// ÃÍ¤ò¥»¥Ã¥È
+	$arrRet = sfGetPaymentDB(MDL_PAYGENT_ID, "AND del_flg = '0'");
 	$objFormParam->setParam($arrRet[0]);
-
+	
+	
 	// ²èÌÌÉ½¼¨ÍÑ¤Ë¥Ç¡¼¥¿¤òÊÑ´¹
 	$arrDisp = array();
+	
 	foreach($arrRet as $key => $val){
 		// ÍøÍÑ·èºÑ¤òÉ½¼¨ÍÑ¤ËÊÑ´¹
 		$arrDisp["payment"][$key] = $val["payment"];
 		
-		// ¥¯¥ì¥¸¥Ã¥È¤Î·èºÑ¶èÊ¬¤ò¼èÆÀ
-		if($val["payment"] == 1) $credit = $val["payment_code"];
-		
+		switch($val['payment']) {
+		// ¥¯¥ì¥¸¥Ã¥È
+		case '1':
+			break;
 		// ¥³¥ó¥Ó¥Ë
-		if($val["payment"] == 2) $arrDisp["convenience"] = $val["convenience"];
-	}
+		case '2':
+			$arrParam = unserialize($val['other_param']);
+			$arrDisp['conveni_limit_date'] = $arrParam['payment_limit_date'];
+			break;
+		// ATM·èºÑ
+		case '3':
+			$arrParam = unserialize($val['other_param']);
+			$arrDisp['payment_detail'] = $arrParam['payment_detail'];
+			$arrDisp['atm_limit_date'] = $arrParam['payment_limit_date'];
+			break;
+		// ¥Í¥Ã¥È¥Ð¥ó¥¯
+		case '4':
+			break;					
+		}
+	}	
+	
 	$objFormParam->setParam($arrDisp);
-	$objFormParam->splitParamCheckBoxes("convenience");
-	
-	// ¥¯¥ì¥¸¥Ã¥È
-	if(substr($credit, 0, 1)) $arrCredit["credit"][] = 1;
-	if(substr($credit, 1, 1)) $arrCredit["credit"][] = 2;
-	$objFormParam->setParam($arrCredit);
-}
-
-// DB¤«¤é¥Ç¡¼¥¿¤ò¼èÆÀ¤¹¤ë
-function lfGetPaymentDB($module_id, $where, $arrWhereVal = array()){
-	global $objQuery;
-	
-	$arrVal = array($module_id);
-	$arrVal = array_merge($arrVal, $arrWhereVal);
-	
-	$arrRet = array();
-	$sql = "SELECT 
-				module_id, 
-				memo01 as code, 
-				memo02 as url, 
-				memo03 as payment,
-				memo04 as payment_code, 
-				memo05 as convenience
-			FROM dtb_payment WHERE module_id = ? " . $where;
-	$arrRet = $objQuery->getall($sql, $arrVal);
-
-	return $arrRet;
-}
-
+}
 
 // ¥Ç¡¼¥¿¤Î¹¹¿·½èÍý
@@ -213,15 +157,6 @@
 	global $objQuery;
 	global $objSess;
-	
-	// ÍøÍÑ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢¥Ï¥¤¥Õ¥ó¶èÀÚ¤ê¤ËÊÔ½¸¤¹¤ë
-	$convCnt = count($_POST["convenience"]);
-	if($convCnt > 0){
-		$convenience = $_POST["convenience"][0];
-		for($i = 1 ; $i < $convCnt ; $i++){
-			$convenience .= "-" . $_POST["convenience"][$i];
-		}
-	}
-		
-	// del_flg¤òºï½ü¤Ë¤·¤Æ¤ª¤¯
+		
+	// ´ØÏ¢¤¹¤ë»ÙÊ§¤¤ÊýË¡¤Îdel_flg¤òºï½ü¤Ë¤·¤Æ¤ª¤¯
 	$del_sql = "UPDATE dtb_payment SET del_flg = 1 WHERE module_id = ? ";
 	$arrDel = array($module_id);
@@ -234,10 +169,8 @@
 
 		// »ÙÊ§ÊýË¡¥Ç¡¼¥¿¤ò¼èÆÀ			
-		$arrPaymentData = lfGetPaymentDB(MDL_PAYGENT_ID, "AND memo03 = ?", array($val));
+		$arrPaymentData = sfGetPaymentDB(MDL_PAYGENT_ID, "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" => "PAYGENT¥¯¥ì¥¸¥Ã¥È"
@@ -249,8 +182,9 @@
 				,"module_id" => $module_id
 				,"module_path" => MODULE_PATH . "mdl_paygent/paygent_credit.php"
-				,"memo01" => $_POST["code"]
-				,"memo02" => $_POST["url"]
+				,"memo01" => $_POST["merchant_id"]
+				,"memo02" => $_POST["connect_id"]
 				,"memo03" => $val
-				,"memo04" => $visa . $jcb . "000-0000-00000"
+				,"memo04" => $_POST["connect_password"]
+				,"memo05" => ""
 				,"del_flg" => "0"
 				,"charge_flg" => "2"
@@ -262,13 +196,6 @@
 		// ¥³¥ó¥Ó¥Ë¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥³¥ó¥Ó¥Ë¤òÅÐÏ¿¤¹¤ë
 		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;
-			}
+			$arrParam = array();
+			$arrParam['payment_limit_date'] = $_POST['conveni_limit_date'];
 			
 			$arrData = array(
@@ -281,9 +208,9 @@
 				,"module_id" => $module_id
 				,"module_path" => MODULE_PATH . "mdl_paygent/paygent_conveni.php"
-				,"memo01" => $_POST["code"]
-				,"memo02" => $_POST["url"]
+				,"memo01" => $_POST["merchant_id"]
+				,"memo02" => $_POST["connect_id"]
 				,"memo03" => $val
-				,"memo04" => "00100-0000-00000"
-				,"memo05" => $convenience
+				,"memo04" => $_POST["connect_password"]
+				,"memo05" => serialize($arrParam)
 				,"del_flg" => "0"
 				,"charge_flg" => "1"
@@ -294,4 +221,8 @@
 		// ATM·èºÑ¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤ÐATM·èºÑ¤òÅÐÏ¿¤¹¤ë
 		if($val == 3){
+			$arrParam = array();
+			$arrParam['payment_detail'] = $_POST['payment_detail'];
+			$arrParam['payment_limit_date'] = $_POST['atm_limit_date'];
+			
 			$arrData = array(
 				"payment_method" => "PAYGENTATM·èºÑ"
@@ -303,9 +234,9 @@
 				,"module_id" => $module_id
 				,"module_path" => MODULE_PATH . "mdl_paygent/paygent_atm.php"
-				,"memo01" => $_POST["code"]
-				,"memo02" => $_POST["url"]
+				,"memo01" => $_POST["merchant_id"]
+				,"memo02" => $_POST["connect_id"]
 				,"memo03" => $val
-				,"memo04" => "00100-0000-00000"
-				,"memo05" => $convenience
+				,"memo04" => $_POST["connect_password"]
+				,"memo05" => serialize($arrParam)
 				,"del_flg" => "0"
 				,"charge_flg" => "1"
@@ -325,9 +256,9 @@
 				,"module_id" => $module_id
 				,"module_path" => MODULE_PATH . "mdl_paygent/paygent_bank.php"
-				,"memo01" => $_POST["code"]
-				,"memo02" => $_POST["url"]
+				,"memo01" => $_POST["merchant_id"]
+				,"memo02" => $_POST["connect_id"]
 				,"memo03" => $val
-				,"memo04" => "00100-0000-00000"
-				,"memo05" => $convenience
+				,"memo04" => $_POST["connect_password"]
+				,"memo05" => ""
 				,"del_flg" => "0"
 				,"charge_flg" => "1"
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.php
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.php	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.php	(revision 15180)
@@ -25,9 +25,12 @@
 $objSiteInfo = $objView->objSiteInfo;
 $arrInfo = $objSiteInfo->data;
-
 // ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
 $objFormParam = new SC_FormParam();
+
+// °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆÉ¹þ
+$arrData = sfGetOrderTemp($uniqid);
+
 // ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-lfInitParam();
+lfInitParam($arrData);
 // POSTÃÍ¤Î¼èÆÀ
 $objFormParam->setParam($_POST);
@@ -35,7 +38,4 @@
 // ¥«¡¼¥È½¸·×½èÍý
 $objPage = sfTotalCart($objPage, $objCartSess, $arrInfo);
-
-// °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆÉ¹þ
-$arrData = sfGetOrderTemp($uniqid);
 
 // ¥«¡¼¥È½¸·×¤ò¸µ¤ËºÇ½ª·×»»
@@ -60,8 +60,8 @@
     	$arrInput = $objFormParam->getHashArray();
 		// ¥¯¥ì¥¸¥Ã¥ÈÅÅÊ¸Á÷¿®
-		list($result, $message) = sfSendPaygentATM($arrData, $arrInput, $uniqid);		
+		$arrRet = sfSendPaygentATM($arrData, $arrInput, $uniqid);		
 		
 		// À®¸ù
-		if($result != "") {
+		if($arrRet['payment_id'] != "") {
             // Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
             $objSiteSess->setRegistFlag();
@@ -84,12 +84,10 @@
 //-------------------------------------------------------------------------------------------------------
 /* ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½ */
-function lfInitParam() {
+function lfInitParam($arrData) {
 	global $objFormParam;
-	$objFormParam->addParam("ÍøÍÑ¼ÔÀ«", "customer_family_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-	$objFormParam->addParam("ÍøÍÑ¼ÔÌ¾", "customer_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-	$objFormParam->addParam("ÍøÍÑ¼ÔÀ«¥«¥Ê", "customer_family_name_kana", STEXT_LEN, "CKVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-	$objFormParam->addParam("ÍøÍÑ¼ÔÌ¾¥«¥Ê", "customer_name_kana", STEXT_LEN, "CKVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-	$objFormParam->addParam("·èºÑÆâÍÆ", "payment_detail", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
-	$objFormParam->addParam("·èºÑÆâÍÆ¥«¥Ê", "payment_detail_kana", STEXT_LEN, "CKVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+	$objFormParam->addParam("ÍøÍÑ¼ÔÀ«", "customer_family_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_name01']);
+	$objFormParam->addParam("ÍøÍÑ¼ÔÌ¾", "customer_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_name02']);
+	$objFormParam->addParam("ÍøÍÑ¼ÔÀ«¥«¥Ê", "customer_family_name_kana", STEXT_LEN, "CKVa", array("EXIST_CHECK", "KANA_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_kana01']);
+	$objFormParam->addParam("ÍøÍÑ¼ÔÌ¾¥«¥Ê", "customer_name_kana", STEXT_LEN, "CKVa", array("EXIST_CHECK", "KANA_CHECK", "MAX_LENGTH_CHECK"), $arrData['order_kana02']);
 }
 
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.tpl
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.tpl	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_credit.tpl	(revision 15180)
@@ -77,4 +77,14 @@
 									</tr>
 									<!--{/if}-->
+									<tr>
+										<td class="fs12" bgcolor="#f3f3f3">»ÙÊ§²ó¿ô</td>
+										<!--{assign var=key1 value="payment_class"}-->
+										<td  bgcolor="#ffffff" class="fs12">
+										<span class="red"><!--{$arrErr[$key1]}--></span>
+										<select name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" >
+										<!--{html_options options=$arrPaymentClass selected=$arrForm[$key1].value}-->
+										</select>
+										</td>
+									</tr>
 									<tr>
 										<td class="fs12" bgcolor="#f3f3f3">¥«¡¼¥ÉÈÖ¹æ</td>
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.tpl
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.tpl	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_bank.tpl	(revision 15180)
@@ -68,5 +68,5 @@
 									<!--{if $tpl_payment_image != ""}-->
 									<tr>
-										<td width="170" class="fs12" bgcolor="#f3f3f3">¤´ÍøÍÑ¤¤¤¿¤À¤±¤ë¥Í¥Ã¥È¥Ð¥ó¥¯¤Î¼ïÎà</td>
+										<td width="170" class="fs12" bgcolor="#f3f3f3">¤´ÍøÍÑ¤¤¤¿¤À¤±¤ë¶âÍ»µ¡´Ø¤Î¼ïÎà</td>
 										<td width="453" bgcolor="#ffffff">
 										<img src="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$tpl_payment_image}-->">
@@ -75,5 +75,5 @@
 									<!--{/if}-->
 									<tr>
-										<td class="fs12" bgcolor="#f3f3f3">¥Í¥Ã¥È¥Ð¥ó¥¯¤ÎÁªÂò</td>
+										<td class="fs12" bgcolor="#f3f3f3">¶âÍ»µ¡´Ø¤ÎÁªÂò</td>
 										<td bgcolor="#ffffff">
 										<table border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -104,5 +104,5 @@
 											<tr><td height="5"></td></tr>
 											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
+												<td class="fs10">¢¨ ÆÃ¼ì¤Ê´Á»ú¤Ï»ÈÍÑ¤Ç¤­¤Ê¤¤¾ì¹ç¤¬¤´¤¶¤¤¤Þ¤¹¡£</td>
 											</tr>
 										</table>
@@ -123,7 +123,4 @@
 											</tr>
 											<tr><td height="5"></td></tr>
-											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
-											</tr>
 										</table>
 										</td>
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.tpl
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.tpl	(revision 15162)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.tpl	(revision 15180)
@@ -41,5 +41,5 @@
 		}
 
-		list = new Array('convenience[]');
+		list = new Array('convenience[]','conveni_limit_date');
 		if(fm[payment[pi]][1].checked){
 			fnChangeDisabled(list, false);
@@ -130,22 +130,30 @@
 									<table width="442" border="0" cellspacing="1" cellpadding="8" summary=" ">
 										<tr class="fs12n">
-											<td width="" bgcolor="#f3f3f3">·ÀÌó¥³¡¼¥É<span class="red">¢¨</span></td>
-											<td width="337" bgcolor="#ffffff">
-											<!--{assign var=key value="code"}-->
-											<span class="red12"><!--{$arrErr[$key]}--></span>
-											<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box10" maxlength="<!--{$smarty.const.INT_LEN}-->">
-											</td>
-										</tr>
-										<tr class="fs12n">
-											<td width="" bgcolor="#f3f3f3">ÀÜÂ³ÀèURL<span class="red">¢¨</span></td>
-											<td width="337" bgcolor="#ffffff">
-											<!--{assign var=key value="url"}-->
-											<span class="red12"><!--{$arrErr[$key]}--></span>
-											<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box40" maxlength="<!--{$smarty.const.URL_LEN}-->">
-											</td>
-										</tr>
-										<tr class="fs12n">
-											<td width="90" bgcolor="#f3f3f3">ÍøÍÑ·èºÑ<span class="red">¢¨</span></td>
-											<td width="337" bgcolor="#ffffff">
+											<td width="100" bgcolor="#f3f3f3">¥Þ¡¼¥Á¥ã¥ó¥ÈID<span class="red">¢¨</span></td>
+											<td width="300" bgcolor="#ffffff">
+											<!--{assign var=key value="merchant_id"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box20" maxlength="<!--{$smarty.const.STEXT_LEN}-->">
+											</td>
+										</tr>
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">ÀÜÂ³ID<span class="red">¢¨</span></td>
+											<td width="" bgcolor="#ffffff">
+											<!--{assign var=key value="connect_id"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box20" maxlength="<!--{$smarty.const.STEXT_LEN}-->">
+											</td>
+										</tr>
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">ÀÜÂ³¥Ñ¥¹¥ï¡¼¥É<span class="red">¢¨</span></td>
+											<td width="" bgcolor="#ffffff">
+											<!--{assign var=key value="connect_password"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											<input type="password" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box20" maxlength="<!--{$smarty.const.STEXT_LEN}-->">
+											</td>
+										</tr>
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">ÍøÍÑ·èºÑ<span class="red">¢¨</span></td>
+											<td width="" bgcolor="#ffffff">
 											<!--{assign var=key value="payment"}-->
 											<span class="red12"><!--{$arrErr[$key]}--></span>
@@ -153,20 +161,40 @@
 											</td>
 										</tr>
-										<tr class="fs12n">
-											<td width="90" bgcolor="#f3f3f3">¥¯¥ì¥¸¥Ã¥È</td>
-											<td width="337" bgcolor="#ffffff">
-											<!--{assign var=key value="credit"}-->
-											<span class="red12"><!--{$arrErr[$key]}--></span>
-											<!--{html_checkboxes_ex name="$key" options=$arrCredit selected=$arrForm[$key].value style=$arrErr[$key]|sfGetErrorColor}-->
-											</td>
-										</tr>
-										<tr class="fs12n">
-											<td width="90" bgcolor="#f3f3f3">¥³¥ó¥Ó¥Ë</td>
-											<td width="337" bgcolor="#ffffff">
-											<!--{assign var=key value="convenience"}-->
-											<span class="red12"><!--{$arrErr[$key]}--></span>
-											<!--{html_checkboxes_ex name="$key" options=$arrConvenience selected=$arrForm[$key].value style=$arrErr[$key]|sfGetErrorColor}-->
-											</td>
-										</tr>
+										
+										<tr class="fs12n">
+											<td colspan="2" width="90" bgcolor="#f3f3f3">¢§¥³¥ó¥Ó¥ËÀßÄê</td>
+										</tr>
+																				
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">»ÙÊ§´ü¸ÂÆü</td>
+											<td width="" bgcolor="#ffffff">
+											<!--{assign var=key value="conveni_limit_date"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											¹ØÆþÆü¤è¤ê<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" size="2" maxlength="2">Æü
+											</td>
+										</tr>
+										
+										<tr class="fs12n">
+											<td colspan="2" width="90" bgcolor="#f3f3f3">¢§ATM·èºÑÀßÄê</td>
+										</tr>
+										
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">»ÙÊ§´ü¸ÂÆü</td>
+											<td width="" bgcolor="#ffffff">
+											<!--{assign var=key value="atm_limit_date"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											¹ØÆþÆü¤è¤ê<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" size="2" maxlength="2">Æü
+											</td>
+										</tr>										
+										<tr class="fs12n">
+											<td width="" bgcolor="#f3f3f3">»ÙÊ§ÀâÌÀÊ¸¡Ê¥«¥Ê¡Ë</td>
+											<td width="" bgcolor="#ffffff">
+											<!--{assign var=key value="payment_detail"}-->
+											<span class="red12"><!--{$arrErr[$key]}--></span>
+											<input type="text" name="<!--{$key}-->" style="ime-mode:disabled; <!--{$arrErr[$key]|sfGetErrorColor}-->" value="<!--{$arrForm[$key].value}-->" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->"><br>
+											<span class="fs12">¢¨ Æþ¶â»þ¤Ë²èÌÌÉ½¼¨¤µ¤ì¤ë³ÎÇ§ÍÑ¤ÎÀâÌÀÊ¸¡Ö¡û¡û¡û¥ª¥ó¥é¥¤¥ó¥·¥ç¥Ã¥×¡×Åù</span>
+											</td>
+										</tr>
+										
 										<!--{assign var=key value="service"}-->
 										<!--{if $arrErr[$key] != ""}-->
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.tpl
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.tpl	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_atm.tpl	(revision 15180)
@@ -89,5 +89,5 @@
 											<tr><td height="5"></td></tr>
 											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
+												<td class="fs10">¢¨ ÆÃ¼ì¤Ê´Á»ú¤Ï»ÈÍÑ¤Ç¤­¤Ê¤¤¾ì¹ç¤¬¤´¤¶¤¤¤Þ¤¹¡£</td>
 											</tr>
 										</table>
@@ -108,41 +108,4 @@
 											</tr>
 											<tr><td height="5"></td></tr>
-											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
-											</tr>
-										</table>
-										</td>
-									</tr>
-									<tr>
-										<td class="fs12" bgcolor="#f3f3f3">·èºÑÆâÍÆ</td>
-										<td bgcolor="#ffffff">
-										<table border="0" cellspacing="0" cellpadding="0" summary=" ">
-											<tr>
-												<!--{assign var=key1 value="payment_detail"}-->
-												<td class="fs12">
-												<span class="red"><!--{$arrErr[$key1]}--></span>
-												<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="ime-mode: disabled; <!--{$arrErr[$key1]|sfGetErrorColor}-->" size="20" class="bo20">&nbsp;&nbsp;
-											</tr>
-											<tr><td height="5"></td></tr>
-											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
-											</tr>
-										</table>
-										</td>
-									</tr>
-									<tr>
-										<td class="fs12" bgcolor="#f3f3f3">·èºÑÆâÍÆ(¥«¥Ê)</td>
-										<td bgcolor="#ffffff">
-										<table border="0" cellspacing="0" cellpadding="0" summary=" ">
-											<tr>
-												<!--{assign var=key1 value="payment_detail_kana"}-->								
-												<td class="fs12">
-												<span class="red"><!--{$arrErr[$key1]}--></span>
-												<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="ime-mode: disabled; <!--{$arrErr[$key1]|sfGetErrorColor}-->" size="20" class="bo20">&nbsp;&nbsp;
-											</tr>
-											<tr><td height="5"></td></tr>
-											<tr>
-												<td class="fs10">È¾³ÑÆþÎÏ¡ÊÎã¡§TARO YAMADA¡Ë</td>
-											</tr>
 										</table>
 										</td>
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.inc
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.inc	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/mdl_paygent.inc	(revision 15180)
@@ -48,4 +48,7 @@
 define ("SEVEN_CHARGE_MAX", 300000);
 
+// ÅÅÊ¸¥Ð¡¼¥¸¥ç¥ó
+define ("TELEGRAM_VERSION", '1.0');
+
 //¥³¥ó¥Ó¥Ë¤Î¼ïÎà
 $arrConvenience = array(
@@ -70,12 +73,12 @@
 	
 // ¥¯¥ì¥¸¥Ã¥ÈÊ¬³ä²ó¿ô
-$arrCreditSplit = array(
+$arrPaymentClass = array(
 	'10' => '°ì³çÊ§¤¤',
-	'61-2' => 'Ê¬³äÊ§¤¤(2²ó)',
-	'61-3' => 'Ê¬³äÊ§¤¤(3²ó)',
-	'61-6' => 'Ê¬³äÊ§¤¤(6²ó)',
-	'61-10' => 'Ê¬³äÊ§¤¤(10²ó)',
-	'61-15' => 'Ê¬³äÊ§¤¤(15²ó)',
-	'61-20' => 'Ê¬³äÊ§¤¤(20²ó)',
+	'61-2' => 'Ê¬³ä2²óÊ§¤¤',
+	'61-3' => 'Ê¬³ä3²óÊ§¤¤',
+	'61-6' => 'Ê¬³ä6²óÊ§¤¤',
+	'61-10' => 'Ê¬³ä10²óÊ§¤¤',
+	'61-15' => 'Ê¬³ä15²óÊ§¤¤',
+	'61-20' => 'Ê¬³ä20²óÊ§¤¤',
 	'80' => '¥ê¥ÜÊ§¤¤'
 );
@@ -89,16 +92,17 @@
  * Ìá¤êÃÍ	¡§¼èÆÀ·ë²Ì
  **************************************************************************************************************/
-function sfGetPaygentShare($telegram_kind, $arrData) {
+function sfGetPaygentShare($telegram_kind, $arrData, $arrParam) {
+	
 	/** ¶¦ÄÌÅÅÊ¸ **/	
 	// ¥Þ¡¼¥Á¥ã¥ó¥ÈID
-	$arrSend['merchant_id'] = "11220";
+	$arrSend['merchant_id'] = $arrParam['merchant_id'];
 	// ÀÜÂ³ID
-	$arrSend['connect_id'] = "lockon";
+	$arrSend['connect_id'] = $arrParam['connect_id'];
 	// ÀÜÂ³¥Ñ¥¹¥ï¡¼¥É
-	$arrSend['connect_password'] = "EFa04KcPwo";
+	$arrSend['connect_password'] = $arrParam['connect_password'];
 	// ÅÅÊ¸¼ïÊÌID
 	$arrSend['telegram_kind'] = $telegram_kind;
 	// ÅÅÊ¸¥Ð¡¼¥¸¥ç¥ó
-	$arrSend['telegram_version'] = "1.0";
+	$arrSend['telegram_version'] = TELEGRAM_VERSION;
 	// ¥Þ¡¼¥Á¥ã¥ó¥È¼è°úID
 	$arrSend['trading_id'] = $arrData['order_id'];
@@ -120,7 +124,11 @@
 	$p->init();
 	
-	// ¶°ÄÞ·èºÑµ°¿Ø
-	$arrSend = sfGetPaygentShare(PAYGENT_CREDIT, $arrData);
-		
+	//¡¡¥¯¥ì¥¸¥Ã¥ÈÍÑ¥Ñ¥é¥á¡¼¥¿¤Î¼èÆÀ
+	$arrPaymentDB = sfGetPaymentDB(MDL_PAYGENT_ID, "AND memo03 = 1");
+	$arrOtherParam = unserialize($arrPaymentDB[0]['other_param']);
+	
+	// ¶¦ÄÌ¥Ç¡¼¥¿¤Î¼èÆÀ
+	$arrSend = sfGetPaygentShare(PAYGENT_CREDIT, $arrData, $arrPaymentDB[0]);
+	
 	/** ¸ÄÊÌÅÅÊ¸ **/
 	
@@ -131,4 +139,7 @@
 	// ¥«¡¼¥ÉÍ­¸ú´ü¸Â(MMYY)
 	$arrSend['card_valid_term'] = $arrInput['card_month'].$arrInput['card_year'];
+	// »ÙÊ§¤¤¶èÊ¬¡¢Ê¬³ä²ó¿ô¤Î¼èÆÀ
+	list($payment_class, $split_count) = split("-", $arrInput['payment_class']);
+		
 	// »ÙÊ§¤¤¶èÊ¬
 	/*
@@ -138,10 +149,10 @@
 	 * 80:¥ê¥Ü¥ë¥Ó¥ó¥°
 	 */
-	$arrSend['payment_class'] = '10';
+	$arrSend['payment_class'] = $payment_class;
 	// Ê¬³ä²ó¿ô
-	$arrSend['split_count'] = '';	
+	$arrSend['split_count'] = $split_count;	
 	// 3D¥»¥­¥å¥¢ÉÞÍÜ¶èÊ¬
 	$arrSend['3dsecure_ryaku'] = '1';
-		
+	
 	// ÅÅÊ¸¤ÎÁ÷ÉÕ
 	foreach($arrSend as $key => $val) {
@@ -160,5 +171,5 @@
 /**************************************************************************************************************
  * ´Ø¿ôÌ¾	¡§sfSendPaygentConveni
- * ½èÍýÆâÍÆ	¡§¥¯¥ì¥¸¥Ã¥È¾ðÊó¤ÎÁ÷¿®
+ * ½èÍýÆâÍÆ	¡§¥³¥ó¥Ó¥Ë¾ðÊó¤ÎÁ÷¿®
  * °ú¿ô1	¡§
  * °ú¿ô2	¡§
@@ -171,6 +182,10 @@
 	$p->init();
 	
-	// ¥³¥ó¥Ó¥Ë·èºÑ
-	$arrSend = sfGetPaygentShare(PAYGENT_CONVENI, $arrData);
+	//¡¡¥³¥ó¥Ó¥ËÍÑ¥Ñ¥é¥á¡¼¥¿¤Î¼èÆÀ
+	$arrPaymentDB = sfGetPaymentDB(MDL_PAYGENT_ID, "AND memo03 = 2");
+	$arrOtherParam = unserialize($arrPaymentDB[0]['other_param']);
+	
+	// ¶¦ÄÌ¥Ç¡¼¥¿¤Î¼èÆÀ
+	$arrSend = sfGetPaygentShare(PAYGENT_CONVENI, $arrData, $arrPaymentDB[0]);
 	
 	/** ¸ÄÊÌÅÅÊ¸ **/
@@ -189,11 +204,9 @@
 	$arrSend['customer_tel'] = $arrInput['customer_tel'];
 	// »ÙÊ§´ü¸ÂÆü
-	$arrSend['payment_limit_date'] = '15';
+	$arrSend['payment_limit_date'] = $arrOtherParam['payment_limit_date'];
 	// ¥³¥ó¥Ó¥Ë´ë¶È¥³¡¼¥É
 	$arrSend['cvs_company_id'] = $arrInput['cvs_company_id'];
 	// »ÙÊ§¼ïÊÌ
 	$arrSend['sales_type'] = '1';
-
-	sfPrintR($arrSend);
 	
 	// ÅÅÊ¸¤ÎÁ÷ÉÕ
@@ -209,7 +222,5 @@
 	// ±þÅú¤ò½èÍý
 	$arrRet = sfPaygentResponse(PAYGENT_CONVENI, $p, $uniqid);
-	
-
-	
+		
 	return $arrRet;
 }
@@ -228,8 +239,11 @@
 	$p->init();
 	
-	// ATM·èºÑ
-	$arrSend = sfGetPaygentShare(PAYGENT_ATM, $arrData);
-	
-	sfPrintR($arrInput);
+	//¡¡ATM·èºÑÍÑ¥Ñ¥é¥á¡¼¥¿¤Î¼èÆÀ
+	$arrPaymentDB = sfGetPaymentDB(MDL_PAYGENT_ID, "AND memo03 = 3");
+	$arrOtherParam = unserialize($arrPaymentDB[0]['other_param']);
+	
+	// ¶¦ÄÌ¥Ç¡¼¥¿¤Î¼èÆÀ
+	$arrSend = sfGetPaygentShare(PAYGENT_ATM, $arrData, $arrPaymentDB[0]);
+	
 	
 	/** ¸ÄÊÌÅÅÊ¸ **/
@@ -247,9 +261,9 @@
 	$arrSend['customer_name_kana'] = mb_convert_kana($arrInput['customer_name_kana'],'k');
 	// ·èºÑÆâÍÆ
-	$arrSend['payment_detail'] = '¥ª¥ó¥é¥¤¥ó¥·¥ç¥Ã¥Ô¥ó¥°';
+	$arrSend['payment_detail'] = $arrOtherParam['payment_detail'];
 	// ·èºÑÆâÍÆÈ¾³Ñ¥«¥Ê
-	$arrSend['payment_detail_kana'] = 'µÝ×²Ý¼®¯ËßÝ¸Þ';
+	$arrSend['payment_detail_kana'] = mb_convert_kana($arrOtherParam['payment_detail'],'k');
 	// »ÙÊ§´ü¸ÂÆü
-	$arrSend['payment_limit_date'] = '15';
+	$arrSend['payment_limit_date'] = $arrOtherParam['payment_limit_date'];
 	
 	// ÅÅÊ¸¤ÎÁ÷ÉÕ
@@ -282,6 +296,10 @@
 	$p->init();
 	
-	// ATM·èºÑ
-	$arrSend = sfGetPaygentShare(PAYGENT_BANK, $arrData);
+	//¡¡¶ä¹ÔNETÍÑ¥Ñ¥é¥á¡¼¥¿¤Î¼èÆÀ
+	$arrPaymentDB = sfGetPaymentDB(MDL_PAYGENT_ID, "AND memo03 = 4");
+	$arrOtherParam = unserialize($arrPaymentDB[0]['other_param']);
+	
+	// ¶¦ÄÌ¥Ç¡¼¥¿¤Î¼èÆÀ
+	$arrSend = sfGetPaygentShare(PAYGENT_BANK, $arrData, $arrPaymentDB[0]);
 
 	/** ¸ÄÊÌÅÅÊ¸ **/
@@ -441,3 +459,31 @@
 	return $objPage;
 }
+
+/**************************************************************************************************************
+ * ´Ø¿ôÌ¾	¡§sfGetPaymentDB
+ * ½èÍýÆâÍÆ	¡§É¬Í×¤Ê¥Ç¡¼¥¿¤ò¼èÆÀ¤¹¤ë¡£
+ * °ú¿ô1	¡§
+ * °ú¿ô2	¡§
+ * °ú¿ô3	¡§
+ * Ìá¤êÃÍ	¡§¼èÆÀ·ë²Ì
+ **************************************************************************************************************/
+function sfGetPaymentDB($module_id, $where, $arrWhereVal = array()){
+	$objQuery = new SC_Query();
+		
+	$arrVal = array($module_id);
+	$arrVal = array_merge($arrVal, $arrWhereVal);
+	
+	$arrRet = array();
+	$sql = "SELECT 
+				module_id, 
+				memo01 as merchant_id, 
+				memo02 as connect_id, 
+				memo03 as payment,
+				memo04 as connect_password, 
+				memo05 as other_param
+			FROM dtb_payment WHERE module_id = ? " . $where;
+	$arrRet = $objQuery->getall($sql, $arrVal);
+
+	return $arrRet;
+}
 ?>
Index: /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_conveni.php
===================================================================
--- /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_conveni.php	(revision 15168)
+++ /branches/feature-module-paygent/data/downloads/module/mdl_paygent/paygent_conveni.php	(revision 15180)
@@ -60,8 +60,8 @@
     	$arrInput = $objFormParam->getHashArray();
 		// ¥¯¥ì¥¸¥Ã¥ÈÅÅÊ¸Á÷¿®
-		list($result, $message) = sfSendPaygentConveni($arrData, $arrInput, $uniqid);		
+		$arrRet = sfSendPaygentConveni($arrData, $arrInput, $uniqid);		
 		
 		// À®¸ù
-		if($result != "") {
+		if($arrRet['payment_id'] != "") {
             // Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
             $objSiteSess->setRegistFlag();
