From d36a5a3fc160f645c2a2382418ec613fb207e4dc Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 11 Mar 2014 15:53:55 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=EC=A7=80=EA=B8=89?=
 =?UTF-8?q?=20=EA=B8=B0=EC=A4=80=EA=B8=88=EC=95=A1=20=EB=B0=8F=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=EC=98=B5=EC=85=98=20=EC=A7=80=EA=B8=89=20=ED=8F=AC?=
 =?UTF-8?q?=EC=9D=B8=ED=8A=B8=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/itemform.php               | 30 +++++++++++++++++++----
 adm/shop_admin/itemformupdate.php         |  3 +++
 install/gnuboard5shop.sql                 |  1 +
 lib/shop.lib.php                          | 22 ++++++++++++++---
 mobile/shop/wishlist.php                  |  1 -
 mobile/skin/shop/basic/item.form.skin.php | 10 +++++---
 shop/cartupdate.php                       | 18 ++++++++++----
 shop/price2/daum.php                      |  9 ++-----
 shop/price2/naver.php                     |  5 ++--
 shop/price2/naver_new.php                 |  5 ++--
 shop/wishlist.php                         |  1 -
 skin/shop/basic/item.form.skin.php        | 10 +++++---
 12 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 3b8c90935..7e2ef9d69 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -94,6 +94,12 @@ if(!sql_query(" select it_stock_sms from {$g5['g5_shop_item_table']} limit 1 ",
                     ADD `it_stock_sms` tinyint(4) NOT NULL DEFAULT '0' AFTER `it_stock_qty` ", true);
 }
 
+// 추가옵션 포인트 설정 필드 추가
+if(!sql_query(" select it_supply_point from {$g5['g5_shop_item_table']} limit 1 ", false)) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_item_table']}`
+                    ADD `it_supply_point` int(11) NOT NULL DEFAULT '0' AFTER `it_point_type` ", true);
+}
+
 $pg_anchor ='<ul class="anchor">
 <li><a href="#anc_sitfrm_cate">상품분류</a></li>
 <li><a href="#anc_sitfrm_ini">기본정보</a></li>
