From fc775578421a871d188a5654aa9b72bf2d3c8d20 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 17 Sep 2013 10:11:22 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=A0=EA=B0=9D=EC=B7=A8=EC=86=8C=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=BD=94=EB=93=9C=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

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

diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index efd1a2fd0..c3f802c0e 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -24,7 +24,7 @@ $ct = sql_fetch($sql);
 
 $uid = md5($od['od_id'].$od['od_time'].$od['od_ip']);
 
-if($od['od_status'] != G5_OD_STATUS_ORDER && $od['od_status'] != G5_OD_STATUS_SETTLE) {
+if($od['od_cancel_price'] > 0 || $ct['od_count1'] != $ct['od_count2']) {
     alert("취소할 수 있는 주문이 아닙니다.", G5_SHOP_URL."/orderinquiryview.php?od_id=$od_id&amp;uid=$uid");
 }
 
@@ -64,7 +64,7 @@ sql_query(" update {$g5['g5_shop_cart_table']} set ct_status = '취소' where od
 
 // 주문 취소
 $cancel_memo = addslashes($cancel_memo);
-$cancel_price = $od['od_misu'];
+$cancel_price = $od['od_cart_price'];
 
 $sql = " update {$g5['g5_shop_order_table']}
             set od_send_cost = '0',
@@ -77,7 +77,7 @@ $sql = " update {$g5['g5_shop_order_table']}
                 od_coupon = '0',
                 od_send_coupon = '0',
                 od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G5_TIME_YMDHIS." (취소이유 : {$cancel_memo})\")
-            where od_id = '$od_id' "
+            where od_id = '$od_id' ";
 sql_query($sql);
 
 // 주문취소 회원의 포인트를 되돌려 줌