diff --git a/adm/shop_admin/ajax.orderitem.php b/adm/shop_admin/ajax.orderitem.php new file mode 100644 index 000000000..e02d85efd --- /dev/null +++ b/adm/shop_admin/ajax.orderitem.php @@ -0,0 +1,100 @@ +주문정보가 존재하지 않습니다.'); + +// 상품목록 +$sql = " select it_id, + it_name, + cp_price, + ct_notax + from {$g5['g5_shop_cart_table']} + where od_id = '$od_id' + group by it_id + order by ct_id "; +$result = sql_query($sql); +?> + +
+

주문상품 목록

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주문 상품 목록
상품명옵션항목상태수량판매가소계쿠폰포인트배송비
+ + + + +
+ +
+
\ No newline at end of file diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php index afa9c0ab3..fae477d4b 100644 --- a/adm/shop_admin/orderlist.php +++ b/adm/shop_admin/orderlist.php @@ -33,7 +33,7 @@ if ($od_status) { $sort1 = "od_receipt_time"; $sort2 = "desc"; break; - case '배송' : // 배송중 + case '배송' : // 배송중 $sort1 = "od_invoice_time"; $sort2 = "desc"; break; @@ -292,7 +292,7 @@ $listall = '전체목록/orderinquiryview.php?od_id=&uid=">
--> - + @@ -426,10 +426,43 @@ $listall = '전체목록 $(function(){ - $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); + $("#fr_date, #to_date").datepicker({ changeMonth: true, changeYear: true, dateFormat: "yy-mm-dd", showButtonPanel: true, yearRange: "c-99:c+99", maxDate: "+0d" }); + + // 주문상품보기 + $(".orderitem").on("click", function() { + var $this = $(this); + var od_id = $this.text().replace(/[^0-9]/g, ""); + + if($this.next().size()) + return false; + + $("#orderitemlist").remove(); + + $.post( + "./ajax.orderitem.php", + { od_id: od_id }, + function(data) { + $this.parent().append("
"); + $("#orderitemlist > div") + .html(data) + .append("
"); + } + ); + + return false; + }); + + // 상품리스트 닫기 + $("#orderitemlist-x").on("click", function() { + $("#orderitemlist").remove(); + }); + + $("body").on("click", function() { + $("#orderitemlist").remove(); + }); }); -function set_date(today) +function set_date(today) { if (today == "오늘") { document.getElementById("fr_date").value = ""; @@ -468,10 +501,10 @@ function forderlist_submit(f) /* switch (f.od_status.value) { - case "" : + case "" : alert("변경하실 주문상태를 선택하세요."); return false; - case '주문' : + case '주문' : default : @@ -493,9 +526,9 @@ function forderlist_submit(f) var chk = document.getElementsByName("chk[]"); - for (var i=0; i -
+
diff --git a/bbs/point.php b/bbs/point.php index 8cc003e43..f0549bb14 100644 --- a/bbs/point.php +++ b/bbs/point.php @@ -25,7 +25,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함

-
+
할 게시판을 한개 이상 선택하여 주십시오.
diff --git a/css/admin.css b/css/admin.css index a3e6f49d7..2792ace1a 100644 --- a/css/admin.css +++ b/css/admin.css @@ -441,6 +441,8 @@ td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} /* 주문내역 */ #sodr_list td {text-align:center !important} +#orderitemlist {position:relative} +#orderitemlist > div {position:absolute;top:0;left:0} /* 주문내역 수정 */ .sodr_nonpay {color:#ff6600} diff --git a/css/default.css b/css/default.css index ae5f3d7f1..fa6fae924 100644 --- a/css/default.css +++ b/css/default.css @@ -162,8 +162,8 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 기본테이블 */ -.tbl_wrp table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_wrp caption {padding:10px 0;font-weight:bold;text-align:left} +.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} +.tbl_wrap caption {padding:10px 0;font-weight:bold;text-align:left} .tbl_head01 {margin:0 0 10px} .tbl_head01 caption {padding:0;font-size:0;line-height:0;overflow:hidden} @@ -215,7 +215,7 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 /* 새창 기본 스타일 */ .new_win {} -.new_win .tbl_wrp {margin:0 20px} +.new_win .tbl_wrap {margin:0 20px} .new_win #win_title {margin:0 0 20px;padding:20px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em} .new_win #win_title .sv {font-size:0.75em;line-height:1.2em} .new_win .win_ul {margin:-20px 0 20px 0;padding:0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none;zoom:1} diff --git a/css/mobile.css b/css/mobile.css index c8f6309e6..d3d32901d 100644 --- a/css/mobile.css +++ b/css/mobile.css @@ -10,8 +10,8 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, header ul, nav ul, footer ul {margin:0;padding:0;list-style:none} legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} label, input, select, img {vertical-align:middle} -input,button {margin:0;padding:0} -input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em} +input,button {margin:0;padding:0;font-size:1em} +input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em;-webkit-appearance:none} textarea, select {font-size:1em} textarea {border-radius:0;-webkit-appearance:none} p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all} @@ -32,10 +32,10 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline} /* 캡챠 자동등록(입력)방지 기본 */ #captcha {display:inline-block;position:relative} #captcha legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden} -#captcha audio {display:block;margin:0 0 5px;width:263px} -#captcha #captcha_img {width:100px;height:41px;border:1px solid #e9e9e9} -#captcha #captcha_reload {margin:0;padding:0;width:70px;height:43px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} -#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:70px;height:41px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} +#captcha audio {display:block;margin:0 0 5px;width:187px} +#captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9} +#captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer} +#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em} #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em} /* 상단 레이아웃 */ @@ -113,7 +113,7 @@ a.btn02:focus, .btn02:hover {text-decoration:none} input.btn_submit {padding:0 10px;height:2.6em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} fieldset .btn_submit {padding:0 10px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;-webkit-appearance:none} -a.btn_cancel {display:inline-block;padding:0 10px;height:2.5em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em;vertical-align:top} +a.btn_cancel {display:inline-block;padding:0 10px;height:2.4em;border:1px solid #ccc;background:#fafafa;color:#000;font-size:1em;text-decoration:none;line-height:2.5em;vertical-align:top} a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 5px;height:1.9em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:1.9em} /* 우편번호검색버튼 등 */ @@ -129,10 +129,11 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .cnt_cmt {display:inline-block;margin:0 0 0 3px;font-weight:bold} /* 기본테이블 */ -.tbl_wrp table {width:100%;border-collapse:collapse;border-spacing:0} -.tbl_wrp caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} +.tbl_wrap {margin:0 10px 10px} +.tbl_wrap table {width:100%;border-collapse:collapse;border-spacing:0} +.tbl_wrap caption {padding:10px 0;color:#4b8b99;font-weight:bold;text-align:left} -.tbl_head01 {margin:0 10px 10px} +.tbl_head01 {} .tbl_head01 caption {padding:0 0 10px;color:#777;text-align:left} .tbl_head01 thead th {padding:12px 0;border-top:1px solid #d1dee2;border-bottom:1px solid #d1dee2;background:#e5ecef;color:#383838;font-size:0.95em;letter-spacing:-0.1em} .tbl_head01 thead a {color:#383838} @@ -144,18 +145,14 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} .tbl_head01 .empty_table {padding:10px 0;text-align:center} /* 폼 테이블 */ -.tbl_frm01 {margin:0 10px} +.tbl_frm01 {} .tbl_frm01 th {padding:10px 0;width:90px;border:1px solid #e9e9e9;border-left:0;text-align:left} .tbl_frm01 td {padding:10px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent} .tbl_frm01 textarea, .frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} -.tbl_frm01 textarea {width:100%;height:150px} -/* -.tbl_frm01 #captcha {margin:0;padding:0;border:0;background:transparent} -.tbl_frm01 #captcha input {margin-left:0.3em;text-align:center} -*/ +.tbl_frm01 textarea {width:100%;height:100px} .tbl_frm01 a {text-decoration:none} .tbl_frm01 .frm_address {display:block;margin-top:5px} -.tbl_frm01 .frm_file {display:block;margin-bottom:5px} +.tbl_frm01 .frm_file {display:block;margin-bottom:5px;width:100%} .tbl_frm01 .frm_info {display:block;padding:5px 0 0;color:#666;line-height:1.3em} /* 필수입력 */ @@ -177,7 +174,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none} /* 새창 기본 스타일 */ .new_win {} .new_win #win_title {margin:0 0 20px;padding:20px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;font-size:1.2em} -.new_win .tbl_wrp {margin:0 20px} +.new_win .tbl_wrap {margin:0 20px} .new_win .win_ul {margin:-20px 0 20px 0;padding:0 20px;border-bottom:1px solid #455255;background:#484848;list-style:none} .new_win .win_ul:after {display:block;visibility:hidden;clear:both;content:""} .new_win .win_ul li {float:left;margin-left:-1px} diff --git a/mobile/skin/board/basic/list.skin.php b/mobile/skin/board/basic/list.skin.php index 9567e06b6..01c2d759a 100644 --- a/mobile/skin/board/basic/list.skin.php +++ b/mobile/skin/board/basic/list.skin.php @@ -48,7 +48,7 @@ if ($is_nogood) $colspan++; -
+
포인트 사용내역 목록
diff --git a/mobile/skin/board/basic/style.css b/mobile/skin/board/basic/style.css index 8d321398d..5c3370433 100644 --- a/mobile/skin/board/basic/style.css +++ b/mobile/skin/board/basic/style.css @@ -137,9 +137,11 @@ #bo_w #wr_email, #bo_w #wr_homepage, #bo_w #wr_subject {width:100%} #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} +#wr_email, #wr_homepage, #wr_subject, .wr_link {width:100%} + /* 게시판 읽기 */ #bo_v {margin-bottom:15px;padding-bottom:15px} diff --git a/mobile/skin/board/basic/view_comment.skin.php b/mobile/skin/board/basic/view_comment.skin.php index 72fa59d90..112623ca1 100644 --- a/mobile/skin/board/basic/view_comment.skin.php +++ b/mobile/skin/board/basic/view_comment.skin.php @@ -93,7 +93,7 @@ var char_max = parseInt(); // 최대 -
+
diff --git a/mobile/skin/board/basic/write.skin.php b/mobile/skin/board/basic/write.skin.php index 9e2ccc367..d87a18218 100644 --- a/mobile/skin/board/basic/write.skin.php +++ b/mobile/skin/board/basic/write.skin.php @@ -50,14 +50,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
+
- + @@ -71,14 +71,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + - + @@ -103,7 +103,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -116,7 +116,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
글자
+
글자
@@ -124,7 +124,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -134,7 +134,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
" id="wr_link" class="frm_input" size="50">" id="wr_link" class="frm_input wr_link">
- + diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css index 6f2b903cb..2ea1ce968 100644 --- a/mobile/skin/board/gallery/style.css +++ b/mobile/skin/board/gallery/style.css @@ -119,9 +119,11 @@ /* 게시판 쓰기 */ #char_count_desc {display:block;margin:0 0 5px;padding:0} -#char_count_wrp {margin:5px 0 0;text-align:right} +#char_count_wrap {margin:5px 0 0;text-align:right} #char_count {font-weight:bold} +#wr_email, #wr_homepage, #wr_subject, .wr_link {width:100%} + /* 게시판 읽기 */ #bo_v {margin-bottom:15px;padding-bottom:15px} diff --git a/mobile/skin/board/gallery/view_comment.skin.php b/mobile/skin/board/gallery/view_comment.skin.php index 72fa59d90..112623ca1 100644 --- a/mobile/skin/board/gallery/view_comment.skin.php +++ b/mobile/skin/board/gallery/view_comment.skin.php @@ -93,7 +93,7 @@ var char_max = parseInt(); // 최대 -
+
diff --git a/mobile/skin/board/gallery/write.skin.php b/mobile/skin/board/gallery/write.skin.php index 9e2ccc367..8890b4f95 100644 --- a/mobile/skin/board/gallery/write.skin.php +++ b/mobile/skin/board/gallery/write.skin.php @@ -50,35 +50,35 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 echo $option_hidden; ?> -
+
- + - + - + - + @@ -103,7 +103,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -116,7 +116,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
글자
+
글자
@@ -124,7 +124,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 - + @@ -134,7 +134,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
class="frm_input " maxlength="20"> class="frm_input " size="15" maxlength="20">
" id="wr_link" class="frm_input" size="50">" id="wr_link" class="frm_input wr_link">
- + diff --git a/mobile/skin/connect/basic/current_connect.skin.php b/mobile/skin/connect/basic/current_connect.skin.php index 351b1bd89..344b6f9cc 100644 --- a/mobile/skin/connect/basic/current_connect.skin.php +++ b/mobile/skin/connect/basic/current_connect.skin.php @@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
+
diff --git a/mobile/skin/member/basic/formmail.skin.php b/mobile/skin/member/basic/formmail.skin.php index 99d391710..439dce321 100644 --- a/mobile/skin/member/basic/formmail.skin.php +++ b/mobile/skin/member/basic/formmail.skin.php @@ -16,7 +16,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
+
diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php index e74b90a05..ece3e6aca 100644 --- a/mobile/skin/member/basic/memo.skin.php +++ b/mobile/skin/member/basic/memo.skin.php @@ -13,7 +13,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
  • 쪽지쓰기
  • -
    +
    메일쓰기
    전체 쪽지
    diff --git a/mobile/skin/member/basic/memo_form.skin.php b/mobile/skin/member/basic/memo_form.skin.php index c228ef2a0..2edb425ef 100644 --- a/mobile/skin/member/basic/memo_form.skin.php +++ b/mobile/skin/member/basic/memo_form.skin.php @@ -14,7 +14,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    -
    +
    diff --git a/mobile/skin/member/basic/profile.skin.php b/mobile/skin/member/basic/profile.skin.php index b3f3a35cb..a4879270c 100644 --- a/mobile/skin/member/basic/profile.skin.php +++ b/mobile/skin/member/basic/profile.skin.php @@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    님의 프로필

    -
    +
    쪽지쓰기
    diff --git a/mobile/skin/member/basic/register_form.skin.php b/mobile/skin/member/basic/register_form.skin.php index ab2217248..4491d88f7 100644 --- a/mobile/skin/member/basic/register_form.skin.php +++ b/mobile/skin/member/basic/register_form.skin.php @@ -22,7 +22,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    @@ -44,7 +44,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    사이트 이용정보 입력
    -
    +
    @@ -161,7 +161,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
    개인정보 입력
    -
    +
    diff --git a/mobile/skin/member/basic/scrap.skin.php b/mobile/skin/member/basic/scrap.skin.php index 20558eb1e..b7c3d4fa7 100644 --- a/mobile/skin/member/basic/scrap.skin.php +++ b/mobile/skin/member/basic/scrap.skin.php @@ -7,7 +7,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가

    -
    +
    기타 개인설정
    diff --git a/mobile/skin/member/basic/scrap_popin.skin.php b/mobile/skin/member/basic/scrap_popin.skin.php index 1f9d08097..833f1e128 100644 --- a/mobile/skin/member/basic/scrap_popin.skin.php +++ b/mobile/skin/member/basic/scrap_popin.skin.php @@ -11,7 +11,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가 -
    +
    스크랩 목록
    diff --git a/mobile/skin/new/basic/new.skin.php b/mobile/skin/new/basic/new.skin.php index b9c900aed..120d71fd2 100644 --- a/mobile/skin/new/basic/new.skin.php +++ b/mobile/skin/new/basic/new.skin.php @@ -30,7 +30,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가 -
    +
    제목 확인 및 댓글 쓰기
    diff --git a/mobile/skin/outlogin/basic/style.css b/mobile/skin/outlogin/basic/style.css index 4060b4ef6..a72e8f800 100644 --- a/mobile/skin/outlogin/basic/style.css +++ b/mobile/skin/outlogin/basic/style.css @@ -8,9 +8,8 @@ .ol a.btn_admin {display:inline-block;margin:0 0 5px;padding:0 10px;border:1px solid #e8180c;background:#e8180c;color:#fff;text-decoration:none;line-height:2em;vertical-align:middle} /* 관리자 전용 버튼 */ .ol a.btn_admin:focus, .ol a.btn_admin:hover {text-decoration:none} -#ol_before input[type=text], -#ol_before input[type=password] {display:block;margin-bottom:5px;padding:0;width:80%;height:1.8em;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none} -#ol_before input[type=submit] {position:absolute;top:0;right:5px;padding:0 !important;width:18%;height:4em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer;-webkit-appearance:none} +#ol_before input[type=text], #ol_before input[type=password] {display:block;margin-bottom:5px;padding:0;width:80%;height:1.8em;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em} +#ol_before input[type=submit] {position:absolute;top:0;right:5px;padding:0 !important;width:18%;height:4.3em;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer} #ol_svc {margin:5px 0;text-align:right} #ol_svc a {display:inline-block;margin:0 0 0 5px;color:#000;text-decoration:none;vertical-align:middle} diff --git a/mobile/skin/poll/basic/poll_result.skin.php b/mobile/skin/poll/basic/poll_result.skin.php index e1120c3c1..aa26c9de6 100644 --- a/mobile/skin/poll/basic/poll_result.skin.php +++ b/mobile/skin/poll/basic/poll_result.skin.php @@ -59,7 +59,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가

    -
    +
    diff --git a/mobile/skin/search/basic/search.skin.php b/mobile/skin/search/basic/search.skin.php index 23d3c58b1..2e6c04507 100644 --- a/mobile/skin/search/basic/search.skin.php +++ b/mobile/skin/search/basic/search.skin.php @@ -23,7 +23,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
    - +