Merge branch 'master' of github.com:gnuboard/yc4s

2013-11-18 16:10:00 +09:00
parent d1bd95aa22 98180b00b7
commit ef1c06a57f
1 changed files with 1 additions and 1 deletions
--- 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' ";