From 98180b00b7eabcda845653be86ad6b46971cbf15 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 18 Nov 2013 16:09:35 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EA=B8=88=EC=95=A1=20?= =?UTF-8?q?=ED=95=A9=EA=B3=84=EC=97=90=EC=84=9C=20=EC=BF=A0=ED=8F=B0?= =?UTF-8?q?=ED=95=A0=EC=9D=B8=20=EA=B8=88=EC=95=A1=20=EB=B9=BC=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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 fd02be9e7..4e2ed0f4b 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' "; From d1bd95aa2241e954d463e24047992f7459064fbe Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 18 Nov 2013 16:09:39 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0:=20#323=20?= =?UTF-8?q?=EC=83=81=ED=92=88=EA=B2=80=EC=83=89=20form=20=EB=A7=88?= =?UTF-8?q?=ED=81=AC=EC=97=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default_shop.css | 7 +++++++ shop/search.php | 32 ++++++++++++++++---------------- 2 files changed, 23 insertions(+), 16 deletions(-) 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); // 전체 페이지 계산
-
- +
+
From 2380f9e2ae41619016de1c8929c27c151b1c5035 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 18 Nov 2013 16:14:10 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=88=98=EB=8B=A8?= =?UTF-8?q?=EB=B3=84=20=EA=B8=88=EC=95=A1=EC=97=90=EC=84=9C=20=EC=BF=A0?= =?UTF-8?q?=ED=8F=B0=20=EA=B8=88=EC=95=A1=20=EB=94=B0=EB=A1=9C=20=EA=B3=84?= =?UTF-8?q?=EC=82=B0=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= 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 4e2ed0f4b..fd7472c1e 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -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'