diff --git a/adm/shop_admin/sale1date.php b/adm/shop_admin/sale1date.php index 75a3183ef..427f1bbc0 100644 --- a/adm/shop_admin/sale1date.php +++ b/adm/shop_admin/sale1date.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php index eee76ed36..4f27d249c 100644 --- a/adm/shop_admin/sale1month.php +++ b/adm/shop_admin/sale1month.php @@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1today.php b/adm/shop_admin/sale1today.php index 52a70e109..6a8dffeda 100644 --- a/adm/shop_admin/sale1today.php +++ b/adm/shop_admin/sale1today.php @@ -6,7 +6,7 @@ auth_check($auth[$sub_menu], "r"); $date = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3", $date); -$g4['title'] = "$date 일일 매출현황"; +$g4['title'] = "$date 일 매출현황"; include_once (G4_ADMIN_PATH.'/admin.head.php'); unset($tot); @@ -31,8 +31,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php index ac841b02e..e9ee44307 100644 --- a/adm/shop_admin/sale1year.php +++ b/adm/shop_admin/sale1year.php @@ -48,8 +48,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $lines[$i] = $row; // 장바구니 상태별 금액 - $sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ - (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ + $sql1 = " select (SUM(IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty))) as orderamount, /* 주문합계 */ + (SUM(IF(ct_status = '취소' OR ct_status = '반품' OR ct_status = '품절', IF(io_type = 1, io_price * ct_qty, (ct_price + io_price) * ct_qty), 0))) as ordercancel /* 주문취소 */ from {$g4['shop_cart_table']} where uq_id = '{$row['uq_id']}' "; $row1 = sql_fetch($sql1); diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php index 7df602f2d..3daf4fcfd 100644 --- a/mobile/shop/orderform.php +++ b/mobile/shop/orderform.php @@ -133,6 +133,7 @@ ob_start(); and cp_used = '0' and cp_start <= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."' + and cp_minimum <= '$sell_amount' and ( ( cp_method = '0' and cp_target = '{$row['it_id']}' ) OR diff --git a/shop/orderform.php b/shop/orderform.php index a633b81ee..06f739b04 100644 --- a/shop/orderform.php +++ b/shop/orderform.php @@ -208,6 +208,7 @@ setTimeout("init_pay_button();",300); and cp_used = '0' and cp_start <= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."' + and cp_minimum <= '$sell_amount' and ( ( cp_method = '0' and cp_target = '{$row['it_id']}' ) OR