@@ -483,15 +489,16 @@ $(function(){
         <tr>
             <th scope="row"><label for="it_point_type">포인트 유형</label></th>
             <td>
-                <?php echo help("포인트 유형을 설정할 수 있습니다. 비율로 설정했을 경우 판매가격의 %비율로 포인트가 지급됩니다."); ?>
+                <?php echo help("포인트 유형을 설정할 수 있습니다. 비율로 설정했을 경우 설정 기준금액의 %비율로 포인트가 지급됩니다."); ?>
                 <select name="it_point_type" id="it_point_type">
-                    <option value="0"<?php echo get_selected('0', $it['it_point_type']); ?>>금액</option>
-                    <option value="1"<?php echo get_selected('1', $it['it_point_type']); ?>>비율</option>
+                    <option value="0"<?php echo get_selected('0', $it['it_point_type']); ?>>설정금액</option>
+                    <option value="1"<?php echo get_selected('1', $it['it_point_type']); ?>>판매가기준 설정비율</option>
+                    <option value="2"<?php echo get_selected('2', $it['it_point_type']); ?>>구매가기준 설정비율</option>
                 </select>
                 <script>
                 $(function() {
                     $("#it_point_type").change(function() {
-                        if($(this).val() == "1")
+                        if(parseInt($(this).val()) > 0)
                             $("#it_point_unit").text("%");
                         else
                             $("#it_point_unit").text("점");
@@ -509,7 +516,7 @@ $(function(){
         <tr>
             <th scope="row"><label for="it_point">포인트</label></th>
             <td>
-                <?php echo help("주문완료후 환경설정에서 설정한 주문완료 설정일 후 회원에게 부여하는 포인트입니다.\n또, 포인트부여를 '아니오'로 설정한 경우 신용카드, 계좌이체로 주문하는 회원께는 부여하지 않습니다.\n게시판의 포인트 기능과는 별개로 동작합니다."); ?>
+                <?php echo help("주문완료후 환경설정에서 설정한 주문완료 설정일 후 회원에게 부여하는 포인트입니다.\n또, 포인트부여를 '아니오'로 설정한 경우 신용카드, 계좌이체로 주문하는 회원께는 부여하지 않습니다."); ?>
                 <input type="text" name="it_point" value="<?php echo $it['it_point']; ?>" id="it_point" class="frm_input" size="8"> <span id="it_point_unit"><?php if($it['it_point_type']) echo '%'; else echo '점'; ?></span>
             </td>
             <td class="td_grpset">
@@ -519,6 +526,19 @@ $(function(){
                 <label for="chk_all_it_point">전체적용</label>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="it_supply_point">추가옵션상품 포인트</label></th>
+            <td>
+                <?php echo help("상품의 추가옵션상품 구매에 일괄적으로 지급하는 포인트입니다. 0으로 설정하시면 구매포인트를 지급하지 않습니다.\n주문완료후 환경설정에서 설정한 주문완료 설정일 후 회원에게 부여하는 포인트입니다.\n또, 포인트부여를 '아니오'로 설정한 경우 신용카드, 계좌이체로 주문하는 회원께는 부여하지 않습니다."); ?>
+                <input type="text" name="it_supply_point" value="<?php echo $it['it_supply_point']; ?>" id="it_supply_point" class="frm_input" size="8"> 점
+            </td>
+            <td class="td_grpset">
+                <input type="checkbox" name="chk_ca_it_supply_point" value="1" id="chk_ca_it_supply_point">
+                <label for="chk_ca_it_supply_point">분류적용</label>
+                <input type="checkbox" name="chk_all_it_supply_point" value="1" id="chk_all_it_supply_point">
+                <label for="chk_all_it_supply_point">전체적용</label>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="it_soldout">상품품절</label></th>
             <td>
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index 8d845bca8..5db5f377f 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -287,6 +287,7 @@ $sql_common = " ca_id               = '$ca_id',
                 it_price            = '$it_price',
                 it_point            = '$it_point',
                 it_point_type       = '$it_point_type',
+                it_supply_point     = '$it_supply_point',
                 it_notax            = '$it_notax',
                 it_sell_email       = '$it_sell_email',
                 it_use              = '$it_use',
@@ -473,6 +474,7 @@ if(is_checked('chk_ca_it_price'))               $ca_fields .= " , it_price = '$i
 if(is_checked('chk_ca_it_cust_price'))          $ca_fields .= " , it_cust_price = '$it_cust_price' ";
 if(is_checked('chk_ca_it_point'))               $ca_fields .= " , it_point = '$it_point' ";
 if(is_checked('chk_ca_it_point_type'))          $ca_fields .= " , it_point_type = '$it_point_type' ";
+if(is_checked('chk_ca_it_supply_point'))        $ca_fields .= " , it_supply_point = '$it_supply_point' ";
 if(is_checked('chk_ca_it_stock_qty'))           $ca_fields .= " , it_stock_qty = '$it_stock_qty' ";
 if(is_checked('chk_ca_it_noti_qty'))            $ca_fields .= " , it_noti_qty = '$it_noti_qty' ";
 if(is_checked('chk_ca_it_sendcost'))            $ca_fields .= " , it_sc_type = '$it_sc_type', it_sc_method = '$it_sc_method', it_sc_price = '$it_sc_price', it_sc_minimum = '$it_sc_minimum', it_sc_qty = '$it_sc_qty' ";
@@ -521,6 +523,7 @@ if(is_checked('chk_all_it_price'))               $all_fields .= " , it_price = '
 if(is_checked('chk_all_it_cust_price'))          $all_fields .= " , it_cust_price = '$it_cust_price' ";
 if(is_checked('chk_all_it_point'))               $all_fields .= " , it_point = '$it_point' ";
 if(is_checked('chk_all_it_point_type'))          $all_fields .= " , it_point_type = '$it_point_type' ";
+if(is_checked('chk_all_it_supply_point'))        $all_fields .= " , it_supply_point = '$it_supply_point' ";
 if(is_checked('chk_all_it_stock_qty'))           $all_fields .= " , it_stock_qty = '$it_stock_qty' ";
 if(is_checked('chk_all_it_noti_qty'))            $all_fields .= " , it_noti_qty = '$it_noti_qty' ";
 if(is_checked('chk_all_it_sendcost'))            $all_fields .= " , it_sc_type = '$it_sc_type', it_sc_method = '$it_sc_method', it_sc_price = '$it_sc_price', it_sc_minimum = '$it_sc_minimum', it_sc_qty = '$it_sc_qty' ";
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 6d4770956..16f184002 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -384,6 +384,7 @@ CREATE TABLE IF NOT EXISTS `g5_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_supply_point` int(11) 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',
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index ae935adcf..26d740ac7 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -1645,12 +1645,28 @@ function get_order_info($od_id)
 
 
 // 상품포인트
-function get_item_point($it)
+function get_item_point($it, $io_id='', $trunc=10)
 {
+    global $g5;
+
     $it_point = 0;
 
-    if($it['it_point_type']) {
-        $it_point = floor(($it['it_price'] * ($it['it_point'] / 100) / 10)) * 10;
+    if($it['it_point_type'] > 0) {
+        $it_price = $it['it_price'];
+
+        if($it['it_point_type'] == 2 && $io_id) {
+            $sql = " select io_id, io_price
+                        from {$g5['g5_shop_item_option_table']}
+                        where io_id = '$io_id'
+                          and io_type = '0'
+                          and io_use = '1' ";
+            $opt = sql_fetch($sql);
+
+            if($opt['io_id'])
+                $it_price += $opt['io_price'];
+        }
+
+        $it_point = floor(($it_price * ($it['it_point'] / 100) / $trunc)) * $trunc;
     } else {
         $it_point = $it['it_point'];
     }
diff --git a/mobile/shop/wishlist.php b/mobile/shop/wishlist.php
index 639dbd7b6..a3b285808 100644
--- a/mobile/shop/wishlist.php
+++ b/mobile/shop/wishlist.php
@@ -45,7 +45,6 @@ include_once(G5_MSHOP_PATH.'/_head.php');
             if ($row['it_tel_inq']) $out_cd = 'tel_inq';
 
             $image = get_it_image($row['it_id'], 50, 50);
-            $it_point = get_item_point($row);
         ?>
 
         <tr>
diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php
index 74b0a30fa..bd5822e30 100644
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@@ -138,9 +138,13 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_MSHOP_SKIN_URL.'/style.css">',
             <th scope="row"><label for="disp_point">포인트</label></th>
             <td>
                 <?php
-                $it_point = get_item_point($it);
-                echo number_format($it_point);
-                ?> 점
+                if($it['it_point_type'] == 2) {
+                    echo '구매금액(추가옵션 제외)의 '.$it['it_point'].'%';
+                } else {
+                    $it_point = get_item_point($it);
+                    echo number_format($it_point).'점';
+                }
+                ?>
             </td>
         </tr>
         <?php } ?>
diff --git a/shop/cartupdate.php b/shop/cartupdate.php
index d96ca0981..dccf51b8d 100644
--- a/shop/cartupdate.php
+++ b/shop/cartupdate.php
@@ -141,11 +141,6 @@ else // 장바구니에 담기
                 $lst_count++;
         }
 
-        // 포인트
-        $point = 0;
-        if($config['cf_use_point'])
-            $point = get_item_point($it);
-
         //--------------------------------------------------------
         //  재고 검사
         //--------------------------------------------------------
@@ -240,6 +235,19 @@ else // 장바구니에 담기
                 continue;
             }
 
+            // 포인트
+            $point = 0;
+            if($config['cf_use_point']) {
+                if($io_type == 0) {
+                    $point = get_item_point($it, $io_id);
+                } else {
+                    $point = $it['it_supply_point'];
+                }
+
+                if($point < 0)
+                    $point = 0;
+            }
+
             // 배송비결제
             if($it['it_sc_type'] == 1)
                 $ct_send_cost = 2; // 무료
diff --git a/shop/price2/daum.php b/shop/price2/daum.php
index a304b5062..1ac3076e9 100644
--- a/shop/price2/daum.php
+++ b/shop/price2/daum.php
@@ -99,14 +99,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         $catename2 = $row2['ca_name'];
     }
 
-    // 배송비 상한가 미만이면 배송비 적용
-    $delivery = 0;
-    if ($row['it_price'] < $cost_limit) {
-        $delivery = $send_cost;
-    }
-
     $pdate = date("Ymd", strtotime($row['it_time']));
-    $point = get_item_point($row);
 
     // 상품이미지
     $img_url = get_it_imageurl($row['it_id']);
@@ -121,6 +114,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'];
         $it_price = $row['it_price'];
         $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+        $point = get_item_point($row);
 
         if($delivery) {
             $deliv  = 1;
@@ -167,6 +161,7 @@ HEREDOC;
             $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'].'&amp;opt='.$row2['io_id'];
             $it_price = $row['it_price'] + $row2['io_price'];
             $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+            $point = get_item_point($row, $row2['io_id']);
 
             if($delivery) {
                 $deliv  = $delivery;
diff --git a/shop/price2/naver.php b/shop/price2/naver.php
index 8af17a38a..3491a41b4 100644
--- a/shop/price2/naver.php
+++ b/shop/price2/naver.php
@@ -76,9 +76,6 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     // 상품이미지
     $img_url = get_it_imageurl($row['it_id']);
 
-    // 포인트
-    $it_point = get_item_point($row);
-
     // 상품별옵션
     $sql = " select * from {$g5['g5_shop_item_option_table']} where it_id = '{$row['it_id']}' and io_type = '0' and io_use = '1' order by io_no asc ";
     $result2 = sql_query($sql);
@@ -89,6 +86,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'];
         $it_price = $row['it_price'];
         $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+        $it_point = get_item_point($row);
 
         echo <<< HEREDOC
 {$lt}begin{$gt}
@@ -134,6 +132,7 @@ HEREDOC;
             $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'].'&amp;opt='.$row2['io_id'];
             $it_price = $row['it_price'] + $row2['io_price'];
             $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+            $it_point = get_item_point($row, $row2['io_id']);
 
     echo <<< HEREDOC
 {$lt}begin{$gt}
diff --git a/shop/price2/naver_new.php b/shop/price2/naver_new.php
index e7c7194d3..eaf443442 100644
--- a/shop/price2/naver_new.php
+++ b/shop/price2/naver_new.php
@@ -77,9 +77,6 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     // 상품이미지
     $img_url = get_it_imageurl($row['it_id']);
 
-    // 포인트
-    $it_point = get_item_point($row);
-
     // 상품별옵션
     $sql = " select * from {$g5['g5_shop_item_option_table']} where it_id = '{$row['it_id']}' and io_type = '0' and io_use = '1' order by io_no asc ";
     $result2 = sql_query($sql);
@@ -90,6 +87,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'];
         $it_price = $row['it_price'];
         $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+        $it_point = get_item_point($row);
 
     echo <<< HEREDOC
 {$lt}begin{$gt}
@@ -135,6 +133,7 @@ HEREDOC;
             $buy_url = G5_SHOP_URL.'/itembuy.php?it_id='.$row['it_id'].'&amp;opt='.$row2['io_id'];
             $it_price = $row['it_price'] + $row2['io_price'];
             $delivery = get_item_sendcost2($row['it_id'], $it_price, 1);
+            $it_point = get_item_point($row, $row2['io_id']);
 
     echo <<< HEREDOC
 {$lt}begin{$gt}
diff --git a/shop/wishlist.php b/shop/wishlist.php
index c96abf50b..bd98cd80f 100644
--- a/shop/wishlist.php
+++ b/shop/wishlist.php
@@ -50,7 +50,6 @@ include_once('./_head.php');
             if ($row['it_tel_inq']) $out_cd = 'tel_inq';
 
             $image = get_it_image($row['it_id'], 70, 70);
-            $it_point = get_item_point($row);
         ?>
 
         <tr>
diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php
index c22e97e6a..afaa2bdb1 100644
--- a/skin/shop/basic/item.form.skin.php
+++ b/skin/shop/basic/item.form.skin.php
@@ -150,9 +150,13 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_SHOP_SKIN_URL.'/style.css">',
             <th scope="row">포인트</th>
             <td>
                 <?php
-                $it_point = get_item_point($it);
-                echo number_format($it_point);
-                ?> 점
+                if($it['it_point_type'] == 2) {
+                    echo '구매금액(추가옵션 제외)의 '.$it['it_point'].'%';
+                } else {
+                    $it_point = get_item_point($it);
+                    echo number_format($it_point).'점';
+                }
+                ?>
             </td>
         </tr>
         <?php } ?>