From 5aec33d732770cf365d946c81ab5179a79176609 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Tue, 22 Nov 2016 10:23:37 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EB=8B=88=EC=8B=9C=EC=8A=A4=20?=
 =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=82=BC=EC=84=B1=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=20=EA=B2=B0=EC=A0=9C=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          |  16 ++++++++++++++++
 adm/shop_admin/configformupdate.php    |   1 +
 adm/shop_admin/orderform.php           |   6 +++---
 adm/shop_admin/orderformcartupdate.php |   2 +-
 css/mobile_shop.css                    |   1 +
 img/samsungpay.png                     | Bin 0 -> 2071 bytes
 install/gnuboard5shop.sql              |   1 +
 mobile/shop/inicis/orderform.1.php     |   1 +
 mobile/shop/orderform.sub.php          |  15 +++++++++++++--
 mobile/shop/orderformupdate.php        |  16 ++++++++++++++++
 10 files changed, 53 insertions(+), 6 deletions(-)
 create mode 100644 img/samsungpay.png

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 949f3da5c..dd6579833 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -102,6 +102,12 @@ if(!isset($default['de_easy_pay_use'])) {
                     ADD `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_iche_use` ", true);
 }
 
+// 이니시스 삼성페이 사용여부 필드 추가
+if(!isset($default['de_samsung_pay_use'])) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                    ADD `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_easy_pay_use` ", true);
+}
+
 // 카카오페이 필드 추가
 if(!isset($default['de_kakaopay_mid'])) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
@@ -731,6 +737,16 @@ if(!isset($default['de_listtype_list_skin'])) {
                 <input type="text" name="de_inicis_sign_key" value="<?php echo $default['de_inicis_sign_key']; ?>" id="de_inicis_sign_key" class="frm_input" size="40" maxlength="50">
             </td>
         </tr>
+        <tr class="pg_info_fld inicis_info_fld">
+            <th scope="row"><label for="de_samsung_pay_use">KG이니시스 삼성페이 버튼 사용</label></th>
+            <td>
+                <?php echo help("주문서 작성 페이지에 KG이니시스 삼성페이 버튼의 별도 사용 여부를 설정합니다.", 50); ?>
+                <select id="de_easy_pay_use" name="de_samsung_pay_use">
+                    <option value="0" <?php echo get_selected($default['de_samsung_pay_use'], 0); ?>>노출안함</option>
+                    <option value="1" <?php echo get_selected($default['de_samsung_pay_use'], 1); ?>>노출함</option>
+                </select>
+            </td>
+        </tr>
         <tr>
             <th scope="row">
                 <label for="de_kakaopay_mid">카카오페이 상점MID</label>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index fd09db806..b8ce6790f 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -144,6 +144,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_card_test                  = '{$_POST['de_card_test']}',
                 de_card_use                   = '{$_POST['de_card_use']}',
                 de_easy_pay_use               = '{$_POST['de_easy_pay_use']}',
+                de_samsung_pay_use            = '{$_POST['de_samsung_pay_use']}',       
                 de_card_noint_use             = '{$_POST['de_card_noint_use']}',
                 de_card_point                 = '{$_POST['de_card_point']}',
                 de_settle_min_point           = '{$_POST['de_settle_min_point']}',
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 8ff00072a..366dc35c5 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -468,7 +468,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                 </tr>
                 <?php } ?>
 
