diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 7bf93f2b9..f88a74b95 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -81,24 +81,10 @@ if ($od['mb_id'] == "") {
//------------------------------------------------------------------------------
// 요청정보
-$sql = " select * from {$g4['shop_request_table']} where od_id = '{$od['od_id']}' and rq_parent = '0' order by rq_id desc limit 1 ";
-$rq = sql_fetch($sql);
-if($rq['rq_id']) {
- switch($rq['rq_type']) {
- case 0:
- $request = '취소';
- break;
- case 1:
- $request = '교환';
- break;
- case 2:
- $request = '반품';
- break;
- default:
- $request = '';
- break;
- }
-}
+$sql = " select rq_id, ct_id, rq_type, rq_time
+ from {$g4['shop_request_table']} where od_id = '{$od['od_id']}' and rq_parent = '0' order by rq_id ";
+$rq_result = sql_query($sql);
+$rq_count = mysql_num_rows($rq_result);
$qstr = "sort1=$sort1&sort2=$sort2&sel_field=$sel_field&search=$search&page=$page";
@@ -124,8 +110,8 @@ $result = sql_query($sql);
$pg_anchor = '
- 주문상품 목록
- 주문결제 내역
';
-if($request)
- $pg_anchor .= '- 주문 '.$request.'요청
';
+if($rq_count)
+ $pg_anchor .= '- 고객요청 내역
';
$pg_anchor .='- 결제상세정보 확인
- 결제상세정보 수정
- 상점메모
@@ -326,21 +312,57 @@ $pg_anchor .='- 결제상세정보 확인
-
+
- 주문 요청
+ 고객요청내역
+ 요청리스트
+
+ 1)
+ $rq_subject .= '외 '.($rq_item_count - 1).'건';
+ $rq_subject .= ' '.$type.'요청';
+
+ $order_href = './orderform.php?od_id='.$od['od_id'].'&uq_id='.$od['uq_id'].'&rq_id='.$rq_row['rq_id'].'&'.$qstr.'#anc_sodr_request';
+ ?>
+
+
+
+
+
+
+
diff --git a/adm/shop_admin/orderrequest.inc.php b/adm/shop_admin/orderrequest.inc.php
index 13289792b..903109602 100644
--- a/adm/shop_admin/orderrequest.inc.php
+++ b/adm/shop_admin/orderrequest.inc.php
@@ -1,10 +1,10 @@
\ No newline at end of file
diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
index 8a400d944..025002d60 100644
--- a/adm/shop_admin/orderrequestform.php
+++ b/adm/shop_admin/orderrequestform.php
@@ -4,8 +4,12 @@ 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(empty($rq)) {
+ $sql = " select * from {$g4['shop_request_table']} where rq_id = '$rq_id' ";
+ $rq = sql_fetch($sql);
+}
+
if(!$rq['rq_id']) {
if(!isset($_POST['rq_id']))
alert('등록된 자료가 없습니다.');
@@ -63,6 +67,8 @@ $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);
+
+$rq_qstr = "sst=$sst&sod=$sod&sfl=$sfl&stx=$stx&save_stx=$save_stx&page=$page&rq_type=$rq_type";
?>
@@ -233,7 +239,7 @@ $result = sql_query($sql);
@@ -262,7 +268,7 @@ $(function() {
var rq_id = $(this).attr("id").replace(/[^0-9]/g, "");
$.post(
"./orderrequestform.php",
- { rq_id: rq_id, disp_list: },
+ { rq_id: rq_id },
function(data) {
$("#order_request").html(data);
}
diff --git a/adm/shop_admin/orderrequestlist.php b/adm/shop_admin/orderrequestlist.php
index 4993f0578..889b1fa80 100644
--- a/adm/shop_admin/orderrequestlist.php
+++ b/adm/shop_admin/orderrequestlist.php
@@ -165,7 +165,7 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
if($tmp['rq_time'])
$done_date = substr($tmp['rq_time'], 2, 8);
- $order_href = './orderform.php?od_id='.$row['od_id'].'&uq_id='.$row['uq_id'].'&rq_type='.$rq_type.'&'.$qstr;
+ $order_href = './orderform.php?od_id='.$row['od_id'].'&uq_id='.$row['uq_id'].'&rq_id='.$row['rq_id'].'&rq_type='.$rq_type.'&'.$qstr;
?>