From 4cc7e8e8f568ccfe394f080e49d8a5c9f65f8d15 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 25 Jul 2013 11:40:04 +0900 Subject: [PATCH 01/11] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EB=93=B1=EB=A1=9D=20=ED=9B=84=20=ED=95=B4=EB=8B=B9?= =?UTF-8?q?=20=EC=83=81=ED=92=88=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=A0=9C=EA=B1=B0=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemeventform.php | 7 +++++-- extend/shop.extend2.php | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/adm/shop_admin/itemeventform.php b/adm/shop_admin/itemeventform.php index a162cd552..c0e0f09cd 100644 --- a/adm/shop_admin/itemeventform.php +++ b/adm/shop_admin/itemeventform.php @@ -289,7 +289,8 @@ $(function() { $("#sch_item_list .add_item").live("click", function() { // 이미 등록된 상품인지 체크 - var it_id = $(this).closest("li").find("input:hidden").val(); + var $li = $(this).closest("li"); + var it_id = $li.find("input:hidden").val(); var it_id2; var dup = false; $("#reg_item_list input[name='it_id[]']").each(function() { @@ -305,7 +306,7 @@ $(function() { return false; } - var cont = "
  • "+$(this).closest("li").html().replace("add_item", "del_item").replace("추가", "삭제")+"
    • "; + var cont = "
  • "+$li.html().replace("add_item", "del_item").replace("추가", "삭제")+"
    • "; var count = $("#reg_item_list li").size(); if(count > 0) { @@ -313,6 +314,8 @@ $(function() { } else { $("#reg_item_list").html(""); } + + $li.remove(); }); $("#reg_item_list .del_item").live("click", function() { diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index e0997d4b9..995b31175 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -378,6 +378,6 @@ if(!sql_query(" select od_tax_flag from {$g4['shop_order_table']} limit 1 ", fal if (!isset($default['de_shop_skin'])) { sql_query(" ALTER TABLE `{$g4['shop_default_table']}` ADD `de_shop_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_admin_info_email`, - ADD `de_shop_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_shop_skin` ", true); + ADD `de_shop_mobile_skin` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_shop_skin` ", false); } ?> \ No newline at end of file From ac36d264799121ec5af055400669b41951daafe5 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 25 Jul 2013 11:56:24 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=9C=84=EC=B9=98?= =?UTF-8?q?=20=EC=9D=B4=EB=8F=99=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A9=94?= =?UTF-8?q?=EB=89=B4=20=EB=B2=88=ED=98=B8=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu500.shop_2of2.php | 12 ++++++------ adm/shop_admin/bannerform.php | 2 +- adm/shop_admin/bannerformupdate.php | 2 +- adm/shop_admin/bannerlist.php | 2 +- adm/shop_admin/contentform.php | 2 +- adm/shop_admin/contentformupdate.php | 2 +- adm/shop_admin/contentlist.php | 2 +- adm/shop_admin/faqform.php | 2 +- adm/shop_admin/faqformupdate.php | 2 +- adm/shop_admin/faqlist.php | 2 +- adm/shop_admin/faqmasterform.php | 2 +- adm/shop_admin/faqmasterformupdate.php | 2 +- adm/shop_admin/faqmasterlist.php | 2 +- adm/shop_admin/itemevent.php | 2 +- adm/shop_admin/itemeventform.php | 2 +- adm/shop_admin/itemeventformupdate.php | 2 +- adm/shop_admin/itemeventlist.php | 2 +- adm/shop_admin/itemeventlistupdate.php | 2 +- adm/shop_admin/itemeventsearch.php | 2 +- adm/shop_admin/itemeventwin.php | 2 +- adm/shop_admin/itemeventwindel.php | 2 +- adm/shop_admin/newwinform.php | 2 +- adm/shop_admin/newwinformupdate.php | 2 +- adm/shop_admin/newwinlist.php | 2 +- 24 files changed, 29 insertions(+), 29 deletions(-) diff --git a/adm/admin.menu500.shop_2of2.php b/adm/admin.menu500.shop_2of2.php index 46964bbfa..a13911650 100644 --- a/adm/admin.menu500.shop_2of2.php +++ b/adm/admin.menu500.shop_2of2.php @@ -7,12 +7,12 @@ $menu['menu500'] = array ( array('500100', '상품판매순위', G4_ADMIN_URL.'/shop_admin/itemsellrank.php', 'sst_rank'), array('500120', '주문내역출력', G4_ADMIN_URL.'/shop_admin/orderprint.php', 'sst_print_order', 1), array('500130', '전자결제내역', G4_ADMIN_URL.'/shop_admin/ordercardhistory.php', 'sst_pg', 1), - array('400630', '이벤트관리', G4_ADMIN_URL.'/shop_admin/itemevent.php', 'scf_event'), - array('400640', '이벤트일괄처리', G4_ADMIN_URL.'/shop_admin/itemeventlist.php', 'scf_event_mng'), - array('400700', '내용관리', G4_ADMIN_URL.'/shop_admin/contentlist.php', 'scf_contents', 1), - array('400710', 'FAQ관리', G4_ADMIN_URL.'/shop_admin/faqmasterlist.php', 'scf_faq', 1), - array('400730', '배너관리', G4_ADMIN_URL.'/shop_admin/bannerlist.php', 'scf_banner', 1), - array('400720', '팝업레이어관리', G4_ADMIN_URL.'/shop_admin/newwinlist.php', 'scf_poplayer', 1), + array('500300', '이벤트관리', G4_ADMIN_URL.'/shop_admin/itemevent.php', 'scf_event'), + array('500310', '이벤트일괄처리', G4_ADMIN_URL.'/shop_admin/itemeventlist.php', 'scf_event_mng'), + array('500400', '내용관리', G4_ADMIN_URL.'/shop_admin/contentlist.php', 'scf_contents', 1), + array('500410', 'FAQ관리', G4_ADMIN_URL.'/shop_admin/faqmasterlist.php', 'scf_faq', 1), + array('500500', '배너관리', G4_ADMIN_URL.'/shop_admin/bannerlist.php', 'scf_banner', 1), + array('500510', '팝업레이어관리', G4_ADMIN_URL.'/shop_admin/newwinlist.php', 'scf_poplayer', 1), array('500140', '보관함현황', G4_ADMIN_URL.'/shop_admin/wishlist.php', 'sst_wish'), array('500200', 'SMS 문자전송', G4_ADMIN_URL.'/shop_admin/smssend.php', 'sst_sms'), array('500210', '가격비교사이트', G4_ADMIN_URL.'/shop_admin/price.php', 'sst_compare', 1) diff --git a/adm/shop_admin/bannerform.php b/adm/shop_admin/bannerform.php index cb38015b6..7fca8126e 100644 --- a/adm/shop_admin/bannerform.php +++ b/adm/shop_admin/bannerform.php @@ -1,5 +1,5 @@ Date: Thu, 25 Jul 2013 16:24:18 +0900 Subject: [PATCH 03/11] =?UTF-8?q?=EC=83=81=ED=92=88=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88=20=EB=B0=8F=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemform.php | 421 +++++++++++------------ adm/shop_admin/itemformrelation.php | 19 +- adm/shop_admin/itemformrelationimage.php | 23 -- 3 files changed, 213 insertions(+), 250 deletions(-) delete mode 100644 adm/shop_admin/itemformrelationimage.php diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php index 68859654b..958558715 100644 --- a/adm/shop_admin/itemform.php +++ b/adm/shop_admin/itemform.php @@ -997,9 +997,8 @@ $(function(){

    등록된 전체상품 목록에서 상품분류를 선택하면 해당 상품 리스트가 연이어 나타납니다.
    - 상품리스트에서 관련 상품으로 추가하길 원하는 상품을 마우스 더블클릭하거나 키보드 스페이스바를 누르면, 선택된 관련상품 목록에 함께 추가됩니다.
    - 예를 들어, A 상품에 B 상품을 관련상품으로 등록하면 B 상품에도 A 상품이 관련상품으로 자동 추가되며, 확인 버튼을 누르셔야 정상 반영됩니다.
    - 선택된 관련상품 목록에서 상품을 마우스 더블클릭하거나 키보드 스페이스바를 누르면 선택된 관련상품 목록에서 제거됩니다. + 상품리스트에서 관련 상품으로 추가하시면 선택된 관련상품 목록에 함께 추가됩니다.
    + 예를 들어, A 상품에 B 상품을 관련상품으로 등록하면 B 상품에도 A 상품이 관련상품으로 자동 추가되며, 확인 버튼을 누르셔야 정상 반영됩니다.

    @@ -1007,7 +1006,7 @@ $(function(){ - -
    - 현재 활성화 된 상품 - -
    - +

    선택된 관련상품 목록

    - -
    - 현재 활성화 된 상품 - +
    + '; + ?> +
  • + + + +
    • + 0) + echo ''; + else + echo '

    선택된 상품이 없습니다.

    '; + ?>
    @@ -1159,112 +1112,105 @@ $(function(){

    관련이벤트

    -

    - 등록된 전체이벤트 목록에서 추가하길 원하는 이벤트를 마우스 더블클릭하거나 키보드 스페이스바를 누르면, 선택된 관련이벤트 목록에 추가됩니다.
    - 선택된 관련이벤트 목록에서 이벤트 선택 후 마우스 더블클릭하거나 키보드 스페이스바를 누르면 선택된 관련이벤트 목록에서 제거됩니다. -

    -

    등록된 전체이벤트 목록

    - +
    + '; + ?> +
  • + + + +
    • + 0) + echo ''; + else + echo '

    등록된 이벤트가 없습니다.

    '; + ?> +

    선택된 관련이벤트 목록

    - +
    + '; + ?> +
  • + + + +
    • + 0) + echo ''; + else + echo '

    선택된 이벤트가 없습니다.

    '; + ?> +
    @@ -1509,12 +1455,47 @@ function fitemformcheck(f) } } + // 관련상품처리 + var item = new Array(); + var re_item = it_id = ""; + + $("#reg_relation input[name='re_it_id[]']").each(function() { + it_id = $(this).val(); + if(it_id == "") + return true; + + item.push(it_id); + }); + + if(item.length > 0) + re_item = item.join(); + + $("input[name=it_list]").val(re_item); + + // 이벤트처리 + var evnt = new Array(); + var ev = ev_id = ""; + + $("#reg_event_list input[name='ev_id[]']").each(function() { + ev_id = $(this).val(); + if(ev_id == "") + return true; + + evnt.push(ev_id); + }); + + if(evnt.length > 0) + ev = evnt.join(); + + $("input[name=ev_list]").val(ev); + + return true; } diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php index 73f5ff427..2b8f756a8 100644 --- a/adm/shop_admin/itemformrelation.php +++ b/adm/shop_admin/itemformrelation.php @@ -9,20 +9,25 @@ $sql = " select ca_id, it_id, it_name, it_price order by ca_id, it_name "; $result = sql_query($sql); +$list = ''; + for($i=0;$row=sql_fetch_array($result);$i++) { - //$sql2 = " select count(*) as cnt from $g4[shop_item_relation_table] where it_id = '$row[it_id]' "; $sql2 = " select count(*) as cnt from {$g4['shop_item_relation_table']} where it_id = '$it_id' and it_id2 = '{$row['it_id']}' "; $row2 = sql_fetch($sql2); if ($row2['cnt']) continue; - $sql2 = " select ca_name from {$g4['shop_category_table']} where ca_id = '{$row['ca_id']}' "; - $row2 = sql_fetch($sql2); - $ca_name = addslashes($row2['ca_name']); + $it_name = get_it_image($row['it_id'], 50, 50).' '.$row['it_name']; - $it_name = addslashes($row['it_name']); - $options .= "\n"; + $list .= '
  • '; + $list .= ''; + $list .= $it_name; + $list .= ''; + $list .= '
    • '.PHP_EOL; } -echo $options; +if($list) + $list = '
      '.$list.'
    '; + +echo $list; ?> \ No newline at end of file diff --git a/adm/shop_admin/itemformrelationimage.php b/adm/shop_admin/itemformrelationimage.php deleted file mode 100644 index ef5844d3a..000000000 --- a/adm/shop_admin/itemformrelationimage.php +++ /dev/null @@ -1,23 +0,0 @@ -'; - -echo ''.$img.'
    '.display_price($row['it_price']); -?> \ No newline at end of file From 34f7be94b7f34050313c12b9a80a83a3ec6d6a82 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 25 Jul 2013 16:34:28 +0900 Subject: [PATCH 04/11] =?UTF-8?q?=EB=B0=B0=EB=84=88=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=97=90=EC=84=9C=20=EB=B0=B0?= =?UTF-8?q?=EB=84=88=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=9E=88=EC=9D=84=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=EB=A7=8C=20=EC=B6=9C=EB=A0=A5=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/bannerlist.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php index aef5be914..b874343b4 100644 --- a/adm/shop_admin/bannerlist.php +++ b/adm/shop_admin/bannerlist.php @@ -63,12 +63,12 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함 $width = 800; else $width = $size[0]; - } - $bn_img = ""; - if ($row['bn_url'] && $row['bn_url'] != "http://") - $bn_img .= ''; - $bn_img .= ''.$row['bn_alt'].''; + $bn_img = ""; + if ($row['bn_url'] && $row['bn_url'] != "http://") + $bn_img .= ''; + $bn_img .= ''.$row['bn_alt'].''; + } $bn_begin_time = substr($row['bn_begin_time'], 2, 14); $bn_end_time = substr($row['bn_end_time'], 2, 14); From 48a76194d8266ee004c15d09786e23947f923b48 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 25 Jul 2013 17:56:47 +0900 Subject: [PATCH 05/11] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20#264=20=EC=83=81=ED=92=88=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88/=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D?= =?UTF-8?q?=ED=8F=BC=20=EB=A7=88=ED=81=AC=EC=97=85=20=EB=B0=8F=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemeventform.php | 17 ++++++++++------- adm/shop_admin/itemform.php | 16 ++++++++-------- css/admin.css | 20 +++++++++++--------- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/adm/shop_admin/itemeventform.php b/adm/shop_admin/itemeventform.php index ce3624b68..e70518272 100644 --- a/adm/shop_admin/itemeventform.php +++ b/adm/shop_admin/itemeventform.php @@ -164,21 +164,24 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); 관련상품 - +

    상품검색

    - -
    + + + +

    등록된 상품

    -
    + +
    ">목록
    -
    +

    관련상품

    @@ -1004,7 +1004,7 @@ $(function(){

    등록된 전체상품 목록

    - + -
    +
    @@ -1175,6 +1195,10 @@ $(function(){ return false; $(this).closest("li").remove(); + + var count = $("#reg_event_list li").size(); + if(count < 1) + $("#reg_event_list").html("

    선택된 이벤트가 없습니다.

    "); }); }); diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php index 2b8f756a8..4ca084ef5 100644 --- a/adm/shop_admin/itemformrelation.php +++ b/adm/shop_admin/itemformrelation.php @@ -28,6 +28,8 @@ for($i=0;$row=sql_fetch_array($result);$i++) { if($list) $list = '
      '.$list.'
    '; +else + $list = '

    등록된 상품이 없습니다.'; echo $list; ?> \ No newline at end of file From 6bdb7bd276184154c023e3169c421b17e9bfdb5a Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 26 Jul 2013 09:49:46 +0900 Subject: [PATCH 10/11] =?UTF-8?q?=EC=83=81=ED=92=88=EC=9D=B4=20=EC=97=86?= =?UTF-8?q?=EC=9D=84=20=EB=95=8C=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC?= =?UTF-8?q?=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/itemeventsearch.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adm/shop_admin/itemeventsearch.php b/adm/shop_admin/itemeventsearch.php index a80dd728c..f15025c58 100644 --- a/adm/shop_admin/itemeventsearch.php +++ b/adm/shop_admin/itemeventsearch.php @@ -33,6 +33,8 @@ for($i=0;$row=sql_fetch_array($result);$i++) { if($list) $list = '

      '.$list.'
    '; +else + $list = '

    등록된 상품이 없습니다.

    '; echo $list; ?> \ No newline at end of file From 896b96d6d15859f8e62ed6042eaac54fb6638cde Mon Sep 17 00:00:00 2001 From: whitedot Date: Fri, 26 Jul 2013 10:20:42 +0900 Subject: [PATCH 11/11] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90:=20=EA=B4=80=EB=A0=A8=EC=83=81=ED=92=88,=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20=EC=95=88=EB=82=B4=EB=A9=94=EC=84=B8=EC=A7=80=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index 01a43fcab..a935c0369 100644 --- a/css/admin.css +++ b/css/admin.css @@ -268,7 +268,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right} .srel li {position:relative;border-bottom:1px solid #e9e9e9} .srel .srel_list {height:auto !important;height:200px;max-height:200px;border:1px solid #ced9de;background:#f6f6f6;overflow-y:scroll} .srel .srel_sel {border:1px solid #ced9de;background:#fcfff2} -.srel .srel_sel p {text-align:center} +.srel .srel_list p, .srel .srel_sel p {text-align:center} .srel .compare_left ul {margin:0;list-style:none} .srel button {position:absolute;top:12px;right:0} .srel .srel_noneimg li {padding:7px 0}