From 014c8052e3356e1362edcbeb9c0d05c143bdcb19 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Wed, 20 May 2020 12:19:03 +0900
Subject: [PATCH] =?UTF-8?q?KG=20=EC=9D=B4=EB=8B=88=EC=8B=9C=EC=8A=A4=20?=
 =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=ED=8E=98=EC=9D=B4=20=EA=B0=84?=
 =?UTF-8?q?=ED=8E=B8=EA=B2=B0=EC=A0=9C=20=ED=98=B8=EC=B6=9C=20=EC=98=B5?=
 =?UTF-8?q?=EC=85=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/css/admin.css                       |  4 ++++
 adm/shop_admin/configform.php           | 15 +++++++++++++++
 adm/shop_admin/configformupdate.php     |  2 ++
 adm/shop_admin/orderform.php            |  4 ++--
 adm/shop_admin/orderlist.php            | 12 ++++++++----
 css/default_shop.css                    |  3 +++
 css/mobile_shop.css                     |  2 ++
 install/gnuboard5shop.sql               |  1 +
 lib/shop.lib.php                        | 16 +++++++++++-----
 mobile/shop/orderform.sub.php           | 14 +++++++++++++-
 mobile/shop/orderformupdate.php         |  4 ++--
 mobile/shop/samsungpay/order.script.php |  4 +++-
 mobile/shop/settle_inicis.inc.php       |  6 +++++-
 shop/inicis/lpay_common.php             |  4 ++--
 shop/inicis/lpay_form.1.php             |  2 +-
 shop/inicis/lpay_order.script.php       | 13 ++++++++-----
 shop/inicis/makesignature.php           |  2 +-
 shop/orderform.php                      |  2 +-
 shop/orderform.sub.php                  | 23 +++++++++++++++++------
 shop/orderformupdate.php                |  4 ++--
 shop/orderinquiryview.php               |  2 +-
 shop/settle_inicis.inc.php              |  6 +++++-
 theme/basic/css/default_shop.css        |  3 +++
 theme/basic/css/mobile_shop.css         |  2 ++
 theme/basic/shop/orderinquiryview.php   |  2 +-
 25 files changed, 115 insertions(+), 37 deletions(-)

