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 = '
@@ -165,26 +168,28 @@ $pg_anchor = '
+ if($lines[$i]['ct_num'] == 0) { ?>
+
+ |
+
+
|
-
+
|
-
-
-
- |
+ |
|
|
|
diff --git a/adm/shop_admin/orderprintresult.php b/adm/shop_admin/orderprintresult.php
index b4fe5cfb5..82a4e5265 100644
--- a/adm/shop_admin/orderprintresult.php
+++ b/adm/shop_admin/orderprintresult.php
@@ -39,7 +39,7 @@ if ($csv == 'csv')
$to_date = date_conv($to_date);
- $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice
+ $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option
FROM {$g4['shop_order_table']} a, {$g4['shop_cart_table']} b
where a.uq_id = b.uq_id ";
if ($case == 1) // 출력기간
@@ -62,7 +62,7 @@ if ($csv == 'csv')
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
//echo "우편번호,주소,이름,전화1,전화2,상품명,수량,비고,전하실말씀\n";
- echo "우편번호,주소,이름,전화1,전화2,상품명,수량,상품코드,주문번호,운송장번호,전하실말씀\n";
+ echo "우편번호,주소,이름,전화1,전화2,상품명,수량,선택사항,상품코드,주문번호,운송장번호,전하실말씀\n";
for ($i=0; $row=mysql_fetch_array($result); $i++)
{
echo '"'.$row['od_b_zip1'].'-'.$row['od_b_zip2'].'"'.',';
@@ -74,6 +74,7 @@ if ($csv == 'csv')
echo '"'.conv_telno($row['od_b_hp']) . '"'.',';
echo '"'.preg_replace("/\"/", """, $row['it_name']) . '"'.',';
echo '"'.$row['ct_qty'].'"'.',';
+ echo '"'.$row['ct_option'].'"'.',';
echo '"\''.$row['it_id'].'\'"'.',';
echo '"\''.$row['od_id'].'\'"'.',';
echo '"'.$row['od_invoice'].'"'.',';
@@ -94,7 +95,7 @@ if ($csv == 'xls')
$to_date = date_conv($to_date);
- $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.it_opt1, b.it_opt2, b.it_opt3, b.it_opt4, b.it_opt5, b.it_opt6
+ $sql = " SELECT od_b_zip1, od_b_zip2, od_b_addr1, od_b_addr2, od_b_name, od_b_tel, od_b_hp, b.it_name, ct_qty, b.it_id, a.od_id, od_memo, od_invoice, b.ct_option
FROM {$g4['shop_order_table']} a, {$g4['shop_cart_table']} b
where a.uq_id = b.uq_id ";
if ($case == 1) // 출력기간
@@ -130,6 +131,7 @@ if ($csv == 'xls')
echo '전화2 | ';
echo '상품명 | ';
echo '수량 | ';
+ echo '선택사항 | ';
echo '상품코드 | ';
echo '주문번호 | ';
echo '운송장번호 | ';
@@ -148,6 +150,7 @@ if ($csv == 'xls')
echo ''.$row['od_b_hp'].' | ';
echo ''.$it_name.' | ';
echo ''.$row['ct_qty'].' | ';
+ echo ''.$row['ct_option'].' | ';
echo ''.$row['it_id'].' | ';
echo ''. urlencode($row['od_id']).' | ';
echo ''.$row['od_invoice'].' | ';
@@ -265,7 +268,7 @@ if (mysql_num_rows($result) == 0)
- | 상품명(주문번호) |
+ 상품명(선택사항) |
판매가 |
수량 |
소계 |
@@ -273,13 +276,7 @@ if (mysql_num_rows($result) == 0)
";
- }
- $it_name .= "";
+ $it_name = "$it_name ({$row2['ct_option']})";
$fontqty1 = $fontqty2 = "";
if ($row2['ct_qty'] >= 2)
diff --git a/adm/shop_admin/orderstatuslist.php b/adm/shop_admin/orderstatuslist.php
index 15e09236f..5adde70ce 100644
--- a/adm/shop_admin/orderstatuslist.php
+++ b/adm/shop_admin/orderstatuslist.php
@@ -48,26 +48,15 @@ $sql = " select a.od_id,
a.od_deposit_name,
a.od_time,
a.od_mobile,
- b.it_opt1,
- b.it_opt2,
- b.it_opt3,
- b.it_opt4,
- b.it_opt5,
- b.it_opt6,
b.ct_status,
b.ct_qty,
b.ct_price,
b.ct_point,
- (b.ct_qty * b.ct_price) as ct_sub_amount,
+ b.ct_option,
+ (IF(b.io_type = 1, b.io_price * b.ct_qty, (b.ct_price + b.io_price) * b.ct_qty)) as ct_sub_amount,
(b.ct_qty * b.ct_point) as ct_sub_point,
b.it_id,
- b.it_name,
- c.it_opt1_subject,
- c.it_opt2_subject,
- c.it_opt3_subject,
- c.it_opt4_subject,
- c.it_opt5_subject,
- c.it_opt6_subject
+ b.it_name
$sql_common
order by $sort1 $sort2
limit $from_record, $rows ";
@@ -183,7 +172,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
- |
+
|
'.$lines[$i]['od_deposit_name']?>
|