Index: /branches/dev/html/admin/order/mail.php
===================================================================
--- /branches/dev/html/admin/order/mail.php	(revision 13821)
+++ /branches/dev/html/admin/order/mail.php	(revision 13822)
@@ -24,11 +24,4 @@
 $objView = new SC_AdminView();
 $objSess = new SC_Session();
-
-// ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
-$objFormParam = new SC_FormParam();
-// ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
-lfInitParam();
-
-// ǧ¾Ú²ÄÈݤÎȽÄê
 sfIsSuccess($objSess);
 
@@ -40,8 +33,14 @@
 }
 
-$objPage->tpl_order_id = order_id;
+
+$objPage->tpl_order_id = $_POST['order_id'];
+$objPage->tpl_order_name01 = $_POST['order_name01'];
+$objPage->tpl_order_name02 = $_POST['order_name02'];
+$objPage->tpl_order_email = $_POST['order_email'];
 print_r($_POST);
-// DB¤«¤é¼õÃí¾ðÊó¤òÆɤ߹þ¤à
-lfGetOrderData($order_id);
+// ¥Ñ¥é¥á¡¼¥¿´ÉÍý¥¯¥é¥¹
+$objFormParam = new SC_FormParam();
+// ¥Ñ¥é¥á¡¼¥¿¾ðÊó¤Î½é´ü²½
+lfInitParam();
 
 switch($_POST['mode']) {
@@ -125,18 +124,32 @@
 }
 
-function lfGetOrderData($order_id) {
-	global $objFormParam;
-	global $objPage;
-	if(sfIsInt($order_id)) {
-		// DB¤«¤é¼õÃí¾ðÊó¤òÆɤ߹þ¤à
-		$objQuery = new SC_Query();
-		$where = "order_id = ?";
-		$arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
-		//$objFormParam->setParam($arrRet[0]);
-		print_r($arrRet);
-		list($point, $total_point) = sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']);
-		$objFormParam->setValue('total_point', $total_point);
-		$objFormParam->setValue('point', $point);
-		$objPage->arrDisp = $arrRet[0];
-	}
-}
+//function lfGetOrderData($order_id) {
+//	global $objFormParam;
+//	global $objPage;
+//	if(sfIsInt($order_id)) {
+//		// DB¤«¤é¼õÃí¾ðÊó¤òÆɤ߹þ¤à
+//		$objQuery = new SC_Query();
+//		$where = "order_id = ?";
+//		$arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
+//		$objFormParam->setParam($arrRet[0]);
+//		list($point, $total_point) = sfGetCustomerPoint($order_id, $arrRet[0]['use_point'], $arrRet[0]['add_point']);
+//		$objFormParam->setValue('total_point', $total_point);
+//		$objFormParam->setValue('point', $point);
+//		$objPage->arrDisp = $arrRet[0];
+//		// ¼õÃí¾ÜºÙ¥Ç¡¼¥¿¤Î¼èÆÀ
+//		$arrRet = lfGetOrderDetail($order_id);
+//		$arrRet = sfSwapArray($arrRet);
+//		$objPage->arrDisp = array_merge($objPage->arrDisp, $arrRet);
+//		$objFormParam->setParam($arrRet);
+//		
+//		// ¤½¤Î¾»Ùʧ¤¤¾ðÊó¤òɽ¼¨
+//		if($objPage->arrDisp["memo02"] != "") $objPage->arrDisp["payment_info"] = unserialize($objPage->arrDisp["memo02"]);
+//		if($objPage->arrDisp["memo01"] == PAYMENT_CREDIT_ID){
+//			$objPage->arrDisp["payment_type"] = "¥¯¥ì¥¸¥Ã¥È·èºÑ";
+//		}elseif($objPage->arrDisp["memo01"] == PAYMENT_CONVENIENCE_ID){
+//			$objPage->arrDisp["payment_type"] = "¥³¥ó¥Ó¥Ë·èºÑ";
+//		}else{
+//			$objPage->arrDisp["payment_type"] = "¤ª»Ùʧ¤¤";
+//		}
+//	}
+//}