Index: /branches/version-1/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-1/data/Smarty/templates/admin/order/edit.tpl	(revision 16810)
+++ /branches/version-1/data/Smarty/templates/admin/order/edit.tpl	(revision 17231)
@@ -39,5 +39,5 @@
 						<td background="<!--{$smarty.const.URL_DIR}-->img/contents/main_left.jpg"><img src="<!--{$smarty.const.URL_DIR}-->img/common/_.gif" width="14" height="1" alt=""></td>
 						<td bgcolor="#cccccc">
-						
+
 						<!--ÅÐÏ¿¥Æ¡¼¥Ö¥ë¤³¤³¤«¤é-->
 						<table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
@@ -61,5 +61,5 @@
 							</tr>
 						</table>
-						
+
 						<!--{* ¥Ú¥¤¥¸¥§¥ó¥È¥â¥¸¥å¡¼¥ëÏ¢·ÈÍÑ *}-->
 						<!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_paygent/paygent_order.tpl}-->
@@ -67,5 +67,11 @@
 							<!--{include file=$path}-->
 						<!--{/if}-->
-						
+
+						<!--{* ¥µ¥¤¥Ð¡¼¥½¡¼¥¹Ï¢·ÈÍÑ *}-->
+						<!--{assign var=path value=`$smarty.const.MODULE_PATH`mdl_cybs/mdl_cybs_order_edit.tpl}-->
+						<!--{if file_exists($path)}-->
+							<!--{include file=$path}-->
+						<!--{/if}-->
+
 						<!--¢§¤ªµÒÍ;ðÊ󤳤³¤«¤é-->
 						<table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
@@ -86,9 +92,9 @@
 							</tr>
 						</table>
-						
+
 						<table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
 							<tr><td colspan="3"><img src="<!--{$smarty.const.URL_DIR}-->img/contents/main_bar.jpg" width="678" height="10" alt=""></td></tr>
 						</table>
-						
+
 						<table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
 							<!--{foreach key=key item=item from=$arrSearchHidden}-->
@@ -138,9 +144,9 @@
 						</table>
 						<!--¢¥¤ªµÒÍ;ðÊ󤳤³¤Þ¤Ç-->
-						
+
 						<table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
 							<tr><td colspan="3"><img src="<!--{$smarty.const.URL_DIR}-->img/contents/main_bar.jpg" width="678" height="10" alt=""></td></tr>
 						</table>
-						
+
 						<!--¢§ÇÛÁ÷Àè¾ðÊ󤳤³¤«¤é-->
 						<table width="678" border="0" cellspacing="1" cellpadding="8" summary=" ">
@@ -174,5 +180,5 @@
 								¢©
 								<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->"  size="6" class="box6" />
-								 - 
+								 -
 								<input type="text"  name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" />
 								<input type="button" name="address_input" value="½»½êÆþÎÏ" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'deliv_zip01', 'deliv_zip02', 'deliv_pref', 'deliv_addr01');" />
@@ -186,6 +192,6 @@
 								<span class="red12"><!--{$arrErr[$key2]}--></span>
 								<span class="red12"><!--{$arrErr[$key3]}--></span>
-								<input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> - 
-								<input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" /> - 
+								<input type="text" name="<!--{$arrForm[$key1].keyname}-->" value="<!--{$arrForm[$key1].value|escape}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" size="6" class="box6" /> -
+								<input type="text" name="<!--{$arrForm[$key2].keyname}-->" value="<!--{$arrForm[$key2].value|escape}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->"  size="6" class="box6" /> -
 								<input type="text" name="<!--{$arrForm[$key3].keyname}-->" value="<!--{$arrForm[$key3].value|escape}-->" maxlength="<!--{$arrForm[$key3].length}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->" size="6" class="box6" />
 								</td>
@@ -199,5 +205,5 @@
 										<!--{assign var=key value="deliv_pref"}-->
 										<span class="red12"><!--{$arrErr[$key]}--></span>
-										<select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">							
+										<select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
 										<option value="" selected="">ÅÔÆ»Éܸ©¤òÁªÂò</option>
 										<!--{html_options options=$arrPref selected=$arrForm[$key].value}-->
