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/4] =?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/4] =?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}

From c47770169087c19d948ec22741c8cce0d958baa5 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 31 Jul 2013 17:50:52 +0900
Subject: [PATCH 3/4] =?UTF-8?q?#268=20=EC=A3=BC=EB=AC=B8=EC=84=9C=EC=97=90?=
 =?UTF-8?q?=20=EA=B3=BC=EC=84=B8=20=EB=B9=84=EA=B3=BC=EC=84=B8=20=EA=B8=88?=
 =?UTF-8?q?=EC=95=A1=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php    | 14 ++++++++++++++
 extend/shop.extend2.php         |  8 ++++++++
 install/shop.sql                |  3 +++
 mobile/shop/orderform.php       |  3 +--
 mobile/shop/orderformupdate.php | 13 +++++++++++++
 shop/orderform.php              |  3 +--
 shop/orderformupdate.php        | 13 +++++++++++++
 7 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 2132bcebe..3e12eeba9 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -474,6 +474,20 @@ $pg_anchor .='<li><a href="#anc_sodr_chk">결제상세정보 확인</a></li>
             <td><?php echo display_price($od['od_cancel_card']); ?></td>
         </tr>
         <?php } ?>
+        <?php if($od['od_tax_flag']) { ?>
+        <tr>
+            <th scope="row">과세공급가액</th>
+            <td><?php echo display_price($od['od_tax_mny']); ?></td>
+        </tr>
+        <tr>
+            <th scope="row">과세부가세액</th>
+            <td><?php echo display_price($od['od_vat_mny']); ?></td>
+        </tr>
+        <tr>
+            <th scope="row">비과세공급가액</th>
+            <td><?php echo display_price($od['od_free_mny']); ?></td>
+        </tr>
+        <?php } ?>
         <tr>
             <th scope="row">포인트</th>
             <td><?php echo display_point($od['od_receipt_point']); ?></td>
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 57aaa0e65..fdc1f5fe2 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -400,4 +400,12 @@ if (!sql_query(" select de_mobile_type1_list_mod from {$g4['shop_default_table']
                     CHANGE `de_mobile_type4_list_row` `de_mobile_type4_list_mod` INT(11) NOT NULL DEFAULT '0',
                     CHANGE `de_mobile_type5_list_row` `de_mobile_type5_list_mod` INT(11) NOT NULL DEFAULT '0' ", true);
 }
+
+// 과세, 비과세 금액 필드 추가
+if(!sql_query(" select od_tax_mny from {$g4['shop_order_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
+                    ADD `od_tax_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_flag`,
+                    ADD `od_vat_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_tax_mny`,
+                    ADD `od_free_mny` INT(11) NOT NULL DEFAULT '0' AFTER `od_vat_mny` ", true);
+}
 ?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index ad9a397de..7d21a7af6 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -623,6 +623,9 @@ CREATE TABLE IF NOT EXISTS `shop_order` (
   `od_tno` varchar(255) NOT NULL DEFAULT '',
   `od_escrow` tinyint(4) NOT NULL DEFAULT '0',
   `od_tax_flag` tinyint(4) NOT NULL DEFAULT '0',
+  `od_tax_mny` int(11) NOT NULL DEFAULT '0',
+  `od_vat_mny` int(11) NOT NULL DEFAULT '0',
+  `od_free_mny` int(11) NOT NULL DEFAULT '0',
   `od_cash_no` varchar(255) NOT NULL,
   `od_cash_receipt_no` varchar(255) NOT NULL,
   `od_cash_app_time` varchar(255) NOT NULL,
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 697a9fa21..41a0b381f 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -1205,8 +1205,7 @@ function kcp_approval()
     f.settle_method.value = settle_method;
 
     <?php if($default['de_tax_flag_use']) { ?>
-    if(settle_method != "무통장")
-        calculate_tax();
+    calculate_tax();
     <?php } ?>
 
     var new_win = window.open("about:blank", "tar_opener", "scrollbars=yes,resizable=yes");
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 946db9fd5..2d1164fa2 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -397,6 +397,16 @@ $od_escrow = 0;
 if($escw_yn == 'Y')
     $od_escrow = 1;
 
+// 복합과세 금액
+$od_tax_mny = round($od_temp_amount / 1.1);
+$od_vat_mny = $od_temp_amount - $od_tax_mny;
+$od_free_mny = 0;
+if($default['de_tax_flag_use']) {
+    $od_tax_mny = (int)$_POST['comm_tax_mny'];
+    $od_vat_mny = (int)$_POST['comm_vat_mny'];
+    $od_free_mny = (int)$_POST['comm_free_mny'];
+}
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -433,6 +443,9 @@ $sql = " insert {$g4['shop_order_table']}
                 od_tno            = '$od_tno',
                 od_escrow         = '$od_escrow',
                 od_tax_flag       = '{$default['de_tax_flag_use']}',
+                od_tax_mny        = '$od_tax_mny',
+                od_vat_mny        = '$od_vat_mny',
+                od_free_mny       = '$od_free_mny',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',
diff --git a/shop/orderform.php b/shop/orderform.php
index b94738e18..fa3507cc6 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -1483,8 +1483,7 @@ function forderform_check(f)
     }
 
     <?php if($default['de_tax_flag_use']) { ?>
-    if(settle_method != "무통장")
-        calculate_tax();
+    calculate_tax();
     <?php } ?>
 
     // pay_method 설정
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 130eb8a6f..1bf61f68c 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -391,6 +391,16 @@ $od_escrow = 0;
 if($escw_yn == 'Y')
     $od_escrow = 1;
 
+// 복합과세 금액
+$od_tax_mny = round($od_temp_amount / 1.1);
+$od_vat_mny = $od_temp_amount - $od_tax_mny;
+$od_free_mny = 0;
+if($default['de_tax_flag_use']) {
+    $od_tax_mny = (int)$_POST['comm_tax_mny'];
+    $od_vat_mny = (int)$_POST['comm_vat_mny'];
+    $od_free_mny = (int)$_POST['comm_free_mny'];
+}
+
 // 주문서에 입력
 $sql = " insert {$g4['shop_order_table']}
             set od_id             = '$od_id',
@@ -427,6 +437,9 @@ $sql = " insert {$g4['shop_order_table']}
                 od_tno            = '$od_tno',
                 od_escrow         = '$od_escrow',
                 od_tax_flag       = '{$default['de_tax_flag_use']}',
+                od_tax_mny        = '$od_tax_mny',
+                od_vat_mny        = '$od_vat_mny',
+                od_free_mny       = '$od_free_mny',
                 od_shop_memo      = '',
                 od_hope_date      = '$od_hope_date',
                 od_time           = '".G4_TIME_YMDHIS."',

From 53d357d98edda67941b535b72da743b209c7d89b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 1 Aug 2013 09:32:23 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=EB=B3=B5=ED=95=A9=EA=B3=BC=EC=84=B8=20?=
 =?UTF-8?q?=EB=B3=80=EC=88=98=EB=AA=85=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 41a0b381f..975a5af4f 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -222,7 +222,7 @@ ob_start();
     // 복합과세처리
     if($default['de_tax_flag_use']) {
         $comm_tax_mny = round(($tot_tax_mny + $send_cost) / 1.1);
-        $comm_vat_mnt = ($tot_tax_mny + $send_cost) - $comm_tax_mny;
+        $comm_vat_mny = ($tot_tax_mny + $send_cost) - $comm_tax_mny;
     }
     ?>
     </tbody>