Index: /branches/dev/html/admin/order/mail.php
===================================================================
--- /branches/dev/html/admin/order/mail.php	(revision 13805)
+++ /branches/dev/html/admin/order/mail.php	(revision 13806)
@@ -138,5 +138,6 @@
 		$where = "order_id = ?";
 		$arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
-		$objFormParam->setParam($arrRet[0]);
+		//$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);
@@ -148,14 +149,4 @@
 		$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"] = "¤ª»Ùʧ¤¤";
-		}
 	}
 }