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

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

Browse Source
This commit is contained in:
gnuboard
2013-11-18 16:16:23 +09:00
parent 4a8a8a91f1 010789d270
commit 60eac58691
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adm/shop_admin/index.php
View File

@ -39,7 +39,7 @@ function get_order_date_sum($date)
{
global $g5;
$sql = " select sum(od_cart_price + od_send_cost + od_send_cost2 - od_cart_coupon - od_coupon - od_send_coupon) as orderprice,
$sql = " select sum(od_cart_price + od_send_cost + od_send_cost2) as orderprice,
sum(od_cancel_price) as cancelprice
from {$g5['g5_shop_order_table']}
where SUBSTRING(od_time, 1, 10) = '$date' ";
@ -63,7 +63,7 @@ function get_order_settle_sum($date)
// 결제수단별 합계
foreach($case as $val)
{
$sql = " select sum(od_cart_price + od_send_cost + od_send_cost2) as price,
$sql = " select sum(od_cart_price + od_send_cost + od_send_cost2 - od_cart_coupon - od_coupon - od_send_coupon) as price,
count(*) as cnt
from {$g5['g5_shop_order_table']}
where SUBSTRING(od_time, 1, 10) = '$date'

7
css/default_shop.css
View File

@ -826,6 +826,13 @@ fieldset .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f7
#ssch_frm #ssch_sort li {float:left;margin:0 1px 0 0}
#ssch_frm #ssch_ov {float:right}
#ssch_cate {}
#ssch_cate ul {margin:10px 0;padding:10px 20px 20px;border-bottom:1px solid #e9e9e9;list-style:none;zoom:1}
#ssch_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
#ssch_cate li {float:left;margin:0 10px 0 0;padding:0 10px 0 0;border-right:1px solid #e9e9e9}
#ssch_cate a {}
#ssch_cate a span {font-weight:bold}
/* 쇼핑몰 이벤트 */
#sev {}
.sev_admin {text-align:right}

32
shop/search.php
View File

@ -114,9 +114,9 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산
<label><input type="checkbox" name="qid" class="frm_input" <?php echo isset($qid)?'checked="checked"':'';?>> 상품코드</label><br>
</div>
<div>
<strong>상품가격</strong>
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" class="frm_input" size="10">원 부터
<input type="text" name="qto" value="<?php echo $qto; ?>" class="frm_input" size="10">원 까지<br>
<strong>상품가격 (원)</strong>
<input type="text" name="qfrom" value="<?php echo $qfrom; ?>" class="frm_input" size="10"> ~
<input type="text" name="qto" value="<?php echo $qto; ?>" class="frm_input" size="10"> 까지<br>
</div>
<div>
<strong>검색어</strong>
@ -143,19 +143,19 @@ $total_page = ceil($total_count / $items); // 전체 페이지 계산
</div>
</div>
<div>
<ul>
<?
$sql = " select b.ca_id, b.ca_name, count(*) as cnt $sql_common $sql_where and length(b.ca_id) = 2 group by b.ca_id order by b.ca_id ";
$result = sql_query($sql);
$total_cnt = 0;
for ($i=0; $row=sql_fetch_array($result); $i++) {
echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} (".$row['cnt'].")</a></li>\n";
$total_cnt += $row['cnt'];
}
echo "<li><a href=\"#\" onclick=\"set_ca_id(''); return false;\">전체분류 ({$total_cnt})</a></li>\n";
?>
</ul>
<div id="ssch_cate">
<ul>
<?php
$sql = " select b.ca_id, b.ca_name, count(*) as cnt $sql_common $sql_where and length(b.ca_id) = 2 group by b.ca_id order by b.ca_id ";
$result = sql_query($sql);
$total_cnt = 0;
for ($i=0; $row=sql_fetch_array($result); $i++) {
echo "<li><a href=\"#\" onclick=\"set_ca_id('{$row['ca_id']}'); return false;\">{$row['ca_name']} (".$row['cnt'].")</a></li>\n";
$total_cnt += $row['cnt'];
}
echo '<li><a href="#" onclick="set_ca_id(\'\'); return false;">전체분류 <span>('.$total_cnt.')</span></a></li>'.PHP_EOL;
?>
</ul>
</div>
<div>