From e34fd0f0664f3d6a7f3f94bffeafc17ca8b5c02f Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 23 Jul 2013 17:39:57 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=20=ED=9B=84=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=82=B4=EC=97=AD?= =?UTF-8?q?=20=EA=B8=B0=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EC=A4=91=20{}=20?= =?UTF-8?q?=EA=B8=B0=ED=98=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/memo_form_update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php index 20a38ce14..fe8611bf5 100644 --- a/bbs/memo_form_update.php +++ b/bbs/memo_form_update.php @@ -68,7 +68,7 @@ for ($i=0; $i Date: Wed, 24 Jul 2013 10:35:50 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EC=8B=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=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 --- bbs/delete_comment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bbs/delete_comment.php b/bbs/delete_comment.php index 2f9762725..89d5fe84d 100644 --- a/bbs/delete_comment.php +++ b/bbs/delete_comment.php @@ -59,7 +59,7 @@ if ($row['cnt'] && !$is_admin) alert('이 코멘트와 관련된 답변코멘트가 존재하므로 삭제 할 수 없습니다.'); // 코멘트 삭제 -if (!delete_point($write['mb_id'], $bo_table, $comment_id, '코멘트')) +if (!delete_point($write['mb_id'], $bo_table, $comment_id, '댓글')) insert_point($write['mb_id'], $board['bo_comment_point'] * (-1), "{$board['bo_subject']} {$write['wr_parent']}-{$comment_id} 코멘트삭제"); // 코멘트 삭제 From e72088a8bf1ed26a8396f2feaaffe858be92f9f8 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 14:19:33 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EB=A7=88=EC=9D=BC=EB=A6=AC=EC=A7=80=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EB=B0=8F=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu400.shop_1of2.php | 1 - adm/shop_admin/configform.php | 7 - adm/shop_admin/configformupdate.php | 1 - adm/shop_admin/mileagelist.php | 231 ------------------- adm/shop_admin/mileagelist_delete.php | 32 --- adm/shop_admin/mileageupdate.php | 24 -- adm/shop_admin/ordercartupdate.php | 6 +- adm/shop_admin/orderform.php | 13 +- extend/shop.extend2.php | 23 +- install/install_db.php | 6 - install/shop.sql | 20 -- lib/shop.lib.php | 85 +------ mobile/shop/mypage.php | 5 - mobile/shop/orderform.php | 98 ++------ mobile/shop/orderformupdate.php | 64 ++--- shop/mileage.php | 113 --------- shop/mypage.php | 5 - shop/orderform.php | 89 ++----- shop/orderformupdate.php | 64 ++--- shop/orderinquirycancel.php | 7 +- skin/outlogin/shop_basic/outlogin.skin.2.php | 9 - 21 files changed, 100 insertions(+), 803 deletions(-) delete mode 100644 adm/shop_admin/mileagelist.php delete mode 100644 adm/shop_admin/mileagelist_delete.php delete mode 100644 adm/shop_admin/mileageupdate.php delete mode 100644 shop/mileage.php diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index 13b38eaf8..7273e2b6a 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -15,7 +15,6 @@ $menu['menu400'] = array ( array('400620', '상품재고관리', G4_ADMIN_URL.'/shop_admin/itemstocklist.php', 'scf_item_stock'), array('400610', '상품유형관리', G4_ADMIN_URL.'/shop_admin/itemtypelist.php', 'scf_item_type'), array('400500', '상품옵션재고관리', G4_ADMIN_URL.'/shop_admin/optionstocklist.php', 'scf_item_option'), - array('400490', '마일리지관리', G4_ADMIN_URL.'/shop_admin/mileagelist.php', 'scf_mileage'), array('400650', '쿠폰관리', G4_ADMIN_URL.'/shop_admin/couponlist.php', 'scf_coupon'), array('400500', '배송일괄처리', G4_ADMIN_URL.'/shop_admin/deliverylist.php', 'scf_deli', 1), array('400740', '배송업체관리', G4_ADMIN_URL.'/shop_admin/deliverycodelist.php', 'scf_deli_co', 1), diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index d32c6397a..4e3b34120 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -444,13 +444,6 @@ $pg_anchor = '
    - - - - - > 사용 - - diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php index d69135b6e..48c97a6e5 100644 --- a/adm/shop_admin/configformupdate.php +++ b/adm/shop_admin/configformupdate.php @@ -98,7 +98,6 @@ $sql = " update {$g4['shop_default_table']} de_card_point = '$de_card_point', de_card_pg = '$de_card_pg', de_card_max_amount = '$de_card_max_amount', - de_mileage_use = '$de_mileage_use', de_point_settle = '$de_point_settle', de_level_sell = '$de_level_sell', de_send_cost_case = '$de_send_cost_case', diff --git a/adm/shop_admin/mileagelist.php b/adm/shop_admin/mileagelist.php deleted file mode 100644 index e5226a651..000000000 --- a/adm/shop_admin/mileagelist.php +++ /dev/null @@ -1,231 +0,0 @@ -전체목록'; - -$mb = array(); -if ($sfl == 'mb_id' && $stx) - $mb = get_member($stx); - -$g4['title'] = '마일리지관리'; -include_once (G4_ADMIN_PATH.'/admin.head.php'); - -$colspan = 8; -?> - -
    -
    - 마일리지 내역 검색 - - - 전체 건 - - - - - - -
    -
    - -
    -

    마일리지 내역

    - -
      -
    • 회원아이디 순 정렬
      • -
    • 일시 순 정렬
      • -
    • 내용 순 정렬
      • -
    • 마일리지 순 정렬
      • -
    - -
    - - - - - - - - - - - - - - - - - - - - - - '; - $link2 = ''; - ?> - - - - - - - - - - - - - '; - ?> - -
    - - - 회원아이디이름별명일시마일리지 내용마일리지마일리지합
    - - - - -
    자료가 없습니다.
    - -
    - -
    - -
    -
    - - - -
    -

    개별회원 마일리지 증감 설정

    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -
    - -
    - -
    - -
    - - - - diff --git a/adm/shop_admin/mileagelist_delete.php b/adm/shop_admin/mileagelist_delete.php deleted file mode 100644 index 2e24b5df2..000000000 --- a/adm/shop_admin/mileagelist_delete.php +++ /dev/null @@ -1,32 +0,0 @@ - diff --git a/adm/shop_admin/mileageupdate.php b/adm/shop_admin/mileageupdate.php deleted file mode 100644 index f7808576b..000000000 --- a/adm/shop_admin/mileageupdate.php +++ /dev/null @@ -1,24 +0,0 @@ - $mb['mb_mileage'])) - alert('포인트를 깎는 경우 현재 마일리지보다 작으면 안됩니다.', './mileagelist.php?'.$qstr); - -insert_mileage($mb_id, $ml_point, $ml_content, '', ''); - -goto_url('./mileagelist.php?'.$qstr); -?> diff --git a/adm/shop_admin/ordercartupdate.php b/adm/shop_admin/ordercartupdate.php index 4ed312dfc..b12f8578d 100644 --- a/adm/shop_admin/ordercartupdate.php +++ b/adm/shop_admin/ordercartupdate.php @@ -141,11 +141,7 @@ for ($i=0; $i<$cnt; $i++) { $point_use = 0; //insert_point($mb_id, (-1) * ($ct[ct_point] * $ct[ct_qty]), "주문번호 $od_id ($ct_id) 취소"); - if(!$default['de_mileage_use']) - delete_point($mb_id, "@delivery", $mb_id, "$od_id,$uq_id,$ct_id"); - - // 마일리지 삭제 - delete_mileage($mb_id, $od_id, $ct_id); + delete_point($mb_id, "@delivery", $mb_id, "$od_id,$uq_id,$ct_id"); } // 히스토리에 남김 diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 57386c5f2..ac77c70fa 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -48,16 +48,9 @@ if (!isset($order_not_point)) { // 회원이면서 포인트가 0보다 크다면 if ($tmp_row['mb_id'] && $row['ct_point'] > 0) { - if(!$default['de_mileage_use']) { - $po_point = $row['ct_point'] * $row['ct_qty']; - $po_content = "$cart_title3 {$tmp_row['od_id']} ({$row['ct_id']}) $cart_title4"; - insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['uq_id']},{$row['ct_id']}"); - } - - // 주문완료 마일리지 적립 - $ml_point = $row['ct_point'] * $row['ct_qty']; - $ml_content = "$cart_title3 {$tmp_row['od_id']} ({$row['ct_id']}) $cart_title4"; - insert_mileage($tmp_row['mb_id'], $ml_point, $ml_content, $tmp_row['od_id'], $row['ct_id']); + $po_point = $row['ct_point'] * $row['ct_qty']; + $po_content = "$cart_title3 {$tmp_row['od_id']} ({$row['ct_id']}) $cart_title4"; + insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['uq_id']},{$row['ct_id']}"); } sql_query("update {$g4['shop_cart_table']} set ct_point_use = '1' where ct_id = '{$row['ct_id']}' "); diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 617b87565..d4aa41105 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -202,35 +202,14 @@ if(!$result) { ADD `de_guest_cart_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_cart_keep_term` ", false); } -// 마일리지관련 필드 추가 +// 포인트타입 필드 추가 $sql = " select it_point_type from {$g4['shop_item_table']} limit 1 "; $result = sql_query($sql, false); if(!$result) { - sql_query(" CREATE TABLE IF NOT EXISTS `{$g4['shop_mileage_table']}` ( - `ml_id` INT(11) NOT NULL AUTO_INCREMENT, - `mb_id` VARCHAR(255) NOT NULL DEFAULT '', - `od_id` BIGINT(20) unsigned NOT NULL, - `ct_id` INT(11) NOT NULL DEFAULT '0', - `ml_content` VARCHAR(255) NOT NULL DEFAULT '', - `ml_point` INT(11) NOT NULL DEFAULT '0', - `ml_datetime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`ml_id`), - KEY `mb_id` (`mb_id`) - ) ", false); - sql_query(" ALTER TABLE `{$g4['member_table']}` - ADD `mb_mileage` INT(11) NOT NULL DEFAULT '0' AFTER `mb_point` ", false); sql_query(" ALTER TABLE `{$g4['shop_item_table']}` ADD `it_point_type` TINYINT(4) NOT NULL DEFAULT '0' AFTER `it_point` ", false); } -// 마일리지 사용설정 필드추가 -$sql = " select de_mileage_use from {$g4['shop_default_table']} "; -$result = sql_query($sql, false); -if(!$result) { - sql_query(" ALTER TABLE `{$g4['shop_default_table']}` - ADD `de_mileage_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_point_settle` ", false); -} - // 쿠폰테이블 $sql = " DESCRIBE `{$g4['shop_coupon_table']}` "; $result = sql_query($sql, false); diff --git a/install/install_db.php b/install/install_db.php index b7d8d1a06..276ece8a9 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -263,7 +263,6 @@ if($shop_install) { de_card_use = '0', de_card_max_amount = '1000', de_point_settle = '10000', - de_mileage_use = '1', de_cart_keep_term = '15', de_point_per = '5', de_card_point = '0', @@ -382,10 +381,6 @@ if($shop_install) { $sql = preg_replace($source, $target, $sql); @mysql_query($sql); } - - // mb_mileage 필드추가 - @mysql_query(" ALTER TABLE `{$table_prefix}member` - ADD `mb_mileage` INT(11) NOT NULL DEFAULT '0' AFTER `mb_point` "); } ?> @@ -493,7 +488,6 @@ if($shop_install) { fwrite($f, "\$g4['shop_onlinecalc_table'] = SHOP_TABLE_PREFIX.'onlinecalc'; // 온라인견적 테이블\n"); fwrite($f, "\$g4['shop_order_table'] = SHOP_TABLE_PREFIX.'order'; // 주문서 테이블\n"); fwrite($f, "\$g4['shop_wish_table'] = SHOP_TABLE_PREFIX.'wish'; // 보관함(위시리스트) 테이블\n"); - fwrite($f, "\$g4['shop_mileage_table'] = SHOP_TABLE_PREFIX.'mileage'; // 마일리지 테이블\n"); fwrite($f, "\$g4['shop_coupon_table'] = SHOP_TABLE_PREFIX.'coupon'; // 쿠폰정보 테이블\n"); fwrite($f, "\$g4['shop_sendcost_table'] = SHOP_TABLE_PREFIX.'sendcost'; // 추가배송비 테이블\n"); fwrite($f, "\$g4['shop_request_table'] = SHOP_TABLE_PREFIX.'request'; // 주문 취소, 교환, 반품 요청테이블\n"); diff --git a/install/shop.sql b/install/shop.sql index 3e8f787ea..e7b5f8226 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -248,7 +248,6 @@ CREATE TABLE IF NOT EXISTS `shop_default` ( `de_card_pg` varchar(255) NOT NULL DEFAULT '', `de_card_max_amount` int(11) NOT NULL DEFAULT '0', `de_point_settle` int(11) NOT NULL DEFAULT '0', - `de_mileage_use` tinyint(4) NOT NULL DEFAULT '0', `de_level_sell` int(11) NOT NULL DEFAULT '0', `de_send_cost_case` varchar(255) NOT NULL DEFAULT '', `de_send_cost_limit` varchar(255) NOT NULL DEFAULT '', @@ -640,25 +639,6 @@ CREATE TABLE IF NOT EXISTS `shop_order` ( -- -------------------------------------------------------- --- --- Table structure for table `shop_mileage` --- - -DROP TABLE IF EXISTS `shop_mileage`; -CREATE TABLE IF NOT EXISTS `shop_mileage` ( - `ml_id` INT(11) NOT NULL AUTO_INCREMENT, - `mb_id` VARCHAR(255) NOT NULL DEFAULT '', - `od_id` BIGINT(20) unsigned NOT NULL, - `ct_id` INT(11) NOT NULL DEFAULT '0', - `ml_content` VARCHAR(255) NOT NULL DEFAULT '', - `ml_point` INT(11) NOT NULL DEFAULT '0', - `ml_datetime` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', - PRIMARY KEY (`ml_id`), - KEY `mb_id` (`mb_id`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; - --- -------------------------------------------------------- - -- -- Table structure for table `shop_request` -- diff --git a/lib/shop.lib.php b/lib/shop.lib.php index db53c487f..0c01dfb5f 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -36,7 +36,7 @@ class item_view $this->link = $link; if ($href) $this->href = $href; - else + else $this->href = G4_SHOP_URL."/item.php?it_id=".$this->it['it_id']; } @@ -51,28 +51,28 @@ class item_view function it_img($imgw, $imgh=0) { $img = get_it_thumbnail($this->it['it_img'.$this->idx], $imgw, $imgh); // 상품이미지의 경우 링크값이 none 이 아닌 경우 무조건 링크를 건다. - if ($this->link != "none") + if ($this->link != "none") $img = $this->get_href($img); $this->buffer[] = "
  • $img
    • "; } function it_name($length) { $it_name = utf8_strcut($this->it['it_name'], $length); - if ($this->link == "all" || $this->link == "it_name") + if ($this->link == "all" || $this->link == "it_name") $it_name = $this->get_href($it_name); $this->buffer[] = "
  • {$it_name}
    • "; } function it_cust_price($prefix="시중가 : ", $suffix="원") { $it_cust_price = $prefix.number_format($this->it['it_cust_price']).$suffix; - if ($this->link == "all") + if ($this->link == "all") $it_cust_price = $this->get_href($it_cust_price); $this->buffer[] = "
  • {$it_cust_price}
    • "; } function it_price($prefix="판매가 : ", $suffix="원") { $it_price = $prefix.number_format($this->it['it_price']).$suffix; - if ($this->link == "all") + if ($this->link == "all") $it_price = $this->get_href($it_price); $this->buffer[] = "
  • {$it_price}
    • "; } @@ -80,21 +80,21 @@ class item_view function it_point($prefix="포인트 : ") { $suffix = ($this->it['it_point_type'] == 1) ? "%" : "점"; $it_point = $prefix.number_format($this->it['it_point']).$suffix; - if ($this->link == "all") + if ($this->link == "all") $it_point = $this->get_href($it_point); $this->buffer[] = "
  • {$it_point}
    • "; } function it_etc($etc="") { $this->index++; - if ($this->link == "all") + if ($this->link == "all") $$etc = $this->get_href($etc); $this->buffer[] = "
  • index}\">{$etc}
    • "; } function run() { $id = "it".$this->it['it_id']; - return !empty($this->buffer) ? "\n".implode("\n", $this->buffer)."\n
