From 73b838aff3b1cd9b10fd19c44056f46cb6c6812c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 18 Jul 2013 14:21:57 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9A=94=EC=B2=AD=EB=82=B4=EC=97=AD=EC=9D=B4?=
 =?UTF-8?q?=20=EC=9E=88=EC=9D=84=20=EB=95=8C=20=EC=A0=84=EC=B2=B4=20?=
 =?UTF-8?q?=EC=A3=BC=EB=AC=B8=20=EC=B7=A8=EC=86=8C=20=EB=B6=88=EA=B0=80?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 2c0faa816..50b9e26d9 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -687,7 +687,7 @@ include_once(G4_MSHOP_PATH.'/_head.php');
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($dsp_request && $od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
+            if (!$rq_cnt && $od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>
 
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 51b2f03c5..fb6febedb 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -708,7 +708,7 @@ if(openwin != null) {
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($dsp_request && $od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
+            if (!$rq_cnt && $od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
         ?>
         <button type="button" onclick="document.getElementById('sod_fin_cancelfrm').style.display='block';">주문 취소하기</button>