From e2227b2f65f29de2aa90c109d55892eafa7d4e73 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 11 Nov 2013 17:56:34 +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=83=81=ED=92=88=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/cart.php             |  26 ++++---
 mobile/shop/orderform.php        |   2 +-
 mobile/shop/orderinquiryview.php | 130 +++++++++++++++----------------
 3 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php
index 72ac45d90..a0d1773ec 100644
--- a/mobile/shop/cart.php
+++ b/mobile/shop/cart.php
@@ -14,13 +14,15 @@ include_once(G5_MSHOP_PATH.'/_head.php');
         <table>
         <thead>
         <tr>
-            <th scope="col">상품이미지</th>
-            <th scope="col">상품명</th>
+            <th scope="col" rowspan="2">상품이미지</th>
+            <th scope="col" colspan="4">상품명</th>
+            <th scope="col" rowspan="2"><input type="checkbox" name="ct_all" value="1" checked="checked"></th>
+        </tr>
+        <tr>
             <th scope="col">총수량</th>
             <th scope="col">판매가</th>
             <th scope="col">소계</th>
             <th scope="col">포인트</th>
-            <th scope="col"><input type="checkbox" name="ct_all" value="1" checked="checked"></th>
         </tr>
         </thead>
         <tbody>
@@ -72,7 +74,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
             $it_name = $a1 . stripslashes($row['it_name']) . $a2;
             $it_options = print_item_options($row['it_id'], $s_cart_id);
             if($it_options) {
-                $mod_options = '<div class="sod_option_btn"><button type="button" class="mod_options">선택사항수정</button></div>';
+                $mod_options = '<div class="sod_option_btn"><button type="button" id="mod_opt_'.$row['it_id'].'" class="mod_options">선택사항수정</button></div>';
                 $it_name .= '<div class="sod_bsk_itopt">'.$it_options.'</div>';
             }
 
@@ -81,18 +83,22 @@ include_once(G5_MSHOP_PATH.'/_head.php');
         ?>
 
         <tr>
-            <td class="sod_bsk_img"><?php echo $image; ?></td>
-            <td>
+            <td rowspan="3" class="sod_bsk_img"><?php echo $image; ?></td>
+            <td colspan="4">
                 <input type="hidden" name="it_id[<?php echo $i; ?>]"    value="<?php echo $row['it_id']; ?>">
                 <input type="hidden" name="it_name[<?php echo $i; ?>]"  value="<?php echo get_text($row['it_name']); ?>">
-                <?php echo $it_name.$mod_options; ?>
+                <?php echo $it_name; ?>
             </td>
-
+            <td rowspan="3" class="td_mngsmall"><input type="checkbox" name="ct_chk[<?php echo $i; ?>]" value="1" checked="checked"></td>
+        </tr>
+        <tr>
             <td class="td_num"><?php echo number_format($sum['qty']); ?></td>
             <td class="td_numbig"><?php echo number_format($row['ct_price']); ?></td>
             <td class="td_numbig"><?php echo number_format($sell_price); ?></td>
             <td class="td_num"><?php echo number_format($sum['point']); ?></td>
-            <td class="td_mngsmall"><input type="checkbox" name="ct_chk[<?php echo $i; ?>]" value="1" checked="checked"></td>
+        </tr>
+        <tr>
+            <td colspan="4"><?php echo $mod_options; ?></td>
         </tr>
 
         <?php
@@ -153,7 +159,7 @@ $(function() {
 
     // 선택사항수정
     $(".mod_options").click(function() {
-        var it_id = $(this).closest("tr").find("input[name^=it_id]").val();
+        var it_id = $(this).attr("id").replace("mod_opt_", "");
         var $this = $(this);
         close_btn_idx = $(".mod_options").index($(this));
 
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 29d43ccd1..f4c1fda73 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -189,7 +189,7 @@ ob_start();
                 <?php if($default['de_tax_flag_use']) { ?>
                 <input type="hidden" name="it_notax[<?php echo $i; ?>]" value="<?php echo $row['it_notax']; ?>">
                 <?php } ?>
-                <?php echo $it_name.$mod_options; ?>
+                <?php echo $it_name; ?>
             </td>
         </tr>
         <tr>
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 9222a361d..b73e5937d 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -41,78 +41,74 @@ include_once(G5_MSHOP_PATH.'/_head.php');
                     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>
+        <thead>
+        <tr>
+            <th scope="col" rowspan="3">상품이미지</th>
+            <th scope="col" colspan="5">상품명</th>
+        </tr>
+            <th scope="col" colspan="5">옵션항목</th>
+        <tr>
+            <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);
 
-                <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);
-                    $ct_list = array();
+            // 옵션항목
+            $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) * 2 + 1;
+        ?>
+        <tr>
+            <td rowspan="<?php echo $rowspan; ?>"><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $image; ?></a></td>
+            <td colspan="5"><a href="./item.php?it_id=<?php echo $row['it_id']; ?>"><?php echo $row['it_name']; ?></a></td>
+        </tr>
+        <?php
+            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'];
 
-                    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 colspan="5"><?php echo $opt['ct_option']; ?></td>
+        </tr>
+        <tr>
+            <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;
 
-                        $sell_price = $opt_price * $opt['ct_qty'];
-                        $point = $opt['ct_point'] * $opt['ct_qty'];
-
-                        $ct_list[$opt['ct_id']]['name'] = $opt['it_name'];
-                        $ct_list[$opt['ct_id']]['option'] = $opt['ct_option'];
-                    ?>
-                    <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>
-            <?php
+                $st_count1++;
+                if($opt['ct_status'] == '주문')
+                    $st_count2++;
             }
+        }
 
-            // 주문 상품의 상태가 모두 주문이면 고객 취소 가능
-            if($st_count1 > 0 && $st_count1 == $st_count2)
-                $custom_cancel = true;
-            ?>
-        </ul>
+        // 주문 상품의 상태가 모두 주문이면 고객 취소 가능
+        if($st_count1 > 0 && $st_count1 == $st_count2)
+            $custom_cancel = true;
+        ?>
+        </tbody>
+        </table>
 
         <div id="sod_sts_wrap">
             <span class="sound_only">상품 상태 설명</span>