From e959f645cd3068ead684ff0a3a225977d518c249 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 28 Nov 2013 13:38:54 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=84=A0=ED=83=9D=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=98=B5=EC=85=98=20=EA=B0=9C=EC=88=98=20=EA=B3=84=EC=82=B0=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/item.php                      | 20 ++++++++++++--------
 mobile/skin/shop/basic/item.form.skin.php | 12 ++++++------
 shop/item.php                             | 20 ++++++++++++--------
 skin/shop/basic/item.form.skin.php        | 12 ++++++------
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/mobile/shop/item.php b/mobile/shop/item.php
index b869db922..4984b64b8 100644
--- a/mobile/shop/item.php
+++ b/mobile/shop/item.php
@@ -134,20 +134,24 @@ if(!$it['it_use'] || $it['it_tel_inq'] || $is_soldout)
 
 if($is_orderable) {
     // 선택 옵션
-    $option_1 = get_item_options($it['it_id'], $it['it_option_subject']);
+    $option_item = get_item_options($it['it_id'], $it['it_option_subject']);
 
     // 추가 옵션
-    $option_2 = get_item_supply($it['it_id'], $it['it_supply_subject']);
+    $supply_item = get_item_supply($it['it_id'], $it['it_supply_subject']);
 
     // 상품 선택옵션 수
-    $sql = " select count(*) as cnt from {$g5['g5_shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '0' and io_use = '1' ";
-    $row = sql_fetch($sql);
-    $opt_count = $row['cnt'];
+    $option_count = 0;
+    if($it['it_option_subject']) {
+        $temp = explode(',', $it['it_option_subject']);
+        $option_count = count($temp);
+    }
 
     // 상품 추가옵션 수
-    $sql = " select count(*) as cnt from {$g5['g5_shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '1' and io_use = '1' ";
-    $row = sql_fetch($sql);
-    $spl_count = $row['cnt'];
+    $supply_count = 0;
+    if($it['it_supply_subject']) {
+        $temp = explode(',', $it['it_supply_subject']);
+        $supply_count = count($temp);
+    }
 }
 
 $g5['title'] = $it['it_name'].' &gt; '.$it['ca_name'];
diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php
index f841754d4..b22df66e1 100644
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@@ -48,7 +48,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <span id="sit_desc"><?php echo $it['it_basic']; ?></span>
         <?php if($is_orderable) { ?>
         <p id="sit_opt_info">
-            상품 선택옵션 <?php echo $opt_count; ?> 개, 추가옵션 <?php echo $spl_count; ?> 개
+            상품 선택옵션 <?php echo $option_count; ?> 개, 추가옵션 <?php echo $supply_count; ?> 개
         </p>
         <?php } ?>
         <?php if ($score = get_star_image($it['it_id'])) { ?>
@@ -187,7 +187,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </table>
 
         <?php
-        if($option_1) {
+        if($option_item) {
         ?>
         <section>
             <h3>선택옵션</h3>
@@ -198,7 +198,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             </colgroup>
             <tbody>
             <?php // 선택옵션
-            echo $option_1;
+            echo $option_item;
             ?>
             </tbody>
             </table>
@@ -208,7 +208,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         ?>
 
         <?php
-        if($option_2) {
+        if($supply_item) {
         ?>
         <section>
             <h3>추가옵션</h3>
@@ -219,7 +219,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             </colgroup>
             <tbody>
             <?php // 추가옵션
-            echo $option_2;
+            echo $supply_item;
             ?>
             </tbody>
             </table>
@@ -231,7 +231,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <?php if ($it['it_use'] && !$it['it_tel_inq'] && !$is_soldout) { ?>
         <div id="sit_sel_option">
         <?php
-        if(!$option_1) {
+        if(!$option_item) {
             if(!$it['it_buy_min_qty'])
                 $it['it_buy_min_qty'] = 1;
         ?>
diff --git a/shop/item.php b/shop/item.php
index ca60bfde1..68004c7ea 100644
--- a/shop/item.php
+++ b/shop/item.php
@@ -161,20 +161,24 @@ if(!$it['it_use'] || $it['it_tel_inq'] || $is_soldout)
 
 if($is_orderable) {
     // 선택 옵션
-    $option_1 = get_item_options($it['it_id'], $it['it_option_subject']);
+    $option_item = get_item_options($it['it_id'], $it['it_option_subject']);
 
     // 추가 옵션
-    $option_2 = get_item_supply($it['it_id'], $it['it_supply_subject']);
+    $supply_item = get_item_supply($it['it_id'], $it['it_supply_subject']);
 
     // 상품 선택옵션 수
-    $sql = " select count(*) as cnt from {$g5['g5_shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '0' and io_use = '1' ";
-    $row = sql_fetch($sql);
-    $opt_count = $row['cnt'];
+    $option_count = 0;
+    if($it['it_option_subject']) {
+        $temp = explode(',', $it['it_option_subject']);
+        $option_count = count($temp);
+    }
 
     // 상품 추가옵션 수
-    $sql = " select count(*) as cnt from {$g5['g5_shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '1' and io_use = '1' ";
-    $row = sql_fetch($sql);
-    $spl_count = $row['cnt'];
+    $supply_count = 0;
+    if($it['it_supply_subject']) {
+        $temp = explode(',', $it['it_supply_subject']);
+        $supply_count = count($temp);
+    }
 }
 
 function pg_anchor($anc_id) {
diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php
index f8b5bbfad..d0df40709 100644
--- a/skin/shop/basic/item.form.skin.php
+++ b/skin/shop/basic/item.form.skin.php
@@ -64,7 +64,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <p id="sit_desc"><?php echo $it['it_basic']; ?></p>
         <?php if($is_orderable) { ?>
         <p id="sit_opt_info">
-            상품 선택옵션 <?php echo $opt_count; ?> 개, 추가옵션 <?php echo $spl_count; ?> 개
+            상품 선택옵션 <?php echo $option_count; ?> 개, 추가옵션 <?php echo $supply_count; ?> 개
         </p>
         <?php } ?>
         <?php if ($star_score) { ?>
@@ -199,7 +199,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </table>
 
         <?php
-        if($option_1) {
+        if($option_item) {
         ?>
         <!-- 선택옵션 시작 { -->
         <section>
@@ -211,7 +211,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             </colgroup>
             <tbody>
             <?php // 선택옵션
-            echo $option_1;
+            echo $option_item;
             ?>
             </tbody>
             </table>
@@ -222,7 +222,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         ?>
 
         <?php
-        if($option_2) {
+        if($supply_item) {
         ?>
         <!-- 추가옵션 시작 { -->
         <section>
@@ -234,7 +234,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             </colgroup>
             <tbody>
             <?php // 추가옵션
-            echo $option_2;
+            echo $supply_item;
             ?>
             </tbody>
             </table>
@@ -249,7 +249,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <section id="sit_sel_option">
             <h3>선택된 옵션</h3>
             <?php
-            if(!$option_1) {
+            if(!$option_item) {
                 if(!$it['it_buy_min_qty'])
                     $it['it_buy_min_qty'] = 1;
             ?>

From c9a22e8d9ddd2ccd218b34dcfc01aa694dd5a53f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 28 Nov 2013 13:48:24 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=BF=A0?=
 =?UTF-8?q?=ED=8F=B0=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=B0=BD=EB=8B=AB?=
 =?UTF-8?q?=EA=B8=B0=20=EB=B2=84=ED=8A=BC=EC=9C=BC=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 shop/coupon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shop/coupon.php b/shop/coupon.php
index d2810d628..4383f7090 100644
--- a/shop/coupon.php
+++ b/shop/coupon.php
@@ -79,7 +79,7 @@ $result = sql_query($sql);
         </table>
     </div>
 
-    <div class="btn_win"><a href="javascript:;" onclick="window.close();">창닫기</a></div>
+    <div class="btn_win"><button type="button" onclick="window.close();">창닫기</button></div>
 </div>
 
 <?php