From 0bc7658b473b01d9a5d233bb8eaf64f313a2954c Mon Sep 17 00:00:00 2001 From: chicpro Date: Tue, 26 Mar 2013 14:58:48 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20on=5Fuid=EB=A5=BC?= =?UTF-8?q?=20uq=5Fid=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/deliverylist.php | 4 ++-- adm/shop_admin/deliverylistupdate.php | 8 ++++---- adm/shop_admin/index.php | 4 ++-- adm/shop_admin/invoicebundleupdate.php | 4 ++-- adm/shop_admin/itemformupdate.php | 2 +- adm/shop_admin/ordercartupdate.php | 6 +++--- adm/shop_admin/orderdelete.php | 8 ++++---- adm/shop_admin/orderform.php | 14 +++++++------- adm/shop_admin/orderlist.php | 6 +++--- adm/shop_admin/orderlist2.php | 8 ++++---- adm/shop_admin/ordermail.inc.php | 2 +- adm/shop_admin/orderprintresult.php | 20 ++++++++++---------- adm/shop_admin/orderstatuslist.php | 2 +- adm/shop_admin/sale1date.php | 4 ++-- adm/shop_admin/sale1month.php | 4 ++-- adm/shop_admin/sale1today.php | 4 ++-- adm/shop_admin/sale1year.php | 4 ++-- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php index 4413c60cd..6a27f135b 100644 --- a/adm/shop_admin/deliverylist.php +++ b/adm/shop_admin/deliverylist.php @@ -34,7 +34,7 @@ if ($sel_ca_id != "") { if ($sel_field == "") $sel_field = "od_id"; $sql_common = " from {$g4['yc4_order_table']} a - left join {$g4['yc4_cart_table']} b on (a.on_uid=b.on_uid) + left join {$g4['yc4_cart_table']} b on (a.uq_id=b.uq_id) $sql_search "; // 테이블의 전체 레코드수만 얻음 @@ -154,7 +154,7 @@ for ($i=0; $row=mysql_fetch_array($result); $i++) $list = $i%2; echo " - + {$row['od_id']} $row[od_name] diff --git a/adm/shop_admin/deliverylistupdate.php b/adm/shop_admin/deliverylistupdate.php index 56ef5b331..3b23a43b8 100644 --- a/adm/shop_admin/deliverylistupdate.php +++ b/adm/shop_admin/deliverylistupdate.php @@ -36,18 +36,18 @@ for ($m=0; $m 0 diff --git a/adm/shop_admin/invoicebundleupdate.php b/adm/shop_admin/invoicebundleupdate.php index 549e69992..980317c75 100644 --- a/adm/shop_admin/invoicebundleupdate.php +++ b/adm/shop_admin/invoicebundleupdate.php @@ -23,7 +23,7 @@ while (($item = fgetcsv($handle, 1000, ",")) !== FALSE) if ($od_id && $od_invoice) { - $sql = " select od_id, on_uid, dl_id, od_invoice from {$g4['yc4_order_table']} where od_id = '$od_id' "; + $sql = " select od_id, uq_id, dl_id, od_invoice from {$g4['yc4_order_table']} where od_id = '$od_id' "; $row = sql_fetch($sql); //echo $sql; echo "
"; //print_r2($row); @@ -44,7 +44,7 @@ while (($item = fgetcsv($handle, 1000, ",")) !== FALSE) { $sql = " update {$g4['yc4_cart_table']} set ct_status = '$ct_status' - where on_uid = '{$row['on_uid']}' + where uq_id = '{$row['uq_id']}' and ct_status in ('주문', '준비', '배송', '완료') "; sql_query($sql); } diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php index 399b7db0c..a9643e59a 100644 --- a/adm/shop_admin/itemformupdate.php +++ b/adm/shop_admin/itemformupdate.php @@ -20,7 +20,7 @@ function itemdelete($it_id) $sql = " select b.od_id from {$g4['yc4_cart_table']} a, {$g4['yc4_order_table']} b - where a.on_uid = b.on_uid + where a.uq_id = b.uq_id and a.it_id = '$it_id' and a.ct_status != '쇼핑' "; $result = sql_query($sql); diff --git a/adm/shop_admin/ordercartupdate.php b/adm/shop_admin/ordercartupdate.php index c1f7e7503..496c37f35 100644 --- a/adm/shop_admin/ordercartupdate.php +++ b/adm/shop_admin/ordercartupdate.php @@ -12,7 +12,7 @@ for ($i=0; $i<$cnt; $i++) $ct_id = $_POST['ct_id'][$i]; $sql = " select * from {$g4['yc4_cart_table']} - where on_uid = '$on_uid' + where uq_id = '$uq_id' and ct_id = '$ct_id' "; $ct = sql_fetch($sql); @@ -55,7 +55,7 @@ for ($i=0; $i<$cnt; $i++) { $point_use = 0; //insert_point($mb_id, (-1) * ($ct[ct_point] * $ct[ct_qty]), "주문번호 $od_id ($ct_id) 취소"); - delete_point($mb_id, "@delivery", $mb_id, "$od_id,$on_uid,$ct_id"); + delete_point($mb_id, "@delivery", $mb_id, "$od_id,$uq_id,$ct_id"); } // 히스토리에 남김 @@ -67,7 +67,7 @@ for ($i=0; $i<$cnt; $i++) ct_stock_use = '$stock_use', ct_status = '$ct_status', ct_history = CONCAT(ct_history,'$ct_history') - where on_uid = '$on_uid' + where uq_id = '$uq_id' and ct_id = '$ct_id' "; sql_query($sql); } diff --git a/adm/shop_admin/orderdelete.php b/adm/shop_admin/orderdelete.php index 454cee80b..cb09918b6 100644 --- a/adm/shop_admin/orderdelete.php +++ b/adm/shop_admin/orderdelete.php @@ -6,16 +6,16 @@ check_demo(); auth_check($auth[$sub_menu], "d"); -if ($od_id && $on_uid) +if ($od_id && $uq_id) { // 장바구니 삭제 - sql_query(" delete from {$g4['yc4_cart_table']} where on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_cart_table']} where uq_id = '$uq_id' "); // 카드결제내역 삭제 - sql_query(" delete from {$g4['yc4_card_history_table']} where od_id = '$od_id' and on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_card_history_table']} where od_id = '$od_id' and uq_id = '$uq_id' "); // 주문서 삭제 - sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and on_uid = '$on_uid' "); + sql_query(" delete from {$g4['yc4_order_table']} where od_id = '$od_id' and uq_id = '$uq_id' "); } if ($return_url) diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php index 7729b9d87..307c6a622 100644 --- a/adm/shop_admin/orderform.php +++ b/adm/shop_admin/orderform.php @@ -45,14 +45,14 @@ if (!isset($order_not_point)) { for ($i=0; $row=sql_fetch_array($result); $i++) { // 회원 ID 를 얻는다. - $tmp_row = sql_fetch("select od_id, mb_id from {$g4['yc4_order_table']} where on_uid = '{$row['on_uid']}' "); + $tmp_row = sql_fetch("select od_id, mb_id from {$g4['yc4_order_table']} where uq_id = '{$row['uq_id']}' "); // 회원이면서 포인트가 0보다 크다면 if ($tmp_row['mb_id'] && $row['ct_point'] > 0) { $po_point = $row['ct_point'] * $row['ct_qty']; $po_content = "$cart_title3 {$tmp_row['od_id']} ({$row['ct_id']}) $cart_title4"; - insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['on_uid']},{$row['ct_id']}"); + insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['uq_id']},{$row['ct_id']}"); } sql_query("update {$g4['yc4_cart_table']} set ct_point_use = '1' where ct_id = '{$row['ct_id']}' "); @@ -103,7 +103,7 @@ $sql = " select a.ct_id, a.it_opt6, b.it_name from {$g4['yc4_cart_table']} a, {$g4['yc4_item_table']} b - where a.on_uid = '{$od['on_uid']}' + where a.uq_id = '{$od['uq_id']}' and a.it_id = b.it_id order by a.ct_id "; $result = sql_query($sql); @@ -125,7 +125,7 @@ $result = sql_query($sql);
-'> +'> '> '> @@ -236,7 +236,7 @@ if ($od['od_receipt_point'] > 0) - + @@ -425,7 +425,7 @@ if ($od['od_receipt_point'] > 0) if ($od["od_cash"]) echo "현금영수증 확인하기"; else - echo "현금영수증을 발급하시려면 클릭하십시오."; + echo "현금영수증을 발급하시려면 클릭하십시오."; echo ""; } } @@ -765,7 +765,7 @@ if ($od['od_receipt_point'] > 0)

    - ');"> + ');">

주문번호