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-11-12 14:20:56 +09:00
parent 4ef22669d1 d29e4ccbc2
commit b2c377d85d
89 changed files with 249 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
shop/cart.php
View File

@ -62,7 +62,7 @@ include_once('./_head.php');
from {$g5['g5_shop_cart_table']} a left join {$g5['g5_shop_item_table']} b on ( a.it_id = b.it_id )
where a.od_id = '$s_cart_id' ";
if($default['de_cart_keep_term']) {
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - (($default['de_cart_keep_term'] - 1) * 86400));
$sql .= " and a.ct_time > '$ctime' ";
}
$sql .= " group by a.it_id ";

2
shop/kcp/pp_cli_hub.php
View File

@ -240,7 +240,7 @@ if ($row['cnt']) {
$cash_info = serialize($cash);
$sql = " update {$g5['g5_shop_order_table']}
set od_cash = '1'
set od_cash = '1',
od_cash_no = '$cash_no',
od_cash_info = '$cash_info'
where od_id = '$ordr_idxx' ";

3
shop/orderaddress.php
View File

@ -50,6 +50,9 @@ $order_action_url = G5_HTTPS_SHOP_URL.'/orderaddressupdate.php';
<h1 id="new_win_title">배송지 목록</h1>
<div>
<button type="button" onclick="self.close();">닫기</button>
</div>
<div class="tbl_head01 tbl_wrap">
<table>
<thead>

4
shop/orderform.php
View File

@ -205,7 +205,7 @@ function get_intall_file()
where a.od_id = '$s_cart_id'
and a.ct_select = '1' ";
if($default['de_cart_keep_term']) {
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - ($default['de_cart_keep_term'] * 86400));
$ctime = date('Y-m-d H:i:s', G5_SERVER_TIME - (($default['de_cart_keep_term'] - 1) * 86400));
$sql .= " and a.ct_time > '$ctime' ";
}
$sql .= " group by a.it_id ";
@ -315,7 +315,7 @@ function get_intall_file()
<?php if($default['de_tax_flag_use']) { ?>
<input type="hidden" name="it_notax[<?php echo $i; ?>]" value="<?php echo $row['it_notax']; ?>">
<?php } ?>
<?php echo $it_name.$mod_options; ?>
<?php echo $it_name; ?>
</td>
<td class="td_num"><?php echo number_format($sum['qty']); ?></td>
<td class="td_numbig"><?php echo number_format($row['ct_price']); ?></td>

4
shop/orderinquiryview.php
View File

@ -84,7 +84,6 @@ if(openwin != null) {
and it_id = '{$row['it_id']}'
order by io_type asc, ct_id asc ";
$res = sql_query($sql);
$ct_list = array();
for($k=0; $opt=sql_fetch_array($res); $k++) {
if($opt['io_type'])
@ -94,9 +93,6 @@ if(openwin != null) {
$sell_price = $opt_price * $opt['ct_qty'];
$point = $opt['ct_point'] * $opt['ct_qty'];
$ct_list[$opt['ct_id']]['name'] = $opt['it_name'];
$ct_list[$opt['ct_id']]['option'] = $opt['ct_option'];
?>
<tr>
<td><?php echo $opt['ct_option']; ?></td>

1
shop/search.php
View File

@ -74,6 +74,7 @@ $total_count = $row['cnt'];
<!-- 검색결과 시작 { -->
<div id="ssch">
<div id="ssch_frm">
<form name="frmdetailsearch" onsubmit="return detail_search_submit(this);">
<div>