\n" : ""; + return !empty($this->buffer) ? "\n".implode("\n", $this->buffer)."\n\n" : ""; } } @@ -1198,75 +1198,6 @@ function delete_item_thumbnail($dir, $file) } } -// 마일리지 부여 -function insert_mileage($mb_id, $point, $content='', $od_id, $ct_id) -{ - global $g4; - - // 포인트가 없다면 업데이트 할 필요 없음 - if ($point == 0) { return 0; } - - // 회원아이디가 없다면 업데이트 할 필요 없음 - if ($mb_id == '') { return 0; } - $mb = sql_fetch(" select mb_id from {$g4['member_table']} where mb_id = '$mb_id' "); - if (!$mb['mb_id']) { return 0; } - - // 이미 등록된 내역이라면 건너뜀 - if($od_id && $ct_id) { - $sql = " select count(*) as cnt from {$g4['shop_mileage_table']} - where mb_id = '$mb_id' - and od_id = '$od_id' - and ct_id = '$ct_id' "; - $row = sql_fetch($sql); - if ($row['cnt']) - return -1; - } - - // 마일리지 건별 생성 - $sql = " insert into {$g4['shop_mileage_table']} - set mb_id = '$mb_id', - od_id = '$od_id', - ct_id = '$ct_id', - ml_content = '".addslashes($content)."', - ml_point = '$point', - ml_datetime = '".G4_TIME_YMDHIS."' "; - sql_query($sql); - - // 마일리지 내역의 합을 구하고 - $sql = " select sum(ml_point) as sum_mileage from {$g4['shop_mileage_table']} where mb_id = '$mb_id' "; - $row = sql_fetch($sql); - $sum_mileage = $row['sum_mileage']; - - // 마일리지 UPDATE - $sql = " update {$g4['member_table']} set mb_mileage = '$sum_mileage' where mb_id = '$mb_id' "; - sql_query($sql); - - return 1; -} - -// 마일리지 삭제 -function delete_mileage($mb_id, $od_id, $ct_id) -{ - global $g4; - - $sql = " delete from {$g4['shop_mileage_table']} - where mb_id = '$mb_id' - and od_id = '$od_id' - and ct_id = '$ct_id' "; - sql_query($sql); - - // 마일리지 내역의 합을 구하고 - $sql = " select sum(ml_point) as sum_mileage from {$g4['shop_mileage_table']} where mb_id = '$mb_id' "; - $row = sql_fetch($sql); - $sum_mileage = $row['sum_mileage']; - - // 마일리지 UPDATE - $sql = " update {$g4['member_table']} set mb_mileage = '$sum_mileage' where mb_id = '$mb_id' "; - sql_query($sql); - - return 1; -} - // 쿠폰번호 생성함수 function get_coupon_id() { diff --git a/mobile/shop/mypage.php b/mobile/shop/mypage.php index c44b87038..5d4701b77 100644 --- a/mobile/shop/mypage.php +++ b/mobile/shop/mypage.php @@ -23,13 +23,8 @@ $cp = sql_fetch($sql);

