From 4b4c8dff170350e35467b41a91bfa65420285fef Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Tue, 8 Oct 2013 16:11:10 +0900
Subject: [PATCH] =?UTF-8?q?de=5Fcard=5Fpg=20=ED=95=84=EB=93=9C=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php       | 1 -
 adm/shop_admin/configformupdate.php | 1 -
 adm/shop_admin/orderform.php        | 8 +++-----
 install/gnuboard5shop.sql           | 1 -
 install/install_db.php              | 1 -
 mobile/shop/orderform.php           | 7 +++----
 mobile/shop/orderinquiryview.php    | 2 +-
 mobile/shop/personalpayform.php     | 7 +++----
 shop/orderform.php                  | 7 +++----
 shop/orderinquirycancel.php         | 5 ++---
 shop/orderinquiryview.php           | 2 +-
 shop/personalpayform.php            | 5 ++---
 12 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 2d95ad19f..d5fae9f6c 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -532,7 +532,6 @@ $pg_anchor = '<ul class="anchor">
         <th scope="row"><label for="de_kcp_mid">KCP SITE CODE</label></th>
         <td>
             <?php echo help("KCP 에서 받은 SR 로 시작하는 영대문자, 숫자 혼용 총 5자리 SITE CODE 를 입력하세요.\n만약, 사이트코드가 SR로 시작하지 않는다면 KCP에 사이트코드 변경 요청을 하십시오. 예) SRZ89"); ?>
-            <input type="hidden" name="de_card_pg" value="kcp">
             <span class="sitecode">SR</span> <input type="text" name="de_kcp_mid" value="<?php echo $default['de_kcp_mid']; ?>" id="de_kcp_mid" class="frm_input" size="2" maxlength="3" style="font:bold 15px Verdana;"> 영대문자, 숫자 혼용 3자리
         </td>
     </tr>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index cf2112315..b7de75fc7 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -98,7 +98,6 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_card_test                = '$de_card_test',
                 de_card_use                 = '$de_card_use',
                 de_card_point               = '$de_card_point',
-                de_card_pg                  = '$de_card_pg',
                 de_settle_min_point         = '$de_settle_min_point',
                 de_settle_max_point         = '$de_settle_max_point',
                 de_settle_point_unit        = '$de_settle_point_unit',
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 8fbaa2b64..0356d335f 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -76,11 +76,12 @@ if ($od['mb_id'] == "") {
 $qstr = "sort1=$sort1&amp;sort2=$sort2&amp;sel_field=$sel_field&amp;search=$search&amp;page=$page";
 
 // PG사를 KCP 사용하면서 테스트 상점아이디라면
+$pg_url = 'http://admin8.kcp.co.kr';
 if ($default['de_card_test']) {
     // 로그인 아이디 / 비번
     // 일반 : test1234 / test12345
     // 에스크로 : escrow / escrow913
-    $g5['g5_shop_cardpg']['kcp'] = "http://testadmin8.kcp.co.kr";
+    $pg_url = 'http://testadmin8.kcp.co.kr';
 }
 
 // 상품목록
@@ -515,7 +516,6 @@ $pg_anchor = '<ul class="anchor">
                 <input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input" size="10"> 원
                 <?php
                 if ($od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌') {
-                    $pg_url = $g5['g5_shop_cardpg'][$default['de_card_pg']];
                 ?>
                 <a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
                 <?php } ?>
@@ -551,7 +551,6 @@ $pg_anchor = '<ul class="anchor">
             <th scope="row"><label for="od_receipt_price"><?php echo $od['od_settle_case']; ?> 결제액</label></th>
             <td>
                 <input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input"> 원
-                <?php $pg_url = $g5['g5_shop_cardpg'][$default['de_card_pg']];?>
                 <a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
             </td>
         </tr>
@@ -570,8 +569,7 @@ $pg_anchor = '<ul class="anchor">
             <th scope="row" class="sodr_sppay"><label for="od_receipt_price">신용카드 결제액</label></th>
             <td>
                 <input type="text" name="od_receipt_price" value="<?php echo $od['od_receipt_price']; ?>" id="od_receipt_price" class="frm_input" size="10"> 원
-                <?php $card_url = $g5['g5_shop_cardpg'][$default['de_card_pg']]; ?>
-                <a href="<?php echo $card_url; ?>" target="_blank">결제대행사</a>
+                <a href="<?php echo $pg_url; ?>" target="_blank">결제대행사</a>
             </td>
         </tr>
         <tr>
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 43e923788..b485ba994 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -258,7 +258,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_card_test` int(11) NOT NULL DEFAULT '0',
   `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_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',
diff --git a/install/install_db.php b/install/install_db.php
index 058c0c797..6af082fc4 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -270,7 +270,6 @@ if($g5_shop_install) {
                     de_cart_keep_term = '15',
                     de_card_point = '0',
                     de_point_days = '7',
-                    de_card_pg = 'kcp',
                     de_kcp_mid = '',
                     de_send_cost_case = '차등',
                     de_send_cost_limit = '20000;30000;40000',
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 00fe4705d..53cefb5c5 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -23,9 +23,8 @@ set_session('ss_order_id', $od_id);
 
 $s_cart_id = $tmp_cart_id;
 $order_action_url = G5_HTTPS_MSHOP_URL.'/orderformupdate.php';
-if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
-    include './settle_'.$default['de_card_pg'].'.inc.php';
-}
+
+require './settle_kcp.inc.php';
 
 // 결제등록 요청시 사용할 입금마감일
 $ipgm_date = date("Ymd", (G5_SERVER_TIME + 86400 * 5));
@@ -813,7 +812,7 @@ ob_end_clean();
     </script>
     <?php } ?>
 
