From 019716853096ccc6f863c0e5233a3577acbe060c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 4 Sep 2013 16:47:29 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=ED=95=AD=EB=AA=A9=20=EC=88=98=EC=A0=95=20=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php       | 30 +++++++++++++++--------------
 adm/shop_admin/configformupdate.php |  6 +++---
 extend/shop.extend2.php             |  9 +++++++++
 install/install_db.php              |  6 +++---
 install/shop.sql                    |  8 ++++----
 5 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 890c57e76..b19e0bca3 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -469,13 +469,6 @@ $pg_anchor = '<ul class="anchor">
             </select>
         </td>
     </tr>
-    <tr>
-        <th scope="row"><label for="de_card_max_amount">카드결제최소금액</label></th>
-        <td>
-            <?php echo help("신용카드는 경우 1000원 미만은 결제가 불가능합니다.\n카드결제최소금액을 1000원 이상으로 설정하십시오."); ?>
-            <input type="text" name="de_card_max_amount" value="<?php echo $default['de_card_max_amount']; ?>"  id="de_card_max_amount" class="frm_input" size="10"> 원
-        </td>
-    </tr>
     <tr>
         <th scope="row"><label for="de_taxsave_use">현금영수증<br>발급사용</label></th>
         <td>
@@ -494,19 +487,28 @@ $pg_anchor = '<ul class="anchor">
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="de_point_settle">포인트결제 비율</label></th>
+        <th scope="row"><label for="de_settle_min_point">결제 최소포인트</label></th>
         <td>
             <?php echo help("회원의 포인트가 설정값 이상일 경우만 주문시 결제에 사용할 수 있습니다.\n포인트 사용을 하지 않는 경우에는 의미가 없습니다."); ?>
-            <input type="text" name="de_point_settle" value="<?php echo $default['de_point_settle']; ?>" id="de_point_settle" class="frm_input" size="10"> 점
+            <input type="text" name="de_settle_min_point" value="<?php echo $default['de_settle_min_point']; ?>" id="de_settle_min_point" class="frm_input" size="10"> 점
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="de_point_per">포인트결제 %</label></th>
+        <th scope="row"><label for="de_settle_max_point">최대 결제포인트</label></th>
         <td>
-            <?php echo help("회원 보유 포인트가 결제액보다 많을 경우, 결제액에서 포인트로 결제 가능한 비율을 설정합니다."); ?>
-            <select id="de_point_per" name="de_point_per">
-            <?php for ($i=100; $i>0; $i=$i-5) echo '<option value="'.$i.'" '.get_selected($default['de_point_per'], $i).'>'.$i.'</option>'.PHP_EOL; ?>
-            </select>%
+            <?php echo help("주문 결제시 최대로 사용할 수 있는 포인트를 설정합니다.\n포인트 사용을 하지 않는 경우에는 의미가 없습니다."); ?>
+            <input type="text" name="de_settle_max_point" value="<?php echo $default['de_settle_max_point']; ?>" id="de_settle_max_point" class="frm_input" size="10"> 점
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="de_settle_point_unit">결제 포인트단위</label></th>
+        <td>
+            <?php echo help("주문 결제시 사용되는 포인트의 절사 단위를 설정합니다."); ?>
+            <select id="de_settle_point_unit" name="de_settle_point_unit">
+                <option value="100" <?php echo get_selected($default['de_settle_point_unit'], 100); ?>>100</option>
+                <option value="10"  <?php echo get_selected($default['de_settle_point_unit'],  10); ?>>10</option>
+                <option value="1"   <?php echo get_selected($default['de_settle_point_unit'],   1); ?>>1</option>
+            </select> 점
         </td>
     </tr>
     <tr>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 034aff3ec..2efff08fd 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -99,8 +99,9 @@ $sql = " update {$g4['shop_default_table']}
                 de_card_use                 = '$de_card_use',
                 de_card_point               = '$de_card_point',
                 de_card_pg                  = '$de_card_pg',
