From 59a1e358e6bd19fcabd3bf8accc41c18085ced38 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 29 May 2013 11:53:09 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=81=ED=92=88=EC=A0=95=EB=B3=B4=EC=97=90?=
 =?UTF-8?q?=20=EB=B8=8C=EB=9E=9C=EB=93=9C=20=EB=AA=A8=EB=8D=B8=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemform.php       | 26 ++++++++++++++++++++++++++
 adm/shop_admin/itemformupdate.php |  6 ++++++
 extend/shop.extend2.php           |  2 --
 install/shop.sql                  |  2 ++
 mobile/shop/item.php              | 14 ++++++++++++++
 shop/item.php                     | 17 ++++++++++++++---
 6 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index aeb4650f1..159189b45 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -283,6 +283,32 @@ $pg_anchor ='<ul class="anchor">
             <input type="checkbox" name="chk_all_it_origin" value="1" id="chk_all_it_origin">
             <label for="chk_all_it_origin">전체적용</label>
         </td>
+    </tr>
+     <tr>
+        <th scope="row"><label for="it_brand">브랜드</label></th>
+        <td>
+            <?php echo help("입력하지 않으면 상품상세페이지에 출력하지 않습니다."); ?>
+            <input type="text" name="it_brand" value="<?php echo get_text($it['it_brand']); ?>" id="it_brand" class="frm_input" size="40">
+        </td>
+        <td class="group_setting">
+            <input type="checkbox" name="chk_ca_it_brand" value="1" id="chk_ca_it_brand">
+            <label for="chk_ca_it_brand">분류적용</label>
+            <input type="checkbox" name="chk_all_it_brand" value="1" id="chk_all_it_brand">
+            <label for="chk_all_it_brand">전체적용</label>
+        </td>
+    </tr>
+     <tr>
+        <th scope="row"><label for="it_model">모델</label></th>
+        <td>
+            <?php echo help("입력하지 않으면 상품상세페이지에 출력하지 않습니다."); ?>
+            <input type="text" name="it_model" value="<?php echo get_text($it['it_model']); ?>" id="it_model" class="frm_input" size="40">
+        </td>
+        <td class="group_setting">
+            <input type="checkbox" name="chk_ca_it_model" value="1" id="chk_ca_it_model">
+            <label for="chk_ca_it_model">분류적용</label>
+            <input type="checkbox" name="chk_all_it_model" value="1" id="chk_all_it_model">
+            <label for="chk_all_it_model">전체적용</label>
+        </td>
     </tr>
     <?php
     $opt_subject = explode(',', $it['it_option_subject']);
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 52f0e59cd..dc70af301 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -358,6 +358,8 @@ $sql_common = " ca_id               = '$ca_id',
                 it_gallery          = '$it_gallery',
                 it_maker            = '$it_maker',
                 it_origin           = '$it_origin',
+                it_brand            = '$it_brand',
+                it_model            = '$it_model',
                 it_option_subject   = '$it_option_subject',
                 it_supply_subject   = '$it_supply_subject',
                 it_type1            = '$it_type1',
@@ -509,6 +511,8 @@ if(is_checked('chk_ca_it_order'))               $ca_fields .= " , it_order = '$i
 if(is_checked('chk_ca_it_type'))                $ca_fields .= " , it_type1 = '$it_type1', it_type2 = '$it_type2', it_type3 = '$it_type3', it_type4 = '$it_type4', it_type5 = '$it_type5' ";
 if(is_checked('chk_ca_it_maker'))               $ca_fields .= " , it_maker = '$it_maker' ";
 if(is_checked('chk_ca_it_origin'))              $ca_fields .= " , it_origin = '$it_origin' ";
+if(is_checked('chk_ca_it_brand'))               $ca_fields .= " , it_brand = '$it_brand' ";
+if(is_checked('chk_ca_it_model'))               $ca_fields .= " , it_model = '$it_model' ";
 if(is_checked('chk_ca_it_sell_email'))          $ca_fields .= " , it_sell_email = '$it_sell_email' ";
 if(is_checked('chk_ca_it_tel_inq'))             $ca_fields .= " , it_tel_inq = '$it_tel_inq' ";
 if(is_checked('chk_ca_it_use'))                 $ca_fields .= " , it_use = '$it_use' ";
@@ -538,6 +542,8 @@ if(is_checked('chk_all_it_order'))               $all_fields .= " , it_order = '
 if(is_checked('chk_all_it_type'))                $all_fields .= " , it_type1 = '$it_type1', it_type2 = '$it_type2', it_type3 = '$it_type3', it_type4 = '$it_type4', it_type5 = '$it_type5' ";
 if(is_checked('chk_all_it_maker'))               $all_fields .= " , it_maker = '$it_maker' ";
 if(is_checked('chk_all_it_origin'))              $all_fields .= " , it_origin = '$it_origin' ";
