From 911f675529ee727b734bf42f79f1ef5ae349ba9f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 31 May 2013 17:56:23 +0900
Subject: [PATCH] =?UTF-8?q?#191=20=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=EC=97=90=20=EB=A7=88=EC=9D=BC=EB=A6=AC=EC=A7=80=20?=
 =?UTF-8?q?=EC=82=AC=EC=9A=A9=20=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 | 1 +
 extend/shop.extend2.php             | 8 ++++++++
 install/install_db.php              | 1 +
 install/shop.sql                    | 1 +
 5 files changed, 18 insertions(+)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 85ac3500a..bf90e45a9 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -444,6 +444,13 @@ $pg_anchor = '<ul class="anchor">
             </select>
         </td>
     </tr>
+    <tr>
+        <th scope="row"><label for="de_mileage_use">마일리지 사용</label></th>
+        <td>
+            <?php echo help("마일리지는 주문완료에 의해 적립되는 포인트입니다.\n마일리지 사용으로 설정하시면 기존 포인트 대신 마일리지가 주문 결제에 사용됩니다."); ?>
+            <input type="checkbox" name="de_mileage_use" value="1" id="de_mileaget_use"<?php echo $default['de_mileage_use']?' checked':''; ?>> 사용
+        </td>
+    </tr>
     <tr>
         <th scope="row"><label for="cf_use_point">포인트 사용</label></th>
         <td>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index cdee4349f..ae35d52ae 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -101,6 +101,7 @@ $sql = " update {$g4['shop_default_table']}
                 de_banktown_mid             = '$de_banktown_mid',
                 de_banktown_auth_key        = '$de_banktown_auth_key',
                 de_telec_mid                = '$de_telec_mid',
+                de_mileage_use              = '$de_mileage_use',
                 de_point_settle             = '$de_point_settle',
                 de_level_sell               = '$de_level_sell',
                 de_send_cost_case           = '$de_send_cost_case',
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 42b40de3a..f461ceeca 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -220,4 +220,12 @@ if(!$result) {
     sql_query(" ALTER TABLE `{$g4['shop_item_table']}`
                     ADD `it_point_type` TINYINT(4) NOT NULL DEFAULT '0' AFTER `it_point` ", false);
 }
+
+// 마일리지 사용설정 필드추가
+$sql = " select de_mileage_use from {$g4['shop_default_table']} ";
+$result = sql_query($sql, false);
+if(!$result) {
+    sql_query(" ALTER TABLE `{$g4['shop_default_table']}`
+                    ADD `de_mileage_use` TINYINT(4) NOT NULL DEFAULT '0' AFTER `de_point_settle` ", false);
+}
 ?>
\ No newline at end of file
diff --git a/install/install_db.php b/install/install_db.php
index 11d323eb4..807ce765b 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -263,6 +263,7 @@ if($shop_install) {
                     de_card_use = '0',
                     de_card_max_amount = '1000',
                     de_point_settle = '10000',
+                    de_mileage_use = '1',
                     de_cart_keep_term = '15',
                     de_point_per = '5',
                     de_card_point = '0',
diff --git a/install/shop.sql b/install/shop.sql
index 30d2c873d..17224fbb2 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -218,6 +218,7 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
   `de_banktown_auth_key` varchar(255) NOT NULL DEFAULT '',
   `de_telec_mid` varchar(255) NOT NULL DEFAULT '',
   `de_point_settle` int(11) NOT NULL DEFAULT '0',
+  `de_mileage_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_level_sell` int(11) NOT NULL DEFAULT '0',
   `de_send_cost_case` varchar(255) NOT NULL DEFAULT '',
   `de_send_cost_limit` varchar(255) NOT NULL DEFAULT '',