firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/yc4s

Browse Source
This commit is contained in:
whitedot
2013-12-03 13:12:24 +09:00
parent abfa90e682 3901804355
commit b78559944a
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extend/shop.extend2.php
View File

@ -646,7 +646,6 @@ if(stripos($row['Type'], 'enum') !== false) {
sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}` sql_query(" ALTER TABLE `{$g5['g5_shop_cart_table']}`
CHANGE `ct_status` `ct_status` varchar(255) NOT NULL DEFAULT '' ", true); 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_email` varchar(255) NOT NULL DEFAULT '' AFTER `iq_name`,
ADD `iq_hp` varchar(255) NOT NULL DEFAULT '' AFTER `iq_email` ", true); ADD `iq_hp` varchar(255) NOT NULL DEFAULT '' AFTER `iq_email` ", true);
} }
*/
?> ?>

18
mobile/shop/orderinquiry.sub.php
View File

@ -20,17 +20,25 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
for ($i=0; $row=sql_fetch_array($result); $i++) 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']} from {$g5['g5_shop_cart_table']}
where od_id = '{$row['od_id']}' where od_id = '{$row['od_id']}'
order by ct_id order by io_type, ct_id
limit 1 "; limit 1 ";
$ct = sql_fetch($sql); $ct = sql_fetch($sql);
$ct_name = get_text($ct['it_name']).' '.get_text($ct['ct_option']); $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']) { switch($row['od_status']) {
case '주문':
$od_status = '입금확인중';
break;
case '입금': case '입금':
$od_status = '입금완료'; $od_status = '입금완료';
break; break;
@ -44,7 +52,7 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
$od_status = '배송완료'; $od_status = '배송완료';
break; break;
default: default:
$od_status = '입금확인중'; $od_status = '주문취소';
break; break;
} }

5
shop/orderinquiry.sub.php
View File

@ -33,6 +33,9 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
$uid = md5($row['od_id'].$row['od_time'].$row['od_ip']); $uid = md5($row['od_id'].$row['od_time'].$row['od_ip']);
switch($row['od_status']) { switch($row['od_status']) {
case '주문':
$od_status = '입금확인중';
break;
case '입금': case '입금':
$od_status = '입금완료'; $od_status = '입금완료';
break; break;
@ -46,7 +49,7 @@ if (!defined("_ORDERINQUIRY_")) exit; // 개별 페이지 접근 불가
$od_status = '배송완료'; $od_status = '배송완료';
break; break;
default: default:
$od_status = '입금확인중'; $od_status = '주문취소';
break; break;
} }
?> ?>