diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 7e2462c5f..de1a4f435 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -177,10 +177,10 @@ function get_max_value($arr) ?>
  • - +
    - +
    • -
    • +
    • @@ -317,16 +317,6 @@ function get_max_value($arr)

    결제수단별 주문현황

    - =0; $i--) - { - $date = date("Y-m-d", strtotime('-'.$i.' days', G5_SERVER_TIME)); - $info[$date] = get_order_settle_sum($date); - } - ?> -
    @@ -554,167 +544,6 @@ function graph_draw() } - -

    주문현황

    - - -
    - -
    - - -
    -

    입금완료 미배송내역

    - - -
    -
    - - - - - - - - - - - - 0 and od_misu <= 0 and od_invoice = '' - order by od_id desc - limit $max_limit "; - $result = sql_query($sql); - for ($i=0; $row=sql_fetch_array($result); $i++) - { - $sql1 = " select * from {$g5['member_table']} where mb_id = '{$row['mb_id']}' "; - $row1 = sql_fetch($sql1); - - $name = get_sideview($row['mb_id'], get_text($row['od_name']), $row1['mb_email'], $row1['mb_homepage']); - - $settle_method = ""; - if ($row['od_settle_case']) - { - $settle_method = $row['od_settle_case']; - } - else - { - $settle_method .= '미입력'; - if ($row['od_receipt_point']) $settle_method .= '포인트'; - } - ?> - - - - - - - - '; - ?> - -
    입금완료 미배송내역
    주문번호주문자입금액결제방법수정
    수정
    자료가 없습니다.
    -
    - -
    - 입금완료 미배송내역 더보기 -
    - - -
    -

    미입금 주문내역

    - - -
    - - - - - - - - - - - - - 0 - order by od_id desc - limit $max_limit "; - $result = sql_query($sql); - for ($i=0; $row=sql_fetch_array($result); $i++) - { - $sql1 = " select * from {$g5['member_table']} where mb_id = '{$row['mb_id']}' "; - $row1 = sql_fetch($sql1); - - $name = get_sideview($row['mb_id'], get_text($row['od_name']), $row1['mb_email'], $row1['mb_homepage']); - - $settle_method = ""; - if ($row['od_settle_case']) - { - $settle_method = $row['od_settle_case']; - } - else - { - $settle_method .= '미입력'; - if ($row['od_receipt_point']) $settle_method .= '포인트'; - } - ?> - - - - - - - - '; - ?> - -
    미입금 주문내역
    주문번호주문자주문액결제방법수정
    수정
    자료가 없습니다.
    -
    - -
    - 미입금 주문내역 더보기 -
    -
    -*/ ?> - diff --git a/bbs/write_comment_update.php b/bbs/write_comment_update.php index f14cf04ce..9c2ac8d7c 100644 --- a/bbs/write_comment_update.php +++ b/bbs/write_comment_update.php @@ -27,7 +27,7 @@ if ($is_guest) { if ($w == "c" || $w == "cu") { if ($member['mb_level'] < $board['bo_comment_level']) - alert('댓글를 쓸 권한이 없습니다.'); + alert('댓글을 쓸 권한이 없습니다.'); } else alert('w 값이 제대로 넘어오지 않았습니다.'); @@ -67,12 +67,12 @@ if ($w == 'c') // 댓글 입력 { /* if ($member[mb_point] + $board[bo_comment_point] < 0 && !$is_admin) - alert('보유하신 포인트('.number_format($member[mb_point]).')가 없거나 모자라서 댓글쓰기('.number_format($board[bo_comment_point]).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 댓글를 써 주십시오.'); + alert('보유하신 포인트('.number_format($member[mb_point]).')가 없거나 모자라서 댓글쓰기('.number_format($board[bo_comment_point]).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 댓글을 써 주십시오.'); */ - // 댓글쓰기 포인트설정시 회원의 포인트가 음수인 경우 댓글를 쓰지 못하던 버그를 수정 (곱슬최씨님) + // 댓글쓰기 포인트설정시 회원의 포인트가 음수인 경우 댓글을 쓰지 못하던 버그를 수정 (곱슬최씨님) $tmp_point = ($member['mb_point'] > 0) ? $member['mb_point'] : 0; if ($tmp_point + $board['bo_comment_point'] < 0 && !$is_admin) - alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 댓글쓰기('.number_format($board['bo_comment_point']).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 댓글를 써 주십시오.'); + alert('보유하신 포인트('.number_format($member['mb_point']).')가 없거나 모자라서 댓글쓰기('.number_format($board['bo_comment_point']).')가 불가합니다.\\n\\n포인트를 적립하신 후 다시 댓글을 써 주십시오.'); // 댓글 답변 if ($comment_id) @@ -264,7 +264,7 @@ else if ($w == 'cu') // 댓글 수정 else alert('그룹관리자의 권한보다 높은 회원의 댓글이므로 수정할 수 없습니다.'); } else - alert('자신이 관리하는 그룹의 게시판이 아니므로 댓글를 수정할 수 없습니다.'); + alert('자신이 관리하는 그룹의 게시판이 아니므로 댓글을 수정할 수 없습니다.'); } else if ($is_admin == 'board') { // 게시판관리자이면 $mb = get_member($comment['mb_id']); if ($member['mb_id'] == $board['bo_admin']) { // 자신이 관리하는 게시판인가? @@ -273,7 +273,7 @@ else if ($w == 'cu') // 댓글 수정 else alert('게시판관리자의 권한보다 높은 회원의 댓글이므로 수정할 수 없습니다.'); } else - alert('자신이 관리하는 게시판이 아니므로 댓글를 수정할 수 없습니다.'); + alert('자신이 관리하는 게시판이 아니므로 댓글을 수정할 수 없습니다.'); } else if ($member['mb_id']) { if ($member['mb_id'] != $comment['mb_id']) alert('자신의 글이 아니므로 수정할 수 없습니다.'); diff --git a/css/admin.css b/css/admin.css index b1005fca5..35c710b6e 100644 --- a/css/admin.css +++ b/css/admin.css @@ -295,8 +295,8 @@ tfoot td {font-weight:bold;text-align:center} .tbl_frm01 #captcha input {margin-left:5px;text-align:center} /* 자료 없는 목록 */ -.empty_table {padding:100px 0;text-align:center} -.empty_list {padding:20px 0;text-align:center} +.empty_table {padding:100px 0 !important;text-align:center} +.empty_list {padding:20px 0 !important;text-align:center} /* 테이블 그리드 */ .grid_1 {width:50px} diff --git a/mobile/shop/index.php b/mobile/shop/index.php index 7b0c07de6..284c7609b 100644 --- a/mobile/shop/index.php +++ b/mobile/shop/index.php @@ -23,7 +23,7 @@ include_once(G5_MSHOP_PATH.'/shop.head.php'); $list->set_type(1); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -43,7 +43,7 @@ include_once(G5_MSHOP_PATH.'/shop.head.php'); $list->set_type(2); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -63,7 +63,7 @@ include_once(G5_MSHOP_PATH.'/shop.head.php'); $list->set_type(3); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -83,7 +83,7 @@ include_once(G5_MSHOP_PATH.'/shop.head.php'); $list->set_type(4); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -103,7 +103,7 @@ include_once(G5_MSHOP_PATH.'/shop.head.php'); $list->set_type(5); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); diff --git a/mobile/shop/list.php b/mobile/shop/list.php index 7b849401b..3b667f146 100644 --- a/mobile/shop/list.php +++ b/mobile/shop/list.php @@ -84,7 +84,7 @@ var itemlist_ca_id = ""; $list->set_view('it_img', true); $list->set_view('it_id', false); $list->set_view('it_name', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); diff --git a/mobile/shop/search.php b/mobile/shop/search.php index ac789c6c8..d37aed607 100644 --- a/mobile/shop/search.php +++ b/mobile/shop/search.php @@ -31,9 +31,9 @@ if ($q) { for ($i=0; $i
    검색범위 - > - > - >
    + > + > + >
    상품가격 (원) @@ -159,6 +159,7 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산 $list = new item_list($default['de_mobile_search_list_skin'], $default['de_mobile_search_list_mod'], 1, $default['de_mobile_search_img_width'], $default['de_mobile_search_img_height']); $list->set_query(" select * $sql_common $sql_where {$order_by} limit $from_record, $items "); $list->set_is_page(true); + $list->set_mobile(true); $list->set_view('it_img', true); $list->set_view('it_id', true); $list->set_view('it_name', true); @@ -182,7 +183,7 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산 $query_string .= 'ca_id='.$ca_id; $query_string .='&qsort='.$qsort.'&qorder='.$qorder; - echo get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$query_string.'&page='); + echo get_paging($config['cf_mobile_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$query_string.'&page='); ?>
    diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php index 04359df19..5a8a6a5cb 100644 --- a/mobile/shop/shop.head.php +++ b/mobile/shop/shop.head.php @@ -21,7 +21,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php'); diff --git a/mobile/skin/shop/basic/list.10.skin.php b/mobile/skin/shop/basic/list.10.skin.php index 7d908bd7b..4a034dff4 100644 --- a/mobile/skin/shop/basic/list.10.skin.php +++ b/mobile/skin/shop/basic/list.10.skin.php @@ -38,7 +38,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($it_name)."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/mobile/skin/shop/basic/main.10.skin.php b/mobile/skin/shop/basic/main.10.skin.php index 2054cf7b4..a352f9d05 100644 --- a/mobile/skin/shop/basic/main.10.skin.php +++ b/mobile/skin/shop/basic/main.10.skin.php @@ -38,7 +38,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($it_name)."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/shop/index.php b/shop/index.php index a1b990528..e1a35588e 100644 --- a/shop/index.php +++ b/shop/index.php @@ -75,7 +75,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php'); $list->set_view('it_id', false); $list->set_view('it_name', true); $list->set_view('it_basic', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -96,7 +96,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php'); $list->set_view('it_id', false); $list->set_view('it_name', true); $list->set_view('it_basic', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); @@ -117,7 +117,7 @@ include_once(G5_SHOP_PATH.'/shop.head.php'); $list->set_view('it_id', false); $list->set_view('it_name', true); $list->set_view('it_basic', true); - $list->set_view('it_cust_price', false); + $list->set_view('it_cust_price', true); $list->set_view('it_price', true); $list->set_view('it_icon', true); $list->set_view('sns', true); diff --git a/skin/shop/basic/list.10.skin.php b/skin/shop/basic/list.10.skin.php index 4c4f51f77..13f5d3a7d 100644 --- a/skin/shop/basic/list.10.skin.php +++ b/skin/shop/basic/list.10.skin.php @@ -61,7 +61,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "
    \n"; - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])." >\n"; } diff --git a/skin/shop/basic/list.20.skin.php b/skin/shop/basic/list.20.skin.php index 4f523245d..755482e24 100644 --- a/skin/shop/basic/list.20.skin.php +++ b/skin/shop/basic/list.20.skin.php @@ -57,7 +57,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "
    \n"; - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])." >\n"; } @@ -88,4 +88,4 @@ if ($i > 1) echo "\n"; if($i == 1) echo "

    등록된 상품이 없습니다.

    \n"; ?> - \ No newline at end of file + diff --git a/skin/shop/basic/list.30.skin.php b/skin/shop/basic/list.30.skin.php index aac8e525c..2fde5ca1c 100644 --- a/skin/shop/basic/list.30.skin.php +++ b/skin/shop/basic/list.30.skin.php @@ -44,7 +44,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/skin/shop/basic/list.40.skin.php b/skin/shop/basic/list.40.skin.php index 97c1ddd7d..e716ea0c2 100644 --- a/skin/shop/basic/list.40.skin.php +++ b/skin/shop/basic/list.40.skin.php @@ -46,7 +46,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/skin/shop/basic/main.10.skin.php b/skin/shop/basic/main.10.skin.php index 98b2242f9..3cbccb7a2 100644 --- a/skin/shop/basic/main.10.skin.php +++ b/skin/shop/basic/main.10.skin.php @@ -26,11 +26,11 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "
  • img_width}px\">\n"; if ($this->href) { - echo "href}{$row['it_id']}\" class=\"sct_a\">\n"; + echo "href}{$row['it_id']}\" class=\"sct_a sct_img\">\n"; } if ($this->view_it_img) { - echo "".get_it_image($row['it_id'], $this->img_width, $this->img_height)."\n"; + echo get_it_image($row['it_id'], $this->img_width, $this->img_height)."\n"; } if ($this->href) { @@ -42,7 +42,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { } if ($this->href) { - echo "href}{$row['it_id']}\" class=\"sct_a\">\n"; + echo "href}{$row['it_id']}\" class=\"sct_a sct_txt\">\n"; } if ($this->view_it_name) { @@ -61,7 +61,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "
    \n"; - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])." >\n"; } diff --git a/skin/shop/basic/main.20.skin.php b/skin/shop/basic/main.20.skin.php index 87736a88a..e44bc6b31 100644 --- a/skin/shop/basic/main.20.skin.php +++ b/skin/shop/basic/main.20.skin.php @@ -55,7 +55,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/skin/shop/basic/main.30.skin.php b/skin/shop/basic/main.30.skin.php index 95f74cc04..15a7662d1 100644 --- a/skin/shop/basic/main.30.skin.php +++ b/skin/shop/basic/main.30.skin.php @@ -51,7 +51,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/skin/shop/basic/main.40.skin.php b/skin/shop/basic/main.40.skin.php index cf6a2c891..97f2807e5 100644 --- a/skin/shop/basic/main.40.skin.php +++ b/skin/shop/basic/main.40.skin.php @@ -55,7 +55,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; } diff --git a/skin/shop/basic/main.50.skin.php b/skin/shop/basic/main.50.skin.php index e6d8000d4..fa409762c 100644 --- a/skin/shop/basic/main.50.skin.php +++ b/skin/shop/basic/main.50.skin.php @@ -54,7 +54,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_name'])."\n"; } - if ($this->view_it_cust_price) { + if ($this->view_it_cust_price && $row['it_cust_price']) { echo "".display_price($row['it_cust_price'])."\n"; }