From f30081f272e501a8d45dc7d283db39b9482193d7 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 25 Nov 2013 17:34:49 +0900 Subject: [PATCH 1/9] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=9D=B4=EC=A0=84=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/index.php | 165 +-------------------------------------- 1 file changed, 2 insertions(+), 163 deletions(-) diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 7e2462c5f..88b356af8 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -177,10 +177,10 @@ function get_max_value($arr) ?>
  • - +
    - +
    • - -

    주문현황

    - - -
    - -
    - - -
    -

    입금완료 미배송내역

    - - -
    - - - - - - - - - - - - - 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 .= '포인트'; - } - ?> - - - - - - - - '; - ?> - -
    미입금 주문내역
    주문번호주문자주문액결제방법수정
    수정
    자료가 없습니다.
    -
    - -
    - 미입금 주문내역 더보기 -
    -
    -*/ ?> - From 8117935a4e95a743c48f08a6ad3dccb86d6b754b Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 25 Nov 2013 17:41:55 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20?= =?UTF-8?q?=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/index.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 88b356af8..6ec29ec09 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -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); - } - ?> -
    From 120cc1340d9ac231a1a0de88399d625300e73611 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 25 Nov 2013 17:52:09 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=EA=B7=B8=EB=9E=98=ED=94=84=20=EB=82=A0?= =?UTF-8?q?=EC=A7=9C=EC=97=90=20=EC=9A=94=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 --- adm/shop_admin/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index 6ec29ec09..de1a4f435 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -191,7 +191,7 @@ function get_max_value($arr) -
    • +
    • From 2d07809a884014871163cdcf7ad8a229a3114b0b Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Nov 2013 09:02:36 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bbs/write_comment_update.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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('자신의 글이 아니므로 수정할 수 없습니다.'); From 36fc7b0e2f35c4134930e3521dafb8fe19b59f8b Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Nov 2013 09:32:27 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?= =?UTF-8?q?=ED=92=88=EA=B2=80=EC=83=89=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mobile/shop/search.php | 13 +++++++------ mobile/shop/shop.head.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mobile/shop/search.php b/mobile/shop/search.php index ac789c6c8..32e1f7e2c 100644 --- a/mobile/shop/search.php +++ b/mobile/shop/search.php @@ -31,9 +31,9 @@ if ($q) { for ($i=0; $iset_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'); From 3d28b0c70665c9b76f0629317c138ddad50c99c6 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Nov 2013 09:50:35 +0900 Subject: [PATCH 6/9] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EA=B2=80?= =?UTF-8?q?=EC=83=89=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=B0=95=EC=8A=A4=20=EC=B6=9C=EB=A0=A5?= =?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 --- mobile/shop/search.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/shop/search.php b/mobile/shop/search.php index 32e1f7e2c..d37aed607 100644 --- a/mobile/shop/search.php +++ b/mobile/shop/search.php @@ -95,9 +95,9 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산
    검색범위 - > - > - >
    + > + > + >
    상품가격 (원) From 1c61678ebcb6a82bfc271b10c8df1f5577d8be41 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 26 Nov 2013 10:21:24 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=ED=99=80=EC=A7=9D=20=EB=B0=B0=EA=B2=BD=EC=83=89=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 --- css/admin.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/css/admin.css b/css/admin.css index cd3d57966..6e080d192 100644 --- a/css/admin.css +++ b/css/admin.css @@ -299,7 +299,8 @@ tfoot td {font-weight:bold;text-align:center} /* 목록 홀짝 배경색 */ .bg0 {background:#fff} -.bg1 {background:#f0f3f7} +.bg1 {background:#f2f5f9} +.bg1 td {border-color:#e9e9e9} .bg0cancel {background:#fdebf3} .bg0cancel td {border-color:#f9d8e6} .bg1cancel {background:#fdebf3} From 88961b00cee42b67e189d689aeb02cf4a3758698 Mon Sep 17 00:00:00 2001 From: whitedot Date: Tue, 26 Nov 2013 10:24:42 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20empty=5Ftabl?= =?UTF-8?q?e=20important=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/admin.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/css/admin.css b/css/admin.css index 6e080d192..c0503bd4d 100644 --- a/css/admin.css +++ b/css/admin.css @@ -274,8 +274,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} From 9f7f6040420cfa46215c3cc4e61dad0124d3c768 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Nov 2013 10:42:50 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=EC=83=81=ED=92=88=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=8B=9C=EC=A4=91=EA=B0=80?= =?UTF-8?q?=EA=B2=A9=20=EB=85=B8=EC=B6=9C=EC=9D=84=20true=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 --- mobile/shop/index.php | 10 +++++----- mobile/shop/list.php | 2 +- mobile/skin/shop/basic/list.10.skin.php | 2 +- mobile/skin/shop/basic/main.10.skin.php | 2 +- shop/index.php | 8 ++++---- shop/list.php | 2 +- skin/shop/basic/list.10.skin.php | 2 +- skin/shop/basic/list.20.skin.php | 2 +- skin/shop/basic/list.30.skin.php | 2 +- skin/shop/basic/list.40.skin.php | 2 +- skin/shop/basic/main.10.skin.php | 2 +- skin/shop/basic/main.20.skin.php | 2 +- skin/shop/basic/main.30.skin.php | 2 +- skin/shop/basic/main.40.skin.php | 2 +- skin/shop/basic/main.50.skin.php | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) 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/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 7f33f2b57..e129d2c0b 100644 --- a/shop/index.php +++ b/shop/index.php @@ -33,7 +33,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); @@ -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/shop/list.php b/shop/list.php index af9149210..c6583d259 100644 --- a/shop/list.php +++ b/shop/list.php @@ -95,7 +95,7 @@ var itemlist_ca_id = ""; $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 b7863d142..49badea33 100644 --- a/skin/shop/basic/list.10.skin.php +++ b/skin/shop/basic/list.10.skin.php @@ -45,7 +45,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_basic'])."\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 56ca9adba..3f45b91eb 100644 --- a/skin/shop/basic/list.20.skin.php +++ b/skin/shop/basic/list.20.skin.php @@ -41,7 +41,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.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 bea614e97..9a4aac2ab 100644 --- a/skin/shop/basic/main.10.skin.php +++ b/skin/shop/basic/main.10.skin.php @@ -45,7 +45,7 @@ for ($i=1; $row=sql_fetch_array($result); $i++) { echo "".stripslashes($row['it_basic'])."\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"; }