diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php index fd02be9e7..fd7472c1e 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -39,7 +39,7 @@ function get_order_date_sum($date) { global $g5; - $sql = " select sum(od_cart_price + od_send_cost + od_send_cost2 - od_cart_coupon - od_coupon - od_send_coupon) as orderprice, + $sql = " select sum(od_cart_price + od_send_cost + od_send_cost2) as orderprice, sum(od_cancel_price) as cancelprice from {$g5['g5_shop_order_table']} where SUBSTRING(od_time, 1, 10) = '$date' "; @@ -63,7 +63,7 @@ function get_order_settle_sum($date) // 결제수단별 합계 foreach($case as $val) { - $sql = " select sum(od_cart_price + od_send_cost + od_send_cost2) as price, + $sql = " select sum(od_cart_price + od_send_cost + od_send_cost2 - od_cart_coupon - od_coupon - od_send_coupon) as price, count(*) as cnt from {$g5['g5_shop_order_table']} where SUBSTRING(od_time, 1, 10) = '$date' diff --git a/css/default_shop.css b/css/default_shop.css index 5903d5e67..f41e3840b 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -826,6 +826,13 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7 #ssch_frm #ssch_sort li {float:left;margin:0 1px 0 0} #ssch_frm #ssch_ov {float:right} +#ssch_cate {} +#ssch_cate ul {margin:10px 0;padding:10px 20px 20px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1} +#ssch_cate ul:after {display:block;visibility:hidden;clear:both;content:""} +#ssch_cate li {float:left;margin:0 10px 0 0;padding:0 10px 0 0;border-right:1px solid #e9e9e9} +#ssch_cate a {} +#ssch_cate a span {font-weight:bold} + /* 쇼핑몰 이벤트 */ #sev {} .sev_admin {text-align:right} diff --git a/shop/search.php b/shop/search.php index 0dfb63a89..bd904848b 100644 --- a/shop/search.php +++ b/shop/search.php @@ -114,9 +114,9 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산
- 상품가격 - 원 부터 - 원 까지
+ 상품가격 (원) + ~ + 까지
검색어 @@ -143,19 +143,19 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산
-
- +
+