From 09438a26fd12044d5937af07ceb97436545c5358 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 15 Jul 2013 17:06:33 +0900
Subject: [PATCH] =?UTF-8?q?#252=20=EC=B7=A8=EC=86=8C=EC=9A=94=EC=B2=AD=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9D=98=20=ED=8E=B8=EC=9D=98=EC=84=B1?=
 =?UTF-8?q?=EC=9D=84=20=EC=9C=84=ED=95=B4=20=EC=9A=94=EC=B2=AD=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EC=A3=BC=EB=AC=B8?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=EC=97=90=20=EB=85=B8=EC=B6=9C=ED=95=98?=
 =?UTF-8?q?=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

---
 adm/shop_admin/orderform.php                  |  2 +-
 ...questview.inc.php => orderrequest.inc.php} |  2 +-
 adm/shop_admin/orderrequestform.php           |  6 +---
 adm/shop_admin/orderrequestlist.php           |  6 ++--
 adm/shop_admin/orderrequestview.php           | 35 -------------------
 5 files changed, 7 insertions(+), 44 deletions(-)
 rename adm/shop_admin/{orderrequestview.inc.php => orderrequest.inc.php} (94%)
 delete mode 100644 adm/shop_admin/orderrequestview.php

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 010fb5ac1..af2d3538a 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -325,7 +325,7 @@ if($request) {
         // 요청 처리폼 include
         $rq_id = $rq['rq_id'];
         $disp_list = 0;
-        include_once('./orderrequestview.inc.php');
+        include_once('./orderrequest.inc.php');
         ?>
     </div>
 </section>
diff --git a/adm/shop_admin/orderrequestview.inc.php b/adm/shop_admin/orderrequest.inc.php
similarity index 94%
rename from adm/shop_admin/orderrequestview.inc.php
rename to adm/shop_admin/orderrequest.inc.php
index 8a1a5785f..2a5c04bac 100644
--- a/adm/shop_admin/orderrequestview.inc.php
+++ b/adm/shop_admin/orderrequest.inc.php
@@ -74,7 +74,7 @@ $result = sql_query($sql);
 <div id="order_request">
     <?php
     // 요청 처리폼 include
-    $disp_list = 1;
+    $rq_qstr = "sst=$sst&amp;sod=$sod&amp;sfl=$sfl&amp;stx=$stx&amp;save_stx=$save_stx&amp;page=$page&amp;rq_type=$rq_type";
     include_once('./orderrequestform.php');
     ?>
 </div>
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
index b202b3670..2d243d6a0 100644
--- a/adm/shop_admin/orderrequestform.php
+++ b/adm/shop_admin/orderrequestform.php
@@ -63,8 +63,6 @@ $sql = " select ct_id, it_id, it_name, ct_option, ct_price, ct_qty, io_type, io_
             where uq_id = '{$od['uq_id']}'
             order by ct_id ";
 $result = sql_query($sql);
-
-$qstr2  = $qstr.'&amp;rq_type='.$rq_type.'&amp;save_stx='.$stx;
 ?>
 
 <section>
@@ -231,9 +229,7 @@ $qstr2  = $qstr.'&amp;rq_type='.$rq_type.'&amp;save_stx='.$stx;
     </table>
     <div>
         <button type="submit" id="request_submit">확인</button>
-        <?php if($disp_list) { ?>
-        <a href="./orderrequestlist.php?<?php echo $qstr2; ?>">목록</a>
-        <?php } ?>
+        <a href="./orderrequestlist.php?<?php echo $rq_qstr; ?>">목록</a>
     </div>
     </form>
 </section>
diff --git a/adm/shop_admin/orderrequestlist.php b/adm/shop_admin/orderrequestlist.php
index 106883fba..1702aac94 100644
--- a/adm/shop_admin/orderrequestlist.php
+++ b/adm/shop_admin/orderrequestlist.php
@@ -164,6 +164,8 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
         $tmp = sql_fetch($sql);
         if($tmp['rq_time'])
             $done_date = substr($tmp['rq_time'], 2, 8);
+
+        $order_href = './orderform.php?od_id='.$row['od_id'].'&amp;uq_id='.$row['uq_id'].'&amp;rq_type='.$rq_type.'&amp;'.$qstr;
     ?>
 
     <tr>
@@ -173,14 +175,14 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
             <input type="hidden" name="rq_id[<?php echo $i; ?>]" value="<?php echo $row['rq_id']; ?>">
         </td>
         <td><?php echo $type; ?></td>
-        <td><?php echo $row['od_id']; ?></td>
+        <td><a href="<?php echo $order_href; ?>"><?php echo $row['od_id']; ?></a></td>
         <td><?php echo number_format($row['od_temp_amount']); ?></td>
         <td><?php echo $row['od_name']; ?></td>
         <td><?php echo $it_name; ?></td>
         <td><?php echo $reg_date; ?></td>
         <td><?php echo $done_date; ?></td>
         <td>
-            <a href="./orderrequestview.php?rq_id=<?php echo $row['rq_id']; ?>&amp;<?php echo $qstr; ?>"><span class="sound_only"><?php echo $it_name. ' '.$type.'요청'; ?> </span>보기</a>
+            <a href="<?php echo $order_href; ?>"><span class="sound_only"><?php echo $it_name. ' '.$type.'요청'; ?> </span>보기</a>
             <a href="./orderrequestdelete.php?w=d&amp;rq_id=<?php echo $row['rq_id']; ?>&amp;<?php echo $qstr; ?>" onclick="return del_confirm();"><span class="sound_only"><?php echo $it_name. ' '.$type.'요청'; ?> </span>삭제</a>
         </td>
     </tr>
diff --git a/adm/shop_admin/orderrequestview.php b/adm/shop_admin/orderrequestview.php
deleted file mode 100644
index c2562eb39..000000000
--- a/adm/shop_admin/orderrequestview.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-$sub_menu = '400430';
-include_once('./_common.php');
-
-auth_check($auth[$sub_menu], "w");
-
-$sql = " select * from {$g4['shop_request_table']} where rq_id = '$rq_id' ";
-$rq = sql_fetch($sql);
-if(!$rq['rq_id'])
-    alert('등록된 자료가 없습니다.');
-
-switch($rq['rq_type']) {
-    case 0:
-        $type = '취소';
-        break;
-    case 1:
-        $type = '교환';
-        break;
-    case 2:
-        $type = '반품';
-        break;
-    default:
-        $type = '';
-        break;
-}
-
-$g4['title'] = $type.'요청 상세내용';
-include_once (G4_ADMIN_PATH.'/admin.head.php');
-?>
-
-<?php include_once('./orderrequestview.inc.php'); ?>
-
-<?php
-include_once (G4_ADMIN_PATH.'/admin.tail.php');
-?>
\ No newline at end of file