From b75f7828a9a30c6226d08c6fe126885bc979f0f1 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 31 Jul 2013 15:48:40 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=ED=8F=AC?=
 =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=EB=A7=8C=EB=A3=8C=EC=9D=BC=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B0=8F=20=EB=A7=8C=EB=A3=8C=EC=9D=BC=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/point_list.php |  2 +-
 bbs/point.php      | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/adm/point_list.php b/adm/point_list.php
index b5fa1ec3d..cf6663f46 100644
--- a/adm/point_list.php
+++ b/adm/point_list.php
@@ -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>
diff --git a/bbs/point.php b/bbs/point.php
index ebfdc9c56..dc7907f4f 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -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>

From 2cb31d3ecc798f98124930f5f8f8793aeaa72c1f Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 31 Jul 2013 16:03:03 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20#487=20?=
 =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=A7=8C=EB=A3=8C=EC=9D=BC=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/css/default.css b/css/default.css
index c0870f5c7..4ed641460 100644
--- a/css/default.css
+++ b/css/default.css
@@ -194,6 +194,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}