Index: /branches/dev/html/admin/order/mail.php
===================================================================
--- /branches/dev/html/admin/order/mail.php	(revision 13795)
+++ /branches/dev/html/admin/order/mail.php	(revision 13797)
@@ -122,2 +122,33 @@
 	$objFormParam->addParam("¥Õ¥Ã¥¿¡¼", "footer", LTEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "SPTAB_CHECK"));
 }
+
+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"] = "¤ª»Ùʧ¤¤";
+		}
+	}
+}