From 94822deddc0292f3b92775d0e86d9180af467928 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 6 Mar 2014 18:31:35 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?= =?UTF-8?q?x=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/head.php b/head.php index a9a14d967..bce43194a 100644 --- a/head.php +++ b/head.php @@ -122,7 +122,9 @@ if (G5_IS_MOBILE) { 'mobile' order by bo_order "; $result2 = sql_query($sql2); - for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index + $gnb_zindex = 999; // gnb_1dli z-index 값 설정용 + for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index + $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여 ?>
    • From ebb6a1c63a53c4ecbaf8a0b67794b7d8eefe078f Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 6 Mar 2014 18:34:53 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?= =?UTF-8?q?x=20=EC=B6=94=EA=B0=802?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/head.php b/head.php index bce43194a..e0600fd7f 100644 --- a/head.php +++ b/head.php @@ -114,7 +114,9 @@ if (G5_IS_MOBILE) { 'mobile' order by gr_order "; $result = sql_query($sql); + $gnb_zindex = 999; // gnb_1dli z-index 값 설정용 for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index + $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여 ?>
  • @@ -122,9 +124,7 @@ if (G5_IS_MOBILE) { 'mobile' order by bo_order "; $result2 = sql_query($sql2); - $gnb_zindex = 999; // gnb_1dli z-index 값 설정용 for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index - $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여 ?>
    • From ddd1726bf1e1f90efe2a1c3032fad2d5ad9ee573 Mon Sep 17 00:00:00 2001 From: whitedot Date: Thu, 6 Mar 2014 18:38:21 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20gnb=20z-inde?= =?UTF-8?q?x=20=EC=B6=94=EA=B0=803?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/head.php b/head.php index e0600fd7f..d574bd650 100644 --- a/head.php +++ b/head.php @@ -118,13 +118,13 @@ if (G5_IS_MOBILE) { for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index $gnb_zindex -= 1; // html 구조에서 앞선 gnb_1dli 에 더 높은 z-index 값 부여 ?> -
  • +
    • 'mobile' order by bo_order "; $result2 = sql_query($sql2); - for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index + for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index ?>
      • From 12b9a4fe052a9a261e99de48d389578c104e830d Mon Sep 17 00:00:00 2001 From: chicpro Date: Fri, 7 Mar 2014 16:48:41 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=9B=84=EA=B8=B0=20?= =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=99=84=EB=A3=8C=20=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=EB=A3=A8=ED=8B=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 4 ++-- mobile/shop/itemuseform.php | 6 +++--- shop/itemuseform.php | 6 +++--- shop/itemuseformupdate.php | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 5e5e7e280..ae935adcf 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1873,7 +1873,7 @@ function is_soldout($it_id) } // 상품후기 작성가능한지 체크 -function check_itemuse_write($close=true) +function check_itemuse_write($it_id, $mb_id, $close=true) { global $g5, $default, $is_admin; @@ -1882,7 +1882,7 @@ function check_itemuse_write($close=true) $sql = " select count(*) as cnt from {$g5['g5_shop_cart_table']} where it_id = '$it_id' - and mb_id = '{$member['mb_id']}' + and mb_id = '$mb_id' and ct_status = '완료' "; $row = sql_fetch($sql); diff --git a/mobile/shop/itemuseform.php b/mobile/shop/itemuseform.php index 5a77f01c5..88f88c0be 100644 --- a/mobile/shop/itemuseform.php +++ b/mobile/shop/itemuseform.php @@ -10,11 +10,11 @@ $w = trim($_REQUEST['w']); $it_id = trim($_REQUEST['it_id']); $is_id = trim($_REQUEST['is_id']); -// 사용후기 작성 설정에 따른 체크 -check_itemuse_write(); - if ($w == "") { $is_score = 5; + + // 사용후기 작성 설정에 따른 체크 + check_itemuse_write($it_id, $member['mb_id']); } else if ($w == "u") { $use = sql_fetch(" select * from {$g5['g5_shop_item_use_table']} where is_id = '$is_id' "); if (!$use) { diff --git a/shop/itemuseform.php b/shop/itemuseform.php index d47f7b0d0..ad2366603 100644 --- a/shop/itemuseform.php +++ b/shop/itemuseform.php @@ -16,11 +16,11 @@ $w = trim($_REQUEST['w']); $it_id = trim($_REQUEST['it_id']); $is_id = trim($_REQUEST['is_id']); -// 사용후기 작성 설정에 따른 체크 -check_itemuse_write(); - if ($w == "") { $is_score = 5; + + // 사용후기 작성 설정에 따른 체크 + check_itemuse_write($it_id, $member['mb_id']); } else if ($w == "u") { $use = sql_fetch(" select * from {$g5['g5_shop_item_use_table']} where is_id = '$is_id' "); if (!$use) { diff --git a/shop/itemuseformupdate.php b/shop/itemuseformupdate.php index 0686fe4d1..642330d2a 100644 --- a/shop/itemuseformupdate.php +++ b/shop/itemuseformupdate.php @@ -5,9 +5,6 @@ if (!$is_member) { alert_close("사용후기는 회원만 작성이 가능합니다."); } -// 사용후기 작성 설정에 따른 체크 -check_itemuse_write(); - $it_id = trim($_REQUEST['it_id']); $is_subject = trim($_POST['is_subject']); $is_content = trim($_POST['is_content']); @@ -15,6 +12,9 @@ $is_name = trim($_POST['is_name']); $is_password = trim($_POST['is_password']); $is_score = (int)$_POST['is_score'] > 5 ? 0 : (int)$_POST['is_score']; +// 사용후기 작성 설정에 따른 체크 +check_itemuse_write($it_id, $member['mb_id']); + if ($w == "" || $w == "u") { $is_name = $member['mb_name']; $is_password = $member['mb_password']; From 9130ece86769043f9720f3a0276d531af0f07c31 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 10 Mar 2014 10:23:08 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=B0=A9=EB=B2=95=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95=20-=20=EC=B0=B8=EC=97=86?= =?UTF-8?q?=EB=8B=A4=EB=8B=98=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/orderform.php | 8 ++++---- shop/orderform.php | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 7a2fcd20a..3c16e0ec4 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -634,8 +634,8 @@ ob_end_clean(); $escrow_title = "에스크로 "; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
        '; + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + echo '
          '; } // 무통장입금 사용 @@ -726,8 +726,8 @@ ob_end_clean(); echo '
        '; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
      '; + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + echo ''; } if ($multi_settle == 0) diff --git a/shop/orderform.php b/shop/orderform.php index c7473b06a..0275aced0 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -917,9 +917,9 @@ function get_intall_file() $escrow_title = "에스크로 "; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
      '; - echo '결제방법 선택'; + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + echo '
      '; + echo '결제방법 선택'; } // 무통장입금 사용 @@ -1011,9 +1011,8 @@ function get_intall_file() echo ''; } - if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_bank_use'] || $default['de_bank_use'] || $default['de_bank_use']) { - echo '
      '; - + if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use']) { + echo '
      '; } if ($multi_settle == 0) From 1ec3ad24ef3b5ed34a1387813a29e86439ae2e16 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 10 Mar 2014 10:30:08 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EB=B0=A9=EB=AC=B8=EC=9E=90=EC=88=98=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=EB=B3=80=ED=99=98=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EB=8D=94=EC=B9=B4=EC=9D=B4=EB=8B=98?= =?UTF-8?q?=20=EC=A0=9C=EB=B3=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/visit.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/visit.lib.php b/lib/visit.lib.php index d06ed1dd2..ed0677857 100644 --- a/lib/visit.lib.php +++ b/lib/visit.lib.php @@ -13,10 +13,10 @@ function visit($skin_dir='basic') // $visit[4] = 전체 // 숫자가 들어감 preg_match("/오늘:(.*),어제:(.*),최대:(.*),전체:(.*)/", $config['cf_visit'], $visit); - settype($visit[0], "integer"); settype($visit[1], "integer"); settype($visit[2], "integer"); settype($visit[3], "integer"); + settype($visit[4], "integer"); ob_start(); if(G5_IS_MOBILE) { From c6161454cfd3d433924a7991e179c41a8762ed73 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 10 Mar 2014 15:50:25 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=8B=A0=EA=B7=9C=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EC=BF=A0=ED=8F=B0=20=EB=B0=9C=ED=96=89=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 20 +++++++++ adm/shop_admin/configformupdate.php | 5 ++- bbs/register_form_update.php | 45 +++++++++++++++++++ install/gnuboard5shop.sql | 5 ++- .../member/basic/register_result.skin.php | 7 +++ skin/member/basic/register_result.skin.php | 7 +++ 6 files changed, 87 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 66cb6e57e..3c3aa1617 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -64,6 +64,14 @@ if(!isset($default['de_mobile_rel_list_use'])) { ADD `de_mobile_rel_img_width` int(11) NOT NULL DEFAULT '0' AFTER `de_mobile_rel_list_skin`, ADD `de_mobile_rel_img_height` int(11) NOT NULL DEFAULT ' 0' AFTER `de_mobile_rel_img_width`", true); } + +// 신규회원 쿠폰 설정 필드 추가 +if(!isset($default['de_member_reg_coupon_use'])) { + sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}` + ADD `de_member_reg_coupon_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_tax_flag_use`, + ADD `de_member_reg_coupon_term` int(11) NOT NULL DEFAULT '0' AFTER `de_member_reg_coupon_use`, + ADD `de_member_reg_coupon_price` int(11) NOT NULL DEFAULT '0' AFTER `de_member_reg_coupon_term` ", true); +} ?>
      @@ -987,6 +995,18 @@ if(!isset($default['de_mobile_rel_list_use'])) { > 사용 + + 신규회원 쿠폰발행 + + + + > + + 원 + + 일 + + 비회원에 대한
      개인정보수집 내용 diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index d5a3d64bd..e182f1c0d 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -163,7 +163,10 @@ $sql = " update {$g5['g5_shop_default_table']} de_guest_privacy = '$de_guest_privacy', de_hp_use = '$de_hp_use', de_escrow_use = '$de_escrow_use', - de_tax_flag_use = '$de_tax_flag_use' + de_tax_flag_use = '$de_tax_flag_use', + de_member_reg_coupon_use = '$de_member_reg_coupon_use', + de_member_reg_coupon_term = '$de_member_reg_coupon_term', + de_member_reg_coupon_price = '$de_member_reg_coupon_price' "; sql_query($sql); diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php index b593792cc..ae4d2ab98 100644 --- a/bbs/register_form_update.php +++ b/bbs/register_form_update.php @@ -359,6 +359,51 @@ if ($config['cf_use_email_certify'] && $old_email != $mb_email) { } +// 신규회원 쿠폰발생 +if($w == '' && $default['de_member_reg_coupon_use'] && $default['de_member_reg_coupon_term'] > 0 && $default['de_member_reg_coupon_price'] > 0) { + $j = 0; + $create_coupon = false; + + do { + $cp_id = get_coupon_id(); + + $sql3 = " select count(*) as cnt from {$g5['g5_shop_coupon_table']} where cp_id = '$cp_id' "; + $row3 = sql_fetch($sql3); + + if(!$row3['cnt']) { + $create_coupon = true; + break; + } else { + if($j > 20) + break; + } + } while(1); + + if($create_coupon) { + $cp_subject = '신규 회원가입 축하 쿠폰'; + $cp_method = 2; + $cp_target = ''; + $cp_start = G5_TIME_YMD; + $cp_end = date("Y-m-d", (G5_SERVER_TIME + (86400 * ((int)$default['de_member_reg_coupon_term'] - 1)))); + $cp_type = 0; + $cp_price = $default['de_member_reg_coupon_price']; + $cp_trunc = 1; + $cp_minimum = 0; + $cp_maximum = 0; + + $sql = " INSERT INTO {$g5['g5_shop_coupon_table']} + ( cp_id, cp_subject, cp_method, cp_target, mb_id, cp_start, cp_end, cp_type, cp_price, cp_trunc, cp_minimum, cp_maximum, cp_datetime ) + VALUES + ( '$cp_id', '$cp_subject', '$cp_method', '$cp_target', '$mb_id', '$cp_start', '$cp_end', '$cp_type', '$cp_price', '$cp_trunc', '$cp_minimum', '$cp_maximum', '".G5_TIME_YMDHIS."' ) "; + + $res = sql_query($sql, false); + + if($res) + set_session('ss_member_reg_coupon', 1); + } +} + + // 사용자 코드 실행 @include_once ($member_skin_path.'/register_form_update.tail.skin.php'); diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql index 3369c9f1d..6d4770956 100644 --- a/install/gnuboard5shop.sql +++ b/install/gnuboard5shop.sql @@ -304,7 +304,10 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` ( `de_guest_privacy` text NOT NULL, `de_hp_use` tinyint(4) NOT NULL DEFAULT '0', `de_escrow_use` tinyint(4) NOT NULL DEFAULT '0', - `de_tax_flag_use` tinyint(4) NOT NULL DEFAULT '0' + `de_tax_flag_use` tinyint(4) NOT NULL DEFAULT '0', + `de_member_reg_coupon_use` tinyint(4) NOT NULL DEFAULT '0', + `de_member_reg_coupon_term` int(11) NOT NULL DEFAULT '0', + `de_member_reg_coupon_price` int(11) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- diff --git a/mobile/skin/member/basic/register_result.skin.php b/mobile/skin/member/basic/register_result.skin.php index 70c88f602..8f34115e4 100644 --- a/mobile/skin/member/basic/register_result.skin.php +++ b/mobile/skin/member/basic/register_result.skin.php @@ -39,6 +39,13 @@ add_stylesheet('', 감사합니다.

      + +

      + 님께 주문시 사용하실 수 있는 원 할인 쿠폰이 발행됐습니다.
      + 발행된 할인 쿠폰 내역은 마이페이지에서 확인하실 수 있습니다. +

      + +
      메인으로
      diff --git a/skin/member/basic/register_result.skin.php b/skin/member/basic/register_result.skin.php index 050f15ccb..5445cd567 100644 --- a/skin/member/basic/register_result.skin.php +++ b/skin/member/basic/register_result.skin.php @@ -40,6 +40,13 @@ add_stylesheet('', 감사합니다.

      + +

      + 님께 주문시 사용하실 수 있는 원 할인 쿠폰이 발행됐습니다.
      + 발행된 할인 쿠폰 내역은 마이페이지에서 확인하실 수 있습니다. +

      + +
      메인으로