diff --git a/adm/shop_admin/deliverylist.php b/adm/shop_admin/deliverylist.php
index a750a5873..fc81c82f7 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['shop_order_table']} a
- left join {$g4['shop_cart_table']} b on (a.uq_id=b.uq_id)
+ left join {$g4['shop_cart_table']} b on (a.od_id=b.od_id)
$sql_search ";
// 테이블의 전체 레코드수만 얻음
@@ -171,7 +171,6 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
-
diff --git a/adm/shop_admin/deliverylistupdate.php b/adm/shop_admin/deliverylistupdate.php
index f8c2b29c7..3ecde04b1 100644
--- a/adm/shop_admin/deliverylistupdate.php
+++ b/adm/shop_admin/deliverylistupdate.php
@@ -51,18 +51,17 @@ for ($m=0; $m
$sql = " select a.od_id,
a.*, "._MISU_QUERY_."
from {$g4['shop_order_table']} a
- left join {$g4['shop_cart_table']} b on (b.uq_id=a.uq_id)
+ left join {$g4['shop_cart_table']} b on (b.od_id=a.od_id)
group by a.od_id
/*having misu <= 0 and a.od_invoice = '' and ordercancel = 0*/
/*having orderamount - receiptamount = 0 and a.od_invoice = ''*/
@@ -100,7 +100,7 @@ $pg_anchor = '
$sql = " select a.od_id,
a.*, "._MISU_QUERY_."
from {$g4['shop_order_table']} a
- left join {$g4['shop_cart_table']} b on (b.uq_id=a.uq_id)
+ left join {$g4['shop_cart_table']} b on (b.od_id=a.od_id)
group by a.od_id
/* having receiptamount <= 0 */
having misu > 0
diff --git a/adm/shop_admin/ordercartupdate.php b/adm/shop_admin/ordercartupdate.php
index b12f8578d..fce4a9548 100644
--- a/adm/shop_admin/ordercartupdate.php
+++ b/adm/shop_admin/ordercartupdate.php
@@ -44,7 +44,7 @@ for ($i=0; $i<$cnt; $i++)
$ct_id = $_POST['ct_id'][$k];
$sql = " select * from {$g4['shop_cart_table']}
- where uq_id = '$uq_id'
+ where od_id = '$od_id'
and ct_id = '$ct_id' ";
$ct = sql_fetch($sql);
if(!$ct['ct_id'])
@@ -76,7 +76,7 @@ for ($i=0; $i<$cnt; $i++)
$sql = " update {$g4['shop_cart_table']}
set ct_qty = '$ct_qty'
where ct_id = '$ct_id'
- and uq_id = '$uq_id' ";
+ and od_id = '$od_id' ";
sql_query($sql);
$mod_history .= G4_TIME_YMDHIS.' '.$ct['ct_option'].' 수량변경 '.$ct['ct_qty'].' -> '.$ct_qty."\n";
}
@@ -141,7 +141,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,$uq_id,$ct_id");
+ delete_point($mb_id, "@delivery", $mb_id, "$od_id,$ct_id");
}
// 히스토리에 남김
@@ -153,7 +153,7 @@ for ($i=0; $i<$cnt; $i++)
ct_stock_use = '$stock_use',
ct_status = '$ct_status',
ct_history = CONCAT(ct_history,'$ct_history')
- where uq_id = '$uq_id'
+ where od_id = '$od_id'
and ct_id = '$ct_id' ";
sql_query($sql);
}
diff --git a/adm/shop_admin/orderdelete.php b/adm/shop_admin/orderdelete.php
index f4999a7b3..540324719 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 && $uq_id)
+if ($od_id)
{
// 장바구니 삭제
- sql_query(" delete from {$g4['shop_cart_table']} where uq_id = '$uq_id' ");
+ sql_query(" delete from {$g4['shop_cart_table']} where od_id = '$od_id' ");
// 카드결제내역 삭제
- sql_query(" delete from {$g4['shop_card_history_table']} where od_id = '$od_id' and uq_id = '$uq_id' ");
+ sql_query(" delete from {$g4['shop_card_history_table']} where od_id = '$od_id' ");
// 주문서 삭제
- sql_query(" delete from {$g4['shop_order_table']} where od_id = '$od_id' and uq_id = '$uq_id' ");
+ sql_query(" delete from {$g4['shop_order_table']} where od_id = '$od_id' ");
}
if ($return_url)
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 3e12eeba9..f511f5621 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -43,14 +43,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['shop_order_table']} where uq_id = '{$row['uq_id']}' ");
+ $tmp_row = sql_fetch("select od_id, mb_id from {$g4['shop_order_table']} where od_id = '{$row['od_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['uq_id']},{$row['ct_id']}");
+ insert_point($tmp_row['mb_id'], $po_point, $po_content, "@delivery", $tmp_row['mb_id'], "{$tmp_row['od_id']},{$row['ct_id']}");
}
sql_query("update {$g4['shop_cart_table']} set ct_point_use = '1' where ct_id = '{$row['ct_id']}' ");
@@ -95,7 +95,7 @@ $sql = " select it_id,
cp_amount,
ct_notax
from {$g4['shop_cart_table']}
- where uq_id = '{$od['uq_id']}'
+ where od_id = '{$od['od_id']}'
and ct_num = '0'
order by ct_id ";
$result = sql_query($sql);
@@ -123,7 +123,6 @@ $pg_anchor .='