From c139b81682b09db6cc9d539892973316009b5237 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 3 Dec 2013 13:24:43 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=20=EC=A3=BC=EB=AC=B8=EC=B4=9D?=
 =?UTF-8?q?=EC=95=A1=20=ED=91=9C=EC=8B=9C=EB=B0=A9=EB=B2=95=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderinquiryview.php | 19 ++++++++-----------
 shop/orderinquiryview.php        | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index c5c09573a..6dbc7f2a0 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -132,7 +132,9 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 
         <?php
         // 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
-        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
+        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']
+                        - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon']
+                        - $od['od_cancel_price'];
         ?>
 
         <dl id="sod_bsk_tot">
@@ -164,6 +166,11 @@ include_once(G5_MSHOP_PATH.'/_head.php');
             <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_cost2']); ?> 원</strong></dd>
             <?php } ?>
 
+            <?php if ($od['od_cancel_price'] > 0) { ?>
+            <dt class="sod_bsk_dvr">취소금액</dt>
+            <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_cancel_price']); ?> 원</strong></dd>
+            <?php } ?>
+
             <dt class="sod_bsk_cnt">총계</dt>
             <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_price); ?> 원</strong></dd>
 
@@ -318,16 +325,6 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                 <?php
                 }
 
-                if ($od['od_cancel_price'] > 0)
-                {
-                ?>
-                <tr>
-                    <th scope="row">취소 금액</th>
-                    <td><?php echo display_price($od['od_cancel_price']); ?></td>
-                </tr>
-                <?php
-                }
-
                 if ($od['od_refund_price'] > 0)
                 {
                 ?>
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index ea3ceac50..8b821b176 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -146,7 +146,9 @@ if(openwin != null) {
 
         <?php
         // 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인 - 배송비할인
-        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2'] - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon'];
+        $tot_price = $od['od_cart_price'] + $od['od_send_cost'] + $od['od_send_cost2']
+                        - $od['od_cart_coupon'] - $od['od_coupon'] - $od['od_send_coupon']
+                        - $od['od_cancel_price'];
         ?>
 
         <dl id="sod_bsk_tot">
@@ -178,6 +180,11 @@ if(openwin != null) {
             <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_send_cost2']); ?> 원</strong></dd>
             <?php } ?>
 
+            <?php if ($od['od_cancel_price'] > 0) { ?>
+            <dt class="sod_bsk_dvr">취소금액</dt>
+            <dd class="sod_bsk_dvr"><strong><?php echo number_format($od['od_cancel_price']); ?> 원</strong></dd>
+            <?php } ?>
+
             <dt class="sod_bsk_cnt">총계</dt>
             <dd class="sod_bsk_cnt"><strong><?php echo number_format($tot_price); ?> 원</strong></dd>
 
@@ -330,16 +337,6 @@ if(openwin != null) {
                 <?php
                 }
 
-                if ($od['od_cancel_price'] > 0)
-                {
-                ?>
-                <tr>
-                    <th scope="row">취소 금액</th>
-                    <td><?php echo display_price($od['od_cancel_price']); ?></td>
-                </tr>
-                <?php
-                }
-
                 if ($od['od_refund_price'] > 0)
                 {
                 ?>

From 560160c37792a166ac670a5fe18972fa393bb634 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 3 Dec 2013 14:06:24 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=BF=A0=ED=8F=B0=20=EC=A0=81=EC=9A=A9=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.php | 21 ++++++++++++---------
 shop/orderform.php        |  3 +++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 305580a6a..657487763 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -820,9 +820,9 @@ $(function() {
 
     $(".cp_btn").click(function() {
         $cp_btn_el = $(this);
-        $cp_row_el = $(this).closest("tr");
+        $cp_row_el = $(this).closest("li");
         $("#cp_frm").remove();
-        var it_id = $cp_btn_el.closest("tr").find("input[name^=it_id]").val();
+        var it_id = $cp_btn_el.closest("li").find("input[name^=it_id]").val();
 
         $.post(
             "./orderitemcoupon.php",
@@ -856,7 +856,7 @@ $(function() {
             if(id == cp_id) {
                 cp_dup_idx = index;
                 cp_dup = true;
-                $cp_dup_el = $(this).closest("tr");;
+                $cp_dup_el = $(this).closest("li");;
 
                 return false;
             }
@@ -868,10 +868,13 @@ $(function() {
                 return false;
             } else {
                 coupon_cancel($cp_dup_el);
+                $("#cp_frm").remove();
+                $cp_dup_el.find(".cp_btn").text("쿠폰적용").focus();
+                $cp_dup_el.find(".cp_cancel").remove();
             }
         }
 
-        var $s_el = $cp_row_el.find(".total_price");;
+        var $s_el = $cp_row_el.find(".total_price strong");;
         sell_price = parseInt($cp_row_el.find("input[name^=it_price]").val());
         sell_price = sell_price - parseInt(price);
         if(sell_price < 0) {
@@ -884,9 +887,9 @@ $(function() {
 
         calculate_total_price();
         $("#cp_frm").remove();
-        $cp_btn_el.text("변경").focus();
+        $cp_btn_el.text("쿠폰변경").focus();
         if(!$cp_row_el.find(".cp_cancel").size())
-            $cp_btn_el.after("<button type=\"button\" class=\"cp_cancel btn_frmline\">취소</button>");
+            $cp_btn_el.after("<button type=\"button\" class=\"cp_cancel btn_frmline\">쿠폰취소</button>");
     });
 
     $("#cp_close").live("click", function() {
@@ -895,10 +898,10 @@ $(function() {
     });
 
     $(".cp_cancel").live("click", function() {
-        coupon_cancel($(this).closest("tr"));
+        coupon_cancel($(this).closest("li"));
         calculate_total_price();
         $("#cp_frm").remove();
-        $(this).closest("tr").find(".cp_btn").text("쿠폰적용").focus();
+        $(this).closest("li").find(".cp_btn").text("쿠폰적용").focus();
         $(this).remove();
     });
 
@@ -1103,7 +1106,7 @@ $(function() {
 
 function coupon_cancel($el)
 {
-    var $dup_sell_el = $el.find(".total_price");
+    var $dup_sell_el = $el.find(".total_price strong");
     var $dup_price_el = $el.find("input[name^=cp_price]");
     var org_sell_price = $el.find("input[name^=it_price]").val();
 
diff --git a/shop/orderform.php b/shop/orderform.php
index b1225a84d..feae24756 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -1131,6 +1131,9 @@ $(function() {
                 return false;
             } else {
                 coupon_cancel($cp_dup_el);
+                $("#cp_frm").remove();
+                $cp_dup_el.find(".cp_btn").text("적용").focus();
+                $cp_dup_el.find(".cp_cancel").remove();
             }
         }