-                <?php if ($od['od_settle_case'] == '간편결제') { ?>
+                <?php if ($od['od_settle_case'] == '간편결제' || ($od['od_pg'] == 'inicis' && $od['od_settle_case'] == '삼성페이') ) { ?>
                 <tr>
                     <th scope="row" class="sodr_sppay"><?php echo $s_receipt_way; ?> 결제금액</th>
                     <td>
@@ -759,7 +759,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                 </tr>
                 <?php } ?>
 
-                <?php if ($od['od_settle_case'] == '간편결제') { ?>
+                <?php if ($od['od_settle_case'] == '간편결제' || ($od['od_pg'] == 'inicis' && $od['od_settle_case'] == '삼성페이')) { ?>
                 <tr>
                     <th scope="row" class="sodr_sppay"><label for="od_receipt_price"><?php echo $s_receipt_way; ?> 결제금액</label></th>
                     <td>
@@ -1066,7 +1066,7 @@ function form_submit(f)
 
     var msg = "";
 
-    <?php if($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == 'KAKAOPAY' || $od['od_settle_case'] == '간편결제') { ?>
+    <?php if($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == 'KAKAOPAY' || $od['od_settle_case'] == '간편결제' || ($od['od_pg'] == 'inicis' && $od['od_settle_case'] == '삼성페이')) { ?>
     if(status == "취소" || status == "반품" || status == "품절") {
         var $ct_chk = $("input[name^=ct_chk]");
         var chk_cnt = $ct_chk.size();
diff --git a/adm/shop_admin/orderformcartupdate.php b/adm/shop_admin/orderformcartupdate.php
index 746439d68..2cdf0c235 100644
--- a/adm/shop_admin/orderformcartupdate.php
+++ b/adm/shop_admin/orderformcartupdate.php
@@ -183,7 +183,7 @@ if (in_array($_POST['ct_status'], $status_cancel)) {
             $sql = " select * from {$g5['g5_shop_order_table']} where od_id = '$od_id' ";
             $od = sql_fetch($sql);
 
-            if($od['od_tno'] && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '간편결제' || $od['od_settle_case'] == 'KAKAOPAY')) {
+            if($od['od_tno'] && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '간편결제' || $od['od_settle_case'] == 'KAKAOPAY') || ($od['od_pg'] == 'inicis' && $od['od_settle_case'] == '삼성페이')) {
                 switch($od['od_pg']) {
                     case 'lg':
                         include_once(G5_SHOP_PATH.'/settle_lg.inc.php');
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index b5a7aa9b2..f71869af7 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -356,6 +356,7 @@ x#sod_frm_paysel .KPAY{background:url('../img/kpay_logo.png') no-repeat;width:37
 #sod_frm_paysel .PAYNOW{background:url('../img/paynow_logo.png') no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;}
 #sod_frm_paysel .PAYCO{background:url('../img/payco_logo.png') no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;}
 .kakaopay_icon{background:url('../img/kakao.png') no-repeat ;height:21px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px}
+.samsung_pay{background:url('../img/samsungpay.png') no-repeat ;height:12px;width:83px;display:inline-block;overflow:hidden;text-indent:-999px}
 
 #sod_frm_paysel #settle_bank {padding:10px;background:#fff;line-height:2em;border:1px solid #dbdbdb}
 #sod_frm_paysel #settle_bank label {display:inline-block;margin:0 10px 0 0;font-weight:bold}
diff --git a/img/samsungpay.png b/img/samsungpay.png
new file mode 100644
index 0000000000000000000000000000000000000000..fb23fa934eb5ea88f0c844282c1c6d54c8c2dfe4
GIT binary patch
literal 2071
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

literal 0
HcmV?d00001

diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index fca6ee792..0d16b602b 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -353,6 +353,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_inicis_sign_key` varchar(255) NOT NULL DEFAULT '',
   `de_iche_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0',
+  `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_item_use_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_item_use_write` tinyint(4) NOT NULL DEFAULT '0',
   `de_code_dup_use` tinyint(4) NOT NULL DEFAULT '0',
diff --git a/mobile/shop/inicis/orderform.1.php b/mobile/shop/inicis/orderform.1.php
index 75da51643..d05a8e6d3 100644
--- a/mobile/shop/inicis/orderform.1.php
+++ b/mobile/shop/inicis/orderform.1.php
@@ -18,6 +18,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 <input type="hidden" name="DEF_RESERVED" value="bank_receipt=N&twotrs_isp=Y&block_isp=Y<?php echo $useescrow; ?>">
 <input type="hidden" name="P_NOTI"       value="<?php echo $od_id; ?>">
 <input type="hidden" name="P_QUOTABASE"  value="01:02:03:04:05:06:07:08:09:10:11:12"> <!-- 할부기간 설정 01은 일시불 -->
+<input type="hidden" name="P_SKIP_TERMS"      value="">
 
 <input type="hidden" name="good_mny"     value="<?php echo $tot_price; ?>" >
 
diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php
index 5d82ee162..c82f4279a 100644
--- a/mobile/shop/orderform.sub.php
+++ b/mobile/shop/orderform.sub.php
@@ -535,7 +535,7 @@ if($is_kakaopay_use) {
             $escrow_title = "에스크로 ";
         }
 
-        if ($is_kakaopay_use || $default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use']) {
+        if ($is_kakaopay_use || $default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use'] || ('inicis' == $default['de_pg_service'] && $default['de_samsung_pay_use'])) {
             echo '<div id="sod_frm_paysel"><ul>';
         }
 
@@ -600,6 +600,12 @@ if($is_kakaopay_use) {
             $checked = '';
         }
 
+        //이니시스 삼성페이
+        if('inicis' == $default['de_pg_service'] && $default['de_samsung_pay_use']) {
+            echo '<li><input type="radio" id="od_settle_samsung_pay" name="od_settle_case" value="삼성페이" '.$checked.'> <label for="od_settle_samsung_pay" class="samsung_pay">삼성페이</label></li>'.PHP_EOL;
+            $checked = '';
+        }
+
         echo '</ul>';
 
         $temp_point = 0;
@@ -653,7 +659,7 @@ if($is_kakaopay_use) {
             echo '</div>';
         }
 
-        if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use']) {
+        if ($default['de_bank_use'] || $default['de_vbank_use'] || $default['de_iche_use'] || $default['de_card_use'] || $default['de_hp_use'] || $default['de_easy_pay_use'] || ('inicis' == $default['de_pg_service'] && $default['de_samsung_pay_use'])) {
             echo '</div>';
         }
 
@@ -1254,6 +1260,11 @@ function pay_approval()
             paymethod = "wcard";
             f.P_RESERVED.value = p_reserved+"&d_kpay=Y&d_kpay_app=Y";
             break;
+        case "삼성페이":
+            paymethod = "wcard";
+            f.P_RESERVED.value = p_reserved+"&d_samsungpay=Y";
+            f.P_SKIP_TERMS.value = "Y"; //약관을 skip 해야 제대로 실행됨
+            break;
     }
     f.P_AMT.value = f.good_mny.value;
     f.P_UNAME.value = pf.od_name.value;
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 74a54d905..f28470fde 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -419,6 +419,22 @@ else if ($od_settle_case == "간편결제")
     if($od_misu == 0)
         $od_status      = '입금';
 }
+else if ($od_settle_case == "삼성페이")
+{
+    // 이니시스에서만 지원
+    include G5_MSHOP_PATH.'/inicis/pay_result.php';
+
+    $od_tno             = $tno;
+    $od_app_no          = $app_no;
+    $od_receipt_price   = $amount;
+    $od_receipt_point   = $i_temp_point;
+    $od_receipt_time    = preg_replace("/([0-9]{4})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})([0-9]{2})/", "\\1-\\2-\\3 \\4:\\5:\\6", $app_time);
+    $od_bank_account    = $card_name;
+    $pg_price           = $amount;
+    $od_misu            = $i_price - $od_receipt_price;
+    if($od_misu == 0)
+        $od_status      = '입금';
+}
 else if ($od_settle_case == "KAKAOPAY")
 {
     include G5_SHOP_PATH.'/kakaopay/kakaopay_result.php';