From 84bf242dd3f0d062997b335945074e6ff66cf9e6 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 14 Apr 2014 16:17:13 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20-?=
 =?UTF-8?q?=20=EC=B0=B8=EC=97=86=EB=8B=A4=EB=8B=98=20=EC=A0=9C=EC=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/css/admin.css                   |  1 +
 adm/shop_admin/itemform.php         | 16 ++++++++++------
 adm/shop_admin/itemformrelation.php | 17 ++++++++++++++---
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/adm/css/admin.css b/adm/css/admin.css
index e11480e16..073e2f690 100644
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@@ -700,6 +700,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .srel .srel_noneimg li {padding:7px 0}
 .srel .srel_noneimg button {top:0;right:0}
 .srel .srel_pad {display:block;height:30px}
+.srel .srel_pad button {position:static}
 
 /* 쿠폰관리 */
 .scp_new_win .empty_table {padding:30px 0}
diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 2c35b7bd9..f83975483 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -1335,24 +1335,28 @@ $(function(){
                         }
                     ?>
                 </select>
+                <label for="sch_name" class="sound_only">상품명</label>
+                <input type="text" name="sch_name" id="sch_name" class="frm_input" size="15">
+                <button type="button" id="btn_search_item" class="btn_frmline">검색</button>
             </span>
             <div id="relation" class="srel_list">
-                <p>상품 검색을 위해 상품의 분류를 선택해주십시오.</p>
+                <p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>
             </div>
             <script>
             $(function() {
-                $("#sch_relation").change(function() {
-                    var ca_id = $(this).val();
+                $("#btn_search_item").click(function() {
+                    var ca_id = $("#sch_relation").val();
+                    var it_name = $.trim($("#sch_name").val());
                     var $relation = $("#relation");
 
-                    if(ca_id == "") {
-                        $relation.html("<p>상품 검색을 위해 상품의 분류를 선택해주십시오.</p>");
+                    if(ca_id == "" && it_name == "") {
+                        $relation.html("<p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>");
                         return false;
                     }
 
                     $("#relation").load(
                         "./itemformrelation.php",
-                        { it_id: "<?php echo $it_id; ?>", ca_id: ca_id }
+                        { it_id: "<?php echo $it_id; ?>", ca_id: ca_id, it_name: it_name }
                     );
                 });
 
diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php
index 10d3244cf..6aa531097 100644
--- a/adm/shop_admin/itemformrelation.php
+++ b/adm/shop_admin/itemformrelation.php
@@ -2,11 +2,22 @@
 $sub_menu = '400300';
 include_once('./_common.php');
 
+$ca_id = trim($ca_id);
+$it_name = trim(stripslashes($it_name));
+
+if(!$ca_id && !$it_name)
+    die('<p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>');
+
 $sql = " select ca_id, it_id, it_name, it_price
            from {$g5['g5_shop_item_table']}
-          where it_id <> '$it_id'
-            and ( ca_id like '$ca_id%' or ca_id2 like '$ca_id%' or ca_id3 like '$ca_id%' )
-          order by ca_id, it_name ";
+          where it_id <> '$it_id' ";
+if($ca_id)
+    $sql .= " and ( ca_id like '$ca_id%' or ca_id2 like '$ca_id%' or ca_id3 like '$ca_id%' ) ";
+
+if($it_name)
+    $sql .= " and it_name like '%$it_name%' ";
+
+$sql .= " order by ca_id, it_name ";
 $result = sql_query($sql);
 
 $list = '';