firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
gnuboard
2013-11-18 17:08:30 +09:00
parent 37aea74877 170525b1e3
commit ac826b7299
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/shop_admin/index.php
View File

@ -21,7 +21,7 @@ function get_order_status_sum($status)
global $g5; global $g5;
$sql = " select count(*) as cnt, $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']} from {$g5['g5_shop_order_table']}
where od_status = '$status' "; where od_status = '$status' ";
$row = sql_fetch($sql); $row = sql_fetch($sql);
@ -63,7 +63,7 @@ function get_order_settle_sum($date)
// 결제수단별 합계 // 결제수단별 합계
foreach($case as $val) 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 count(*) as cnt
from {$g5['g5_shop_order_table']} from {$g5['g5_shop_order_table']}
where SUBSTRING(od_time, 1, 10) = '$date' where SUBSTRING(od_time, 1, 10) = '$date'