From 3b39b447c15adf69983d83a42725cd1943929469 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 14 Apr 2014 18:02:15 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EA=B4=80=EB=A0=A8=20=EC=83=81=ED=92=88=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/itemeventform.php    | 16 ++++++++++------
 adm/shop_admin/itemeventsearch.php  | 17 +++++++++++++----
 adm/shop_admin/itemformrelation.php |  2 ++
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/adm/shop_admin/itemeventform.php b/adm/shop_admin/itemeventform.php
index 575522bbf..91f7a0cb0 100644
--- a/adm/shop_admin/itemeventform.php
+++ b/adm/shop_admin/itemeventform.php
@@ -205,9 +205,12 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
                         <option value="">분류선택</option>
                         <?php echo $category_select; ?>
                     </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="sch_item_list" class="srel_list">
-                    <p>상품 검색을 위해 상품의 분류를 선택해주십시오.</p>
+                    <p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>
                 </div>
             </section>
 
@@ -314,17 +317,18 @@ include_once (G5_ADMIN_PATH.'/admin.head.php');
 
 <script>
 $(function() {
-    $("#sch_ca_id").change(function() {
-        var ca_id = $(this).val();
+    $("#btn_search_item").click(function() {
+        var ca_id = $("#sch_ca_id").val();
+        var it_name = $.trim($("#sch_name").val());
 
-        if(ca_id == "") {
-            $("#sch_item_list").html("<p>상품 검색을 위해 상품의 분류를 선택해주십시오.</p>");
+        if(ca_id == "" && it_name == "") {
+            $("#sch_item_list").html("<p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>");
             return false;
         }
 
         $("#sch_item_list").load(
             "./itemeventsearch.php",
-            { w: "<?php echo $w; ?>", ev_id: "<?php echo $ev_id; ?>", ca_id: ca_id }
+            { w: "<?php echo $w; ?>", ev_id: "<?php echo $ev_id; ?>", ca_id: ca_id, it_name: it_name }
         );
     });
 
diff --git a/adm/shop_admin/itemeventsearch.php b/adm/shop_admin/itemeventsearch.php
index 51a274676..914c54f77 100644
--- a/adm/shop_admin/itemeventsearch.php
+++ b/adm/shop_admin/itemeventsearch.php
@@ -4,13 +4,22 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], "w");
 
-if(!trim($_POST['ca_id']))
-    die("");
+$ca_id = trim($ca_id);
+$it_name = trim(stripslashes($it_name));
+
+if(!$ca_id && !$it_name)
+    die('<p>상품의 분류를 선택하시거나 상품명을 입력하신 후 검색하여 주십시오.</p>');
 
 $sql = " select it_id, it_name
            from {$g5['g5_shop_item_table']}
-          where ( ca_id like '$ca_id%' or ca_id2 like '$ca_id%' or ca_id3 like '$ca_id%' )
-          order by ca_id, it_name ";
+          where (1) ";
+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 = '';
diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php
index b9985e0c4..dac756d87 100644
--- a/adm/shop_admin/itemformrelation.php
+++ b/adm/shop_admin/itemformrelation.php
@@ -2,6 +2,8 @@
 $sub_menu = '400300';
 include_once('./_common.php');
 
+auth_check($auth[$sub_menu], "w");
+
 $ca_id = trim($ca_id);
 $it_name = trim(stripslashes($it_name));