From 185a1ea6ab67d4d6429ccaf6ffb410927ac731d4 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 28 May 2013 13:20:23 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=AF=B8=EC=88=98=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=EB=A5=BC=20=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=98=B5=EC=85=98?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=97=90=20=EB=A7=9E=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/shop.extend.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extend/shop.extend.php b/extend/shop.extend.php index 4b18402d9..a0db96aff 100644 --- a/extend/shop.extend.php +++ b/extend/shop.extend.php @@ -32,13 +32,13 @@ if (G4_HTTPS_DOMAIN) { define(_MISU_QUERY_, " count(distinct a.od_id) as ordercount, /* 주문서건수 */ count(b.ct_id) as itemcount, /* 상품건수 */ - (SUM(b.ct_price * b.ct_qty) + a.od_send_cost) as orderamount , /* 주문합계 */ - (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', b.ct_price * b.ct_qty, 0))) as ordercancel, /* 주문취소 */ + (SUM(IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)) + a.od_send_cost) as orderamount, /* 주문합계 */ + (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', (IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)), 0))) as ordercancel, /* 주문취소 */ (a.od_receipt_bank + a.od_receipt_card + a.od_receipt_hp + a.od_receipt_point) as receiptamount, /* 입금합계 */ (a.od_refund_amount + a.od_cancel_card) as receiptcancel, /* 입금취소 */ ( - (SUM(b.ct_price * b.ct_qty) + a.od_send_cost) - - (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', b.ct_price * b.ct_qty, 0))) - + (SUM(IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)) + a.od_send_cost) - + (SUM(IF(b.ct_status = '취소' OR b.ct_status = '반품' OR b.ct_status = '품절', (IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)), 0))) - a.od_dc_amount - (a.od_receipt_bank + a.od_receipt_card + a.od_receipt_hp + a.od_receipt_point) + (a.od_refund_amount + a.od_cancel_card) From 1e5fd5368f4d246dd987a910febf24b8376558d5 Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 28 May 2013 13:52:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EB=B3=80=EA=B2=BD=EB=90=9C=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EA=B8=B0=EB=8A=A5=EC=97=90=20=EB=A7=9E=EA=B2=8C=20?= =?UTF-8?q?=EC=9E=A5=EB=B0=94=EA=B5=AC=EB=8B=88=20=EC=BF=BC=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/orderform.php | 35 ++++++++++++--------- adm/shop_admin/orderprintresult.php | 48 ++++++++--------------------- adm/shop_admin/orderstatuslist.php | 19 +++--------- 3 files changed, 37 insertions(+), 65 deletions(-) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 350bd306e..89c3c5b1a 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -90,18 +90,16 @@ $sql = " select ct_id, it_id, it_name, ct_qty, + ct_option, ct_price, ct_point, ct_status, ct_time, ct_point_use, ct_stock_use, - it_opt1, - it_opt2, - it_opt3, - it_opt4, - it_opt5, - it_opt6 + io_type, + io_price, + ct_num from {$g4['shop_cart_table']} where uq_id = '{$od['uq_id']}' order by ct_id "; @@ -111,7 +109,12 @@ $lines = array(); $total_order = 0; for($i=0; $row=sql_fetch_array($result); $i++) { $lines[$i] = $row; - $total_order += ($row['ct_price'] * $row['ct_qty']); + if($row['io_type']) + $total_price = $row['io_price'] * $row['ct_qty']; + else + $total_price = ($row['ct_price'] + $row['io_price']) * $row['ct_qty']; + $lines[$i]['price'] = $total_price; + $total_order += $total_price; } $pg_anchor = '