@@ -257,9 +263,9 @@
 								<input type="hidden" name="product_code[]" value="<!--{$arrDisp.product_code[$key]}-->">
 								<input type="hidden" name="product_name[]" value="<!--{$arrDisp.product_name[$key]}-->">
-								<input type="hidden" name="point_rate[]" value="<!--{$arrDisp.point_rate[$key]}-->">	
-								<input type="hidden" name="classcategory_id1[]" value="<!--{$arrDisp.classcategory_id1[$key]}-->">	
+								<input type="hidden" name="point_rate[]" value="<!--{$arrDisp.point_rate[$key]}-->">
+								<input type="hidden" name="classcategory_id1[]" value="<!--{$arrDisp.classcategory_id1[$key]}-->">
 								<input type="hidden" name="classcategory_id2[]" value="<!--{$arrDisp.classcategory_id2[$key]}-->">
-								<input type="hidden" name="classcategory_name1[]" value="<!--{$arrDisp.classcategory_name1[$key]}-->">	
-								<input type="hidden" name="classcategory_name2[]" value="<!--{$arrDisp.classcategory_name2[$key]}-->">				
+								<input type="hidden" name="classcategory_name1[]" value="<!--{$arrDisp.classcategory_name1[$key]}-->">
+								<input type="hidden" name="classcategory_name2[]" value="<!--{$arrDisp.classcategory_name2[$key]}-->">
 								<td width="84" align="center"><input type="text" name="price[]" value="<!--{$arrForm.price.value[$key]|escape}-->" size="6" class="box6" maxlength="<!--{$arrForm.price.length}-->"/> ±ß</td>
 								<td width="45" align="center"><input type="text" name="quantity[]" value="<!--{$arrForm.quantity.value[$key]|escape}-->" size="3" class="box3" maxlength="<!--{$arrForm.quantity.length}-->"/></td>
@@ -364,5 +370,5 @@
 								</select></td>
 							</tr>
-							
+
 							<!--{if $arrDisp.payment_info|@count > 0}-->
 							<tr class="fs12n">
@@ -377,5 +383,5 @@
 							</tr>
 							<!--{/if}-->
-							
+
 							<tr class="fs12n">
 								<td bgcolor="#f2f1ec" colspan="6">¢§»þ´Ö»ØÄê</td>
@@ -385,5 +391,5 @@
 								<!--{assign var=key value="deliv_time_id"}-->
 								<span class="red12"><!--{$arrErr[$key]}--></span>
-								<select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">	
+								<select name="<!--{$key}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
 								<option value="" selected="0">»ØÄê̵¤·</option>
 								<!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}-->
@@ -414,5 +420,5 @@
 						</table>
 						<!--¢¥¼õÃí¾¦ÉʾðÊ󤳤³¤Þ¤Ç-->
-				
+
 						<table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
 							<tr>
@@ -427,5 +433,5 @@
 									<tr>
 										<td>
-											<!--{if count($arrSearchHidden) > 0}-->		
+											<!--{if count($arrSearchHidden) > 0}-->
 											<a href="#" onmouseover="chgImg('<!--{$smarty.const.URL_DIR}-->img/contents/btn_search_back_on.jpg','back');" onmouseout="chgImg('<!--{$smarty.const.URL_DIR}-->img/contents/btn_search_back.jpg','back');" onclick="fnChangeAction('<!--{$smarty.const.URL_SEARCH_ORDER}-->'); fnModeSubmit('search','',''); return false;"><img src="<!--{$smarty.const.URL_DIR}-->img/contents/btn_search_back.jpg" width="123" height="24" alt="¸¡º÷²èÌ̤ËÌá¤ë" border="0" name="back"></a>
 											<!--{/if}-->
@@ -460,3 +466,3 @@
 </form>
 </table>
-<!--¡ú¡ú¥á¥¤¥ó¥³¥ó¥Æ¥ó¥Ä¡ú¡ú-->		
+<!--¡ú¡ú¥á¥¤¥ó¥³¥ó¥Æ¥ó¥Ä¡ú¡ú-->