+if(is_checked('chk_all_it_brand'))               $all_fields .= " , it_brand = '$it_brand' ";
+if(is_checked('chk_all_it_model'))               $all_fields .= " , it_model = '$it_model' ";
 if(is_checked('chk_all_it_sell_email'))          $all_fields .= " , it_sell_email = '$it_sell_email' ";
 if(is_checked('chk_all_it_tel_inq'))             $all_fields .= " , it_tel_inq = '$it_tel_inq' ";
 if(is_checked('chk_all_it_use'))                 $all_fields .= " , it_use = '$it_use' ";
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 106c972ec..851b4099d 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -93,7 +93,6 @@ if(!$result) {
 }
 
 // it_brand 추가
-/*
 $sql = " select it_brand from {$g4['shop_item_table']} limit 1 ";
 $result = sql_query($sql, false);
 if(!$result) {
@@ -101,7 +100,6 @@ if(!$result) {
                     ADD `it_brand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_origin`,
                     ADD `it_model` VARCHAR(255) NOT NULL DEFAULT '' AFTER `it_brand` ", false);
 }
-*/
 
 // sms_cont5 필드추가
 $sql = " select de_sms_cont5 from {$g4['shop_default_table']} ";
diff --git a/install/shop.sql b/install/shop.sql
index a37343594..5617ad587 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -366,6 +366,8 @@ CREATE TABLE IF NOT EXISTS `shop_item` (
   `it_gallery` tinyint(4) NOT NULL DEFAULT '0',
   `it_maker` varchar(255) NOT NULL DEFAULT '',
   `it_origin` varchar(255) NOT NULL DEFAULT '',
+  `it_brand` varchar(255) NOT NULL DEFAULT '',
+  `it_model` varchar(255) NOT NULL DEFAULT '',
   `it_option_subject` varchar(255) NOT NULL DEFAULT '',
   `it_supply_subject` varchar(255) NOT NULL DEFAULT '',
   `it_type1` tinyint(4) NOT NULL DEFAULT '0',
diff --git a/mobile/shop/item.php b/mobile/shop/item.php
index 306447dea..541159071 100644
--- a/mobile/shop/item.php
+++ b/mobile/shop/item.php
@@ -282,6 +282,20 @@ else
             </tr>
             <?php } ?>
 
+            <?php if ($it['it_brand']) { ?>
+            <tr>
+                <th scope="row">브랜드</th>
+                <td><?php echo $it['it_brand']; ?></td>
+            </tr>
+            <?php } ?>
+
+            <?php if ($it['it_model']) { ?>
+            <tr>
+                <th scope="row">모델</th>
+                <td><?php echo $it['it_model']; ?></td>
+            </tr>
+            <?php } ?>
+
             <?php if (!$it['it_gallery']) { // 갤러리 형식이라면 가격, 구매하기 출력하지 않음 ?>
             <?php if ($it['it_tel_inq']) { // 전화문의일 경우 ?>
 
diff --git a/shop/item.php b/shop/item.php
index d536a74d9..05fc471ad 100644
--- a/shop/item.php
+++ b/shop/item.php
@@ -241,8 +241,6 @@ else
         <section id="sit_ov">
             <h2 id="sit_title"><?php echo stripslashes($it['it_name']); ?></h2>
             <p id="sit_desc"><?php echo $it['it_basic']; ?></p>
-            <!-- ########## 상품 선택옵션/추가옵션에 따른 출력 - 지운아빠 2013-05-24 -->
-            <!-- 스크린리더에서만 출력할 예정 -->
             <p id="sit_opt_info">
             <?php
             $sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '{$it['it_id']}' and io_type = '0' and io_use = '1' ";
@@ -255,7 +253,6 @@ else
             ?>
                 상품 선택옵션 <?php echo $opt_count; ?> 개, 추가옵션 <?php echo $spl_count; ?> 개
             </p>
-            <!-- ########## 상품 선택옵션/추가옵션에 따른 출력 끝 -->
             <?php if ($score = get_star_image($it['it_id'])) { ?>
             <div id="sit_star_sns">
                 <?php
@@ -289,6 +286,20 @@ else
             </tr>
             <?php } ?>
 
+            <?php if ($it['it_brand']) { ?>
+            <tr>
+                <th scope="row">브랜드</th>
+                <td><?php echo $it['it_brand']; ?></td>
+            </tr>
+            <?php } ?>
+
+            <?php if ($it['it_model']) { ?>
+            <tr>
+                <th scope="row">모델</th>
+                <td><?php echo $it['it_model']; ?></td>
+            </tr>
+            <?php } ?>
+
             <?php if (!$it['it_gallery']) { // 갤러리 형식이라면 가격, 구매하기 출력하지 않음 ?>
             <?php if ($it['it_tel_inq']) { // 전화문의일 경우 ?>