diff --git a/adm/css/admin.css b/adm/css/admin.css
index ef42f0319..870046c95 100644
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@@ -677,6 +677,10 @@ ul.de_pg_tab li.tab-current a{background:#2CC185;color:#fff}
 
 #sodr_list .list_escrow {display:block;color:#80bc0d;text-align:center}
 #sodr_list .list_test {display:block;text-align:center;color:#ff3061}
+#sodr_list .odrpay {max-width:50px}
+
+.local_sch03.local_sch [data-tooltip-text]:hover {position:relative}
+.local_sch03.local_sch [data-tooltip-text]:hover:after{line-height:20px;background-color:#000;background-color:rgba(0,0,0,0.8);-webkit-box-shadow:0 0 3px 1px rgba(50,50,50,0.4);-moz-box-shadow:0 0 3px 1px rgba(50,50,50,0.4);box-shadow:0 0 3px 1px rgba(50,50,50,0.4);-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;color:#FFF;font-size:11px;content:attr(data-tooltip-text);white-space: pre;margin-bottom:10px;top:130%;left:0;padding:7px 12px;position:absolute;max-width:500px;word-wrap:break-word;z-index:9999}
 
 /* 주문내역 수정 */
 .sodr_nonpay {color:#ff6600}
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index e3dec51d6..5d173a422 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -117,6 +117,12 @@ if(!isset($default['de_inicis_lpay_use'])) {
                     ADD `de_inicis_lpay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_samsung_pay_use` ", true);
 }
 
+// 이니시스 kakaopay 사용여부 필드 추가
+if(!isset($default['de_inicis_kakaopay_use'])) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                    ADD `de_inicis_kakaopay_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_inicis_lpay_use` ", true);
+}
+
 // 카카오페이 필드 추가
 if(!isset($default['de_kakaopay_mid'])) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
@@ -819,6 +825,15 @@ if( function_exists('pg_setting_check') ){
                 <input type="checkbox" name="de_inicis_lpay_use" value="1" id="de_inicis_lpay_use"<?php echo $default['de_inicis_lpay_use']?' checked':''; ?>> <label for="de_inicis_lpay_use">사용</label>
             </td>
         </tr>
+        <tr class="pg_info_fld inicis_info_fld">
+            <th scope="row">
+                <label for="de_inicis_kakaopay_use">KG이니시스 카카오페이 사용</label>
+            </th>
+            <td>
+                <?php echo help("체크시 KG이니시스 결제의 카카오페이를 사용합니다. <br>주문서 화면에 카카오페이(KG 이니시스 결제) 아이콘 이 출력됩니다. <br>실결제시 반드시 결제대행사 KG이니시스 항목의 상점 정보( 아이디, 키패스워드, 웹결제 사인키 )를 입력해 주세요.", 50); ?>
+                <input type="checkbox" name="de_inicis_kakaopay_use" value="1" id="de_inicis_kakaopay_use"<?php echo $default['de_inicis_kakaopay_use']?' checked':''; ?>> <label for="de_inicis_kakaopay_use">사용</label>
+            </td>
+        </tr>
         <tr class="pg_info_fld inicis_info_fld">
             <th scope="row">
                 <label for="de_inicis_cartpoint_use">KG이니시스 신용카드 포인트 결제</label>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 45933944b..138558f33 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -160,6 +160,7 @@ $check_sanitize_keys = array(
 'de_inicis_sign_key',           //KG이니시스 웹결제 사인키
 'de_samsung_pay_use',           //KG이니시스 삼성페이 사용
 'de_inicis_lpay_use',           //KG이니시스 Lpay 사용
+'de_inicis_kakaopay_use',       //KG이니시스 카카오페이 사용
 'de_inicis_cartpoint_use',      //KG이니시스 신용카드 포인트 결제
 'de_kakaopay_mid',              //카카오페이 상점MID
 'de_kakaopay_key',              //카카오페이 상점키
@@ -349,6 +350,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_easy_pay_use               = '{$de_easy_pay_use}',
                 de_samsung_pay_use            = '{$de_samsung_pay_use}',
                 de_inicis_lpay_use            = '{$de_inicis_lpay_use}',
+                de_inicis_kakaopay_use        = '{$de_inicis_kakaopay_use}',
                 de_inicis_cartpoint_use       = '{$de_inicis_cartpoint_use}',
                 de_card_noint_use             = '{$de_card_noint_use}',
                 de_card_point                 = '{$de_card_point}',
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 8b0308f81..20ad39935 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -310,7 +310,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
     //$amount['미수'] = $amount['order'] - $amount['receipt'] - $amount['coupon'];
 
     // 결제방법
-    $s_receipt_way = $od['od_settle_case'];
+    $s_receipt_way = check_pay_name_replace($od['od_settle_case'], $od);
 
     if($od['od_settle_case'] == '간편결제') {
         switch($od['od_pg']) {
@@ -324,7 +324,7 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
                 $s_receipt_way = 'PAYCO';
                 break;
             default:
-                $s_receipt_way = $row['od_settle_case'];
+                $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $od);
                 break;
         }
     }
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 6dc673f4e..5b5ad44e4 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -69,7 +69,11 @@ if ($od_status) {
 }
 
 if ($od_settle_case) {
-    $where[] = " od_settle_case = '$od_settle_case' ";
+    if( $od_settle_case === '간편결제' ) {
+        $where[] = " od_settle_case in ('간편결제', '삼성페이', 'lpay', 'inicis_kakaopay') ";
+    } else {
+        $where[] = " od_settle_case = '$od_settle_case' ";
+    }
 }
 
 if ($od_misu) {
@@ -217,7 +221,7 @@ if( function_exists('pg_setting_check') ){
     <input type="radio" name="od_settle_case" value="신용카드" id="od_settle_case06" <?php echo get_checked($od_settle_case, '신용카드');  ?>>
     <label for="od_settle_case06">신용카드</label>
     <input type="radio" name="od_settle_case" value="간편결제" id="od_settle_case07" <?php echo get_checked($od_settle_case, '간편결제');  ?>>
-    <label for="od_settle_case07">PG간편결제</label>
+    <label for="od_settle_case07" data-tooltip-text="NHN_KCP 간편결제 : PAYCO &#xa;LG유플러스 간편결제 : PAYNOW &#xa;KG 이니시스 간편결제 : KPAY, 삼성페이, LPAY, 카카오페이(KG이니시스)">PG간편결제</label>
     <input type="radio" name="od_settle_case" value="KAKAOPAY" id="od_settle_case08" <?php echo get_checked($od_settle_case, 'KAKAOPAY');  ?>>
     <label for="od_settle_case08">KAKAOPAY</label>
 </div>
@@ -299,7 +303,7 @@ if( function_exists('pg_setting_check') ){
         $s_receipt_way = $s_br = "";
         if ($row['od_settle_case'])
         {
-            $s_receipt_way = $row['od_settle_case'];
+            $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $row);
             $s_br = '<br />';
 
             // 간편결제
@@ -315,7 +319,7 @@ if( function_exists('pg_setting_check') ){
                         $s_receipt_way = 'PAYCO';
                         break;
                     default:
-                        $s_receipt_way = $row['od_settle_case'];
+                        $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $row);
                         break;
                 }
             }
diff --git a/css/default_shop.css b/css/default_shop.css
index 3002f63b6..df5d42b3b 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -814,6 +814,8 @@ box-shadow: 1px 2px 2px #eee;}
 #sod_frm_paysel .PAYNOW{background:url('../img/paynow.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .PAYCO{background:url('../img/payco.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .inicis_lpay{background:url('../img/lpay_logo.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay{position:relative;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay em{position:absolute;top:15px;left:45px;width:70px;height:30px;background:url('../img/kakao.png') no-repeat 50% 50% #ffeb00;overflow:hidden;text-indent:-999px;border-radius:30px}
 #sod_frm_paysel .kakaopay_icon{background:url('../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .bank_icon{background:url('../img/pay_icon1.png') no-repeat 15px 50% #fff}
 #sod_frm_paysel .vbank_icon{background:url('../img/pay_icon2.png') no-repeat 15px 50% #fff;padding-top:13px}
@@ -1149,6 +1151,7 @@ box-shadow: 1px 2px 2px #eee;}
 .sod_frm_mobile #m_sod_frm_paysel .PAYNOW{background:url(../img/paynow.png) no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 .sod_frm_mobile #m_sod_frm_paysel .PAYCO{background:url(../img/payco.png) no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 .sod_frm_mobile #m_sod_frm_paysel .inicis_lpay{background:url(../img/lpay_logo.png) no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
+.sod_frm_mobile #m_sod_frm_paysel .inicis_kakaopay{background:url(../img/kakao.png) no-repeat 50% 50% #f4dc34;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .kakaopay_icon{background:url(../img/kakao.png) no-repeat 24px 3px;height:25px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url(../img/samsungpay.png) no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 .sod_frm_mobile #sod_frm_pay{border-top:1px solid #f3f3f3}
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index bf0cb783f..4d1322257 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -223,6 +223,7 @@ box-shadow: 0 0 6px rgba(0,0,0,0.2);}
 #m_sod_frm_paysel .PAYNOW{background:url('../img/paynow.png') no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
 #m_sod_frm_paysel .PAYCO{background:url('../img/payco.png') no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
 #m_sod_frm_paysel .inicis_lpay{background:url('../img/lpay_logo.png') no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
+#m_sod_frm_paysel .inicis_kakaopay{background:url('../img/kakao.png') no-repeat 50% 50% #ffeb00;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 #m_sod_frm_paysel .kakaopay_icon{background:url('../img/kakao.png') no-repeat 24px 3px;height:25px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url('../img/samsungpay.png') no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 
@@ -904,6 +905,7 @@ box-shadow:0 0 8px rgba(65,98,255,0.8)}
 #sod_frm_paysel .PAYNOW{background:url('../img/paynow.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .PAYCO{background:url('../img/payco.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .inicis_lpay{background:url('../img/lpay_logo.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay{background:url('../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .kakaopay_icon{background:url('../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .bank_icon{background:url('../img/pay_icon1.png') no-repeat 15px 50% #fff}
 #sod_frm_paysel .vbank_icon{background:url('../img/pay_icon2.png') no-repeat 15px 50% #fff;padding-top:13px}
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 4ef87497f..9be7ce570 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -355,6 +355,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_easy_pay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_samsung_pay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_inicis_lpay_use` tinyint(4) NOT NULL DEFAULT '0',
+  `de_inicis_kakaopay_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_inicis_cartpoint_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',
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index f48c3ca82..66ac31c6f 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -2556,18 +2556,18 @@ function add_order_post_log($msg='', $code='error'){
     }
 }
 
-//이니시스의 삼성페이 또는 L.pay 결제가 활성화 되어 있는지 체크합니다.
+//이니시스의 삼성페이 또는 L.pay 결제 또는 카카오페이 가 활성화 되어 있는지 체크합니다.
 function is_inicis_simple_pay(){
     global $default;
 
-    if ( $default['de_samsung_pay_use'] || $default['de_inicis_lpay_use'] ){
+    if ( $default['de_samsung_pay_use'] || $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){
         return true;
     }
 
     return false;
 }
 
-//이니시스의 취소된 주문인지 또는 삼성페이 또는 L.pay 결제인지 확인합니다.
+//이니시스의 취소된 주문인지 또는 삼성페이 또는 L.pay 또는 이니시스 카카오페이 결제인지 확인합니다.
 function is_inicis_order_pay($type){
     global $default, $g5;
 
@@ -2582,7 +2582,7 @@ function is_inicis_order_pay($type){
         }
     }
 
-    if( in_array($type, array('삼성페이', 'lpay') ) ){
+    if( in_array($type, array('삼성페이', 'lpay', 'inicis_kakaopay') ) ){
         return true;
     }
 
@@ -2613,10 +2613,16 @@ function get_item_images_info($it, $size=array(), $image_width, $image_height){
 }
 
 //결제방식 이름을 체크하여 치환 대상인 문자열은 따로 리턴합니다.
-function check_pay_name_replace($payname){
+function check_pay_name_replace($payname, $od=array()){
 
     if( $payname === 'lpay' ){
         return 'L.pay';
+    } else if($payname === 'inicis_kakaopay'){
+        return '카카오페이(KG이니시스)';
+    } else if($payname === '신용카드'){
+        if(isset($od['od_bank_account']) && $od['od_bank_account'] === '카카오머니'){
+            return $payname.'(카카오페이)';
+        }
     }
 
     return $payname;
diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php
index 497e434a2..d4168dc1a 100644
--- a/mobile/shop/orderform.sub.php
+++ b/mobile/shop/orderform.sub.php
@@ -618,6 +618,12 @@ if($is_kakaopay_use) {
             $checked = '';
         }
 
+        //이니시스 카카오페이
+        if($default['de_inicis_kakaopay_use']) {
+            echo '<li><input type="radio" id="od_settle_inicis_kakaopay" data-case="inicis_kakaopay" name="od_settle_case" value="inicis_kakaopay" '.$checked.'> <label for="od_settle_inicis_kakaopay" title="KG 이니시스 카카오페이" class="inicis_kakaopay">KG 이니시스 카카오페이</label></li>'.PHP_EOL;
+            $checked = '';
+        }
+
         echo '</ul>';
 
         $temp_point = 0;
@@ -1215,7 +1221,7 @@ function pay_approval()
 
     var form_order_method = '';
 
-    if( settle_method == "삼성페이" || settle_method == "lpay" ){
+    if( settle_method == "삼성페이" || settle_method == "lpay" || settle_method == "inicis_kakaopay" ){
         form_order_method = 'samsungpay';
     }
 
@@ -1306,6 +1312,12 @@ function pay_approval()
                 //f.DEF_RESERVED.value = f.DEF_RESERVED.value.replace("&useescrow=Y", "");
                 f.P_SKIP_TERMS.value = "Y"; //약관을 skip 해야 제대로 실행됨
                 break;
+            case "inicis_kakaopay":
+                paymethod = "wcard";
+                f.P_RESERVED.value = f.P_RESERVED.value.replace("&useescrow=Y", "")+"&d_kakaopay=Y";
+                //f.DEF_RESERVED.value = f.DEF_RESERVED.value.replace("&useescrow=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 a49accfca..2c2f8df90 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -2,7 +2,7 @@
 include_once('./_common.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
-//삼성페이 또는 lpay 요청으로 왔다면 현재 삼성페이 또는 lpay는 이니시스 밖에 없으므로 $default['de_pg_service'] 값을 이니시스로 변경한다.
+//삼성페이 또는 lpay 또는 이니시스 카카오페이 요청으로 왔다면 현재 삼성페이 또는 lpay 또는 이니시스 카카오페이는 이니시스 밖에 없으므로 $default['de_pg_service'] 값을 이니시스로 변경한다.
 if( is_inicis_order_pay($od_settle_case) && !empty($_POST['P_HASH']) ){
     $default['de_pg_service'] = 'inicis';
 }
@@ -446,7 +446,7 @@ else if ($od_settle_case == "간편결제")
     if($od_misu == 0)
         $od_status      = '입금';
 }
-else if ( is_inicis_order_pay($od_settle_case) )    //이니시스의 삼성페이 또는 L.pay
+else if ( is_inicis_order_pay($od_settle_case) )    //이니시스의 삼성페이 또는 L.pay 또는 이니시스 카카오페이
 {
     // 이니시스에서만 지원
     include G5_MSHOP_PATH.'/inicis/pay_result.php';
diff --git a/mobile/shop/samsungpay/order.script.php b/mobile/shop/samsungpay/order.script.php
index 9a433b4a6..6feb844bf 100644
--- a/mobile/shop/samsungpay/order.script.php
+++ b/mobile/shop/samsungpay/order.script.php
@@ -31,7 +31,9 @@ jQuery(function($){
 
             paymethod = "wcard";
 
-            if( typeof settle_method != "undefined" && settle_method == "lpay" ){   // L.pay 로 결제하는 경우
+            if( typeof settle_method != "undefined" && settle_method == "inicis_kakaopay" ){   // L.pay 로 결제하는 경우
+                samsungpayform.P_RESERVED.value = samsungpayform.P_RESERVED.value.replace("&useescrow=Y", "")+"&d_kakaopay=Y";
+            } else if( typeof settle_method != "undefined" && settle_method == "lpay" ){   // L.pay 로 결제하는 경우
                 samsungpayform.P_RESERVED.value = samsungpayform.P_RESERVED.value.replace("&useescrow=Y", "")+"&d_lpay=Y";
             } else {    // 그 외에는 삼성페이로 인식
                 samsungpayform.P_RESERVED.value = samsungpayform.P_RESERVED.value.replace("&useescrow=Y", "")+"&d_samsungpay=Y";
diff --git a/mobile/shop/settle_inicis.inc.php b/mobile/shop/settle_inicis.inc.php
index e308f4619..f5e29b9f8 100644
--- a/mobile/shop/settle_inicis.inc.php
+++ b/mobile/shop/settle_inicis.inc.php
@@ -82,7 +82,11 @@ $CARD_CODE = array(
     '22' => '해외마스터',
     '23' => 'JCB',
     '24' => '해외아멕스',
-    '25' => '해외다이너스'
+    '25' => '해외다이너스',
+    '93' => '토스머니',
+    '94' => 'SSG머니',
+    '97' => '카카오머니',
+    '98' => '페이코'
 );
 
 $PAY_METHOD = array(
diff --git a/shop/inicis/lpay_common.php b/shop/inicis/lpay_common.php
index 3e59cfa4b..5b1cd9c2c 100644
--- a/shop/inicis/lpay_common.php
+++ b/shop/inicis/lpay_common.php
@@ -1,8 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-//삼성페이 또는 Lpay 사용시에만 해당함
-if( ! $default['de_inicis_lpay_use'] || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
+//삼성페이 또는 Lpay 또는 이니시스 카카오페이 사용시에만 해당함
+if( ! ($default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use']) || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
     return;
 }
 
diff --git a/shop/inicis/lpay_form.1.php b/shop/inicis/lpay_form.1.php
index 0eaa98fde..75ca81458 100644
--- a/shop/inicis/lpay_form.1.php
+++ b/shop/inicis/lpay_form.1.php
@@ -2,7 +2,7 @@
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 //이니시스 lpay 사용시에만 해당함
-if( ! $default['de_inicis_lpay_use'] || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
+if( ! ($default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use']) || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
     return;
 }
 
diff --git a/shop/inicis/lpay_order.script.php b/shop/inicis/lpay_order.script.php
index 1a5aacd5c..a5788a39f 100644
--- a/shop/inicis/lpay_order.script.php
+++ b/shop/inicis/lpay_order.script.php
@@ -1,8 +1,8 @@
 <?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
-//삼성페이 또는 L.pay 사용시에만 해당함
-if( ! $default['de_inicis_lpay_use'] || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
+//삼성페이 또는 L.pay 또는 이니시스 카카오페이 사용시에만 해당함
+if( ! ($default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use']) || ('inicis' == $default['de_pg_service']) ){    //PG가 이니시스인 경우 아래 내용 사용 안함
     return;
 }
 ?>
@@ -12,13 +12,16 @@ jQuery(function($){
         var pf = document.forderform;
 
         $(pf).on("form_sumbit_order_samsungpay", inicis_pay_form_submit);
-
+        
         function inicis_pay_form_submit(){
             var $form = $(this),
                 pf = $form[0],
-                inicis_pay_form = document.inicis_pay_form;
+                inicis_pay_form = document.inicis_pay_form,
+                inicis_settle_case = jQuery("input[name='od_settle_case']:checked").val();
+            
+            console.log( inicis_settle_case );
 
-            inicis_pay_form.gopaymethod.value = "onlylpay";
+            inicis_pay_form.gopaymethod.value = (inicis_settle_case === "inicis_kakaopay") ? "onlykakaopay" : "onlylpay";
             inicis_pay_form.acceptmethod.value = "cardonly";
             
             inicis_pay_form.price.value = inicis_pay_form.good_mny.value = pf.good_mny.value;
diff --git a/shop/inicis/makesignature.php b/shop/inicis/makesignature.php
index 7a09e2264..27b707d4a 100644
--- a/shop/inicis/makesignature.php
+++ b/shop/inicis/makesignature.php
@@ -3,7 +3,7 @@ include_once('./_common.php');
 include_once(G5_LIB_PATH.'/json.lib.php');
 include_once(G5_SHOP_PATH.'/settle_inicis.inc.php');
 
-if($default['de_pg_service'] != 'inicis' && ! $default['de_inicis_lpay_use'] )
+if($default['de_pg_service'] != 'inicis' && ! ($default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use']) )
     die(json_encode(array('error'=>'올바른 방법으로 이용해 주십시오.')));
 
 $orderNumber = get_session('ss_order_inicis_id');
diff --git a/shop/orderform.php b/shop/orderform.php
index 84c59ae34..731ec4352 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -28,7 +28,7 @@ if (get_cart_count($tmp_cart_id) == 0)
 $od_id = get_uniqid();
 set_session('ss_order_id', $od_id);
 $s_cart_id = $tmp_cart_id;
-if($default['de_pg_service'] == 'inicis' || $default['de_inicis_lpay_use'])
+if($default['de_pg_service'] == 'inicis' || $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'])
     set_session('ss_order_inicis_id', $od_id);
 
 $g5['title'] = '주문서 작성';
diff --git a/shop/orderform.sub.php b/shop/orderform.sub.php
index 48a5a54cf..e5f472bc5 100644
--- a/shop/orderform.sub.php
+++ b/shop/orderform.sub.php
@@ -4,14 +4,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 require_once(G5_SHOP_PATH.'/settle_'.$default['de_pg_service'].'.inc.php');
 require_once(G5_SHOP_PATH.'/settle_kakaopay.inc.php');
 
-if( $default['de_inicis_lpay_use'] ){   //이니시스 Lpay 사용시
+if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //이니시스 Lpay 또는 이니시스 카카오페이 사용시
     require_once(G5_SHOP_PATH.'/inicis/lpay_common.php');
 }
 
 // 결제대행사별 코드 include (스크립트 등)
 require_once(G5_SHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
 
-if( $default['de_inicis_lpay_use'] ){   //이니시스 L.pay 사용시
+if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //이니시스 L.pay 사용시
     require_once(G5_SHOP_PATH.'/inicis/lpay_form.1.php');
 }
 
@@ -559,7 +559,7 @@ if($is_kakaopay_use) {
                     $escrow_title = "에스크로<br>";
                 }
 
-                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'] || $default['de_inicis_lpay_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'] || $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use']) {
                     echo '<fieldset id="sod_frm_paysel">';
                     echo '<legend>결제방법 선택</legend>';
                 }
@@ -631,6 +631,12 @@ if($is_kakaopay_use) {
                     $checked = '';
                 }
 
+                //이니시스 카카오페이 
+                if(isset($default['de_inicis_kakaopay_use']) && $default['de_inicis_kakaopay_use']) {
+                    echo '<input type="radio" id="od_settle_inicis_kakaopay" data-case="inicis_kakaopay" name="od_settle_case" value="inicis_kakaopay" '.$checked.' title="KG 이니시스 카카오페이"> <label for="od_settle_inicis_kakaopay" class="inicis_kakaopay lb_icon">KG 이니시스 카카오페이<em></em></label>'.PHP_EOL;
+                    $checked = '';
+                }
+
                 $temp_point = 0;
                 // 회원이면서 포인트사용이면
                 if ($is_member && $config['cf_use_point'])
@@ -693,7 +699,7 @@ if($is_kakaopay_use) {
                     echo '</div>';
                 }
 
-                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'] || $default['de_inicis_lpay_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'] || $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ) {
                     echo '</fieldset>';
                 }
 
@@ -725,7 +731,7 @@ if($is_kakaopay_use) {
 </form>
 
 <?php
-if( $default['de_inicis_lpay_use'] ){   //이니시스 L.pay 사용시
+if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //이니시스 L.pay 또는 이니시스 카카오페이 사용시
     require_once(G5_SHOP_PATH.'/inicis/lpay_order.script.php');
 }
 ?>
@@ -1233,6 +1239,7 @@ function forderform_check(f)
     var settle_case = document.getElementsByName("od_settle_case");
     var settle_check = false;
     var settle_method = "";
+
     for (i=0; i<settle_case.length; i++)
     {
         if (settle_case[i].checked)
@@ -1354,7 +1361,7 @@ function forderform_check(f)
 
     var form_order_method = '';
 
-    if( settle_method == "lpay" ){      //이니시스 L.pay 이면 ( 이니시스의 삼성페이는 모바일에서만 단독실행 가능함 )
+    if( settle_method == "lpay" || settle_method == "inicis_kakaopay" ){      //이니시스 L.pay 또는 이니시스 카카오페이 이면 ( 이니시스의 삼성페이는 모바일에서만 단독실행 가능함 )
         form_order_method = 'samsungpay';
     }
 
@@ -1450,6 +1457,10 @@ function forderform_check(f)
                 f.gopaymethod.value = "onlylpay";
                 f.acceptmethod.value = f.acceptmethod.value+":cardonly";
                 break;
+            case "inicis_kakaopay":
+                f.gopaymethod.value = "onlykakaopay";
+                f.acceptmethod.value = f.acceptmethod.value+":cardonly";
+                break;
             default:
                 f.gopaymethod.value = "무통장";
                 break;
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index 24815ecce..eb9eeec98 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -3,7 +3,7 @@ include_once('./_common.php');
 include_once(G5_LIB_PATH.'/mailer.lib.php');
 
 //이니시스 lpay 요청으로 왔다면 $default['de_pg_service'] 값을 이니시스로 변경합니다.
-if( $od_settle_case == 'lpay' ){
+if( in_array($od_settle_case, array('lpay', 'inicis_kakaopay')) ){
     $default['de_pg_service'] = 'inicis';
 }
 
@@ -400,7 +400,7 @@ else if ($od_settle_case == "신용카드")
     if($od_misu == 0)
         $od_status      = '입금';
 }
-else if ($od_settle_case == "간편결제" || ($od_settle_case == "lpay" && $default['de_pg_service'] === 'inicis') )
+else if ($od_settle_case == "간편결제" || (($od_settle_case == "lpay" || $od_settle_case == "inicis_kakaopay") && $default['de_pg_service'] === 'inicis') )
 {
     switch($default['de_pg_service']) {
         case 'lg':
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 32125a93b..7779b7674 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -281,7 +281,7 @@ if($od['od_pg'] == 'lg') {
                 </tr>
                 <tr>
                     <th scope="row">결제방식</th>
-                    <td><?php echo ($easy_pay_name ? $easy_pay_name.'('.$od['od_settle_case'].')' : check_pay_name_replace($od['od_settle_case']) ); ?></td>
+                    <td><?php echo ($easy_pay_name ? $easy_pay_name.'('.$od['od_settle_case'].')' : check_pay_name_replace($od['od_settle_case'], $od) ); ?></td>
                 </tr>
                 <tr>
                     <th scope="row">결제금액</th>
diff --git a/shop/settle_inicis.inc.php b/shop/settle_inicis.inc.php
index a13390692..b546a4dcf 100644
--- a/shop/settle_inicis.inc.php
+++ b/shop/settle_inicis.inc.php
@@ -130,7 +130,11 @@ $CARD_CODE = array(
     '22' => '해외마스터',
     '23' => 'JCB',
     '24' => '해외아멕스',
-    '25' => '해외다이너스'
+    '25' => '해외다이너스',
+    '93' => '토스머니',
+    '94' => 'SSG머니',
+    '97' => '카카오머니',
+    '98' => '페이코'
 );
 
 $PAY_METHOD = array(
diff --git a/theme/basic/css/default_shop.css b/theme/basic/css/default_shop.css
index 06385de52..023dca9c8 100644
--- a/theme/basic/css/default_shop.css
+++ b/theme/basic/css/default_shop.css
@@ -804,6 +804,8 @@ box-shadow: 1px 2px 2px #eee;}
 #sod_frm_paysel .PAYNOW{background:url('../../../img/paynow.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .PAYCO{background:url('../../../img/payco.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .inicis_lpay{background:url('../../../img/lpay_logo.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay{position:relative;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay em{position:absolute;top:15px;left:45px;width:70px;height:30px;background:url('../../../img/kakao.png') no-repeat 50% 50% #ffeb00;overflow:hidden;text-indent:-999px;border-radius:30px}
 #sod_frm_paysel .kakaopay_icon{background:url('../../../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .bank_icon{background:url('../../../img/pay_icon1.png') no-repeat 15px 50% #fff}
 #sod_frm_paysel .vbank_icon{background:url('../../../img/pay_icon2.png') no-repeat 15px 50% #fff;padding-top:13px}
@@ -1155,6 +1157,7 @@ a.btn_frmline.is-long-text{height:auto;width:160px}
 .sod_frm_mobile #m_sod_frm_paysel .PAYNOW{background:url(../../../img/paynow.png) no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 .sod_frm_mobile #m_sod_frm_paysel .PAYCO{background:url(../../../img/payco.png) no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
 .sod_frm_mobile #m_sod_frm_paysel .inicis_lpay{background:url(../../../img/lpay_logo.png) no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%}
+.sod_frm_mobile #m_sod_frm_paysel .inicis_kakaopay{background:url(../../../img/kakao.png) no-repeat 50% 50% #f4dc34;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .kakaopay_icon{background:url(../../../img/kakao.png) no-repeat 24px 3px;height:25px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 .sod_frm_mobile #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url(../../../img/samsungpay.png) no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 .sod_frm_mobile #sod_frm_pay{border-top:1px solid #f3f3f3}
diff --git a/theme/basic/css/mobile_shop.css b/theme/basic/css/mobile_shop.css
index 0d23ba661..e221f075c 100644
--- a/theme/basic/css/mobile_shop.css
+++ b/theme/basic/css/mobile_shop.css
@@ -223,6 +223,7 @@ box-shadow: 0 0 6px rgba(0,0,0,0.2);}
 #m_sod_frm_paysel .PAYNOW{background:url('../../../img/paynow.png') no-repeat;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
 #m_sod_frm_paysel .PAYCO{background:url('../../../img/payco.png') no-repeat 1px;width:46px;height:15px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
 #m_sod_frm_paysel .inicis_lpay{background:url('../../../img/lpay_logo.png') no-repeat;width:35px;height:12px;overflow:hidden;text-indent:-999px;display:inline-block;background-size:100%;}
+#m_sod_frm_paysel .inicis_kakaopay{background:url('../../../img/kakao.png') no-repeat 50% 50% #ffeb00;border-radius:30px;height:22px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 #m_sod_frm_paysel .kakaopay_icon{background:url('../../../img/kakao.png') no-repeat 24px 3px;height:25px;width:74px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
 #m_sod_frm_paysel .samsung_pay{margin-left:-23px;background:url('../../../img/samsungpay.png') no-repeat 24px 3px;height:25px;width:106px;display:inline-block;overflow:hidden;text-indent:-999px}
 
@@ -904,6 +905,7 @@ box-shadow:0 0 8px rgba(65,98,255,0.8)}
 #sod_frm_paysel .PAYNOW{background:url('../../../img/paynow.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .PAYCO{background:url('../../../img/payco.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .inicis_lpay{background:url('../../../img/lpay_logo.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .inicis_kakaopay{background:url('../../../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .kakaopay_icon{background:url('../../../img/kakao.png') no-repeat 50% 50% #f4dc34;overflow:hidden;text-indent:-999px}
 #sod_frm_paysel .bank_icon{background:url('../../../img/pay_icon1.png') no-repeat 15px 50% #fff}
 #sod_frm_paysel .vbank_icon{background:url('../../../img/pay_icon2.png') no-repeat 15px 50% #fff;padding-top:13px}
diff --git a/theme/basic/shop/orderinquiryview.php b/theme/basic/shop/orderinquiryview.php
index 754fbade0..94b73866d 100644
--- a/theme/basic/shop/orderinquiryview.php
+++ b/theme/basic/shop/orderinquiryview.php
@@ -415,7 +415,7 @@ if($od['od_pg'] == 'lg') {
 	            </li>
 	            <li>
 	                <strong>결제방식</strong>
-	                <span><?php echo ($easy_pay_name ? $easy_pay_name.'('.$od['od_settle_case'].')' : check_pay_name_replace($od['od_settle_case']) ); ?></span>
+	                <span><?php echo ($easy_pay_name ? $easy_pay_name.'('.$od['od_settle_case'].')' : check_pay_name_replace($od['od_settle_case'], $od) ); ?></span>
 	            </li>
 	            <li>
 	                <strong>결제금액</strong>