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] =?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)
                 {
                 ?>