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

Merge branch 'g4s'

Browse Source
This commit is contained in:
chicpro
2013-07-31 17:51:40 +09:00
parent c477701690 2cb31d3ecc
commit 91bea28819
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/point_list.php
View File

@ -179,7 +179,7 @@ function point_clear()
<td class="td_time"><?php echo $row['po_datetime'] ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo date('ymd', strtotime($row['po_expire_date'])); ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_num td_pt"><?php echo number_format($row['po_mb_point']) ?></td>

14
bbs/point.php
View File

@ -31,6 +31,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
<tr>
<th scope="col">일시</th>
<th scope="col">내용</th>
<th scope="col">만료일</th>
<th scope="col">지급포인트</th>
<th scope="col">사용포인트</th>
</tr>
@ -55,10 +56,19 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
}
$po_content = $row['po_content'];
$expr = '';
if($row['po_expired'] == 1)
$expr = ' txt_expired';
?>
<tr>
<td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
<td><?php echo $po_content; ?></td>
<td class="td_date<?php echo $expr; ?>">
<?php if ($row['po_expired'] == 1) { ?>
만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
<?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
</td>
<td class="td_bignum"><?php echo $point1; ?></td>
<td class="td_bignum"><?php echo $point2; ?></td>
</tr>
@ -76,12 +86,12 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
</tbody>
<tfoot>
<tr>
<th scope="row" colspan="2">소계</th>
<th scope="row" colspan="3">소계</th>
<td><?php echo $sum_point1; ?></td>
<td><?php echo $sum_point2; ?></td>
</tr>
<tr>
<th scope="row" colspan="2">보유포인트</th>
<th scope="row" colspan="3">보유포인트</th>
<td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
</tr>
</tfoot>

3
css/default.css
View File

@ -196,6 +196,9 @@ td.empty_table {padding:85px 0;text-align:center}
.td_datetime {width:110px;text-align:center}
.td_mng {width:80px;text-align:center}
.txt_active {color:#5d910b}
.txt_expired {color:#ccc}
/* 새창 기본 스타일 */
.new_win {}
.new_win #new_win_title {margin-bottom:20px;padding:0 20px;height:60px;border-top:3px solid #4e5d60;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}