diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index b5667ac93..932f68dcd 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -646,7 +646,6 @@ if(stripos($row['Type'], 'enum') !== false) { sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` CHANGE `ct_status` `ct_status` varchar(255) NOT NULL DEFAULT '' ", true); } -*/ // 상품테이블에 검색을 위하여 태그없는 상품설명 저장용 필드 추가 @@ -731,4 +730,5 @@ if(!sql_query(" select iq_hp from {$g5['g5_shop_item_qa_table']} limit 1 ", fals ADD `iq_email` varchar(255) NOT NULL DEFAULT '' AFTER `iq_name`, ADD `iq_hp` varchar(255) NOT NULL DEFAULT '' AFTER `iq_email` ", true); } +*/ ?> diff --git a/mobile/shop/orderinquiry.sub.php b/mobile/shop/orderinquiry.sub.php index 25c63c813..b0463ce45 100644 --- a/mobile/shop/orderinquiry.sub.php +++ b/mobile/shop/orderinquiry.sub.php @@ -20,17 +20,25 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가 for ($i=0; $row=sql_fetch_array($result); $i++) { // 주문상품 - $sql = " select *, count(ct_id) as cnt + $sql = " select it_name, ct_option from {$g5['g5_shop_cart_table']} where od_id = '{$row['od_id']}' - order by ct_id + order by io_type, ct_id limit 1 "; $ct = sql_fetch($sql); $ct_name = get_text($ct['it_name']).' '.get_text($ct['ct_option']); - if($ct['cnt'] > 1) - $ct_name .= ' 외 '.($ct['cnt'] - 1).'건'; + + $sql = " select count(*) as cnt + from {$g5['g5_shop_cart_table']} + where od_id = '{$row['od_id']}' "; + $ct2 = sql_fetch($sql); + if($ct2['cnt'] > 1) + $ct_name .= ' 외 '.($ct2['cnt'] - 1).'건'; switch($row['od_status']) { + case '주문': + $od_status = '입금확인중'; + break; case '입금': $od_status = '입금완료'; break; @@ -44,7 +52,7 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가 $od_status = '배송완료'; break; default: - $od_status = '입금확인중'; + $od_status = '주문취소'; break; } diff --git a/shop/orderinquiry.sub.php b/shop/orderinquiry.sub.php index afe1ad2a8..ad3227a44 100644 --- a/shop/orderinquiry.sub.php +++ b/shop/orderinquiry.sub.php @@ -33,6 +33,9 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가 $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']); switch($row['od_status']) { + case '주문': + $od_status = '입금확인중'; + break; case '입금': $od_status = '입금완료'; break; @@ -46,7 +49,7 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가 $od_status = '배송완료'; break; default: - $od_status = '입금확인중'; + $od_status = '주문취소'; break; } ?>