From a768ede08172b2c4bacf2730f66925dfb19b807d Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 18 Nov 2013 16:16:31 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C?= =?UTF-8?q?=EB=B3=84=20=EC=A3=BC=EB=AC=B8=20=ED=95=A9=EA=B3=84=20=EA=B8=88?= =?UTF-8?q?=EC=95=A1=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 fd7472c1e..cb3e62e6f 100644 --- a/adm/shop_admin/index.php +++ b/adm/shop_admin/index.php @@ -21,7 +21,7 @@ function get_order_status_sum($status) global $g5; $sql = " select count(*) as cnt, - sum(od_cart_price + od_send_cost + od_send_cost2 - od_cancel_price - od_cart_coupon - od_coupon - od_send_coupon) as price + sum(od_cart_price + od_send_cost + od_send_cost2 - od_cancel_price) as price from {$g5['g5_shop_order_table']} where od_status = '$status' "; $row = sql_fetch($sql); From 170525b1e391ae8622927410da469f5354543222 Mon Sep 17 00:00:00 2001 From: chicpro Date: Mon, 18 Nov 2013 16:40:46 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=88=98=EB=8B=A8?= =?UTF-8?q?=EB=B3=84=20=EC=A3=BC=EB=AC=B8=EA=B8=88=EC=95=A1=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EA=B8=88=EC=95=A1=20?= =?UTF-8?q?=EB=B9=BC=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 cb3e62e6f..beb5e2ae4 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 - od_cart_coupon - od_coupon - od_send_coupon) as price, + $sql = " select sum(od_cart_price + od_send_cost + od_send_cost2 - od_receipt_point - 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'