From 219f8b3ee1585d79b1c95657e8edee01d27a2f82 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 12 Jun 2013 11:20:11 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20#470=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EC=A0=95=EB=A0=AC=20=EC=8A=A4=ED=83=80?= =?UTF-8?q?=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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/css/admin.css b/css/admin.css index c7483bc7e..18928fb19 100644 --- a/css/admin.css +++ b/css/admin.css @@ -172,6 +172,13 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f .anchor a {display:inline-block;border:1px solid #586267;background:#667379;padding:0 7px;height:30px;color:#fff;text-decoration:none;line-height:2.6em} .anchor a:focus, .anchor a:hover {background:#434f54;text-decoration:none} +/* 리스트 정렬 */ +#sort_odr {float:left;margin:0;padding-left:1px;list-style:none;zoom:1} +#sort_odr:after {display:block;visibility:hidden;clear:both;content:""} +#sort_odr li {float:left;margin-bottom:-1px} +#sort_odr a {display:block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +#sort_odr a:focus, #sort_odr a:hover, #sort_odr a:active {text-decoration:none} + /* 테이블 */ table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} caption {padding:10px 0 15px;font-weight:bold;text-align:left} From e9660ef491f4e31000dd2e15b6685f92a788d9bd Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 12 Jun 2013 13:16:03 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20#470=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=EC=A0=95=EB=A0=AC=20=EC=B6=9C=EB=A0=A5=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=ED=9A=8C=EC=9B=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=ED=9A=8C=EC=9B=90=EB=AA=A9=EB=A1=9D=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20th=20?= =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/auth_list.php | 17 ++++++--- adm/board_list.php | 54 ++++++++++++++++------------ adm/boardgroup_list.php | 36 ++++++++++--------- adm/boardgroupmember_list.php | 31 +++++++++++----- adm/mail_list.php | 2 +- adm/member_list.php | 67 ++++++++++++++++++++--------------- adm/point_list.php | 27 +++++++++----- adm/poll_list.php | 2 +- css/admin.css | 23 ++++++------ 9 files changed, 160 insertions(+), 99 deletions(-) diff --git a/adm/auth_list.php b/adm/auth_list.php index fad76a840..f65ca6241 100644 --- a/adm/auth_list.php +++ b/adm/auth_list.php @@ -73,6 +73,11 @@ $colspan = 5;

설정된 관리권한 내역

권한 r은 읽기권한, w는 쓰기권한, d는 삭제권한입니다.

+ +
@@ -83,9 +88,12 @@ $colspan = 5; - - - + + + @@ -109,7 +117,8 @@ $colspan = 5; diff --git a/adm/board_list.php b/adm/board_list.php index a8f821efc..5553d6143 100644 --- a/adm/board_list.php +++ b/adm/board_list.php @@ -79,11 +79,23 @@ $colspan = 15;

여러개의 게시판 설정을 한번에 바꾸실 때는 게시판 체크기능을 이용하세요.

-
+
게시판 추가
+
    +
  • 그룹 순 정렬
    • +
  • TABLE 순 정렬
    • +
  • 스킨 순 정렬
    • +
  • 모바일 스킨 순 정렬
    • +
  • 제목 순 정렬
    • +
  • SNS 순 정렬
    • +
  • 검색사용 순 정렬
    • +
  • 메뉴보임 순 정렬
    • +
  • 출력순서 순 정렬
    • +
