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

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

Browse Source
This commit is contained in:
whitedot
2013-06-12 10:31:24 +09:00
parent f957c2842e 993fe2b396
commit fdeca4afa9
6 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/shop_admin/sale1date.php
View File

@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
$lines[$i] = $row; $lines[$i] = $row;
// 장바구니 상태별 금액 // 장바구니 상태별 금액
$sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ $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 = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ (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']} from {$g4['shop_cart_table']}
where uq_id = '{$row['uq_id']}' "; where uq_id = '{$row['uq_id']}' ";
$row1 = sql_fetch($sql1); $row1 = sql_fetch($sql1);

4
adm/shop_admin/sale1month.php
View File

@ -53,8 +53,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
$lines[$i] = $row; $lines[$i] = $row;
// 장바구니 상태별 금액 // 장바구니 상태별 금액
$sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ $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 = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ (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']} from {$g4['shop_cart_table']}
where uq_id = '{$row['uq_id']}' "; where uq_id = '{$row['uq_id']}' ";
$row1 = sql_fetch($sql1); $row1 = sql_fetch($sql1);

6
adm/shop_admin/sale1today.php
View File

@ -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); $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'); include_once (G4_ADMIN_PATH.'/admin.head.php');
unset($tot); unset($tot);
@ -31,8 +31,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
$lines[$i] = $row; $lines[$i] = $row;
// 장바구니 상태별 금액 // 장바구니 상태별 금액
$sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ $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 = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ (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']} from {$g4['shop_cart_table']}
where uq_id = '{$row['uq_id']}' "; where uq_id = '{$row['uq_id']}' ";
$row1 = sql_fetch($sql1); $row1 = sql_fetch($sql1);

4
adm/shop_admin/sale1year.php
View File

@ -48,8 +48,8 @@ for ($i=0; $row=mysql_fetch_array($result); $i++)
$lines[$i] = $row; $lines[$i] = $row;
// 장바구니 상태별 금액 // 장바구니 상태별 금액
$sql1 = " select (SUM(ct_price * ct_qty)) as orderamount, /* 주문합계 */ $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 = '품절', ct_price * ct_qty, 0))) as ordercancel /* 주문취소 */ (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']} from {$g4['shop_cart_table']}
where uq_id = '{$row['uq_id']}' "; where uq_id = '{$row['uq_id']}' ";
$row1 = sql_fetch($sql1); $row1 = sql_fetch($sql1);

1
mobile/shop/orderform.php
View File

@ -133,6 +133,7 @@ ob_start();
and cp_used = '0' and cp_used = '0'
and cp_start <= '".G4_TIME_YMD."' and cp_start <= '".G4_TIME_YMD."'
and cp_end >= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."'
and cp_minimum <= '$sell_amount'
and ( and (
( cp_method = '0' and cp_target = '{$row['it_id']}' ) ( cp_method = '0' and cp_target = '{$row['it_id']}' )
OR OR

1
shop/orderform.php
View File

@ -208,6 +208,7 @@ setTimeout("init_pay_button();",300);
and cp_used = '0' and cp_used = '0'
and cp_start <= '".G4_TIME_YMD."' and cp_start <= '".G4_TIME_YMD."'
and cp_end >= '".G4_TIME_YMD."' and cp_end >= '".G4_TIME_YMD."'
and cp_minimum <= '$sell_amount'
and ( and (
( cp_method = '0' and cp_target = '{$row['it_id']}' ) ( cp_method = '0' and cp_target = '{$row['it_id']}' )
OR OR