From 0df0f388b134179b1ce28603e95d37255598bbe0 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 19 Nov 2013 11:14:12 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20PC=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=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/orderinquiryview.php | 111 +++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 57 deletions(-)

diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index a51220995..8c330961a 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -54,74 +54,71 @@ if(openwin != null) {
                     order by ct_id ";
         $result = sql_query($sql);
         ?>
-        <ul id="sod_ul">
+        <div class="tbl_head01 tbl_wrap">
+            <table>
+            <thead>
+            <tr>
+                <th scope="col" colspan="2">상품/옵션</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
             for($i=0; $row=sql_fetch_array($result); $i++) {
                 $image = get_it_image($row['it_id'], 70, 70);
+
+                $sql = " select ct_id, it_name, ct_option, ct_qty, ct_price, ct_point, ct_status, io_type, io_price
+                            from {$g5['g5_shop_cart_table']}
+                            where od_id = '$od_id'
+                              and it_id = '{$row['it_id']}'
+                            order by io_type asc, ct_id asc ";
+                $res = sql_query($sql);
+                $rowspan = mysql_num_rows($res) + 1;
+
+                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_price = $opt_price * $opt['ct_qty'];
+                    $point = $opt['ct_point'] * $opt['ct_qty'];
+
+                    if($k == 0) {
             ?>
-            <li>
-                <p>
-                    <a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?> <?php echo $row['it_name']; ?></a>
-                </p>
-
-                <div class="tbl_head01 tbl_wrap">
-                    <table>
-                    <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_id, it_name, ct_option, ct_qty, ct_price, ct_point, ct_status, io_type, io_price
-                                from {$g5['g5_shop_cart_table']}
-                                where od_id = '$od_id'
-                                  and it_id = '{$row['it_id']}'
-                                order by io_type asc, ct_id asc ";
-                    $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_price = $opt_price * $opt['ct_qty'];
-                        $point = $opt['ct_point'] * $opt['ct_qty'];
-                    ?>
-                    <tr>
-                        <td><?php echo $opt['ct_option']; ?></td>
-                        <td class="td_mngsmall"><?php echo number_format($opt['ct_qty']); ?></td>
-                        <td class="td_numbig"><?php echo number_format($opt_price); ?></td>
-                        <td class="td_num"><?php echo number_format($sell_price); ?></td>
-                        <td class="td_num"><?php echo number_format($point); ?></td>
-                        <td class="td_mngsmall"><?php echo $opt['ct_status']; ?></td>
-                    </tr>
-                    <?php
-                        $tot_point       += $point;
-
-                        $st_count1++;
-                        if($opt['ct_status'] == '주문')
-                            $st_count2++;
-                    }
-                    ?>
-                    </tbody>
-                    </table>
-                </div>
-            </li>
+            <tr>
+                <td rowspan="<?php echo $rowspan; ?>"><?php echo $image; ?></td>
+                <td colspan="6"><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $row['it_name']; ?></a></td>
+            </tr>
+            <?php } ?>
+            <tr>
+                <td><?php echo $opt['ct_option']; ?></td>
+                <td class="td_mngsmall"><?php echo number_format($opt['ct_qty']); ?></td>
+                <td class="td_numbig"><?php echo number_format($opt_price); ?></td>
+                <td class="td_num"><?php echo number_format($sell_price); ?></td>
+                <td class="td_num"><?php echo number_format($point); ?></td>
+                <td class="td_mngsmall"><?php echo $opt['ct_status']; ?></td>
+            </tr>
             <?php
+                    $tot_point       += $point;
+
+                    $st_count1++;
+                    if($opt['ct_status'] == '주문')
+                        $st_count2++;
+                }
             }
 
             // 주문 상품의 상태가 모두 주문이면 고객 취소 가능
             if($st_count1 > 0 && $st_count1 == $st_count2)
                 $custom_cancel = true;
             ?>
-        </ul>
+            </tbody>
+            </table>
+        </div>
 
         <div id="sod_sts_wrap">
             <span class="sound_only">상품 상태 설명</span>