From 8ba2a84198461168008549042bbfc2d01e738d03 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 18 Jun 2013 10:19:52 +0900
Subject: [PATCH] =?UTF-8?q?#235=20=EB=B3=B5=ED=95=A9=EA=B3=BC=EC=84=B8=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php       |  7 +++++++
 adm/shop_admin/configformupdate.php |  3 ++-
 adm/shop_admin/itemform.php         | 20 ++++++++++++++++++--
 adm/shop_admin/itemformupdate.php   |  1 +
 extend/shop.extend2.php             | 10 ++++++++++
 install/shop.sql                    |  4 +++-
 6 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 8ff303a84..10419295f 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -803,6 +803,13 @@ $pg_anchor = '<ul class="anchor">
             <input type="checkbox" name="de_guest_cart_use" value="1" id="de_guest_cart_use"<?php echo $default['de_guest_cart_use']?' checked':''; ?>> 사용
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="de_tax_flag_use">복합과세 결제</label></th>
+        <td>
+             <?php echo help("복합과세(과세, 비과세) 결제를 사용하려면 체크하십시오.\n복합과세 결제를 사용하기 전 KCP에 결제 신청을 해주셔야 합니다."); ?>
+            <input type="checkbox" name="de_tax_flag_use" value="1" id="de_tax_flag_use"<?php echo $default['de_tax_flag_use']?' checked':''; ?>> 사용
+        </td>
+    </tr>
     <tr>
         <th scope="row">비회원에 대한<br/>개인정보수집 내용</th>
         <td><?php echo editor_html('de_guest_privacy', $default['de_guest_privacy']); ?></td>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 0d1db2a2a..9a29968a2 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -149,7 +149,8 @@ $sql = " update {$g4['shop_default_table']}
                 de_taxsave_use              = '$de_taxsave_use',
                 de_guest_privacy            = '$de_guest_privacy',
                 de_hp_use                   = '$de_hp_use',
-                de_escrow_use               = '$de_escrow_use'
+                de_escrow_use               = '$de_escrow_use',
+                de_tax_flag_use             = '$de_tax_flag_use'
                 ";
 sql_query($sql);
 
diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 8047a0476..33e9fbfcd 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -286,7 +286,7 @@ $pg_anchor ='<ul class="anchor">
             <label for="chk_all_it_origin">전체적용</label>
         </td>
     </tr>
-     <tr>
+    <tr>
         <th scope="row"><label for="it_brand">브랜드</label></th>
         <td>
             <?php echo help("입력하지 않으면 상품상세페이지에 출력하지 않습니다."); ?>
@@ -299,7 +299,7 @@ $pg_anchor ='<ul class="anchor">
             <label for="chk_all_it_brand">전체적용</label>
         </td>
     </tr>
-     <tr>
+    <tr>
         <th scope="row"><label for="it_model">모델</label></th>
         <td>
             <?php echo help("입력하지 않으면 상품상세페이지에 출력하지 않습니다."); ?>
@@ -312,6 +312,22 @@ $pg_anchor ='<ul class="anchor">
             <label for="chk_all_it_model">전체적용</label>
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="it_notax">상품과세 유형</label></th>
+        <td>
+            <?php echo help("상품의 과세유형(과세, 비과세)을 설정합니다."); ?>
+            <select name="it_notax" id="it_notax">
+                <option value="0"<?php echo get_selected('0', $it['it_notax']); ?>>과세</option>
+                <option value="1"<?php echo get_selected('1', $it['it_notax']); ?>>비과세</option>
+            </select>
+        </td>
+        <td class="group_setting">
+            <input type="checkbox" name="chk_ca_it_notax" value="1" id="chk_ca_it_notax">
+            <label for="chk_ca_it_notax">분류적용</label>
+            <input type="checkbox" name="chk_all_it_notax" value="1" id="chk_all_it_notax">
+            <label for="chk_all_it_notax">전체적용</label>
+        </td>
+    </tr>
     <?php
     $opt_subject = explode(',', $it['it_option_subject']);
     ?>
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 102860445..cf145e452 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -283,6 +283,7 @@ $sql_common = " ca_id               = '$ca_id',
                 it_price            = '$it_price',
                 it_point            = '$it_point',
                 it_point_type       = '$it_point_type',
+                it_notax            = '$it_notax',
                 it_sell_email       = '$it_sell_email',
                 it_use              = '$it_use',
                 it_stock_qty        = '$it_stock_qty',
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 2be1768ec..de4e1e6b1 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -336,4 +336,14 @@ if(!$result) {
     sql_query(" ALTER TABLE `{$g4['shop_order_table']}`
                     ADD `od_send_cost2` INT(11) NOT NULL DEFAULT '0' AFTER `od_send_coupon` ", false);
 }
+
+// 복합과세 필드 추가
+$sql = " select de_tax_flag_use from {$g4['shop_default_table']} ";
+$result = sql_query($sql, false);
+if(!$result) {
+    sql_query(" ALTER TABLE `{$g4['shop_default_table']}`
+                    ADD `de_tax_flag_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_escrow_use` ", false);
+    sql_query(" ALTER TABLE `{$g4['shop_item_table']}`
+                    ADD `it_notax` TINYINT(4) NOT NULL DEFAULT '0' AFTER `it_point_type` ", false);
+}
 ?>
\ No newline at end of file
diff --git a/install/shop.sql b/install/shop.sql
index 7ed5c3ca5..b33e9f091 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -296,7 +296,8 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
   `de_taxsave_use` tinyint(4) NOT NULL,
   `de_guest_privacy` text NOT NULL,
   `de_hp_use` tinyint(4) NOT NULL DEFAULT '0',
-  `de_escrow_use` tinyint(4) NOT NULL DEFAULT '0'
+  `de_escrow_use` tinyint(4) NOT NULL DEFAULT '0',
+  `de_tax_flag_use` tinyint(4) NOT NULL DEFAULT '0'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
@@ -418,6 +419,7 @@ CREATE TABLE IF NOT EXISTS `shop_item` (
   `it_price` int(11) NOT NULL DEFAULT '0',
   `it_point` int(11) NOT NULL DEFAULT '0',
   `it_point_type` tinyint(4) NOT NULL DEFAULT '0',
+  `it_notax` tinyint(4) NOT NULL DEFAULT '0',
   `it_sell_email` varchar(255) NOT NULL DEFAULT '',
   `it_use` tinyint(4) NOT NULL DEFAULT '0',
   `it_stock_qty` int(11) NOT NULL DEFAULT '0',