From 03ce7daf476c5fc1afbbfac6628678e8ab1b2e91 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Mon, 15 Jul 2013 18:12:40 +0900
Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90:=20#254=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=20=EA=B4=80=EB=A6=AC=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php        |  9 ++++----
 adm/shop_admin/orderrequest.inc.php |  4 ++--
 adm/shop_admin/orderrequestform.php | 33 +++++++++++++++++------------
 adm/shop_admin/orderrequestlist.php | 16 +++++++-------
 css/admin.css                       | 16 +++++++++++++-
 5 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index af2d3538a..6936f65d0 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -154,7 +154,7 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
     <input type="hidden" name="search" value="<?php echo $search; ?>">
     <input type="hidden" name="page" value="<?php echo $page;?>">
 
-    <label for="sit_select_all" class="sound_only">현재 상품 목록 전체선택</label>
+    <label for="sit_select_all" class="sound_only">주문 상품 전체</label>
     <input type="checkbox" id="sit_select_all">
 
     <ul id="sodr_ul">
@@ -320,7 +320,7 @@ if($request) {
 <section id="anc_sodr_request" class="cbox">
     <h2>주문 <?php echo $request; ?>요청</h2>
     <?php echo $pg_anchor; ?>
-    <div>
+    <div id="sodr_request_frm">
         <?php
         // 요청 처리폼 include
         $rq_id = $rq['rq_id'];
@@ -581,7 +581,7 @@ if($request) {
                 <input type="text" name="od_receipt_time" value="<?php echo is_null_time($od['od_receipt_time']) ? "" : $od['od_receipt_time']; ?>" id="od_receipt_time" class="frm_input" maxlength="19">
             </td>
         </tr>
-        <?php } ########## 끝 ?>
+        <?php } ?>
 
         <?php if ($od['od_settle_case'] == '휴대폰') { ?>
         <tr>
@@ -599,8 +599,7 @@ if($request) {
         <tr>
             <th scope="row"><label for="op_receipt_time">휴대폰 결제일시</label></th>
             <td>
-                <label for="od_card_chk">현재 시간으로 설정</label>
-                <!-- name od_card_chk 를 od_hp_chk 로 수정 - 지운아빠 2013-04-16 -->
+                <label for="od_hp_chk">현재 시간으로 설정</label>
                 <input type="checkbox" name="od_hp_chk" id="od_hp_chk" value="<?php echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_receipt_time.value=this.form.od_hp_chk.value; else this.form.od_receipt_time.value = this.form.od_receipt_time.defaultValue;"><br>
                 <input type="text" name="od_receipt_time" value="<?php echo is_null_time($od['od_receipt_time']) ? "" : $od['od_receipt_time']; ?>" id="op_receipt_time" class="frm_input" size="19" maxlength="19">
             </td>
diff --git a/adm/shop_admin/orderrequest.inc.php b/adm/shop_admin/orderrequest.inc.php
index 1d1db0f54..b2401b1df 100644
--- a/adm/shop_admin/orderrequest.inc.php
+++ b/adm/shop_admin/orderrequest.inc.php
@@ -13,8 +13,8 @@ $sql = " select ct_id, it_id, it_name, ct_option, ct_price, ct_qty, io_type, io_
 $result = sql_query($sql);
 ?>
 
-<section>
-    <h2><?php echo $type; ?>요청 상품</h2>
+<section id="sodr_request_item">
+    <h3><?php echo $type; ?>요청 상품</h3>
     <table>
     <thead>
     <tr>
diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php
index 2d243d6a0..ac485e31e 100644
--- a/adm/shop_admin/orderrequestform.php
+++ b/adm/shop_admin/orderrequestform.php
@@ -65,17 +65,18 @@ $sql = " select ct_id, it_id, it_name, ct_option, ct_price, ct_qty, io_type, io_
 $result = sql_query($sql);
 ?>
 
-<section>
-    <h2><?php echo $type; ?>요청 내용</h2>
-    <div>
+<section id="sodr_requset_content">
+    <h3><?php echo $type; ?>요청 내용</h3>
+    <p>
         <?php echo $cus_content; ?>
-    </div>
+    </p>
 </section>
 
-<section>
-    <h2><?php echo $type; ?>요청 처리내역</h2>
+<section id="sodr_request_log">
+    <h3><?php echo $type; ?>요청 처리내역</h3>
     <p>처리내역을 클릭하시면 상세 내용을 확인할 수 있습니다.</p>
-    <div>
+
+    <div id="sodr_request_log_wrap">
         <?php
         $c_rq_id = $rq_id;
         if($rq['rq_parent'])
@@ -86,8 +87,9 @@ $result = sql_query($sql);
 
         for($i=0; $row=sql_fetch_array($result); $i++) {
         ?>
-        <p id="rq_id_<?php echo $row['rq_id']; ?>" class="od_request_list">
-            <?php echo $row['rq_time'].' '.$row['rq_content']; ?>
+        <p>
+            <span><b><?php echo $row['rq_time']; ?></b> <?php echo $row['rq_content']; ?></span>
+            <button id="rq_id_<?php echo $row['rq_id']; ?>" class="od_request_list">상세보기</button>
         </p>
         <?php
         }
@@ -98,9 +100,10 @@ $result = sql_query($sql);
     </div>
 </section>
 
-<section>
-    <h2><?php echo $type; ?>요청 처리</h2>
-    <form name="forderrequest" method="post" action="./orderrequestformupdate.php">
+<section id="sodr_request_handle">
+    <h3><?php echo $type; ?>요청 처리</h3>
+
+    <form name="forderrequest" id="forderrequest" method="post" action="./orderrequestformupdate.php">
     <input type="hidden" name="rq_id" value="<?php echo $rq['rq_parent'] ? $rq['rq_parent'] : $rq['rq_id']; ?>">
     <input type="hidden" name="disp_list" value="<?php echo $disp_list; ?>">
     <table class="frm_tbl">
@@ -227,10 +230,12 @@ $result = sql_query($sql);
     </tr>
     </tbody>
     </table>
-    <div>
-        <button type="submit" id="request_submit">확인</button>
+
+    <div class="btn_confirm">
+        <button type="submit" id="request_submit" class="btn_submit">확인</button>
         <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 dcabedc76..4993f0578 100644
--- a/adm/shop_admin/orderrequestlist.php
+++ b/adm/shop_admin/orderrequestlist.php
@@ -169,19 +169,19 @@ if ($sfl || $stx) // 검색렬일 때만 처음 버튼을 보여줌
     ?>
 
     <tr>
-        <td>
+        <td class="td_chk">
             <label for="chk_<?php echo $i; ?>" class="sound_only"><?php echo $it_name.' '.$type ?> 요청</label>
             <input type="checkbox" name="chk[]" value="<?php echo $i ?>" id="chk_<?php echo $i; ?>">
             <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><?php echo number_format($row['od_temp_amount']); ?></td>
-        <td><?php echo $row['od_name']; ?></td>
+        <td class="td_smallstat"><?php echo $type; ?></td>
+        <td class="td_odrnum3"><?php echo $row['od_id']; ?></td>
+        <td class="td_bignum"><?php echo number_format($row['od_temp_amount']); ?></td>
+        <td class="td_name"><?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>
+        <td class="td_date"><?php echo $reg_date; ?></td>
+        <td class="td_date"><?php echo $done_date; ?></td>
+        <td class="td_smallmng">
             <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>
diff --git a/css/admin.css b/css/admin.css
index 650a963a0..4ead354b7 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -146,10 +146,20 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 #sodr_ul p {padding:5px 14px}
 #sodr_ul p a {font-weight:bold;text-decoration:none}
 
+#sodr_request_frm h3 {margin:20px 0 0}
+#sodr_request_item h3 {margin-bottom:10px}
+#sodr_request_frm #forderrequest {border-top:1px solid #e9e9e9}
+#sodr_request_log_wrap {padding:10px;height:auto !important;height:200px;max-height:200px;border:1px solid #e9e9e9;background:#f5f6fa;overflow-y:scroll}
+#sodr_request_log_wrap p {position:relative;padding:5px 0;border-bottom:1px solid #e9e9e9}
+#sodr_request_log_wrap span {display:inline-block;margin:0 0 0 80px}
+#sodr_request_log_wrap b {display:inline-block;margin:0 15px 0 0;font-weight:normal}
+#sodr_request_log_wrap button {position:absolute;top:7px;left:0;margin:0;padding:0;border:0;background:transparent;font-weight:bold}
+#sodr_request_handle h3 {margin-bottom:10px}
+
 /* 주문개별내역 */
 #sodr_status {text-align:center}
 
-/* 주문통합내역 */
+/* 주문통합내역 */`
 #sodr_all {}
 
 #sodr_all_list {clear:both;margin:0;padding:10px 0 0;border-top:25px solid #f7f7f7;list-style:none}
@@ -352,6 +362,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .btn_confirm {clear:both;margin-bottom:20px;text-align:center}
 .btn_confirm button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle}
 .btn_confirm button:focus {padding:0 15px;height:30px;background:#555;color:#fff;line-height:2.2em;vertical-align:middle}
+.btn_confirm .btn_submit {background:#ff3061}
 .btn_confirm a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
 .btn_confirm a:focus {background:#555}
 .btn_submit {padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;line-height:2.5em;vertical-align:middle}
@@ -526,14 +537,17 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 .tr_bg {background:#f5f6fa}
 
 .td_chk {width:30px;text-align:center}
+.td_smallstat {width:50px;text-align:center}
 .td_num {width:60px;text-align:center}
 .td_smallnum {width:40px;text-align:center}
 .td_bignum {width:100px;text-align:center}
 .td_odrnum {width:250px;text-align:center}
 .td_odrnum2 {width:200px;text-align:center}
+.td_odrnum3 {width:110px;text-align:center}
 .td_grid {width:60px;text-align:center}
 .td_mbid, .td_name, .td_mbname {width:100px;text-align:left !important}
 .td_addr {text-align:left !important}
+.td_date {width:80px;text-align:center}
 .td_time {width:150px;text-align:center}
 .td_boolean {width:50px;text-align:center}
 .td_pt {text-align:right !important}