Index: /temp/trunk/data/downloads/module/mdl_epsilon/convenience.php
===================================================================
--- /temp/trunk/data/downloads/module/mdl_epsilon/convenience.php	(revision 7573)
+++ /temp/trunk/data/downloads/module/mdl_epsilon/convenience.php	(revision 7796)
@@ -7,11 +7,11 @@
 
 require_once("../require.php");
+require_once(DATA_PATH . "module/Request.php");
+require_once(MODULE_PATH . "mdl_epsilon/mdl_epsilon.inc");
 
 class LC_Page {
 	function LC_Page() {
-		$this->tpl_mainpage = "shopping/convenience.tpl";
-		$this->tpl_css = '/css/layout/shopping/pay.css';
-		global $arrCONVENIENCE;
-		$this->arrCONVENIENCE = $arrCONVENIENCE;
+		/** ɬ¤º»ØÄꤹ¤ë **/
+		$this->tpl_mainpage = 'mdl_epsilon/card.tpl';			// ¥á¥¤¥ó¥Æ¥ó¥×¥ì¡¼¥È
 		/*
 		 session_start»þ¤Îno-cache¥Ø¥Ã¥À¡¼¤òÍÞÀ©¤¹¤ë¤³¤È¤Ç
@@ -23,196 +23,74 @@
 }
 
-$objPage = new LC_Page;
-$objView = new SC_SiteView;
-$objSiteSess = new SC_SiteSession;
-$objCartSess = new SC_CartSession;
+$objPage = new LC_Page();
+$objView = new SC_SiteView();
 $objSiteInfo = $objView->objSiteInfo;
-$objCustomer = new SC_Customer;
-
 $arrInfo = $objSiteInfo->data;
 
-// ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
-$objFormParam = new SC_FormParam();
-// ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-lfInitParam();
-// POSTÃͤμèÆÀ
-$objFormParam->setParam($_POST);
-
-// ¥¢¥¯¥»¥¹¤ÎÀµÅöÀ­¤ÎȽÄê
+// ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ¤È¹ØÆþ¾õÂÖ¤ÎÀµÅöÀ­¤ò¥Á¥§¥Ã¥¯
 $uniqid = sfCheckNormalAccess($objSiteSess, $objCartSess);
 
-//¥³¥ó¥Ó¥Ë¤Î¼ïÎà¤Ç½èÍý¥Õ¥¡¥¤¥ë¤òÀÚ¤êÂؤ¨¤ë
-switch($_POST['mode']) {
-//´°Î»
-case 'complete':
-	//¥¨¥é¡¼¥Á¥§¥Ã¥¯
-	$objPage->arrErr = lfCheckError();
-	if($objPage->arrErr == "") {
-		// ¥Þ¡¼¥Á¥ã¥ó¥È¾ðÊóÀßÄê¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É
-		//require("merchant.ini");
-		// ·èºÑ½èÍý¥Ñ¥Ã¥±¡¼¥¸¤ò¥¤¥ó¥¯¥ë¡¼¥É
-		require_once(DATA_PATH . "vtcvsmdk/mdk/lib/BSCVS/Transaction.php");
-		require_once(DATA_PATH . "vtcvsmdk/mdk/lib/BSCVS/Config.php");
-		require_once(DATA_PATH . "vtcvsmdk/mdk/lib/BSCVS/Log.php");
+// ¥«¡¼¥È½¸·×½èÍý
+$objPage = sfTotalCart($objPage, $objCartSess, $arrInfo);
+
+// °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆɹþ
+$arrData = sfGetOrderTemp($uniqid);
+
+// ¥«¡¼¥È½¸·×¤ò¸µ¤ËºÇ½ª·×»»
+$arrData = sfTotalConfirm($arrData, $objPage, $objCartSess, $arrInfo);
+
+// Âåɽ¾¦ÉʾðÊó
+$arrMainProduct = $objPage->arrProductsClass[0];
+
+// »Ùʧ¤¤¾ðÊó¤ò¼èÆÀ
+$arrPayment = $objQuery->getall("SELECT module_id, memo01, memo02, memo03, memo04, memo05, memo06, memo07, memo08, memo09, memo10 FROM dtb_payment WHERE payment_id = ? ", array($arrData["payment_id"]));
+
+// ¥Ç¡¼¥¿Á÷¿®ÀèCGI
+$order_url = $arrPayment[0]["memo02"];
+
+// trans_code¤ËÃͤ¬¤¢¤ê³î¤Ä¡¢Àµ¾ï½ªÎ»¤Î¤È¤­¤Ï¥ª¡¼¥À¡¼³Îǧ¤ò¹Ô¤¦¡£
+if($_GET["result"] == "1"){
 	
-		// ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥¤¥ó¥¹¥¿¥ó¥¹¤òºîÀ®
-		$objTran = new Transaction;
-		
-		// ÀßÄê¥Õ¥¡¥¤¥ë cvsgwlib.conf ¤Ë¤è¤ê¥¤¥ó¥¹¥¿¥ó¥¹¤ò½é´ü²½
-		$objTran->setServer(DATA_PATH . "vtcvsmdk/mdk/conf/cvsgwlib.conf");
-		
-		// ¥«¡¼¥È½¸·×½èÍý
-		$objPage = sfTotalCart($objPage, $objCartSess, $arrInfo);
-		// °ì»þ¼õÃí¥Æ¡¼¥Ö¥ë¤ÎÆɹþ
-		$arrData = sfGetOrderTemp($uniqid);
-		// ¥«¡¼¥È½¸·×¤ò¸µ¤ËºÇ½ª·×»»
-		$arrPrice = sfTotalConfirm($arrData, $objPage, $objCartSess, $arrInfo, $objCustomer);
-		
-		// ¥í¥°½ÐÎÏ¥¤¥ó¥¹¥¿¥ó¥¹¤ò¼èÆÀ
-		$logger = $objTran->getLogger();
-		
-		// ¥í¥°½ÐÎÏ(¤³¤³¤«¤é)
-		$logger->logprint('DEBUG', '<<< »Ùʧ·ë²Ì²èÌ̽èÍý³«»Ï... >>>');
-		
-		//¥³¥ó¥Ó¥Ë¤Î¼ïÎफ¤éCVS¥¿¥¤¥×¤ò·èÄꤹ¤ë
-		switch($_POST['convenience']) {
-		//¥»¥Ö¥ó¥¤¥ì¥Ö¥ó
-		case '1':
-			$cvs_type = '01';
-			break;
-		//¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È
-		case '2':
-			$cvs_type = '03';
-			break;
-		//¥µ¡¼¥¯¥ëK¥µ¥ó¥¯¥¹
-		case '3':
-			$cvs_type = '04';
-			break;
-		//¤½¤Î¾
-		case '4':
-		case '5':
-			$cvs_type = '02';
-			break;
-		default:
-			sfDispSiteError(PAGE_ERROR);
-			break;
-		}
+	// Àµ¾ï¤Ê¿ä°Ü¤Ç¤¢¤ë¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
+	$objSiteSess->setRegistFlag();
 	
-		//¥ê¥¯¥¨¥¹¥ÈÅÅʸ
-		$arrRequest = array(
-			// ¼è°ú ID
-		    REQ_ORDER_ID => $uniqid,		
-		    // CVS¥¿¥¤¥×
-		    REQ_CVS_TYPE => $cvs_type,
-		    // ¶â³Û
-		    REQ_AMOUNT => $arrPrice['payment_total'],
-		    // »Ùʧ´ü¸Â
-		    REQ_PAY_LIMIT => lfGetPayLimit(),
-		    // »á̾¡ÊÃí°Õ¡§¥Ù¥ê¥È¥é¥ó¥¹¥³¥ó¥Ó¥Ë¥²¡¼¥È¥¦¥§¥¤¤Ï UTF-8 ¤Îʸ»ú¤Î¤ß¤ò
-		    // ¼õ¤±ÉÕ¤±¤ë¤¿¤á¡¢¥²¡¼¥È¥¦¥§¥¤Àܳ¤ÎÁ°¤Ë UTF-8 ¥³¡¼¥É¤ØÊÑ´¹¡Ë
-		    REQ_NAME1 => $objTran->jCode($arrData['order_name01'], ENCODE_UTF8),
-		    REQ_NAME2 => $objTran->jCode($arrData['order_name02'], ENCODE_UTF8),
-			REQ_KANA => $objTran->jCode($arrData['order_kana01'].$arrData['order_kana02'], ENCODE_UTF8),
-		    // ÅÅÏÃÈÖ¹æ
-		    REQ_TEL_NO => $arrData['order_tel01']."-".$arrData['order_tel02']."-".$arrData['order_tel03']
-		);
+	// GET¥Ç¡¼¥¿¤òÊݸ
+	$arrVal["credit_result"] = $_GET["result"];
+	$arrVal["memo01"] = 1;
+	$arrVal["memo03"] = $arrPayment[0]["module_id"];
+	
+	// ¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥³¡¼¥É
+	$arrMemo["trans_code"] = array("name"=>"Epsilon¥È¥é¥ó¥¶¥¯¥·¥ç¥ó¥³¡¼¥É", "value" => $_GET["trans_code"]);
+	$arrVal["memo02"] = serialize($arrMemo);
 
-		//¥Ù¥ê¥È¥é¥ó¥¹¥³¥ó¥Ó¥Ë¥²¡¼¥È¥¦¥§¥¤¤Ë¥ê¥¯¥¨¥¹¥ÈÅÅʸ¤òÅꤲ¡¢¼è°ú·ë²Ì¤ò³ÊǼ
-		$arrResult = $objTran->doTransaction(CMD_ENTRY, $arrRequest);
-		//¼è°úÀ®¸ù
-		if($arrResult[RES_ACTION_CODE] = '010') {
-			//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-			switch($_POST['convenience']) {
-			//¥»¥Ö¥ó¥¤¥ì¥Ö¥ó
-			case '1':
-				$arrRet['cv_type'] = '1';										//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-				$arrRet['cv_payment_url'] = $arrResult[RES_HARAIKOMI_URL];		//ʧ¹þɼURL(PC)
-				$arrRet['cv_receipt_no'] = $arrResult[RES_RECEIPT_NO];			//ʧ¹þɼÈÖ¹æ
-				break;
-			//¥Õ¥¡¥ß¥ê¡¼¥Þ¡¼¥È
-			case '2':
-				$company_code = substr($arrResult[RES_RECEIPT_NO], 0, 5);
-				$order_no = substr($arrResult[RES_RECEIPT_NO], 6, 12);
-				$arrRet['cv_type'] = '2';						//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-				$arrRet['cv_company_code'] = $company_code;	//´ë¶È¥³¡¼¥É
-				$arrRet['cv_order_no'] = $order_no;			//¼õÉÕÈÖ¹æ
-				break;
-			//¥µ¡¼¥¯¥ëK¥µ¥ó¥¯¥¹
-			case '3':
-				$mobile_url = preg_replace("/https:\/\/.+?\/JLPcon/","https://w2.kessai.info/JLM/JLMcon", $arrResult[RES_HARAIKOMI_URL]);
-				$arrRet['cv_type'] = '3';										//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-				$arrRet['cv_payment_url'] = $arrResult[RES_HARAIKOMI_URL];		//ʧ¹þɼURL
-				$arrRet['cv_payment_mobile_url'] = $mobile_url;					//ʧ¹þɼURL(¥â¥Ð¥¤¥ë)
-				break;
-			//¥í¡¼¥½¥ó¡¢¥»¥¤¥³¡¼¥Þ¡¼¥È
-			case '4':
-				$arrRet['cv_type'] = '4';									//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-				$arrRet['cv_receipt_no'] = $arrResult[RES_RECEIPT_NO];		//ʧ¹þɼÈÖ¹æ
-				break;
-			//¥ß¥Ë¥¹¥È¥Ã¥×¡¢¥Ç¥¤¥ê¡¼¥ä¥Þ¥¶¥­¡¢¥ä¥Þ¥¶¥­¥Ç¥¤¥ê¡¼¥¹¥È¥¢
-			case '5':
-				$arrRet['cv_type'] = '5';										//¥³¥ó¥Ó¥Ë¤Î¼ïÎà
-				$arrRet['cv_payment_url'] = $arrResult[RES_HARAIKOMI_URL];		//ʧ¹þɼURL(PC)
-				break;
-			}
-			//»Ùʧ´ü¸Â
-			$arrRet['cv_payment_limit'] = lfGetPayLimit();
-			//¥³¥ó¥Ó¥Ë·èºÑ¾ðÊó¤ò³ÊǼ
-			$sqlval['conveni_data'] = serialize($arrRet);
-			$objQuery = new SC_Query;
-			$objQuery->update("dtb_order_temp", $sqlval, "order_temp_id = ? ", array($uniqid));
-			// Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
-			$objSiteSess->setRegistFlag();
-			//¹ØÆþ´°Î»¥Ú¡¼¥¸¤Ø
-			header("Location: " . URL_SHOP_COMPLETE);
-		//¼ºÇÔ
-		} else {
-			$objPage->arrErr = '¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£';
-		}
-		
-		# ¥í¥°½ÐÎÏ(¤³¤³¤Þ¤Ç)
-		$logger->logprint('DEBUG', '<<< »Ùʧ·ë²Ì²èÌ̽èÍý½ªÎ». >>>');
-	
-	}
-	break;
-//Ìá¤ë
-case 'return':
-	// Àµ¾ï¤ËÅÐÏ¿¤µ¤ì¤¿¤³¤È¤òµ­Ï¿¤·¤Æ¤ª¤¯
-	$objSiteSess->setRegistFlag();
-	// ³Îǧ¥Ú¡¼¥¸¤Ø°ÜÆ°
-	header("Location: " . URL_SHOP_CONFIRM);
-	exit;
-	break;
+	// ¼õÃí°ì»þ¥Æ¡¼¥Ö¥ë¤Ë¹¹¿·
+	sfRegistTempOrder($uniqid, $arrVal);
+
+	// ´°Î»²èÌ̤Ø
+	header("Location: " .  URL_SHOP_COMPLETE);
 }
 
-$objView->assignobj($objPage);
-$objView->display(SITE_FRAME);
+// Á÷¿®¥Ç¡¼¥¿À¸À®
+$arrData = array(
+	'contract_code' => $arrPayment[0]["memo01"],						// ·ÀÌ󥳡¼¥É
+	'user_id' => $arrData["customer_id"],								// ¥æ¡¼¥¶ID
+	'user_name' => $arrData["order_name01"].$arrData["order_name02"],	// ¥æ¡¼¥¶Ì¾
+	'user_mail_add' => $arrData["order_email"],							// ¥á¡¼¥ë¥¢¥É¥ì¥¹
+	'order_number' => $arrData["order_id"],								// ¥ª¡¼¥À¡¼ÈÖ¹æ
+	'item_code' => $arrMainProduct["product_code"],						// ¾¦ÉÊ¥³¡¼¥É(Âåɽ)
+	'item_name' => $arrMainProduct["name"],								// ¾¦ÉÊ̾(Âåɽ)
+	'item_price' => $arrData["payment_total"],							// ¾¦ÉʲÁ³Ê(Àǹþ¤ßÁí³Û)
+	'st_code' => $arrPayment[0]["memo04"],								// ·èºÑ¶èʬ
+	'mission_code' => '1',												// ²Ý¶â¶èʬ(¸ÇÄê)
+	'process_code' => '1',												// ½èÍý¶èʬ(¸ÇÄê)
+	'xml' => '1',														// ±þÅú·Á¼°(¸ÇÄê)
+	'memo1' => ECCUBE_PAYMENT,											// ͽÈ÷01
+	'memo2' => ''														// ͽÈ÷02
+);
 
-//-------------------------------------------------------------------------------------------------------------
+// ¥Ç¡¼¥¿Á÷¿®
+sfPostPaymentData($order_url, $arrData);
 
-//»Ùʧ´ü¸Â¤ÎÀ¸À®
-function lfGetPayLimit() {
-    $date = sprintf("%10s",
-                    date("Y/m/d",mktime(0,0,0,date("m"),
-                    date("d")+CV_PAYMENT_LIMIT,date("Y"))));
-    return $date;
-}
-
-//¥Ñ¥é¥á¡¼¥¿¤Î½é´ü²½
-function lfInitParam() {
-	global $objFormParam;
-	$objFormParam->addParam("¥³¥ó¥Ó¥Ë¤Î¼ïÎà", "convenience", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
-}
-	
-// ÆþÎÏÆâÍƤΥÁ¥§¥Ã¥¯
-function lfCheckError() {
-	global $objFormParam;
-	// ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
-	$arrRet =  $objFormParam->getHashArray();
-	$objErr = new SC_CheckError($arrRet);
-	$objErr->arrErr = $objFormParam->checkError();
-	
-	return $objErr->arrErr;
-}
+//---------------------------------------------------------------------------------------------------------------------------------------------------------
 
 ?>