Index: /branches/version-1/html/admin/order/edit.php
===================================================================
--- /branches/version-1/html/admin/order/edit.php	(revision 16762)
+++ /branches/version-1/html/admin/order/edit.php	(revision 17241)
@@ -11,9 +11,13 @@
 }
 
+if(file_exists(MODULE_PATH . "mdl_cybs/mdl_cybs.inc")) {
+    require_once(MODULE_PATH . "mdl_cybs/mdl_cybs.inc");
+}
+
 class LC_Page {
 	function LC_Page() {
 		$this->tpl_mainpage = 'order/edit.tpl';
 		$this->tpl_subnavi = 'order/subnavi.tpl';
-		$this->tpl_mainno = 'order';		
+		$this->tpl_mainno = 'order';
 		$this->tpl_subno = 'index';
 		$this->tpl_subtitle = '¼õÃí´ÉÍý';
@@ -71,5 +75,5 @@
 	// POST¾ðÊó¤Ç¾å½ñ¤­
 	$objFormParam->setParam($_POST);
-	
+
 	// ÆþÎÏÃͤÎÊÑ´¹
 	$objFormParam->convParam();
@@ -100,6 +104,22 @@
 	$objPage->paygent_return = sfPaygentOrder($_POST['paygent_type'], $order_id);
 	break;
+
+// ¥µ¥¤¥Ð¡¼¥½¡¼¥¹ Í¿¿®¥¹¥Æ¡¼¥¿¥¹¤ÎÊѹ¹
+case 'cybs_change_auth_status':
+    $objPage = sfCybsChangeAuthStatus($objPage, $_POST['cybs_auth_status']);
+    break;
+
+// ¥µ¥¤¥Ð¡¼¥½¡¼¥¹ ³Æ¼ïÏ¢·È½èÍý
+case 'cybs_do_ics_application':
+    $objPage = sfCybsDoIcsApplication($objPage, $_POST['cybs_app']);
+    break;
+
 default:
 	break;
+}
+
+// ¥µ¥¤¥Ð¡¼¥½¡¼¥¹ÍѼõÃíÊÔ½¸¥Ú¡¼¥¸¤Î½é´ü²½
+if(function_exists("sfCybsOrderPage")) {
+    $objPage = sfCybsOrderPage($objPage);
 }
 
@@ -149,5 +169,5 @@
 	$objFormParam->addParam("¤ª»ÙʧÊýˡ̾¾Î", "payment_method");
 	$objFormParam->addParam("ÇÛÁ÷»þ´Ö", "deliv_time");
-	
+
 	// ¼õÃí¾ÜºÙ¾ðÊó
 	$objFormParam->addParam("ñ²Á", "price", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), '0');
@@ -192,5 +212,5 @@
 		$objPage->arrDisp = array_merge($objPage->arrDisp, $arrRet);
 		$objFormParam->setParam($arrRet);
-		
+
 		// ¤½¤Î¾»Ùʧ¤¤¾ðÊó¤òɽ¼¨
 		if($objPage->arrDisp["memo02"] != "") $objPage->arrDisp["payment_info"] = unserialize($objPage->arrDisp["memo02"]);
@@ -222,5 +242,5 @@
 	$objErr = new SC_CheckError($arrRet);
 	$objErr->arrErr = $objFormParam->checkError();
-	
+
 	return $objErr->arrErr;
 }
@@ -229,7 +249,7 @@
 function lfCheek($arrInfo) {
 	global $objFormParam;
-		
+
 	$arrVal = $objFormParam->getHashArray();
-			
+
 	// ¾¦ÉʤμïÎà¿ô
 	$max = count($arrVal['quantity']);
@@ -245,7 +265,7 @@
 		$totalpoint += sfPrePoint($arrVal['price'][$i], $arrVal['point_rate'][$i]) * $arrVal['quantity'][$i];
 	}
-	
+
 	// ¾ÃÈñÀÇ
