From 00198eb8cbf77f023bf65c0f0c9fb40529aec9cf Mon Sep 17 00:00:00 2001 From: gnuboard Date: Mon, 24 Jun 2013 14:24:44 +0900 Subject: [PATCH 01/13] =?UTF-8?q?$qstr=20=EB=B3=80=EC=88=98=EA=B0=80=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=EB=A1=9C=20=EC=9D=B8=EC=8B=9D?= =?UTF-8?q?=EB=90=98=EB=8D=98=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/visit_domain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/visit_domain.php b/adm/visit_domain.php index 6cc4501dc..eb8ec867d 100644 --- a/adm/visit_domain.php +++ b/adm/visit_domain.php @@ -70,7 +70,7 @@ while ($row=sql_fetch_array($result)) { $link2 = ''; $key = '직접'; } else { - $link = ''; + $link = ''; $link2 = ''; } From a6ab77a71d5e6ae57d20396ff635c0436f0f749a Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 24 Jun 2013 14:31:38 +0900 Subject: [PATCH 02/13] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=20=EC=8A=A4=ED=82=A8=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EC=82=AC=EB=85=B8=EB=9D=BC=EA=B0=80=EB=85=B8=EB=9D=BC=EB=8B=98?= =?UTF-8?q?=20=EC=A0=9C=EC=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/search/basic/search.skin.php | 3 ++- skin/search/basic/style.css | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/skin/search/basic/search.skin.php b/skin/search/basic/search.skin.php index 27bcdb8c0..2cafe220a 100644 --- a/skin/search/basic/search.skin.php +++ b/skin/search/basic/search.skin.php @@ -21,7 +21,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - +
@@ -954,6 +954,8 @@ setTimeout("init_pay_button();",500); From b81002cc24593b86fc1a19e75a73f44fb5ecb465 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 09:11:40 +0900 Subject: [PATCH 12/13] =?UTF-8?q?get=20=EB=B0=A9=EC=8B=9D=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EA=B5=AC=EB=A7=A4=EC=97=90=EC=84=9C=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=EA=B4=80=EB=A0=A8=20=EC=B2=B4=ED=81=AC=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/itembuy.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shop/itembuy.php b/shop/itembuy.php index d53b82e19..f7dbd25f4 100644 --- a/shop/itembuy.php +++ b/shop/itembuy.php @@ -8,6 +8,13 @@ $io_id = $_GET['opt']; $sql = " select * from {$g4['shop_item_table']} where it_id = '$it_id' "; $it = sql_fetch($sql); +// 상품옵션체크 +$sql = " select count(*) as cnt from {$g4['shop_item_option_table']} where it_id = '$it_id' and io_type = '0' and io_use = '1' "; +$cnt = sql_fetch($sql); + +if(($io_id && !$cnt['cnt']) || (!$io_id && $cnt['cnt'])) + alert('상품의 옵션정보가 변경됐습니다.\\n상품페이지에서 다시 주문해 주십시오.', G4_SHOP_URL.'/item.php?it_id='.$it_id); + // 옵션정보 if($io_id && $it['it_option_subject']) { $sql = " select * from {$g4['shop_item_option_table']} where it_id = '$it_id' and io_id = '$io_id' "; From 35f5ffbdf2f7e5cef59ebe1ce5563f3f06b652ab Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 25 Jun 2013 11:54:41 +0900 Subject: [PATCH 13/13] =?UTF-8?q?#246=20=EC=98=B5=EC=85=98=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=ED=8A=BC=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F?= =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=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 --- js/shop.js | 63 +++++++++++++++++++++++++++++++++++--------- lib/shop.lib.php | 1 - mobile/shop/item.php | 3 --- shop/cartoption.php | 3 --- shop/item.php | 3 --- 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/js/shop.js b/js/shop.js index b1846cb45..caaf177a3 100644 --- a/js/shop.js +++ b/js/shop.js @@ -1,5 +1,27 @@ +var option_add = false; +var supply_add = false; + $(function() { // 선택옵션 + $("select[name='it_option[]']").live("keydown", function(e) { + var sel_count = $("select[name='it_option[]']").size(); + var idx = $("select[name='it_option[]']").index($(this)); + var code = e.keyCode; + var val = $(this).val(); + + option_add = false; + if(code == 13 && sel_count == idx + 1) { + if(val == "") + return; + + sel_option_process(true); + } + }); + + $("select[name='it_option[]']").live("mousedown", function() { + option_add = true; + }); + $("select[name='it_option[]']").live("change", function() { var sel_count = $("select[name='it_option[]']").size(); var idx = $("select[name='it_option[]']").index($(this)); @@ -44,6 +66,9 @@ $(function() { } ); } else if((idx + 1) == sel_count) { // 선택옵션처리 + if(option_add && val == "") + return; + var info = val.split(","); // 재고체크 if(parseInt(info[2]) < 1) { @@ -51,27 +76,39 @@ $(function() { return false; } - // 선택옵션 자동추가 기능을 사용하려면 아래 false를 true로 설정 - sel_option_process(false); + if(option_add) + sel_option_process(true); } }); // 추가옵션 + $("select[name='it_supply[]']").live("keydown", function(e) { + var $el = $(this); + var code = e.keyCode; + var val = $(this).val(); + + supply_add = false; + if(code == 13) { + if(val == "") + return; + + sel_supply_process($el, true); + } + }); + + $("select[name='it_supply[]']").live("mousedown", function() { + supply_add = true; + }); + $("select[name='it_supply[]']").live("change", function() { var $el = $(this); - // 선택옵션 자동추가 기능을 사용하려면 아래 false를 true로 설정 - sel_supply_process($el, false); - }); + var val = $(this).val(); - // 선택옵션 추가 - $("#sit_selopt_submit").live("click", function() { - sel_option_process(true); - }); + if(val == "") + return; - // 추가옵션 추가 - $("button.sit_sel_submit").live("click", function() { - var $el = $(this).closest("td").find("select[name='it_supply[]']"); - sel_supply_process($el, true); + if(supply_add) + sel_supply_process($el, true); }); // 수량변경 및 삭제 diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 8645314b7..ae771cc96 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -705,7 +705,6 @@ function get_item_supply($it_id, $subject) } } $select .= ''.PHP_EOL; - $select .= ''.PHP_EOL; $str .= ''.$select.''.PHP_EOL; $str .= ''.PHP_EOL; diff --git a/mobile/shop/item.php b/mobile/shop/item.php index 4b7f4e94d..b7c911902 100644 --- a/mobile/shop/item.php +++ b/mobile/shop/item.php @@ -378,9 +378,6 @@ else ?> -
- -
-
- -
-
- -