회원정보 개요

- -
마일리지
-
점
-
보유포인트
점
-
보유쿠폰
연락처
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index c1a3c6296..0e786591f 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -242,7 +242,7 @@ ob_start(); 원 -
+
포인트
점
@@ -621,43 +621,22 @@ ob_end_clean(); } $temp_point = 0; - if($default['de_mileage_use']) { - // 마일리지 사용 - if ($is_member) + // 회원이면서 포인트사용이면 + if ($is_member && $config['cf_use_point']) + { + // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 + if ($member['mb_point'] >= $default['de_point_settle']) { - // 포인트 결제 사용 포인트보다 회원의 마일리지가 크다면 - if ($member['mb_mileage'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 + $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 + $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - $member_mileage = (int)((int)($member['mb_mileage'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_mileage) - $temp_point = $member_mileage; + $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 + if ($temp_point > $member_point) + $temp_point = $member_point; - echo '
결제포인트 : 점 (100점 단위로 입력하세요.)
'; - echo '
회원님의 보유포인트('.display_point($member['mb_mileage']).')중 '.display_point($temp_point).'(주문금액 '.$default['de_point_per'].'%) 내에서 결제가 가능합니다.
'; - $multi_settle++; - } - } - } else { - // 회원이면서 포인트사용이면 - if ($is_member && $config['cf_use_point']) - { - // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 - if ($member['mb_point'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - - $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_point) - $temp_point = $member_point; - - echo '
결제포인트 : 점 (100점 단위로 입력하세요.)
'; - echo '
회원님의 보유포인트('.display_point($member['mb_point']).')중 '.display_point($temp_point).'(주문금액 '.$default['de_point_per'].'%) 내에서 결제가 가능합니다.
'; - $multi_settle++; - } + echo '
결제포인트 : 점 (100점 단위로 입력하세요.)
'; + echo '
회원님의 보유포인트('.display_point($member['mb_point']).')중 '.display_point($temp_point).'(주문금액 '.$default['de_point_per'].'%) 내에서 결제가 가능합니다.
'; + $multi_settle++; } } ?> @@ -1069,18 +1048,11 @@ function calculate_order_amount() function calculate_temp_point() { - var sell_amount = parseInt($("input[name=od_amount]").val()); var send_cost = parseInt($("input[name=od_send_cost]").val()); var point_per = ; var temp_point = parseInt((sell_amount + send_cost) * (point_per / 100) / 100) * 100; - var point = + var point = if(temp_point > point) temp_point = point; @@ -1181,30 +1153,20 @@ function kcp_approval() { temp_point = parseInt(pf.od_temp_point.value); - - if (temp_point < 0) { - alert("를 0 이상 입력하세요."); + alert("포인트를 0 이상 입력하세요."); pf.od_temp_point.select(); return false; } if (temp_point > tot_amount) { - alert("주문금액 보다 많이 결제할 수 없습니다."); + alert("주문금액 보다 많이 포인트결제할 수 없습니다."); pf.od_temp_point.select(); return false; } - if (temp_point > ) { - alert("회원님의 보다 많이 결제할 수 없습니다."); + if (temp_point > ) { + alert("회원님의 포인트보다 많이 결제할 수 없습니다."); pf.od_temp_point.select(); return false; } @@ -1216,7 +1178,7 @@ function kcp_approval() } if (parseInt(parseInt(temp_point / 100) * 100) != temp_point) { - alert("를 100점 단위로 입력하세요."); + alert("포인트를 100점 단위로 입력하세요."); pf.od_temp_point.select(); return false; } @@ -1341,30 +1303,20 @@ function forderform_check(f) { temp_point = parseInt(f.od_temp_point.value); - - if (temp_point < 0) { - alert("를 0 이상 입력하세요."); + alert("포인트를 0 이상 입력하세요."); f.od_temp_point.select(); return false; } if (temp_point > tot_amount) { - alert("주문금액 보다 많이 결제할 수 없습니다."); + alert("주문금액 보다 많이 포인트결제할 수 없습니다."); f.od_temp_point.select(); return false; } - if (temp_point > ) { - alert("회원님의 보다 많이 결제할 수 없습니다."); + if (temp_point > ) { + alert("회원님의 포인트보다 많이 결제할 수 없습니다."); f.od_temp_point.select(); return false; } @@ -1376,7 +1328,7 @@ function forderform_check(f) } if (parseInt(parseInt(temp_point / 100) * 100) != temp_point) { - alert("를 100점 단위로 입력하세요."); + alert("포인트를 100점 단위로 입력하세요."); f.od_temp_point.select(); return false; } diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php index 699861047..946db9fd5 100644 --- a/mobile/shop/orderformupdate.php +++ b/mobile/shop/orderformupdate.php @@ -273,52 +273,27 @@ if($send_cost2 !== $i_send_cost2) $tot_amount = $tot_sell_amount + $send_cost; // 회원이면서 포인트사용이면 $temp_point = 0; -if($default['de_mileage_use']) { - if ($is_member) +if ($is_member && $config['cf_use_point']) +{ + // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 + if ($member['mb_point'] >= $default['de_point_settle']) { - // 포인트 결제 사용 포인트보다 회원의 마일리지가 크다면 - if ($member['mb_mileage'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 + $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 + $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - $member_mileage = (int)((int)($member['mb_mileage'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_mileage) - $temp_point = $member_mileage; - } + $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 + if ($temp_point > $member_point) + $temp_point = $member_point; } +} - if (($i_temp_point > (int)$temp_point || $i_temp_point < 0)) - die("Error...."); +if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) + die("Error...."); - if ($od_temp_point) - { - if ($member['mb_mileage'] < $od_temp_point) - alert('회원님의 마일리지가 부족하여 마일리지로 결제 할 수 없습니다.'); - } -} else { - if ($is_member && $config['cf_use_point']) - { - // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 - if ($member['mb_point'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - - $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_point) - $temp_point = $member_point; - } - } - - if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) - die("Error...."); - - if ($od_temp_point) - { - if ($member['mb_point'] < $od_temp_point) - alert('회원님의 포인트가 부족하여 포인트로 결제 할 수 없습니다.'); - } +if ($od_temp_point) +{ + if ($member['mb_point'] < $od_temp_point) + alert('회원님의 포인트가 부족하여 포인트로 결제 할 수 없습니다.'); } $i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point; @@ -506,11 +481,8 @@ if(!$result) { } // 회원이면서 포인트를 사용했다면 포인트 테이블에 사용을 추가 -if ($is_member && $od_receipt_point) { - if(!$default['de_mileage_use']) - insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); - insert_mileage($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제", $od_id); -} +if ($is_member && $od_receipt_point) + insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); // PG 결제내역기록 include_once(G4_MSHOP_PATH.'/kcp/pp_ax_hub_result.php'); diff --git a/shop/mileage.php b/shop/mileage.php deleted file mode 100644 index 48190d786..000000000 --- a/shop/mileage.php +++ /dev/null @@ -1,113 +0,0 @@ -= 0) { - $sum_point1 += $row['ml_point']; - } else { - $sum_point2 += $row['ml_point']; - } -} -?> - - -
-

- - - - - - - - - - - - - - - - - - - - - - - 0) { - $point1 = '+' .number_format($row['ml_point']); - $sum_point1 += $row['ml_point']; - } else { - $point2 = number_format($row['ml_point']); - $sum_point2 += $row['ml_point']; - } - - ?> - - - - - - - '; - else { - if ($sum_point1 > 0) - $sum_point1 = "+" . number_format($sum_point1); - $sum_point2 = number_format($sum_point2); - } - ?> - -
일시내용지급마일리지사용마일리지
소계
보유마일리지
자료가 없습니다.
- - - - -
창닫기
-
- - - \ No newline at end of file diff --git a/shop/mypage.php b/shop/mypage.php index 3750b1d2d..2bc3f5008 100644 --- a/shop/mypage.php +++ b/shop/mypage.php @@ -42,13 +42,8 @@ $cp = sql_fetch($sql);
- -
마일리지
-
점
-
보유포인트
점
-
보유쿠폰
연락처
diff --git a/shop/orderform.php b/shop/orderform.php index 4f1b631f2..0d79f42d8 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -329,7 +329,7 @@ function get_intall_file() 원 -
+
포인트
점
@@ -827,49 +827,25 @@ function get_intall_file() } $temp_point = 0; - if($default['de_mileage_use']) { - // 마일리지 사용 - if ($is_member) + // 회원이면서 포인트사용이면 + if ($is_member && $config['cf_use_point']) + { + // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 + if ($member['mb_point'] >= $default['de_point_settle']) { - // 포인트 결제 사용 포인트보다 회원의 마일리지가 크다면 - if ($member['mb_mileage'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 + $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 + $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - $member_mileage = (int)((int)($member['mb_mileage'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_mileage) - $temp_point = $member_mileage; - ?> -

보유마일리지()중 최대 까지 사용 가능 (주문금액 %)

- - - 점 (100점 단위로 입력하세요.) - = $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - - $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_point) - $temp_point = $member_point; - ?> -

