From 5f1f8891a685fa1fa9e9d1e0bb42b219e8c2ffb2 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 30 May 2013 15:14:04 +0900
Subject: [PATCH] =?UTF-8?q?#206=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=20=EC=83=81=ED=92=88=EB=A6=AC?=
 =?UTF-8?q?=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/orderinquiry.sub.php |   4 +-
 mobile/shop/orderinquiryview.php | 103 +++++++++++++++++++++++++++++--
 2 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php
index 1c0a000ad..f9d583859 100644
--- a/mobile/shop/orderinquiry.sub.php
+++ b/mobile/shop/orderinquiry.sub.php
@@ -12,7 +12,7 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
     <th scope="col">주문번호</th>
     <th scope="col">주문일시</th>
     <th scope="col">주문금액</th>
-    <th scope="col">배송상태</th>
+    <th scope="col">입금액</th>
 </tr>
 </thead>
 <tbody>
@@ -37,7 +37,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     </td>
     <td class="td_datetime"><?php echo substr($row['od_time'],0,16); ?> (<?php echo get_yoil($row['od_time']); ?>)</td>
     <td class="td_bignum"><?php echo display_price($row['orderamount']); ?></td>
-    <td class="td_stat">배송상태</td>
+    <td class="td_stat"><?php echo display_price($row['receiptamount']); ?></td>
 </tr>
 
 <?php
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 0077bbda0..6af7413fe 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -24,9 +24,6 @@ set_session('ss_temp_uq_id', $uq_id);
 
 $g4['title'] = '주문상세내역';
 include_once(G4_MSHOP_PATH.'/_head.php');
-
-$s_uq_id = $od['uq_id'];
-$s_page = 'orderinquiryview.php';
 ?>
 
 <div id="sod_fin">
@@ -46,7 +43,105 @@ $s_page = 'orderinquiryview.php';
             <dt>완료</dt>
             <dd>상품 배송이 완료되었습니다.</dd>
         </dl>
-        <?php include G4_MSHOP_PATH.'/cartsub.inc.php'; ?>
+        <?php
+        $sql = " select it_id, it_name
+                    from {$g4['shop_cart_table']}
+                    where uq_id = '$uq_id'
+                      and ct_num = '0'
+                    order by ct_id ";
+        $result = sql_query($sql);
+        ?>
+        <ul id="sod_ul">
+            <?php
+            for($i=0; $row=sql_fetch_array($result); $i++) {
+                $image = get_it_image($row['it_id'], 70, 70);
+            ?>
+            <li>
+                <p>
+                    <a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?><?php echo $row['it_name']; ?></a>
+                </p>
+
+                <table class="basic_tbl">
+                <thead>
+                <tr>
+                    <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 ct_option, ct_qty, ct_price, ct_point, ct_status, io_type, io_price
+                            from {$g4['shop_cart_table']}
+                            where uq_id = '$uq_id'
+                              and it_id = '{$row['it_id']}'
+                            order by ct_num ";
+                $res = sql_query($sql);
+
+                for($k=0; $opt=sql_fetch_array($res); $k++) {
+                    if($opt['io_type'])
+                        $opt_price = $opt['io_price'];
+                    else
+                        $opt_price = $opt['ct_price'] + $opt['io_price'];
+
+                    $sell_amount = $opt_price * $opt['ct_qty'];
+                    $point = $opt['ct_point'] * $opt['ct_qty'];
+                ?>
+                <tr>
+                    <td><?php echo $opt['ct_option']; ?></td>
+                    <td class="td_smallmng"><?php echo number_format($opt['ct_qty']); ?></td>
+                    <td class="td_bignum"><?php echo number_format($opt_price); ?></td>
+                    <td class="td_num"><?php echo number_format($sell_amount); ?></td>
+                    <td class="td_num"><?php echo number_format($point); ?></td>
+                    <td class="td_smallmng"><?php echo $opt['ct_status']; ?></td>
+                </tr>
+                <?php
+                    if ($opt['ct_status'] == '취소' || $opt['ct_status'] == '반품' || $opt['ct_status'] == '품절') {
+                        $tot_cancel_amount += $sell_amount;
+                    }
+                    else {
+                        $tot_point       += $point;
+                        $tot_sell_amount += $sell_amount;
+                    }
+                }
+                ?>
+                </tbody>
+                </table>
+            </li>
+            <?php
+            }
+
+            $send_cost = $od['od_send_cost'];
+            ?>
+        </ul>
+        <?php
+        // 배송비가 0 보다 크다면 (있다면)
+        if ($send_cost > 0)
+        {
+        ?>
+
+        <div id="sod_bsk_dvr" class="sod_bsk_tot">
+            <span>배송비</span>
+            <strong><?php echo number_format($send_cost); ?> 원</strong>
+        </div>
+
+        <?php } ?>
+
+        <?php
+        // 총계 = 주문상품금액합계 + 배송비
+        $tot_amount = $tot_sell_amount + $send_cost;
+        if ($tot_amount > 0) {
+        ?>
+
+        <div id="sod_bsk_cnt" class="sod_bsk_tot">
+            <span>총계</span>
+            <strong><?php echo number_format($tot_amount); ?> 원 <?php echo number_format($tot_point); ?> 점</strong>
+        </div>
+
+        <?php } ?>
     </section>
 
     <div id="sod_fin_view">