From 85ddc13c20dc71bd02aaf22cd350c72bd42d8cf1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 12 Jul 2013 09:18:08 +0900
Subject: [PATCH] =?UTF-8?q?#252=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=20=EC=B7=A8=EC=86=8C=EC=9A=94=EC=B2=AD=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=9E=91=EC=97=85=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/admin.menu400.shop_1of2.php |  1 +
 shop/orderinquiryview.php       | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php
index 2f6d44288..13b38eaf8 100644
--- a/adm/admin.menu400.shop_1of2.php
+++ b/adm/admin.menu400.shop_1of2.php
@@ -7,6 +7,7 @@ $menu['menu400'] = array (
     array('400400', '주문내역', G4_ADMIN_URL.'/shop_admin/orderlist.php', 'scf_order', 1),
     array('400410', '주문개별내역', G4_ADMIN_URL.'/shop_admin/orderstatuslist.php', 'scf_order_by', 1),
     array('400420', '주문통합내역', G4_ADMIN_URL.'/shop_admin/orderlist2.php', 'scf_order_all', 1),
+    array('400430', '취소교환반품내역', G4_ADMIN_URL.'/shop_admin/orderrequestlist.php', 'scf_request', 1),
     array('400200', '분류관리', G4_ADMIN_URL.'/shop_admin/categorylist.php', 'scf_cate'),
     array('400300', '상품관리', G4_ADMIN_URL.'/shop_admin/itemlist.php', 'scf_item'),
     array('400660', '상품문의', G4_ADMIN_URL.'/shop_admin/itemqalist.php', 'scf_item_qna'),
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 6013b0dae..766f54089 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -167,7 +167,7 @@ if(openwin != null) {
                 <label for="rq_content">요청내용</label>
                 <input type="text" name="rq_content" value="" id="rq_content" required class="required frm_input">
                 <input type="submit" value="확인" class="btn_frmline">
-                <button type="button" id="request_cancel" class="btn_cancel">닫기</button>
+                <button type="button" id="request_close" class="btn_cancel">닫기</button>
             </div>
         </div>
 
@@ -584,7 +584,7 @@ if(openwin != null) {
         <?php
         // 취소한 내역이 없다면
         if ($tot_cancel_amount == 0) {
-            if ($od_count1 == $od_count2 && ($od['od_settle_case'] != '가상계좌' || $od['od_receipt_amount'] == 0)) {
+            if ($dsp_request && $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>
 
@@ -647,12 +647,13 @@ $(function() {
         }
 
         $("input[name=rq_content]").val("");
-        $("#request_form").show();
+        $("#request_form label").text(req_act+"내용");
+        $("#request_form div").css("display", "block");
 
     });
 
-    $("#request_cancel").click(function() {
-        $("#request_form").hide();
+    $("#request_close").click(function() {
+        $("#request_form div").css("display", "none");
     });
 });