보유포인트()중 최대 까지 사용 가능 (주문금액 %)

- - - 점 (100점 단위로 입력하세요.) - $member_point) + $temp_point = $member_point; + ?> +

보유포인트()중 최대 까지 사용 가능 (주문금액 %)

+ + + 점 (100점 단위로 입력하세요.) + var sell_amount = parseInt($("input[name=od_amount]").val()); var send_cost = parseInt($("input[name=od_send_cost]").val()); var point_per = ; var temp_point = parseInt((sell_amount + send_cost) * (point_per / 100) / 100) * 100; - var point = + var point = ; if(temp_point > point) temp_point = point; @@ -1449,30 +1418,20 @@ function forderform_check(f) { temp_point = parseInt(f.od_temp_point.value); - - if (temp_point < 0) { - alert("를 0 이상 입력하세요."); + alert("포인트를 0 이상 입력하세요."); f.od_temp_point.select(); return false; } if (temp_point > tot_amount) { - alert("주문금액 보다 많이 결제할 수 없습니다."); + alert("주문금액 보다 많이 포인트결제할 수 없습니다."); f.od_temp_point.select(); return false; } - if (temp_point > ) { - alert("회원님의 보다 많이 결제할 수 없습니다."); + if (temp_point > ) { + alert("회원님의 포인트보다 많이 결제할 수 없습니다."); f.od_temp_point.select(); return false; } @@ -1484,7 +1443,7 @@ function forderform_check(f) } if (parseInt(parseInt(temp_point / 100) * 100) != temp_point) { - alert("를 100점 단위로 입력하세요."); + alert("포인트를 100점 단위로 입력하세요."); f.od_temp_point.select(); return false; } diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php index 1da3e7682..130eb8a6f 100644 --- a/shop/orderformupdate.php +++ b/shop/orderformupdate.php @@ -267,52 +267,27 @@ if($send_cost2 !== $i_send_cost2) $tot_amount = $tot_od_amount + ($send_cost - $tot_sc_cp_amount); // 회원이면서 포인트사용이면 $temp_point = 0; -if($default['de_mileage_use']) { - if ($is_member) +if ($is_member && $config['cf_use_point']) +{ + // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 + if ($member['mb_point'] >= $default['de_point_settle']) { - // 포인트 결제 사용 포인트보다 회원의 마일리지가 크다면 - if ($member['mb_mileage'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 + $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 + $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - $member_mileage = (int)((int)($member['mb_mileage'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_mileage) - $temp_point = $member_mileage; - } + $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 + if ($temp_point > $member_point) + $temp_point = $member_point; } +} - if (($i_temp_point > (int)$temp_point || $i_temp_point < 0)) - die("Error...."); +if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) + die("Error...."); - if ($od_temp_point) - { - if ($member['mb_mileage'] < $od_temp_point) - alert('회원님의 마일리지가 부족하여 마일리지로 결제 할 수 없습니다.'); - } -} else { - if ($is_member && $config['cf_use_point']) - { - // 포인트 결제 사용 포인트보다 회원의 포인트가 크다면 - if ($member['mb_point'] >= $default['de_point_settle']) - { - $temp_point = $tot_amount * ($default['de_point_per'] / 100); // 포인트 결제 % 적용 - $temp_point = (int)((int)($temp_point / 100) * 100); // 100점 단위 - - $member_point = (int)((int)($member['mb_point'] / 100) * 100); // 100점 단위 - if ($temp_point > $member_point) - $temp_point = $member_point; - } - } - - if (($i_temp_point > (int)$temp_point || $i_temp_point < 0) && $config['cf_use_point']) - die("Error...."); - - if ($od_temp_point) - { - if ($member['mb_point'] < $od_temp_point) - alert('회원님의 포인트가 부족하여 포인트로 결제 할 수 없습니다.'); - } +if ($od_temp_point) +{ + if ($member['mb_point'] < $od_temp_point) + alert('회원님의 포인트가 부족하여 포인트로 결제 할 수 없습니다.'); } $i_amount = $i_amount + $i_send_cost + $i_send_cost2 - $i_temp_point; @@ -499,11 +474,8 @@ if(!$result) { } // 회원이면서 포인트를 사용했다면 테이블에 사용을 추가 -if ($is_member && $od_receipt_point) { - if(!$default['de_mileage_use']) - insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); - insert_mileage($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제", $od_id); -} +if ($is_member && $od_receipt_point) + insert_point($member['mb_id'], (-1) * $od_receipt_point, "주문번호 $od_id 결제"); // PG 결제내역기록 include_once(G4_SHOP_PATH.'/kcp/pp_ax_hub_result.php'); diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php index b61e99d60..a9b2eabcb 100644 --- a/shop/orderinquirycancel.php +++ b/shop/orderinquirycancel.php @@ -65,11 +65,8 @@ $cancel_memo = addslashes($cancel_memo); sql_query(" update {$g4['shop_order_table']} set od_send_cost = '0', od_send_cost2 = '0', od_temp_point = '0', od_receipt_amount = '0', od_receipt_point = '0', od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G4_TIME_YMDHIS." (취소이유 : {$cancel_memo})\") where uq_id = '$uq_id' "); // 주문취소 회원의 포인트를 되돌려 줌 -if ($od['od_receipt_point'] > 0) { - if(!$default['de_mileage_use']) - insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소"); - insert_mileage($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소", $od_id); -} +if ($od['od_receipt_point'] > 0) + insert_point($member['mb_id'], $od['od_receipt_point'], "주문번호 $od_id 본인 취소"); goto_url(G4_SHOP_URL."/orderinquiryview.php?od_id=$od_id&uq_id=$uq_id"); ?> \ No newline at end of file diff --git a/skin/outlogin/shop_basic/outlogin.skin.2.php b/skin/outlogin/shop_basic/outlogin.skin.2.php index b0788bd0c..a840d6b69 100644 --- a/skin/outlogin/shop_basic/outlogin.skin.2.php +++ b/skin/outlogin/shop_basic/outlogin.skin.2.php @@ -18,21 +18,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 - -
  • - - 마일리지 - - -
    • -
  • 포인트
    • -
  • 스크랩
    • From 7e19a06ab9b4161b08bad8a3490ac0285e671393 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 14:24:44 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EB=B3=B4=EA=B4=80=EC=9D=BC=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EC=84=A4=EC=A0=95=2015=EC=9D=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index ac77c70fa..2132bcebe 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -21,7 +21,7 @@ include_once(G4_ADMIN_PATH.'/admin.head.php'); // 설정 시간이 지난 주문서 없는 장바구니 자료 삭제 //------------------------------------------------------------------------------ $keep_term = $default['de_cart_keep_term']; -if (!$keep_term) $keep_term = 1; // 기본값 1일 +if (!$keep_term) $keep_term = 15; // 기본값 15일 $beforetime = date('Y-m-d H:i:s', ( G4_SERVER_TIME - (86400 * $keep_term) ) ); $sql = " delete from {$g4['shop_cart_table']} where ct_status = '$cart_title1' and ct_time <= '$beforetime' "; sql_query($sql); From 98c85adba5929d0cbbf9a6ff46fbf6244d9a2f8c Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 14:25:40 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=EB=B3=B5=ED=95=A9=EA=B3=BC=EC=84=B8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=ED=95=AD=EB=AA=A9=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/configform.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php index 4e3b34120..0ea8df27a 100644 --- a/adm/shop_admin/configform.php +++ b/adm/shop_admin/configform.php @@ -509,13 +509,6 @@ $pg_anchor = '
      - - - - - > 사용 - - 신용카드 결제테스트 @@ -554,6 +547,13 @@ $pg_anchor = '
        + + + + + > 사용 + + 공통 URL From ae4e8da869d16ee1c1b0ef09ff9b3f731c89c22a Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 17:12:44 +0900 Subject: [PATCH 06/10] =?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=EC=97=90=EC=84=9C=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=9D=B4=EB=AF=B8=EC=A7=80=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/itemformrelation.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php index 2f28c8c09..17c69eb25 100644 --- a/adm/shop_admin/itemformrelation.php +++ b/adm/shop_admin/itemformrelation.php @@ -21,11 +21,6 @@ for($i=0;$row=sql_fetch_array($result);$i++) { $ca_name = addslashes($row2['ca_name']); $it_name = addslashes($row['it_name']); - if(file_exists(G4_DATA_PATH."/item/{$row['it_id']}_s")) - $it_image = "{$row['it_id']}_s"; - else - $it_image = ""; - $options .= "\n"; } From 02cb1350172cc694a8a12bdd91996a73937a4d23 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 18:31:57 +0900 Subject: [PATCH 07/10] =?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=20=EC=BF=BC=EB=A6=AC=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/itemformrelation.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/shop_admin/itemformrelation.php b/adm/shop_admin/itemformrelation.php index 17c69eb25..73f5ff427 100644 --- a/adm/shop_admin/itemformrelation.php +++ b/adm/shop_admin/itemformrelation.php @@ -4,8 +4,8 @@ include_once('./_common.php'); $sql = " select ca_id, it_id, it_name, it_price from {$g4['shop_item_table']} - where ca_id like '$ca_id%' - and it_id <> '$it_id' + 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 "; $result = sql_query($sql); From 8817be4eacc991d458491c9455c734ea83fb3512 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 24 Jul 2013 18:45:50 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=EC=9D=B4=EB=B2=A4=ED=8A=B8=20=EC=83=81?= =?UTF-8?q?=ED=92=88=20=EC=82=AD=EC=A0=9C=EB=90=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8D=98=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 --- adm/shop_admin/itemeventwin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/itemeventwin.php b/adm/shop_admin/itemeventwin.php index 4ecd61289..55823e555 100644 --- a/adm/shop_admin/itemeventwin.php +++ b/adm/shop_admin/itemeventwin.php @@ -40,7 +40,7 @@ include_once(G4_PATH.'/head.sub.php'); - <?php echo $ev['ev_subject']; ?> 이벤트에서 삭제 : <?php echo cut_str(stripslashes($row['it_name']), 60, "> + <?php echo $ev['ev_subject']; ?> 이벤트에서 삭제 : <?php echo cut_str(stripslashes($row['it_name']), 60, "> Date: Wed, 24 Jul 2013 18:46:35 +0900 Subject: [PATCH 09/10] =?UTF-8?q?#262=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=8F=BC=EC=97=90=EC=84=9C=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20=EA=B4=80=EB=A6=AC=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=88=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/itemeventform.php | 126 +++++++++++++++++++++++++ adm/shop_admin/itemeventformupdate.php | 22 +++++ adm/shop_admin/itemeventsearch.php | 38 ++++++++ 3 files changed, 186 insertions(+) create mode 100644 adm/shop_admin/itemeventsearch.php diff --git a/adm/shop_admin/itemeventform.php b/adm/shop_admin/itemeventform.php index 2f8cd103e..93cf5b707 100644 --- a/adm/shop_admin/itemeventform.php +++ b/adm/shop_admin/itemeventform.php @@ -17,6 +17,12 @@ if ($w == "u") $ev = sql_fetch($sql); if (!$ev['ev_id']) alert("등록된 자료가 없습니다."); + + // 등록된 이벤트 상품 + $sql = " select b.it_id, b.it_name + from {$g4['shop_event_item_table']} a left join {$g4['shop_item_table']} b on ( a.it_id = b.it_id ) + where a.ev_id = '$ev_id' "; + $res_item = sql_query($sql); } else { @@ -34,12 +40,31 @@ else $ev['ev_list_row'] = 5; } +// 분류리스트 +$category_select = ''; +$sql = " select * from {$g4['shop_category_table']} "; +if ($is_admin != 'super') + $sql .= " where ca_mb_id = '{$member['mb_id']}' "; +$sql .= " order by ca_id "; +$result = sql_query($sql); +for ($i=0; $row=sql_fetch_array($result); $i++) +{ + $len = strlen($row['ca_id']) / 2 - 1; + + $nbsp = ""; + for ($i=0; $i<$len; $i++) + $nbsp .= "   "; + + $category_select .= "\n"; +} + include_once (G4_ADMIN_PATH.'/admin.head.php'); ?>
        +

        @@ -137,6 +162,46 @@ include_once (G4_ADMIN_PATH.'/admin.head.php'); ?> + + +
        +

        상품검색

        +
        + +
        +
        +
        +
        +
        +

        등록된 상품

        +
        + '; + ?> +
      • + + + +
        • + 0) + echo '
      '; + else + echo '등록된 상품이 없습니다.'; + ?> + + + + @@ -211,8 +276,69 @@ include_once (G4_ADMIN_PATH.'/admin.head.php');