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 = '
> 사용
+
+ |
+
+
+ > 사용
+ |
+
비회원에 대한 개인정보수집 내용 |
|
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 ='
-
+
|
@@ -299,7 +299,7 @@ $pg_anchor =' |
-
+
|
@@ -312,6 +312,22 @@ $pg_anchor =' |
+
+ |
+
+
+
+ |
+
+
+
+
+
+ |
+
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',