From de6780881a1c83645d64b83f9d7642dce362efae Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 3 Dec 2013 14:45:40 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=EC=97=90=20=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=ED=95=A0=EC=9D=B8=EA=B8=88=EC=95=A1=20=ED=91=9C=EC=8B=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 324b92599..4b67c181f 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -412,6 +412,10 @@ $result = sql_query($sql);
                     <td><?php echo display_price($od['od_free_mny']); ?></td>
                 </tr>
                 <?php } ?>
+                <tr>
+                    <th scope="row">결제할인금액</th>
+                    <td><?php echo display_price($od['od_coupon']); ?></td>
+                </tr>
                 <tr>
                     <th scope="row">포인트</th>
                     <td><?php echo display_point($od['od_receipt_point']); ?></td>
@@ -429,15 +433,14 @@ $result = sql_query($sql);
                     <th scope="row">운송장번호</th>
                     <td><?php echo $od['od_invoice']; ?></td>
                 </tr>
-                <?php } ?>
                 <tr>
                     <th scope="row">배송일시</th>
                     <td><?php echo is_null_time($od['od_invoice_time']) ? "" : $od['od_invoice_time']; ?></td>
                 </tr>
+                <?php } ?>
                 <tr>
                     <th scope="row"><label for="od_send_cost">배송비</label></th>
                     <td>
-                        <?php echo help("주문취소시 배송비는 취소되지 않으므로 이 배송비를 0으로 설정하여 미수금을 맞추십시오."); ?>
                         <input type="text" name="od_send_cost" value="<?php echo $od['od_send_cost']; ?>" id="od_send_cost" class="frm_input" size="10"> 원
                     </td>
                 </tr>