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-05-09 11:05:33 +09:00
parent 52b7cba9b0 e770a74849
commit faf3c5940e
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/shop_admin/orderlist.php
View File

@ -199,10 +199,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
$mb_nick = get_sideview($lines[$i]['mb_id'], $lines[$i]['od_name'], $lines[$i]['od_email'], '');
$od_cnt = 0;
if ($lines[$i]['mb_id'])
{
$sql2 = " select count(*) as cnt from {$g4['shop_order_table']} where mb_id = '{$lines[$i]['mb_id']}' ";
$row2 = sql_fetch($sql2);
$od_cnt = $row2['cnt'];
}
?>
<tr class="orderlist">
@ -219,7 +221,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
<?php echo $lines[$i]['mb_id']; ?>
</a>
</td>
<td class="td_sodr_cnt"><b><?php echo $lines[$i]['itemcount']; ?></b>건<br>누적 <?php echo $row2['cnt']; ?>건</td>
<td class="td_sodr_cnt"><b><?php echo $lines[$i]['itemcount']; ?></b>건<?php if($od_cnt) { ?><br>누적 <?php echo $od_cnt; ?>건<?php } ?></td>
<td class="td_sodr_sum"><?php echo number_format($lines[$i]['orderamount']); ?></td>
<td><?php echo number_format($lines[$i]['ordercancel']); ?></td>
<td><?php echo number_format($lines[$i]['od_dc_amount']); ?></td>

2
mobile/shop/cartsub.inc.php
View File

@ -189,7 +189,7 @@ if ($i == 0) echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구
</tbody>
</table>
<?php if ($goods_count) $goods .= '<div> 외 '.$goods_count.'건</div>'; ?>
<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
<?php
// 배송비가 0 보다 크다면 (있다면)

4
mobile/shop/orderformupdate.php
View File

@ -9,6 +9,10 @@ if(get_magic_quotes_gpc())
$_GET = array_map("mysql_real_escape_string", $_GET);
$_POST = array_map("mysql_real_escape_string", $_POST);
// 결제등록 완료 체크
if($_POST['tran_cd'] == '' || $_POST['enc_info'] == '' || $_POST['enc_data'] == '')
alert('결제등록 요청 후 주문해 주십시오.');
// 장바구니가 비어있는가?
if (get_session("ss_direct"))
$tmp_uq_id = get_session('ss_uq_direct');

2
shop/cartsub.inc.php
View File

@ -189,7 +189,7 @@ if ($i == 0) echo '<tr><td colspan="'.$colspan.'" class="empty_table">장바구
</tbody>
</table>
<?php if ($goods_count) $goods .= '<div> 외 '.$goods_count.'건</div>'; ?>
<?php if ($goods_count) $goods .= ' 외 '.$goods_count.'건'; ?>
<?php
// 배송비가 0 보다 크다면 (있다면)