-    <!-- <?php if ($default[de_card_use] || $default[de_iche_use]) { echo "결제대행사 : $default[de_card_pg]"; } ?> -->
+    <!-- <?php if ($default['de_card_use'] || $default['de_iche_use']) { echo "결제대행사 : KCP"; } ?> -->
 
 </div>
 
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 1d85a3a3e..fc29a92fa 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -320,7 +320,7 @@ include_once(G5_MSHOP_PATH.'/_head.php');
             }
 
             // 현금영수증 발급을 사용하는 경우에만
-            if ($default['de_taxsave_use'] && $default['de_card_pg'] == 'kcp') {
+            if ($default['de_taxsave_use']) {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
                 if ($misu_price == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
             ?>
diff --git a/mobile/shop/personalpayform.php b/mobile/shop/personalpayform.php
index c6772e393..f73d4639d 100644
--- a/mobile/shop/personalpayform.php
+++ b/mobile/shop/personalpayform.php
@@ -14,9 +14,8 @@ $g5['title'] = $pp['pp_name'].'님 개인결제';
 include_once(G5_MSHOP_PATH.'/_head.php');
 
 $action_url = G5_HTTPS_MSHOP_URL.'/personalpayformupdate.php';
-if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
-    include './settle_'.$default['de_card_pg'].'.inc.php';
-}
+
+require './settle_kcp.inc.php';
 
 // 결제등록 요청시 사용할 입금마감일
 $ipgm_date = date("Ymd", (G5_SERVER_TIME + 86400 * 5));
@@ -264,7 +263,7 @@ if($default['de_escrow_use']) {
     </script>
     <?php } ?>
 
-    <!-- <?php if ($default[de_card_use] || $default[de_iche_use]) { echo "결제대행사 : $default[de_card_pg]"; } ?> -->
+    <!-- <?php if ($default['de_card_use'] || $default['de_iche_use']) { echo "결제대행사 : KCP"; } ?> -->
 </div>
 
 <script>
diff --git a/shop/orderform.php b/shop/orderform.php
index 47307ab42..e03a50611 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -30,9 +30,8 @@ $od_id = get_uniqid();
 set_session('ss_order_id', $od_id);
 $s_cart_id = $tmp_cart_id;
 $order_action_url = G5_HTTPS_SHOP_URL.'/orderformupdate.php';
-if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
-    include './settle_'.$default['de_card_pg'].'.inc.php';
-}
+
+require './settle_kcp.inc.php';
 ?>
 
 <?php
@@ -1058,7 +1057,7 @@ function get_intall_file()
     <!-- } 에스크로 안내 끝 -->
     <?php } ?>
 
-    <!-- <?php if ($default[de_card_use] || $default[de_iche_use]) { echo "결제대행사 : $default[de_card_pg]"; } ?> -->
+    <!-- <?php if ($default['de_card_use'] || $default['de_iche_use']) { echo "결제대행사 : KCP"; } ?> -->
 
 </div>
 
diff --git a/shop/orderinquirycancel.php b/shop/orderinquirycancel.php
index c3f802c0e..61944b707 100644
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@@ -30,9 +30,8 @@ if($od['od_cancel_price'] > 0 || $ct['od_count1'] != $ct['od_count2']) {
 
 // PG 결제 취소
 if($od['od_tno']) {
-    if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
-        include './settle_'.$default['de_card_pg'].'.inc.php';
-    }
+    require './settle_kcp.inc.php';
+
     $_POST['tno'] = $od['od_tno'];
     $_POST['req_tx'] = 'mod';
     $_POST['mod_type'] = 'STSC';
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index f07ec1b44..4b598504f 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -333,7 +333,7 @@ if(openwin != null) {
             }
 
             // 현금영수증 발급을 사용하는 경우에만
-            if ($default['de_taxsave_use'] && $default['de_card_pg'] == 'kcp') {
+            if ($default['de_taxsave_use']) {
                 // 미수금이 없고 현금일 경우에만 현금영수증을 발급 할 수 있습니다.
                 if ($misu_price == 0 && $od['od_receipt_price'] && ($od['od_settle_case'] == '무통장' || $od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌')) {
             ?>
diff --git a/shop/personalpayform.php b/shop/personalpayform.php
index b10feb8d2..c38573413 100644
--- a/shop/personalpayform.php
+++ b/shop/personalpayform.php
@@ -19,9 +19,8 @@ $g5['title'] = $pp['pp_name'].'님 개인결제';
 include_once('./_head.php');
 
 $action_url = G5_HTTPS_SHOP_URL.'/personalpayformupdate.php';
-if (file_exists('./settle_'.$default['de_card_pg'].'.inc.php')) {
-    include './settle_'.$default['de_card_pg'].'.inc.php';
-}
+
+require './settle_kcp.inc.php';
 
 // 개인결제 체크를 위한 hash
 $hash_data = md5($pp['pp_id'].$pp['pp_price'].$pp['pp_time']);