From 07982b6a1a5b3a9edce485a7fa72ff74204cfbd4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 11 Nov 2013 14:27:26 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=AA=A8?=
 =?UTF-8?q?=EB=B0=94=EC=9D=BC=20=EC=A3=BC=EB=AC=B8=20=EB=B3=B4=EA=B4=80?=
 =?UTF-8?q?=ED=95=A8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/mypage.php           |  6 ++--
 mobile/shop/orderinquiry.sub.php | 59 +++++++++++++++++++++++++++-----
 mobile/shop/wishlist.php         |  4 +--
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/mobile/shop/mypage.php b/mobile/shop/mypage.php
index ced95d4d5..6601c51cb 100644
--- a/mobile/shop/mypage.php
+++ b/mobile/shop/mypage.php
@@ -65,7 +65,7 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
             <tr>
                 <th scope="col">이미지</th>
                 <th scope="col">상품명</th>
-                <th scope="col">보관일시</th>
+                <th scope="col">보관일</th>
             </tr>
             </thead>
             <tbody>
@@ -80,13 +80,13 @@ for($k=0; $cp=sql_fetch_array($res); $k++) {
             $result = sql_query($sql);
             for ($i=0; $row = sql_fetch_array($result); $i++)
             {
-                $image = get_it_image($row['it_id'], 70, 70, true);
+                $image = get_it_image($row['it_id'], 50, 50, true);
             ?>
 
             <tr>
                 <td class="smb_my_img"><?php echo $image; ?></td>
                 <td><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo stripslashes($row['it_name']); ?></a></td>
-                <td class="td_datetime"><?php echo $row['wi_time']; ?></td>
+                <td class="td_datetime"><?php echo substr($row['wi_time'], 2, 8); ?></td>
             </tr>
 
             <?php
diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php
index 85d94204e..d70512379 100644
--- a/mobile/shop/orderinquiry.sub.php
+++ b/mobile/shop/orderinquiry.sub.php
@@ -12,9 +12,13 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
     <tr>
         <th scope="col">주문번호</th>
         <th scope="col">주문일시</th>
-        <th scope="col">주문금액</th>
-        <th scope="col">쿠폰</th>
-        <th scope="col">입금액</th>
+        <th rowspan="2" scope="col">입금액</th>
+    </tr>
+    <tr>
+        <th colspan="2" scope="col">주문상품</th>
+    </tr>
+    <tr>
+        <th colspan="3" scope="col">배송정보</th>
     </tr>
     </thead>
     <tbody>
@@ -28,18 +32,57 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
     $result = sql_query($sql);
     for ($i=0; $row=sql_fetch_array($result); $i++)
     {
+        // 주문상품
+        $sql = " select *, count(ct_id) as cnt
+                    from {$g5['g5_shop_cart_table']}
+                    where od_id = '{$row['od_id']}'
+                    order by ct_id
+                    limit 1 ";
+        $ct = sql_fetch($sql);
+        $ct_name = get_text($ct['it_name']).' '.get_text($ct['ct_option']);
+        if($ct['cnt'] > 1)
+            $ct_name .= ' 외 '.($ct['cnt'] - 1).'건';
+
+        switch($row['od_status']) {
+            case '입금':
+                $od_status = '입금완료';
+                break;
+            case '준비':
+                $od_status = '상품준비중';
+                break;
+            case '배송':
+                $od_status = '상품배송';
+                break;
+            case '완료':
+                $od_status = '배송완료';
+                break;
+            default:
+                $od_status = '입금확인중';
+                break;
+        }
+
+        $od_invoice = '';
+        if($row['od_delivery_company'] && $row['od_invoice'])
+            $od_invoice = get_text($row['od_delivery_company']).' '.get_text($row['od_invoice']);
+
         $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
     ?>
 
     <tr>
         <td>
-            <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 class="td_datetime"><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</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_stat"><?php echo display_price($row['od_receipt_price']); ?></td>
+        <td><?php echo substr($row['od_time'],2,8); ?></td>
+        <td rowspan="2"><?php echo display_price($row['od_receipt_price']); ?></td>
+    </tr>
+    <tr>
+        <td colspan="2"><?php echo $ct_name; ?></td>
+    </tr>
+    <tr>
+        <td colspan="3">
+            <?php echo $od_status; ?>
+            <?php echo $od_invoice; ?>
+        </td>
     </tr>
 
     <?php
diff --git a/mobile/shop/wishlist.php b/mobile/shop/wishlist.php
index e7e2d825a..07c8f57f3 100644
--- a/mobile/shop/wishlist.php
+++ b/mobile/shop/wishlist.php
@@ -44,7 +44,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
 
             if ($row['it_tel_inq']) $out_cd = 'tel_inq';
 
-            $image = get_it_image($row['it_id'], 70, 70);
+            $image = get_it_image($row['it_id'], 50, 50);
             $it_point = get_item_point($row);
         ?>
 
@@ -52,7 +52,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
             <td class="sod_ws_img"><?php echo $image; ?></td>
             <td>
                 <a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo stripslashes($row['it_name']); ?></a>
-                <small>보관일시 <?php echo $row['wi_time']; ?></small>
+                <br><small>보관일 <?php echo substr($row['wi_time'], 2, 8); ?></small>
             </td>
             <td class="td_chk">
                 <?php