From f06c17afce6d580e4f92fb6a8a61d9b9a6c86f8d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 2 Dec 2013 17:00:09 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=97=90=20=EB=B0=B0=EC=86=A1=EC=83=81=ED=83=9C=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderinquiry.sub.php | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/shop/orderinquiry.sub.php b/shop/orderinquiry.sub.php
index 2b02b3ec1..afe1ad2a8 100644
--- a/shop/orderinquiry.sub.php
+++ b/shop/orderinquiry.sub.php
@@ -15,15 +15,14 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
         <th scope="col">주문일시</th>
         <th scope="col">상품수</th>
         <th scope="col">주문금액</th>
-        <th scope="col">쿠폰</th>
         <th scope="col">입금액</th>
         <th scope="col">미입금액</th>
+        <th scope="col">상태</th>
     </tr>
     </thead>
     <tbody>
     <?php
-    $sql = " select *,
-                (od_cart_coupon + od_coupon + od_send_coupon) as couponprice
+    $sql = " select *
                from {$g5['g5_shop_order_table']}
               where mb_id = '{$member['mb_id']}'
               order by od_id desc
@@ -32,6 +31,24 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
     for ($i=0; $row=sql_fetch_array($result); $i++)
     {
         $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
+
+        switch($row['od_status']) {
+            case '입금':
+                $od_status = '입금완료';
+                break;
+            case '준비':
+                $od_status = '상품준비중';
+                break;
+            case '배송':
+                $od_status = '상품배송';
+                break;
+            case '완료':
+                $od_status = '배송완료';
+                break;
+            default:
+                $od_status = '입금확인중';
+                break;
+        }
     ?>
 
     <tr>
@@ -39,12 +56,12 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
             <input type="hidden" name="ct_id[<?php echo $i; ?>]" value="<?php echo $row['ct_id']; ?>">
             <a href="<?php echo G5_SHOP_URL; ?>/orderinquiryview.php?od_id=<?php echo $row['od_id']; ?>&amp;uid=<?php echo $uid; ?>"><?php echo $row['od_id']; ?></a>
         </td>
-        <td><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
+        <td><?php echo substr($row['od_time'],2,14); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
         <td class="td_num"><?php echo $row['od_cart_count']; ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_cart_price'] + $row['od_send_cost'] + $row['od_send_cost2']); ?></td>
-        <td class="td_numbig"><?php echo display_price($row['couponprice']); ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_receipt_price']); ?></td>
         <td class="td_numbig"><?php echo display_price($row['od_misu']); ?></td>
+        <td><?php echo $od_status; ?></td>
     </tr>
 
     <?php