+ @@ -94,20 +106,23 @@ $colspan = 15;
회원아이디별명 + + + 회원아이디별명 메뉴 권한
- + +
- - - - - - + + + + + + - - - - + + + + @@ -115,13 +130,14 @@ $colspan = 15; 수정'; - $one_copy = '
  • 복사
    • '; + $one_update = '수정'; + $one_copy = '복사'; ?> - + -
    +
    게시판그룹 추가
    +
      +
    • 그룹아이디 순 정렬 +
    • 제목 순 정렬 +
    • 그룹관리자 순 정렬 +
    • 출력순서 순 정렬 +
    + @@ -102,15 +109,18 @@ $colspan = 8;
    그룹TABLE스킨모바일
    스킨    		제목 + + + 그룹TABLE스킨모바일
    스킨    		제목 읽기P포인트 쓰기P포인트 댓글P포인트 다운P포인트SNS
    사용    		검색
    사용    		메뉴
    보임    		출력
    순서    		SNS
    사용    		검색
    사용    		메뉴
    보임    		출력
    순서    		 접속기기 관리
    - + + @@ -156,15 +172,7 @@ $colspan = 15; -
    - -
      - - -
    -
    -
    - - - - + + + + - + @@ -127,13 +137,14 @@ $colspan = 8; $sql2 = " select count(*) as cnt from {$g4['board_table']} where gr_id = '{$row['gr_id']}' "; $row2 = sql_fetch($sql2); - $s_upd = '
  • 수정
    • '; + $s_upd = '수정'; ?> - +
    -

    그룹에 접근가능한 회원 목록 (그룹아이디:)

    +

    그룹 접근가능 회원 목록 (그룹아이디:)

    + +
      +
    • 회원아이디 순 정렬
      • +
    • 이름 순 정렬
      • +
    • 별명 순 정렬
      • +
    • 최종접속 순 정렬
      • +
    • 처리일시 순 정렬
      • +
    + @@ -83,13 +92,16 @@ $colspan = 7;
    그룹아이디제목그룹관리자 + + + 그룹아이디제목그룹관리자 게시판
    갯수    		 접근
    사용    		 접근
    회원수    		 메뉴
    보임    		출력
    순서    		출력
    순서    		 접속기기 관리
    - + + @@ -160,14 +171,7 @@ $colspan = 8; -
    - -
      - -
    -
    -
    - + - - - - - + + + + + @@ -108,7 +120,10 @@ $colspan = 7; $mb_nick = get_sideview($row['mb_id'], $row['mb_nick'], $row['mb_email'], $row['mb_homepage']); ?> - + diff --git a/adm/mail_list.php b/adm/mail_list.php index 97da65781..7db0dc873 100644 --- a/adm/mail_list.php +++ b/adm/mail_list.php @@ -29,7 +29,7 @@ $colspan = 6; 현재 등록된 메일은 총 건입니다.

    -
    +
    메일내용추가
    diff --git a/adm/member_list.php b/adm/member_list.php index 553574b44..6776910fc 100644 --- a/adm/member_list.php +++ b/adm/member_list.php @@ -103,11 +103,27 @@ $colspan = 15;

    회원자료 삭제 시 다른 회원이 기존 회원아이디를 사용하지 못하도록 회원아이디, 이름, 별명은 삭제하지 않고 영구 보관합니다.

    -
    +
    회원추가
    +
      +
    • 회원아이디 순 정렬
      • +
    • 이름 순 정렬
      • +
    • 최종접속 순 정렬
      • +
    • 포인트 순 정렬
      • +
    • 별명 순 정렬
      • +
    • 권한 순 정렬
      • +
    • 메일인증 순 정렬
      • +
    • 메일수신 순 정렬
      • +
    • 정보공개 순 정렬
      • +
    • 본인확인 순 정렬
      • +
    • 성인인증 순 정렬
      • +
    • 접근차단 순 정렬
      • +
    • 가입일 순 정렬
      • +
    + @@ -118,26 +134,29 @@ $colspan = 15;
    + + + 그룹회원아이디이름별명최종접속처리일시회원아이디이름별명최종접속처리일시
    + + +
    - - - + + + - - + + - - + + - - - - - - - + + + + + + + @@ -155,10 +174,10 @@ $colspan = 15; $s_mod = ''; $s_del = ''; } else { - $s_mod = '
  • 수정
    • '; - //$s_del = '
  • 삭제
    • '; + $s_mod = '수정'; + //$s_del = '삭제'; } - $s_grp = '
  • 그룹
    • '; + $s_grp = '그룹'; $leave_date = $row['mb_leave_date'] ? $row['mb_leave_date'] : date('Ymd', G4_SERVER_TIME); $intercept_date = $row['mb_intercept_date'] ? $row['mb_intercept_date'] : date('Ymd', G4_SERVER_TIME); @@ -190,7 +209,7 @@ $colspan = 15; > @@ -199,15 +218,7 @@ $colspan = 15; - + > diff --git a/adm/point_list.php b/adm/point_list.php index 80a8dd164..af3d342e2 100644 --- a/adm/point_list.php +++ b/adm/point_list.php @@ -100,6 +100,13 @@ function point_clear()

    포인트 내역

    +
      +
    • 회원아이디 순 정렬
      • +
    • 일시 순 정렬
      • +
    • 포인트 내용 순 정렬
      • +
    • 포인트 순 정렬
      • +
    + @@ -111,13 +118,16 @@ function point_clear()
    회원아이디이름 + + + 회원아이디이름 휴대폰 주소최종접속 포인트최종접속포인트 관리
    별명상태/권한별명상태/권한 전화번호메일
    인증    		메일
    수신    		정보
    공개    		본인
    확인    		성인
    인증    		접근
    차단    		가입일메일
    인증    		메일
    수신    		정보
    공개    		본인
    확인    		성인
    인증    		접근
    차단    		가입일 접근그룹
    - + -
    - -
      - - -
    -
    -
    - - + + - - - + + + @@ -140,9 +150,10 @@ function point_clear() diff --git a/adm/poll_list.php b/adm/poll_list.php index fad175aba..b413b5113 100644 --- a/adm/poll_list.php +++ b/adm/poll_list.php @@ -73,7 +73,7 @@ $colspan = 6;

    투표목록

    -
    +
    투표 추가
    diff --git a/css/admin.css b/css/admin.css index 9737f8993..b868e880d 100644 --- a/css/admin.css +++ b/css/admin.css @@ -135,8 +135,8 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em} .btn_ft a {display:inline-block;padding:0 15px;height:28px;background:#617d46;color:#fff;text-decoration:none;line-height:2.4em;vertical-align:middle} .btn_ft a:focus {background:#555} -#btn_add {margin-bottom:10px;text-align:right} -#btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} +.btn_add {margin-bottom:10px;text-align:right} +.btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} /* 필수입력 */ .required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat !important} @@ -173,16 +173,20 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f .anchor a:focus, .anchor a:hover {background:#434f54;text-decoration:none} /* 리스트 정렬 */ -#sort_odr {float:left;margin:0;padding-left:1px;list-style:none;zoom:1} -#sort_odr:after {display:block;visibility:hidden;clear:both;content:""} -#sort_odr li {float:left;margin-bottom:-1px} -#sort_odr a {display:block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} -#sort_odr a:focus, #sort_odr a:hover, #sort_odr a:active {text-decoration:none} +.sort_odr {float:left;margin:0 0 10px;padding-left:1px;list-style:none;zoom:1} +.sort_odr:after {display:block;visibility:hidden;clear:both;content:""} +.sort_odr li {float:left;margin-bottom:-1px} +.sort_odr a {display:block;position:relative;margin-left:-1px;padding:8px 0 6px;width:70px;border:1px solid #e9e9e9;background:#f5f6fa;color:#000;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer} +.sort_odr a:focus, .sort_odr a:hover, .sort_odr a:active {text-decoration:none} + +.sort_with {float:right} + +#sort_mb {width:800px} /* 테이블 */ table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0} caption {padding:10px 0 15px;font-weight:bold;text-align:left} -thead th {padding:12px 0 8px;border-top:1px solid #e9e9e9;background:#f3f6f7} +thead th {padding:12px 0 8px;border-bottom:1px solid #666;background:#565e60;color:#fff} thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */ tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff} tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center} @@ -260,8 +264,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9 .visit_bar {position:relative} .visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd} /* 공통 */ -.tr_bg {background:#fafeef} -.tr_bg td {border-bottom:1px solid #d8e6b6 !important} +.tr_bg {background:#f5f6fa} .td_chk {width:30px;text-align:center} .td_num {width:60px;text-align:center} From eef608699722eadbfa8e07344cffa82d023fe41f Mon Sep 17 00:00:00 2001 From: gnuboard Date: Wed, 12 Jun 2013 18:04:27 +0900 Subject: [PATCH 3/9] =?UTF-8?q?jQuery=20load()=20=EB=A1=9C=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/item.php | 10 +++-- shop/itemuse.inc.php | 96 -------------------------------------------- 2 files changed, 6 insertions(+), 100 deletions(-) delete mode 100644 shop/itemuse.inc.php diff --git a/shop/item.php b/shop/item.php index 293b29b81..28264a33e 100644 --- a/shop/item.php +++ b/shop/item.php @@ -582,10 +582,12 @@ else

    이용후기

    - +
    +
    diff --git a/shop/itemuse.inc.php b/shop/itemuse.inc.php deleted file mode 100644 index 55a3a6de5..000000000 --- a/shop/itemuse.inc.php +++ /dev/null @@ -1,96 +0,0 @@ - - -더보기 - -
    회원아이디 + + + 회원아이디 이름 별명일시포인트 내용포인트일시포인트 내용포인트 포인트합
    - - - + + + +
    - - - - - - - - - - - - - - - - - - - -'; -} -?> -
    번호제목작성자작성일평점
    번 - - - 별<?php echo $use_star; ?>개
    등록된 사용후기가 없습니다.
    - - - - -사용후기 쓰기 새 창 - - From 8187debad1d2d315b7e8cb3703257679c5ac3582 Mon Sep 17 00:00:00 2001 From: chicpro Date: Wed, 12 Jun 2013 18:44:47 +0900 Subject: [PATCH 4/9] =?UTF-8?q?#209=20=EC=BF=A0=ED=8F=B0=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=20=EC=9D=B8=EC=A7=80=EC=88=98=EB=8B=A8=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=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 --- mobile/shop/orderform.php | 70 ++++++++++++++++++++++-------------- shop/ordercoupon.php | 3 -- shop/orderform.php | 64 ++++++++++++++++++++------------- shop/orderitemcoupon.php | 3 -- shop/ordersendcostcoupon.php | 3 -- 5 files changed, 83 insertions(+), 60 deletions(-) diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index fcaed20cc..0ab87258f 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -195,31 +195,35 @@ ob_start(); - 0) - { - ?> +
    + 주문 + 원 +
    + +
    + 쿠폰 + 0 원 +
    배송비 원
    - - 0) { ?>
    총계 - 원 점 + 원
    - +
    + + 점 +
    " }, + { it_id: it_id, sw_direct: "" }, function(data) { $cp_btn_el.after(data); } @@ -718,7 +722,7 @@ $(function() { }); $(".cp_apply").live("click", function() { - var $el = $(this).closest("li"); + var $el = $(this).closest("tr"); var cp_id = $el.find("input[name='f_cp_id[]']").val(); var amount = $el.find("input[name='f_cp_amt[]']").val(); var subj = $el.find("input[name='f_cp_subj[]']").val(); @@ -764,7 +768,9 @@ $(function() { calculate_total_amount(); $("#it_coupon_frm").remove(); - $cp_btn_el.focus(); + $cp_btn_el.text("변경").focus(); + if(!$cp_row_el.find(".it_coupon_cancel").size()) + $cp_btn_el.after(""); }); $("#it_coupon_close").live("click", function() { @@ -772,11 +778,12 @@ $(function() { $cp_btn_el.focus(); }); - $("#it_coupon_cancel").live("click", function() { - coupon_cancel($cp_row_el); + $(".it_coupon_cancel").live("click", function() { + coupon_cancel($(this).closest("tr")); calculate_total_amount(); $("#it_coupon_frm").remove(); - $cp_btn_el.focus(); + $(this).closest("tr").find(".it_coupon_btn").text("적용").focus(); + $(this).remove(); }); $("#od_coupon_btn").click(function() { @@ -793,7 +800,7 @@ $(function() { }); $(".od_cp_apply").live("click", function() { - var $el = $(this).closest("li"); + var $el = $(this).closest("tr"); var cp_id = $el.find("input[name='o_cp_id[]']").val(); var amount = parseInt($el.find("input[name='o_cp_amt[]']").val()); var subj = $el.find("input[name='o_cp_subj[]']").val(); @@ -813,7 +820,9 @@ $(function() { $("input[name=od_cp_id]").val(cp_id); calculate_order_amount(); $("#od_coupon_frm").remove(); - $("#od_coupon_btn").focus(); + $("#od_coupon_btn").text("쿠폰변경").focus(); + if(!$("#od_coupon_cancel").size()) + $("#od_coupon_btn").after(""); }); $("#od_coupon_close").live("click", function() { @@ -826,7 +835,8 @@ $(function() { $("input[name=od_amount]").val(org_amount); calculate_order_amount(); $("#od_coupon_frm").remove(); - $("#od_coupon_btn").focus(); + $("#od_coupon_btn").text("쿠폰적용").focus(); + $(this).remove(); }); $("#sc_coupon_btn").click(function() { @@ -844,7 +854,7 @@ $(function() { }); $(".sc_cp_apply").live("click", function() { - var $el = $(this).closest("li"); + var $el = $(this).closest("tr"); var cp_id = $el.find("input[name='s_cp_id[]']").val(); var amount = parseInt($el.find("input[name='s_cp_amt[]']").val()); var subj = $el.find("input[name='s_cp_subj[]']").val(); @@ -860,7 +870,9 @@ $(function() { $("input[name=sc_cp_id]").val(cp_id); calculate_order_amount(); $("#sc_coupon_frm").remove(); - $("#sc_coupon_btn").focus(); + $("#sc_coupon_btn").text("쿠폰변경").focus(); + if(!$("#sc_coupon_cancel").size()) + $("#sc_coupon_btn").after(""); }); $("#sc_coupon_close").live("click", function() { @@ -873,7 +885,8 @@ $(function() { $("input[name=od_send_cost]").val(send_cost); calculate_order_amount(); $("#sc_coupon_frm").remove(); - $("#sc_coupon_btn").focus(); + $("#sc_coupon_btn").text("쿠폰적용").focus(); + $(this).remove(); }); $("#od_settle_bank").bind("click", function() { @@ -905,20 +918,23 @@ function calculate_total_amount() { var $it_amt = $("input[name^=it_amount]"); var $cp_amt = $("input[name^=cp_amount]"); - var tot_sell_amount = sell_amount = 0; + var tot_sell_amount = sell_amount = tot_cp_amount = 0; var it_amount, cp_amount; var send_cost = parseInt($("input[name=org_send_cost]").val()); $it_amt.each(function(index) { it_amount = parseInt($(this).val()); cp_amount = parseInt($cp_amt.eq(index).val()); - sell_amount += (it_amount - cp_amount); + sell_amount += it_amount; + tot_cp_amount += cp_amount; }); - tot_sell_amount = sell_amount + send_cost; + tot_sell_amount = sell_amount - tot_cp_amount + send_cost; - $("#ct_tot_amount").text(number_format(String(tot_sell_amount))); - $("form[name=sm_form] input[name=good_mny]").val(tot_sell_amount); + $("#ct_tot_coupon").text(number_format(String(tot_cp_amount))+" 원"); + $("#ct_tot_amount").text(number_format(String(tot_sell_amount))+" 원"); + + $("input[name=good_mny]").val(tot_sell_amount); $("input[name=od_amount]").val(sell_amount); $("input[name=org_od_amount]").val(sell_amount); $("input[name=od_send_cost]").val(send_cost); diff --git a/shop/ordercoupon.php b/shop/ordercoupon.php index f1f73d1ee..25a8aa5c1 100644 --- a/shop/ordercoupon.php +++ b/shop/ordercoupon.php @@ -65,8 +65,5 @@ $count = mysql_num_rows($result); ?>
    - 0) { ?> - -
    \ No newline at end of file diff --git a/shop/orderform.php b/shop/orderform.php index 2a45a1c6f..40b9c8f85 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -270,31 +270,35 @@ setTimeout("init_pay_button();",300); - 0) - { - ?> +
    + 주문 + 원 +
    + +
    + 쿠폰 + 0 원 +
    배송비 원
    - - 0) { ?>
    총계 - 원 점 + 원
    - +
    + + 점 +
    @@ -969,7 +973,9 @@ $(function() { calculate_total_amount(); $("#it_coupon_frm").remove(); - $cp_btn_el.focus(); + $cp_btn_el.text("변경").focus(); + if(!$cp_row_el.find(".it_coupon_cancel").size()) + $cp_btn_el.after(""); }); $("#it_coupon_close").live("click", function() { @@ -977,11 +983,12 @@ $(function() { $cp_btn_el.focus(); }); - $("#it_coupon_cancel").live("click", function() { - coupon_cancel($cp_row_el); + $(".it_coupon_cancel").live("click", function() { + coupon_cancel($(this).closest("tr")); calculate_total_amount(); $("#it_coupon_frm").remove(); - $cp_btn_el.focus(); + $(this).closest("tr").find(".it_coupon_btn").text("적용").focus(); + $(this).remove(); }); $("#od_coupon_btn").click(function() { @@ -998,7 +1005,7 @@ $(function() { }); $(".od_cp_apply").live("click", function() { - var $el = $(this).closest("li"); + var $el = $(this).closest("tr"); var cp_id = $el.find("input[name='o_cp_id[]']").val(); var amount = parseInt($el.find("input[name='o_cp_amt[]']").val()); var subj = $el.find("input[name='o_cp_subj[]']").val(); @@ -1018,7 +1025,9 @@ $(function() { $("input[name=od_cp_id]").val(cp_id); calculate_order_amount(); $("#od_coupon_frm").remove(); - $("#od_coupon_btn").focus(); + $("#od_coupon_btn").text("쿠폰변경").focus(); + if(!$("#od_coupon_cancel").size()) + $("#od_coupon_btn").after(""); }); $("#od_coupon_close").live("click", function() { @@ -1031,7 +1040,8 @@ $(function() { $("input[name=od_amount]").val(org_amount); calculate_order_amount(); $("#od_coupon_frm").remove(); - $("#od_coupon_btn").focus(); + $("#od_coupon_btn").text("쿠폰적용").focus(); + $(this).remove(); }); $("#sc_coupon_btn").click(function() { @@ -1049,7 +1059,7 @@ $(function() { }); $(".sc_cp_apply").live("click", function() { - var $el = $(this).closest("li"); + var $el = $(this).closest("tr"); var cp_id = $el.find("input[name='s_cp_id[]']").val(); var amount = parseInt($el.find("input[name='s_cp_amt[]']").val()); var subj = $el.find("input[name='s_cp_subj[]']").val(); @@ -1065,7 +1075,9 @@ $(function() { $("input[name=sc_cp_id]").val(cp_id); calculate_order_amount(); $("#sc_coupon_frm").remove(); - $("#sc_coupon_btn").focus(); + $("#sc_coupon_btn").text("쿠폰변경").focus(); + if(!$("#sc_coupon_cancel").size()) + $("#sc_coupon_btn").after(""); }); $("#sc_coupon_close").live("click", function() { @@ -1078,7 +1090,8 @@ $(function() { $("input[name=od_send_cost]").val(send_cost); calculate_order_amount(); $("#sc_coupon_frm").remove(); - $("#sc_coupon_btn").focus(); + $("#sc_coupon_btn").text("쿠폰적용").focus(); + $(this).remove(); }); $("#od_settle_bank").bind("click", function() { @@ -1106,19 +1119,22 @@ function calculate_total_amount() { var $it_amt = $("input[name^=it_amount]"); var $cp_amt = $("input[name^=cp_amount]"); - var tot_sell_amount = sell_amount = 0; + var tot_sell_amount = sell_amount = tot_cp_amount = 0; var it_amount, cp_amount; var send_cost = parseInt($("input[name=org_send_cost]").val()); $it_amt.each(function(index) { it_amount = parseInt($(this).val()); cp_amount = parseInt($cp_amt.eq(index).val()); - sell_amount += (it_amount - cp_amount); + sell_amount += it_amount; + tot_cp_amount += cp_amount; }); - tot_sell_amount = sell_amount + send_cost; + tot_sell_amount = sell_amount - tot_cp_amount + send_cost; + + $("#ct_tot_coupon").text(number_format(String(tot_cp_amount))+" 원"); + $("#ct_tot_amount").text(number_format(String(tot_sell_amount))+" 원"); - $("#ct_tot_amount").text(number_format(String(tot_sell_amount))); $("input[name=good_mny]").val(tot_sell_amount); $("input[name=od_amount]").val(sell_amount); $("input[name=org_od_amount]").val(sell_amount); diff --git a/shop/orderitemcoupon.php b/shop/orderitemcoupon.php index 73d0eed46..f64ac4087 100644 --- a/shop/orderitemcoupon.php +++ b/shop/orderitemcoupon.php @@ -86,8 +86,5 @@ $count = mysql_num_rows($result); ?>
    - 0) { ?> - -
    \ No newline at end of file diff --git a/shop/ordersendcostcoupon.php b/shop/ordersendcostcoupon.php index f80b4db2a..98fdba271 100644 --- a/shop/ordersendcostcoupon.php +++ b/shop/ordersendcostcoupon.php @@ -69,8 +69,5 @@ $count = mysql_num_rows($result); ?>
    - 0) { ?> - -
    \ No newline at end of file From 1bbfad3f2319ce4fff89561fbd387b4a955d92fd Mon Sep 17 00:00:00 2001 From: gnuboard Date: Thu, 13 Jun 2013 10:25:46 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EB=82=98=EC=98=A4?= =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EC=98=A4=EB=A5=98=20php=20lon?= =?UTF-8?q?g=20open=20tag=20=EB=A1=9C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/admin.menu400.shop_1of2.php | 2 +- adm/admin.menu500.shop_2of2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adm/admin.menu400.shop_1of2.php b/adm/admin.menu400.shop_1of2.php index e0bc6e24c..007291aa1 100644 --- a/adm/admin.menu400.shop_1of2.php +++ b/adm/admin.menu400.shop_1of2.php @@ -1,4 +1,4 @@ - Date: Thu, 13 Jun 2013 10:55:44 +0900 Subject: [PATCH 6/9] =?UTF-8?q?short=20tag=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 --- shop/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shop/list.php b/shop/list.php index 2ef974140..e4ee9f49e 100644 --- a/shop/list.php +++ b/shop/list.php @@ -48,7 +48,7 @@ if ($is_admin)
    - Date: Thu, 13 Jun 2013 10:56:35 +0900 Subject: [PATCH 7/9] =?UTF-8?q?short=20tag=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 --- mobile/shop/list.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/shop/list.php b/mobile/shop/list.php index aede9cd10..e627dbf60 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -40,7 +40,7 @@ if ($is_admin)
    - Date: Thu, 13 Jun 2013 10:57:37 +0900 Subject: [PATCH 8/9] =?UTF-8?q?#210=20=EA=B0=9C=EB=B3=84=EB=B0=B0=EC=86=A1?= =?UTF-8?q?=EB=B9=84=20=EA=B3=84=EC=82=B0=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/shop.lib.php | 20 +++----------------- mobile/shop/cart.php | 15 +++++++++++---- shop/cart.php | 20 +++++++++++--------- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/lib/shop.lib.php b/lib/shop.lib.php index 5fba5214b..ef0a18ede 100644 --- a/lib/shop.lib.php +++ b/lib/shop.lib.php @@ -1177,7 +1177,7 @@ function get_item_point($it) } // 상품별 배송비 -function get_item_sendcost($it_id, $uq_id) +function get_item_sendcost($it_id, $price, $qty) { global $g4, $default; @@ -1193,31 +1193,17 @@ function get_item_sendcost($it_id, $uq_id) if($it['it_sc_type']) { if($it['it_sc_type'] == 1) { // 조건부무료 - $sql = " select SUM( IF(io_type = '1', io_price * ct_qty, (ct_price + io_price) * ct_qty)) as sum_price - from {$g4['shop_cart_table']} - where uq_id = '$uq_id' - and it_id = '$it_id' "; - $ct = sql_fetch($sql); - $item_price = $ct['sum_price']; - - if($item_price >= $it['it_sc_minimum']) + if($price >= $it['it_sc_minimum']) $sendcost = 0; else $sendcost = $it['it_sc_amount']; } else if($it['it_sc_type'] == 2) { // 유료배송 $sendcost = $it['it_sc_amount']; } else { // 수량별 부과 - $sql = " select SUM(ct_qty) as item_count - from {$g4['shop_cart_table']} - where uq_id = '$uq_id' - and it_id = '$it_id' "; - $ct = sql_fetch($sql); - $item_count = $ct['item_count']; - if(!$it['it_sc_qty']) $it['it_sc_qty'] = 1; - $q = ceil((int)$item_count / (int)$it['it_sc_qty']); + $q = ceil((int)$qty / (int)$it['it_sc_qty']); $sendcost = (int)$it['it_sc_amount'] * $q; } } else { diff --git a/mobile/shop/cart.php b/mobile/shop/cart.php index 5424d4d87..f0b77eb1a 100644 --- a/mobile/shop/cart.php +++ b/mobile/shop/cart.php @@ -46,7 +46,7 @@ include_once(G4_MSHOP_PATH.'/_head.php'); $sql .= " order by a.ct_id "; $result = sql_query($sql); - $good_info = ''; + $it_send_cost = 0; for ($i=0; $row=mysql_fetch_array($result); $i++) { @@ -74,6 +74,11 @@ include_once(G4_MSHOP_PATH.'/_head.php'); $it_name .= '
    '.$it_options.'
    '; } + // 개별배송비 계산 + if($default['de_send_cost_case'] == '개별') { + $it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']); + } + $point = $sum['point']; $sell_amount = $sum['price']; ?> @@ -104,18 +109,20 @@ include_once(G4_MSHOP_PATH.'/_head.php'); // 배송비 계산 if ($default['de_send_cost_case'] == '없음') $send_cost = 0; - else { + else if($default['de_send_cost_case'] == '상한') { // 배송비 상한 : 여러단계의 배송비 적용 가능 $send_cost_limit = explode(";", $default['de_send_cost_limit']); $send_cost_list = explode(";", $default['de_send_cost_list']); $send_cost = 0; for ($k=0; $k diff --git a/shop/cart.php b/shop/cart.php index 89331029f..dac1e3c64 100644 --- a/shop/cart.php +++ b/shop/cart.php @@ -64,9 +64,6 @@ include_once('./_head.php'); $tot_sell_amount = 0; $tot_cancel_amount = 0; - $goods = $goods_it_id = ""; - $goods_count = -1; - // $s_uq_id 로 현재 장바구니 자료 쿼리 $sql = " select a.ct_id, a.it_id, @@ -88,7 +85,7 @@ include_once('./_head.php'); $sql .= " order by a.ct_id "; $result = sql_query($sql); - $good_info = ''; + $it_send_cost = 0; for ($i=0; $row=mysql_fetch_array($result); $i++) { @@ -116,6 +113,11 @@ include_once('./_head.php'); $it_name .= '
    '.$it_options.'
    '; } + // 개별배송비 계산 + if($default['de_send_cost_case'] == '개별') { + $it_send_cost += get_item_sendcost($row['it_id'], $sum['price'], $sum['qty']); + } + $point = $sum['point']; $sell_amount = $sum['price']; ?> @@ -153,26 +155,26 @@ include_once('./_head.php'); // 배송비 계산 if ($default['de_send_cost_case'] == '없음') $send_cost = 0; - else { + else if($default['de_send_cost_case'] == '상한') { // 배송비 상한 : 여러단계의 배송비 적용 가능 $send_cost_limit = explode(";", $default['de_send_cost_limit']); $send_cost_list = explode(";", $default['de_send_cost_list']); $send_cost = 0; for ($k=0; $k - - 0) From 1347cb96544ad74e0d69474af525c52c00b1ecb9 Mon Sep 17 00:00:00 2001 From: chicpro Date: Thu, 13 Jun 2013 11:26:25 +0900 Subject: [PATCH 9/9] =?UTF-8?q?short=20tag=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 --- adm/admin.head.php | 16 +-- adm/mail_select_list.php | 2 +- adm/shop_admin/itemformupdate.php | 2 +- adm/version.php | 38 +++--- mobile/shop/kcp/order_approval_form.php | 124 +++++++++---------- mobile/shop/navigation1.inc.php | 4 +- mobile/shop/orderform.php | 8 +- mobile/skin/member/shop_basic/login.skin.php | 10 +- shop/content.php | 2 +- shop/navigation1.inc.php | 4 +- skin/member/shop_basic/login.skin.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.1.php | 10 +- skin/outlogin/shop_basic/outlogin.skin.2.php | 20 +-- skin/poll/shop_basic/poll_result.skin.php | 34 ++--- 14 files changed, 140 insertions(+), 144 deletions(-) diff --git a/adm/admin.head.php b/adm/admin.head.php index cc381378f..fb3b2096e 100644 --- a/adm/admin.head.php +++ b/adm/admin.head.php @@ -118,26 +118,26 @@ function imageview(id, w, h)
    diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 52195b66f..102860445 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -495,7 +495,7 @@ echo ""; ?> @@ -83,7 +81,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    비회원 주문조회 - + diff --git a/shop/content.php b/shop/content.php index ee1890167..10fdeace2 100644 --- a/shop/content.php +++ b/shop/content.php @@ -57,7 +57,7 @@ if (file_exists($himg)) // 상단 이미지 echo '
    '; ?> -
    +

    diff --git a/shop/navigation1.inc.php b/shop/navigation1.inc.php index ceddaee44..1a0245f83 100644 --- a/shop/navigation1.inc.php +++ b/shop/navigation1.inc.php @@ -30,6 +30,6 @@ else ?>
    - Home - + Home +
    diff --git a/skin/member/shop_basic/login.skin.php b/skin/member/shop_basic/login.skin.php index f3d2e8c69..0c0a6f24d 100644 --- a/skin/member/shop_basic/login.skin.php +++ b/skin/member/shop_basic/login.skin.php @@ -49,7 +49,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    - +
    @@ -69,10 +69,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 } } - //f.url.value = "/orderform.php"; - //f.action = "/orderform.php"; - f.url.value = ""; - f.action = ""; + f.url.value = ""; + f.action = ""; f.submit(); } @@ -83,7 +81,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    비회원 주문조회 - + diff --git a/skin/outlogin/shop_basic/outlogin.skin.1.php b/skin/outlogin/shop_basic/outlogin.skin.1.php index ad679975d..cb189aea1 100644 --- a/skin/outlogin/shop_basic/outlogin.skin.1.php +++ b/skin/outlogin/shop_basic/outlogin.skin.1.php @@ -2,22 +2,22 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> - +

    회원로그인

    - +
    - +
    diff --git a/skin/outlogin/shop_basic/outlogin.skin.2.php b/skin/outlogin/shop_basic/outlogin.skin.2.php index f49b42b2b..410f75f51 100644 --- a/skin/outlogin/shop_basic/outlogin.skin.2.php +++ b/skin/outlogin/shop_basic/outlogin.skin.2.php @@ -2,26 +2,26 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?> - +

    나의 회원정보

    - 님 - 관리자 모드 + 님 + 관리자 모드
    @@ -39,7 +39,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 function member_leave() { if (confirm("정말 회원에서 탈퇴 하시겠습니까?")) - location.href = "/member_confirm.php?url=member_leave.php"; + location.href = "/member_confirm.php?url=member_leave.php"; } diff --git a/skin/poll/shop_basic/poll_result.skin.php b/skin/poll/shop_basic/poll_result.skin.php index 6e864af37..4eb16b276 100644 --- a/skin/poll/shop_basic/poll_result.skin.php +++ b/skin/poll/shop_basic/poll_result.skin.php @@ -3,24 +3,24 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 ?>
    -

    +

    -

    결과

    +

    결과

    -
    전체 표
    +
    전체 표

    1. - - 표 - 퍼센트 + + 표 + 퍼센트

      - +
      2. @@ -36,12 +36,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
      -

      님의 의견

      - - +

      님의 의견

      + +

      - +