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 1/2] =?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>

From ee8fd4ede4ba94fa6ffc449fc7d06556de9095fe Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 3 Dec 2013 14:50:06 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=BF=A0?=
 =?UTF-8?q?=ED=8F=B0=20=EC=A0=81=EC=9A=A9=20=ED=9B=84=20cp=5Fmod=20?=
 =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EC=B6=94=EA=B0=80=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 657487763..2fea6acf0 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -869,7 +869,7 @@ $(function() {
             } else {
                 coupon_cancel($cp_dup_el);
                 $("#cp_frm").remove();
-                $cp_dup_el.find(".cp_btn").text("쿠폰적용").focus();
+                $cp_dup_el.find(".cp_btn").text("쿠폰적용").removeClass("cp_mod").focus();
                 $cp_dup_el.find(".cp_cancel").remove();
             }
         }
@@ -887,7 +887,7 @@ $(function() {
 
         calculate_total_price();
         $("#cp_frm").remove();
-        $cp_btn_el.text("쿠폰변경").focus();
+        $cp_btn_el.text("쿠폰변경").addClass("cp_mod").focus();
         if(!$cp_row_el.find(".cp_cancel").size())
             $cp_btn_el.after("<button type=\"button\" class=\"cp_cancel btn_frmline\">쿠폰취소</button>");
     });
@@ -901,7 +901,7 @@ $(function() {
         coupon_cancel($(this).closest("li"));
         calculate_total_price();
         $("#cp_frm").remove();
-        $(this).closest("li").find(".cp_btn").text("쿠폰적용").focus();
+        $(this).closest("li").find(".cp_btn").text("쿠폰적용").removeClass("cp_mod").focus();
         $(this).remove();
     });