-	$arrVal['tax'] = $totaltax;	
+	$arrVal['tax'] = $totaltax;
 	// ¾®·×
 	$arrVal['subtotal'] = $subtotal;
@@ -254,14 +274,14 @@
 	// ¤ª»Ùʧ¤¤¹ç·×
 	$arrVal['payment_total'] = $arrVal['total'] - ($arrVal['use_point'] * POINT_VALUE);
-	
+
 	// ²Ã»»¥Ý¥¤¥ó¥È
 	$arrVal['add_point'] = sfGetAddPoint($totalpoint, $arrVal['use_point'], $arrInfo);
-		
+
 	list($arrVal['point'], $arrVal['total_point']) = sfGetCustomerPoint($_POST['order_id'], $arrVal['use_point'], $arrVal['add_point']);
-		
+
 	if($arrVal['total'] < 0) {
 		$arrErr['total'] = '¹ç·×³Û¤¬¥Þ¥¤¥Ê¥¹É½¼¨¤Ë¤Ê¤é¤Ê¤¤¤è¤¦¤ËÄ´À°¤·¤Æ²¼¤µ¤¤¡£<br />';
 	}
-	
+
 	if($arrVal['payment_total'] < 0) {
 		$arrErr['payment_total'] = '¤ª»Ùʧ¤¤¹ç·×³Û¤¬¥Þ¥¤¥Ê¥¹É½¼¨¤Ë¤Ê¤é¤Ê¤¤¤è¤¦¤ËÄ´À°¤·¤Æ²¼¤µ¤¤¡£<br />';
@@ -280,10 +300,10 @@
 	global $objFormParam;
 	$objQuery = new SC_Query();
-	
+
 	$objQuery->begin();
 
 	// ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
 	$arrRet =  $objFormParam->getHashArray();
-	
+
 	foreach($arrRet as $key => $val) {
 		// ÇÛÎó¤ÏÅÐÏ¿¤·¤Ê¤¤
@@ -292,10 +312,10 @@
 		}
 	}
-	
+
 	unset($sqlval['total_point']);
 	unset($sqlval['point']);
-			
+
 	$where = "order_id = ?";
-	
+
 	// ¼õÃí¥¹¥Æ¡¼¥¿¥¹¤ÎȽÄê
 	if ($sqlval['status'] == ODERSTATUS_COMMIT) {
@@ -303,7 +323,7 @@
 		$sqlval['commit_date'] = "Now()";
 	}
-    
+
     $sqlval['update_date'] = "Now()";
-	
+
 	// ¼õÃí¥Æ¡¼¥Ö¥ë¤Î¹¹¿·
 	$objQuery->update("dtb_order", $sqlval, $where, array($order_id));
@@ -317,5 +337,5 @@
 	$sql .= "     ,update_date = NOW()";
 	$sql .= " WHERE order_id = ?";
-	
+
 	if ($arrRet['deliv_time_id'] == "") {
 		$deliv_time_id = 0;
@@ -329,5 +349,5 @@
 	$arrDetail = $objFormParam->getSwapArray(array("product_id", "product_code", "product_name", "price", "quantity", "point_rate", "classcategory_id1", "classcategory_id2", "classcategory_name1", "classcategory_name2"));
 	$objQuery->delete("dtb_order_detail", $where, array($order_id));
-	
+
 	$max = count($arrDetail);
 	for($i = 0; $i < $max; $i++) {
@@ -343,5 +363,5 @@
 		$sqlval['classcategory_id2'] = $arrDetail[$i]['classcategory_id2'];
 		$sqlval['classcategory_name1'] = $arrDetail[$i]['classcategory_name1'];
-		$sqlval['classcategory_name2'] = $arrDetail[$i]['classcategory_name2'];		
+		$sqlval['classcategory_name2'] = $arrDetail[$i]['classcategory_name2'];
 		$objQuery->insert("dtb_order_detail", $sqlval);
 	}