From de73f54959e76870faa438a7060dd93322f1b2f7 Mon Sep 17 00:00:00 2001
From: kagla <kagla@naver.com>
Date: Tue, 19 Oct 2021 11:13:59 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8B=A0=EC=9A=A9=EC=B9=B4=EB=93=9C=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=B0=BD=EC=97=90=EC=84=9C=20=EB=84=A4?=
 =?UTF-8?q?=EC=9D=B4=EB=B2=84=ED=8E=98=EC=9D=B4=EB=A5=BC=20=EC=A7=80?=
 =?UTF-8?q?=EC=9B=90=ED=95=98=EB=AF=80=EB=A1=9C=20=EC=83=81=ED=92=88?=
 =?UTF-8?q?=EC=83=81=EC=84=B8=ED=8E=98=EC=9D=B4=EC=A7=80,=20=EC=9E=A5?=
 =?UTF-8?q?=EB=B0=94=EA=B5=AC=EB=8B=88=EC=97=90=EC=84=9C=20=EB=8D=94?=
 =?UTF-8?q?=EC=9D=B4=EC=83=81=20=EB=84=A4=EC=9D=B4=EB=B2=84=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A7=81=EC=A0=91=EA=B2=B0=EC=A0=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EC=A7=80=EC=9B=90=ED=95=98=EC=A7=80=20=EC=95=8A=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php       |  2 ++
 adm/shop_admin/configformupdate.php | 14 ++++++++------
 shop.config.php                     |  4 ++++
 shop/settle_naverpay.inc.php        |  1 +
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index d34875e49..2cc89e2fd 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -919,6 +919,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <input type="text" name="de_kakaopay_hashkey" value="<?php echo get_sanitize_input($default['de_kakaopay_hashkey']); ?>" id="de_kakaopay_hashkey" class="frm_input" size="20">
             </td>
         </tr>
+        <?php if (defined('G5_SHOP_DIRECT_NAVERPAY') && G5_SHOP_DIRECT_NAVERPAY) { ?>
         <tr class="naver_info_fld">
             <th scope="row">
                 <label for="de_naverpay_mid">네이버페이 가맹점 아이디</label>
@@ -982,6 +983,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <input type="text" name="de_naverpay_sendcost" value="<?php echo get_sanitize_input($default['de_naverpay_sendcost']); ?>" id="de_naverpay_sendcost" class="frm_input" size="70">
              </td>
         </tr>
+        <?php } // defined('G5_SHOP_DIRECT_NAVERPAY') ?>
         <tr>
             <th scope="row">에스크로 사용</th>
             <td>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 3d31db95c..ae621cbf0 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -427,17 +427,19 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_kakaopay_enckey            = '{$de_kakaopay_enckey}',
                 de_kakaopay_hashkey           = '{$de_kakaopay_hashkey}',
                 de_kakaopay_cancelpwd         = '{$de_kakaopay_cancelpwd}',
-                de_naverpay_mid               = '{$de_naverpay_mid}',
-                de_naverpay_cert_key          = '{$de_naverpay_cert_key}',
-                de_naverpay_button_key        = '{$de_naverpay_button_key}',
-                de_naverpay_test              = '{$de_naverpay_test}',
-                de_naverpay_mb_id             = '{$de_naverpay_mb_id}',
-                de_naverpay_sendcost          = '{$de_naverpay_sendcost}',
                 de_member_reg_coupon_use      = '{$de_member_reg_coupon_use}',
                 de_member_reg_coupon_term     = '{$de_member_reg_coupon_term}',
                 de_member_reg_coupon_price    = '{$de_member_reg_coupon_price}',
                 de_member_reg_coupon_minimum  = '{$de_member_reg_coupon_minimum}'
                 ";
+if (defined('G5_SHOP_DIRECT_NAVERPAY') && G5_SHOP_DIRECT_NAVERPAY) {
+    $sql .= "  ,de_naverpay_mid               = '{$de_naverpay_mid}',
+                de_naverpay_cert_key          = '{$de_naverpay_cert_key}',
+                de_naverpay_button_key        = '{$de_naverpay_button_key}',
+                de_naverpay_test              = '{$de_naverpay_test}',
+                de_naverpay_mb_id             = '{$de_naverpay_mb_id}',
+                de_naverpay_sendcost          = '{$de_naverpay_sendcost}' ";
+}
 sql_query($sql);
 
 // 환경설정 > 포인트 사용
diff --git a/shop.config.php b/shop.config.php
index bd219cdec..0b926680b 100644
--- a/shop.config.php
+++ b/shop.config.php
@@ -94,6 +94,10 @@ if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']=='on') {
     define('SHOP_TOSSPAYMENTS_CASHRECEIPT_TEST_JS', 'http://pgweb.tosspayments.com:7085/WEB_SERVER/js/receipt_link.js');
 }
 
+// 네이버페이를 신용카드 결제창에서 지원하고 있으므로 네이버에 직접신청하는 결제 기능을 미사용(false:기본설정) 합니다. (kagla,211019)
+// 네이버에서 직접신청 결제를 사용(true)하시는 경우 모든 문제를 직접 해결해 주셔야 합니다.
+define('G5_SHOP_DIRECT_NAVERPAY', false); // false 미사용(기본설정), true 사용
+
 /*
 // 주문상태 상수
 define('G5_OD_STATUS_ORDER'     , '입금확인중');
diff --git a/shop/settle_naverpay.inc.php b/shop/settle_naverpay.inc.php
index 3fc9dd8b0..93c4b501b 100644
--- a/shop/settle_naverpay.inc.php
+++ b/shop/settle_naverpay.inc.php
@@ -1,5 +1,6 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+if (!defined('G5_SHOP_DIRECT_NAVERPAY') || !G5_SHOP_DIRECT_NAVERPAY) return;
 
 if(!$is_admin && !$default['de_card_test'] && $default['de_naverpay_test']) {
     if($default['de_naverpay_mb_id'] && ($is_guest || $member['mb_id'] != $default['de_naverpay_mb_id']))