-                de_card_max_amount          = '$de_card_max_amount',
-                de_point_settle             = '$de_point_settle',
+                de_settle_min_point         = '$de_settle_min_point',
+                de_settle_max_point         = '$de_settle_max_point',
+                de_settle_point_unit        = '$de_settle_point_unit',
                 de_level_sell               = '$de_level_sell',
                 de_send_cost_case           = '$de_send_cost_case',
                 de_send_cost_limit          = '$de_send_cost_limit',
@@ -134,7 +135,6 @@ $sql = " update {$g4['shop_default_table']}
                 de_code_dup_use             = '$de_code_dup_use',
                 de_cart_keep_term           = '$de_cart_keep_term',
                 de_guest_cart_use           = '$de_guest_cart_use',
-                de_point_per                = '$de_point_per',
                 de_admin_buga_no            = '$de_admin_buga_no',
                 de_sms_use                  = '$de_sms_use',
 				de_icode_id                 = '$de_icode_id',
diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php
index 9deb72785..d285d45d2 100644
--- a/extend/shop.extend2.php
+++ b/extend/shop.extend2.php
@@ -465,4 +465,13 @@ if(!sql_query(" DESCRIBE `{$g4['shop_order_address_table']}` ", false)) {
                   KEY `mb_id` (`mb_id`)
                 )", true);
 }
+
+// 포인트 설정필드 변경
+if(!sql_query(" select de_settle_min_point from {$g4['shop_default_table']} ", false)) {
+    sql_query(" ALTER TABLE `{$g4['shop_default_table']}`
+                    CHANGE `de_point_settle` `de_settle_min_point` int(11) NOT NULL DEFAULT '0',
+                    ADD `de_settle_max_point` int(11) NOT NULL DEFAULT '0' AFTER `de_settle_min_point`,
+                    ADD `de_settle_point_unit` int(11) NOT NULL DEFAULT '0' AFTER `de_settle_max_point`,
+                    DROP `de_point_per` ", true);
+}
 ?>
diff --git a/install/install_db.php b/install/install_db.php
index 4c32944a5..b14ae462d 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -264,10 +264,10 @@ if($shop_install) {
                     de_vbank_use = '0',
                     de_iche_use = '0',
                     de_card_use = '0',
-                    de_card_max_amount = '1000',
-                    de_point_settle = '10000',
+                    de_settle_min_point = '5000',
+                    de_settle_max_point = '50000',
+                    de_settle_point_unit = '100',
                     de_cart_keep_term = '15',
-                    de_point_per = '5',
                     de_card_point = '0',
                     de_point_days = '7',
                     de_card_pg = 'kcp',
diff --git a/install/shop.sql b/install/shop.sql
index ad4976d71..7d1c86f0f 100644
--- a/install/shop.sql
+++ b/install/shop.sql
@@ -220,8 +220,9 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
   `de_card_use` int(11) NOT NULL DEFAULT '0',
   `de_card_point` int(11) NOT NULL DEFAULT '0',
   `de_card_pg` varchar(255) NOT NULL DEFAULT '',
-  `de_card_max_amount` int(11) NOT NULL DEFAULT '0',
-  `de_point_settle` int(11) NOT NULL DEFAULT '0',
+  `de_settle_min_point` int(11) NOT NULL DEFAULT '0',
+  `de_settle_max_point` int(11) NOT NULL DEFAULT '0',
+  `de_settle_point_unit` int(11) 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 '',
@@ -254,8 +255,7 @@ CREATE TABLE IF NOT EXISTS `shop_default` (
   `de_item_use_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_code_dup_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_cart_keep_term` int(11) NOT NULL DEFAULT '0',
-  `de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0',
-  `de_point_per` tinyint(4) NOT NULL DEFAULT '0',
+  `de_guest_cart_use` tinyint(4) NOT NULL DEFAULT '0',  
   `de_admin_buga_no` varchar(255) NOT NULL DEFAULT '',
   `de_sms_use` varchar(255) NOT NULL DEFAULT '',
   `de_icode_id` varchar(255) NOT NULL DEFAULT '',