diff --git a/adm/board_form.php b/adm/board_form.php
index f75650a74..ec8676883 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -77,9 +77,15 @@ if (!isset($board['bo_mobile_subject'])) {
 }
 
 if (!isset($board['bo_use_captcha'])) {
-    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` ");
+    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_use_captcha` TINYINT NOT NULL DEFAULT '0' AFTER `bo_use_sns` ", false);
 }
 
+if (!isset($board['bo_select_editor'])) {
+    sql_query(" ALTER TABLE `{$g5['board_table']}` ADD `bo_select_editor` VARCHAR(50) NOT NULL DEFAULT '' AFTER `bo_use_dhtml_editor` ", false);
+}
+
+run_event('adm_board_form_before', $board, $w);
+
 $required = "";
 $readonly = "";
 $sound_only = "";
@@ -482,6 +488,27 @@ $pg_anchor = '<ul class="anchor">
                 <label for="chk_all_use_dhtml_editor">전체적용</label>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="bo_select_editor">게시판 에디터 선택</label></th>
+            <td>
+                <?php echo help('게시판에 사용할 에디터를 설정합니다. 스킨에 따라 적용되지 않을 수 있습니다.') ?>
+                <select name="bo_select_editor" id="bo_select_editor">
+                <?php
+                $arr = get_skin_dir('', G5_EDITOR_PATH);
+                for ($i=0; $i<count($arr); $i++) {
+                    if ($i == 0) echo "<option value=\"\">기본환경설정의 에디터 사용</option>";
+                    echo "<option value=\"".$arr[$i]."\"".get_selected($board['bo_select_editor'], $arr[$i]).">".$arr[$i]."</option>\n";
+                }
+                ?>
+                </select>
+            </td>
+            <td class="td_grpset">
+                <input type="checkbox" name="chk_grp_select_editor" value="1" id="chk_grp_select_editor">
+                <label for="chk_grp_select_editor">그룹적용</label>
+                <input type="checkbox" name="chk_all_select_editor" value="1" id="chk_all_select_editor">
+                <label for="chk_all_select_editor">전체적용</label>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="bo_use_rss_view">RSS 보이기 사용</label></th>
             <td>
diff --git a/adm/board_form_update.php b/adm/board_form_update.php
index bea127247..79a882870 100644
--- a/adm/board_form_update.php
+++ b/adm/board_form_update.php
@@ -114,6 +114,7 @@ $sql_common = " gr_id               = '{$gr_id}',
                 bo_use_file_content = '{$_POST['bo_use_file_content']}',
                 bo_use_secret       = '{$_POST['bo_use_secret']}',
                 bo_use_dhtml_editor = '{$_POST['bo_use_dhtml_editor']}',
+                bo_select_editor    = '{$_POST['bo_select_editor']}',
                 bo_use_rss_view     = '{$_POST['bo_use_rss_view']}',
                 bo_use_good         = '{$_POST['bo_use_good']}',
                 bo_use_nogood       = '{$_POST['bo_use_nogood']}',
@@ -301,6 +302,7 @@ if (is_checked('chk_grp_use_sideview'))         $grp_fields .= " , bo_use_sidevi
 if (is_checked('chk_grp_use_file_content'))     $grp_fields .= " , bo_use_file_content = '{$bo_use_file_content}' ";
 if (is_checked('chk_grp_use_secret'))           $grp_fields .= " , bo_use_secret = '{$bo_use_secret}' ";
 if (is_checked('chk_grp_use_dhtml_editor'))     $grp_fields .= " , bo_use_dhtml_editor = '{$bo_use_dhtml_editor}' ";
+if (is_checked('chk_grp_select_editor'))        $grp_fields .= " , bo_select_editor = '{$bo_select_editor}' ";
 if (is_checked('chk_grp_use_rss_view'))         $grp_fields .= " , bo_use_rss_view = '{$bo_use_rss_view}' ";
 if (is_checked('chk_grp_use_good'))             $grp_fields .= " , bo_use_good = '{$bo_use_good}' ";
 if (is_checked('chk_grp_use_nogood'))           $grp_fields .= " , bo_use_nogood = '{$bo_use_nogood}' ";
@@ -390,6 +392,7 @@ if (is_checked('chk_all_use_sideview'))         $all_fields .= " , bo_use_sidevi
 if (is_checked('chk_all_use_file_content'))     $all_fields .= " , bo_use_file_content = '{$bo_use_file_content}' ";
 if (is_checked('chk_all_use_secret'))           $all_fields .= " , bo_use_secret = '{$bo_use_secret}' ";
 if (is_checked('chk_all_use_dhtml_editor'))     $all_fields .= " , bo_use_dhtml_editor = '{$bo_use_dhtml_editor}' ";
+if (is_checked('chk_all_select_editor'))        $all_fields .= " , bo_select_editor = '{$bo_select_editor}' ";
 if (is_checked('chk_all_use_rss_view'))         $all_fields .= " , bo_use_rss_view = '{$bo_use_rss_view}' ";
 if (is_checked('chk_all_use_good'))             $all_fields .= " , bo_use_good = '{$bo_use_good}' ";
 if (is_checked('chk_all_use_nogood'))           $all_fields .= " , bo_use_nogood = '{$bo_use_nogood}' ";
diff --git a/adm/css/admin.css b/adm/css/admin.css
index 04fc49593..ac5bd3350 100644
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@@ -198,12 +198,14 @@ a.btn_submit{background:#ff4081;color:#fff}
 .btn_frmline{display:inline-block;background:#9eacc6;color:#fff;height:35px;border:0;border-radius:5px;padding:0 10px}
 a.btn_frmline{display:inline-block;background:#9eacc6;color:#fff;height:35px;line-height:33px;border-radius:5px;padding:0 10px;text-decoration:none !important}
 .btn_ov01{display:inline-block;line-height:30px;height:30px;font-size:0.92em;vertical-align:top}
-.btn_ov01:after{display:block;visibility:hidden;clear :both;content:""}
 .btn_ov01 .ov_txt{float:left;background:#9eacc6;color:#fff;border-radius:5px 0 0 5px;padding:0 5px}
 .btn_ov01 .ov_num{float:left;background:#ededed;color:#666;border-radius:0 5px 5px 0;padding:0 5px}
 a.btn_ov02,a.ov_listall{display:inline-block;line-height:30px;height:30px;font-size:0.92em;background:#565e8c;color:#fff;vertical-align:top;border-radius:5px;padding:0 7px }
 a.btn_ov02:hover,a.ov_listall:hover{background:#3f51b5}
 
+.local_ov01.local_ov [data-tooltip-text]:hover {position:relative}
+.local_ov01.local_ov [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}
+
 /*form*/
 .sound_only {display:inline-block !important;position:absolute;top:0;left:0;margin:0 !important;padding:0 !important;width:1px !important;height:1px !important;font-size:0;line-height:0;border:0 !important;overflow:hidden !important}
 .frm_input{height:35px;line-height:32px;border:1px solid #d5d5d5;}
diff --git a/adm/img/svc_btn_02.jpg b/adm/img/svc_btn_02.jpg
index c41ced6dd..9bc06843e 100644
Binary files a/adm/img/svc_btn_02.jpg and b/adm/img/svc_btn_02.jpg differ
diff --git a/adm/member_list.php b/adm/member_list.php
index be3aa7990..e8bcf4611 100644
--- a/adm/member_list.php
+++ b/adm/member_list.php
@@ -70,8 +70,8 @@ $colspan = 16;
 <div class="local_ov01 local_ov">
     <?php echo $listall ?>
     <span class="btn_ov01"><span class="ov_txt">총회원수 </span><span class="ov_num"> <?php echo number_format($total_count) ?>명 </span></span>
-    <a href="?sst=mb_intercept_date&amp;sod=desc&amp;sfl=<?php echo $sfl ?>&amp;stx=<?php echo $stx ?>" class="btn_ov01"> <span class="ov_txt">차단 </span><span class="ov_num"><?php echo number_format($intercept_count) ?>명</span></a>
-    <a href="?sst=mb_leave_date&amp;sod=desc&amp;sfl=<?php echo $sfl ?>&amp;stx=<?php echo $stx ?>" class="btn_ov01"> <span class="ov_txt">탈퇴  </span><span class="ov_num"><?php echo number_format($leave_count) ?>명</span></a>
+    <a href="?sst=mb_intercept_date&amp;sod=desc&amp;sfl=<?php echo $sfl ?>&amp;stx=<?php echo $stx ?>" class="btn_ov01" data-tooltip-text="차단된 순으로 정렬합니다.&#xa;전체 데이터를 출력합니다."> <span class="ov_txt">차단 </span><span class="ov_num"><?php echo number_format($intercept_count) ?>명</span></a>
+    <a href="?sst=mb_leave_date&amp;sod=desc&amp;sfl=<?php echo $sfl ?>&amp;stx=<?php echo $stx ?>" class="btn_ov01" data-tooltip-text="탈퇴된 순으로 정렬합니다.&#xa;전체 데이터를 출력합니다."> <span class="ov_txt">탈퇴  </span><span class="ov_num"><?php echo number_format($leave_count) ?>명</span></a>
 </div>
 
 <form id="fsearch" name="fsearch" class="local_sch01 local_sch" method="get">
diff --git a/adm/service.php b/adm/service.php
index 7cd423d25..c47d371b1 100644
--- a/adm/service.php
+++ b/adm/service.php
@@ -19,10 +19,8 @@ include_once('./admin.head.php');
 
         <ul>
             <li><a href="http://sir.kr/main/service/p_pg.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 신용카드 전자결제 신청하기"></a></li>
-            <li ><a href="http://sir.kr/main/service/lg_pg.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="LG유플러스 신용카드 전자결제 신청하기"></a></li>
+            <li ><a href="http://sir.kr/main/service/lg_pg.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg?v2" alt="토스페이먼츠 전자결제 신청하기"></a></li>
             <li class="last"><a href="http://sir.kr/main/service/inicis_pg.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_06.jpg" alt="KG 이니시스 전자결제 신청하기"></a></li>
-
-
         </ul>
     </div>
     <div class="sevice_1 svc_phone">
@@ -31,7 +29,7 @@ include_once('./admin.head.php');
 
         <ul>
             <li><a href="http://sir.kr/main/service/p_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_01.jpg" alt="KCP 휴대폰 본인확인 신청하기"></a></li>
-            <li><a href="http://sir.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg" alt="유플러스 휴대폰 본인확인 신청하기"></a></li>
+            <li><a href="http://sir.kr/main/service/lg_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_02.jpg?v2" alt="유플러스 휴대폰 본인확인 신청하기"></a></li>
             <li class="last"><a href="http://sir.kr/main/service/b_cert.php" target="_blank"><img src="<?php echo G5_ADMIN_URL ?>/img/svc_btn_03.jpg" alt="오케이네임 휴대폰대체인증 신청하기"></a></li>
 
         </ul>
diff --git a/adm/shop_admin/admin.shop.lib.php b/adm/shop_admin/admin.shop.lib.php
index 1685b0b7c..7130530aa 100644
--- a/adm/shop_admin/admin.shop.lib.php
+++ b/adm/shop_admin/admin.shop.lib.php
@@ -136,6 +136,14 @@ function pg_setting_check($is_print=false){
 		}
 	}
 
+    if( function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp') ){
+        if(!extension_loaded('soap') || !class_exists('SOAPClient')) {
+            $msg .= '<script>'.PHP_EOL;
+            $msg .= 'alert("PHP SOAP 확장모듈이 설치되어 있지 않습니다.\n모바일 쇼핑몰 결제 때 사용되오니 SOAP 확장 모듈을 설치하여 주십시오.\nNHN_KCP (네이버페이) 모바일결제가 되지 않습니다.");'.PHP_EOL;
+            $msg .= '</script>'.PHP_EOL;
+        }
+    }
+
 	if( $pg_msg ){
 		$pg_test_conf_link = G5_ADMIN_URL.'/shop_admin/configform.php#de_card_test1';
 		$msg .= '<div class="admin_pg_notice od_test_caution">(주의!) '.$pg_msg.' 결제의 결제 설정이 현재 테스트결제 로 되어 있습니다.<br>테스트결제시 실제 결제가 되지 않으므로, 쇼핑몰 운영중이면 반드시 실결제로 설정하여 운영하셔야 합니다.<br>아래 링크를 클릭하여 실결제로 설정하여 운영해 주세요.<br><a href="'.$pg_test_conf_link.'" class="pg_test_conf_link">'.$pg_test_conf_link.'</a></div>';
diff --git a/adm/shop_admin/bannerformupdate.php b/adm/shop_admin/bannerformupdate.php
index cd2a9ff2b..0a2267a89 100644
--- a/adm/shop_admin/bannerformupdate.php
+++ b/adm/shop_admin/bannerformupdate.php
@@ -52,7 +52,7 @@ if ($w=="")
                     bn_new_win    = '$bn_new_win',
                     bn_begin_time = '$bn_begin_time',
                     bn_end_time   = '$bn_end_time',
-                    bn_time       = '$now',
+                    bn_time       = '".G5_TIME_YMDHIS."',
                     bn_hit        = '0',
                     bn_order      = '$bn_order' ";
     sql_query($sql);
@@ -70,6 +70,7 @@ else if ($w=="u")
                     bn_new_win    = '$bn_new_win',
                     bn_begin_time = '$bn_begin_time',
                     bn_end_time   = '$bn_end_time',
+                    bn_time       = '".G5_TIME_YMDHIS."',
                     bn_order      = '$bn_order'
               where bn_id = '$bn_id' ";
     sql_query($sql);
diff --git a/adm/shop_admin/bannerlist.php b/adm/shop_admin/bannerlist.php
index fc2346901..19891e8bc 100644
--- a/adm/shop_admin/bannerlist.php
+++ b/adm/shop_admin/bannerlist.php
@@ -121,7 +121,7 @@ $from_record = ($page - 1) * $rows; // 시작 열을 구함
 
             $bn_img = "";
            
-            $bn_img .= '<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'" width="'.$width.'" alt="'.get_text($row['bn_alt']).'">';
+            $bn_img .= '<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'?'.preg_replace('/[^0-9]/i', '', $row['bn_time']).'" width="'.$width.'" alt="'.get_text($row['bn_alt']).'">';
         }
 
         switch($row['bn_device']) {
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index f652025d9..c1aa55ee2 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -193,8 +193,15 @@ if( ! isset($config['cf_icode_token_key']) ){
     sql_query($sql, false);
 }
 
+// PG 간편결제 추가 ( NHN_KCP 네이버페이, 카카오페이 )
+if( ! isset($default['de_easy_pay_services']) ){
+    $sql = "ALTER TABLE `{$g5['g5_shop_default_table']}` 
+            ADD COLUMN `de_easy_pay_services` VARCHAR(255) NOT NULL DEFAULT '' AFTER `de_easy_pay_use`; ";
+    sql_query($sql, false);
+}
+
 if( function_exists('pg_setting_check') ){
-	pg_setting_check(true);
+    pg_setting_check(true);
 }
 
 if(!$default['de_kakaopay_cancelpwd']){
@@ -669,26 +676,26 @@ if(!$default['de_kakaopay_cancelpwd']){
                 </select>
             </td>
         </tr>
-		<?php
-		$account_checked = $vbank_checked = $transfer_checked = '';
+        <?php
+        $account_checked = $vbank_checked = $transfer_checked = '';
 
-		if (strstr($default['de_taxsave_types'], 'account')) {
-			$account_checked = 'checked="checked"';
-		}
-		if (strstr($default['de_taxsave_types'], 'vbank')) {
-			$vbank_checked = 'checked="checked"';
-		}
-		if (strstr($default['de_taxsave_types'], 'transfer')) {
-			$transfer_checked = 'checked="checked"';
-		}
-		?>
+        if (strstr($default['de_taxsave_types'], 'account')) {
+            $account_checked = 'checked="checked"';
+        }
+        if (strstr($default['de_taxsave_types'], 'vbank')) {
+            $vbank_checked = 'checked="checked"';
+        }
+        if (strstr($default['de_taxsave_types'], 'transfer')) {
+            $transfer_checked = 'checked="checked"';
+        }
+        ?>
         <tr id="de_taxsave_types" class="de_taxsave_types">
             <th scope="row">현금영수증<br>적용수단</th>
             <td>
                 <?php echo help("현금영수증 발급 사용일 경우 해당됩니다.<br>현금 영수증 발급은 무통장입금, 가상계좌, 실시간계좌에만 적용됩니다.<br>아래 체크된 수단에 한해서 회원이 직접 주문 보기 페이지에서 현금영수증을 발급 받을수 있습니다.<br>!!! 만약 PG사 상점관리자에서 가상계좌 또는 실시간계좌이체가 자동으로 현금영수증이 발급되는 경우이면, 아래 가상계좌와 실시간계좌이체 체크박스를 해제하여 사용해 주세요.( 중복으로 발급되는 것을 막기 위함입니다. )", 50); ?>
                 <input type="checkbox" id="de_taxsave_types_account" name="de_taxsave_types_account" value="account" <?php echo $account_checked; ?> > <label for="de_taxsave_types_account" disabled>무통장입금</label><br>
-				<input type="checkbox" id="de_taxsave_types_vbank" name="de_taxsave_types_vbank" value="vbank" <?php echo $vbank_checked; ?> > <label for="de_taxsave_types_vbank">가상계좌</label><br>
-				<input type="checkbox" id="de_taxsave_types_transfer" name="de_taxsave_types_transfer" value="transfer" <?php echo $transfer_checked; ?> > <label for="de_taxsave_types_transfer">실시간계좌이체</label>
+                <input type="checkbox" id="de_taxsave_types_vbank" name="de_taxsave_types_vbank" value="vbank" <?php echo $vbank_checked; ?> > <label for="de_taxsave_types_vbank">가상계좌</label><br>
+                <input type="checkbox" id="de_taxsave_types_transfer" name="de_taxsave_types_transfer" value="transfer" <?php echo $transfer_checked; ?> > <label for="de_taxsave_types_transfer">실시간계좌이체</label>
             </td>
         </tr>
         <tr>
@@ -747,7 +754,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <?php echo help('쇼핑몰에서 사용할 결제대행사를 선택합니다.'); ?>
                 <ul class="de_pg_tab">
                     <li class="<?php if($default['de_pg_service'] == 'kcp') echo 'tab-current'; ?>"><a href="#kcp_info_anchor" data-value="kcp" title="NHN KCP 선택하기" >NHN KCP</a></li>
-                    <li class="<?php if($default['de_pg_service'] == 'lg') echo 'tab-current'; ?>"><a href="#lg_info_anchor" data-value="lg" title="LG유플러스 선택하기">LG유플러스</a></li>
+                    <li class="<?php if($default['de_pg_service'] == 'lg') echo 'tab-current'; ?>"><a href="#lg_info_anchor" data-value="lg" title="토스페이먼츠 선택하기">토스페이먼츠</a></li>
                     <li class="<?php if($default['de_pg_service'] == 'inicis') echo 'tab-current'; ?>"><a href="#inicis_info_anchor" data-value="inicis" title="KG이니시스 선택하기">KG이니시스</a></li>
                 </ul>
             </td>
@@ -755,7 +762,7 @@ if(!$default['de_kakaopay_cancelpwd']){
         <tr class="pg_info_fld kcp_info_fld" id="kcp_info_anchor">
             <th scope="row">
                 <label for="de_kcp_mid">KCP SITE CODE</label><br>
-                <a href="http://sir.kr/main/service/p_pg.php" target="_blank" id="scf_kcpreg" class="kcp_btn">NHN KCP서비스신청하기</a>
+                <a href="http://sir.kr/main/service/p_pg.php" target="_blank" id="scf_kcpreg" class="kcp_btn">NHN KCP 신청하기</a>
             </th>
             <td>
                 <?php echo help("NHN KCP 에서 받은 SR 로 시작하는 영대문자, 숫자 혼용 총 5자리 중 SR 을 제외한 나머지 3자리 SITE CODE 를 입력하세요.\n만약, 사이트코드가 SR로 시작하지 않는다면 NHN KCP에 사이트코드 변경 요청을 하십시오. 예) SR9A3"); ?>
@@ -769,27 +776,43 @@ if(!$default['de_kakaopay_cancelpwd']){
                 <input type="text" name="de_kcp_site_key" value="<?php echo $default['de_kcp_site_key']; ?>" id="de_kcp_site_key" class="frm_input" size="36" maxlength="25">
             </td>
         </tr>
+        <tr class="pg_info_fld kcp_info_fld">
+            <th scope="row"><label for="de_kcp_easy_pays">NHN KCP 간편결제</label></th>
+            <td>
+                <?php echo help("체크시 NHN KCP 간편결제들을 활성화 합니다.\nNHN_KCP > 네이버페이, 카카오페이는 테스트결제가 되지 않습니다."); ?>
+                <input type="checkbox" id="de_easy_nhnkcp_payco" name="de_easy_pays[]" value="nhnkcp_payco" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_payco') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_payco" disabled>PAYCO (페이코)</label><br>
+                <input type="checkbox" id="de_easy_nhnkcp_naverpay" name="de_easy_pays[]" value="nhnkcp_naverpay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_naverpay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_naverpay">NAVERPAY (네이버페이)</label><br>
+                <input type="checkbox" id="de_easy_nhnkcp_kakaopay" name="de_easy_pays[]" value="nhnkcp_kakaopay" <?php if(stripos($default['de_easy_pay_services'], 'nhnkcp_kakaopay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_easy_nhnkcp_kakaopay">KAKAOPAY (카카오페이)</label>
+            </td>
+        </tr>
+        <tr class="pg_info_fld kcp_info_fld">
+            <th scope="row"><label for="de_global_nhnkcp_naverpay">NHN KCP 네이버페이 사용</label></th>
+            <td>
+                <?php echo help("체크시 타 PG (토스페이먼츠, KG 이니시스) 사용중일때도 NHN_KCP 를 통한 네이버페이 간편결제를 사용할수 있습니다.\n실결제시 반드시 결제대행사 NHN_KCP 항목에 KCP SITE CODE와 NHN KCP SITE KEY를 입력해야 합니다."); ?>
+                <input type="checkbox" id="de_global_nhnkcp_naverpay" name="de_easy_pays[]" value="global_nhnkcp_naverpay" <?php if(stripos($default['de_easy_pay_services'], 'global_nhnkcp_naverpay') !== false){ echo 'checked="checked"'; } ?> > <label for="de_global_nhnkcp_naverpay">NAVERPAY (네이버페이)</label><br>
+            </td>
+        </tr>
         <tr class="pg_info_fld lg_info_fld" id="lg_info_anchor">
             <th scope="row">
-                <label for="cf_lg_mid">LG유플러스 상점아이디</label><br>
-                <a href="http://sir.kr/main/service/lg_pg.php" target="_blank" id="scf_lgreg" class="lg_btn">LG유플러스 서비스신청하기</a>
+                <label for="cf_lg_mid">토스페이먼츠 상점아이디</label><br>
+                <a href="http://sir.kr/main/service/lg_pg.php" target="_blank" id="scf_lgreg" class="lg_btn">토스페이먼츠 신청하기</a>
             </th>
             <td>
-                <?php echo help("LG유플러스에서 받은 si_ 로 시작하는 상점 ID를 입력하세요.\n만약, 상점 ID가 si_로 시작하지 않는다면 LG유플러스에 사이트코드 변경 요청을 하십시오. 예) si_lguplus\n<a href=\"".G5_ADMIN_URL."/config_form.php#anc_cf_cert\">기본환경설정 &gt; 본인확인</a> 설정의 LG유플러스 상점아이디와 동일합니다."); ?>
+                <?php echo help("토스페이먼츠에서 받은 si_ 로 시작하는 상점 ID를 입력하세요.\n만약, 상점 ID가 si_로 시작하지 않는다면 토스페이먼츠에 사이트코드 변경 요청을 하십시오. 예) si_lguplus\n<a href=\"".G5_ADMIN_URL."/config_form.php#anc_cf_cert\">기본환경설정 &gt; 본인확인</a> 설정의 토스페이먼츠 상점아이디와 동일합니다."); ?>
                 <span class="sitecode">si_</span> <input type="text" name="cf_lg_mid" value="<?php echo $config['cf_lg_mid']; ?>" id="cf_lg_mid" class="frm_input code_input" size="10" maxlength="20"> 영문자, 숫자 혼용
             </td>
         </tr>
         <tr class="pg_info_fld lg_info_fld">
-            <th scope="row"><label for="cf_lg_mert_key">LG유플러스 MERT KEY</label></th>
+            <th scope="row"><label for="cf_lg_mert_key">토스페이먼츠 MERT KEY</label></th>
             <td>
-                <?php echo help("LG유플러스 상점MertKey는 상점관리자 -> 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.\n예) 95160cce09854ef44d2edb2bfb05f9f3\n<a href=\"".G5_ADMIN_URL."/config_form.php#anc_cf_cert\">기본환경설정 &gt; 본인확인</a> 설정의 LG유플러스 MERT KEY와 동일합니다."); ?>
+                <?php echo help("토스페이먼츠 상점MertKey는 상점관리자 -> 계약정보 -> 상점정보관리에서 확인하실 수 있습니다.\n예) 95160cce09854ef44d2edb2bfb05f9f3\n<a href=\"".G5_ADMIN_URL."/config_form.php#anc_cf_cert\">기본환경설정 &gt; 본인확인</a> 설정의 토스페이먼츠 MERT KEY와 동일합니다."); ?>
                 <input type="text" name="cf_lg_mert_key" value="<?php echo $config['cf_lg_mert_key']; ?>" id="cf_lg_mert_key" class="frm_input " size="36" maxlength="50">
             </td>
         </tr>
         <tr class="pg_info_fld inicis_info_fld" id="inicis_info_anchor">
             <th scope="row">
                 <label for="de_inicis_mid">KG이니시스 상점아이디</label><br>
-                <a href="http://sir.kr/main/service/inicis_pg.php" target="_blank" id="scf_kgreg" class="kg_btn">KG이니시스 서비스신청하기</a>
+                <a href="http://sir.kr/main/service/inicis_pg.php" target="_blank" id="scf_kgreg" class="kg_btn">KG이니시스 신청하기</a>
             </th>
             <td>
                 <?php echo help("KG이니시스로 부터 발급 받으신 상점아이디(MID) 10자리 중 SIR 을 제외한 나머지 7자리를 입력 합니다.\n만약, 상점아이디가 SIR로 시작하지 않는다면 계약담당자에게 변경 요청을 해주시기 바랍니다. (Tel. 02-3430-5858) 예) SIRpaytest"); ?>
@@ -999,7 +1022,7 @@ if(!$default['de_kakaopay_cancelpwd']){
                         <li><b>일반결제</b>의 테스트 사이트코드는 <b>T0000</b> 이며, <b>에스크로 결제</b>의 테스트 사이트코드는 <b>T0007</b> 입니다.</li>
                     </ul>
                     <ul id="lg_cardtest_tip" class="scf_cardtest_tip_adm scf_cardtest_tip_adm_hide">
-                        <li>테스트결제의 <a href="http://pgweb.dacom.net:7085/" target="_blank">상점관리자</a> 로그인 정보는 LG유플러스 상점아이디 첫 글자에 t를 추가해서 로그인하시기 바랍니다. 예) tsi_lguplus</li>
+                        <li>테스트결제의 <a href="http://pgweb.dacom.net:7085/" target="_blank">상점관리자</a> 로그인 정보는 토스페이먼츠 상점아이디 첫 글자에 t를 추가해서 로그인하시기 바랍니다. 예) tsi_lguplus</li>
                     </ul>
                     <ul id="inicis_cardtest_tip" class="scf_cardtest_tip_adm scf_cardtest_tip_adm_hide">
                         <li><b>일반결제</b>의 테스트 사이트 mid는 <b>INIpayTest</b> 이며, <b>에스크로 결제</b>의 테스트 사이트 mid는 <b>iniescrow0</b> 입니다.</li>
@@ -1672,67 +1695,73 @@ function fconfig_check(f)
     <?php echo get_editor_js('de_baesong_content'); ?>
     <?php echo get_editor_js('de_change_content'); ?>
     <?php echo get_editor_js('de_guest_privacy'); ?>
-	
-	var msg = "",
-		pg_msg = "";
+    
+    var msg = "",
+        pg_msg = "";
 
-	if( f.de_pg_service.value == "kcp" ){
-		if( f.de_kcp_mid.value && f.de_kcp_site_key.value && parseInt(f.de_card_test.value) > 0 ){
-			pg_msg = "NHN KCP";
-		}
-	} else if ( f.de_pg_service.value == "lg" ) {
-		if( f.cf_lg_mid.value && f.cf_lg_mert_key.value && parseInt(f.de_card_test.value) > 0 ){
-			pg_msg = "LG유플러스";
-		}
-	} else if ( f.de_pg_service.value == "inicis" ) {
-		if( f.de_inicis_mid.value && f.de_inicis_sign_key.value && parseInt(f.de_card_test.value) > 0 ){
-			pg_msg = "KG이니시스";
-		}
-	}
+    if( f.de_pg_service.value == "kcp" ){
+        if( f.de_kcp_mid.value && f.de_kcp_site_key.value && parseInt(f.de_card_test.value) > 0 ){
+            pg_msg = "NHN KCP";
+        }
+    } else if ( f.de_pg_service.value == "lg" ) {
+        if( f.cf_lg_mid.value && f.cf_lg_mert_key.value && parseInt(f.de_card_test.value) > 0 ){
+            pg_msg = "토스페이먼츠";
+        }
+    } else if ( f.de_pg_service.value == "inicis" ) {
+        if( f.de_inicis_mid.value && f.de_inicis_sign_key.value && parseInt(f.de_card_test.value) > 0 ){
+            pg_msg = "KG이니시스";
+        }
+    }
 
-	if( pg_msg ){
-		msg += "(주의!) "+pg_msg+" 결제의 결제 설정이 현재 테스트결제 로 되어 있습니다.\n쇼핑몰 운영중이면 반드시 실결제로 설정하여 운영하셔야 합니다.\n실결제로 변경하려면 결제설정 탭 -> 결제 테스트에서 실결제를 선택해 주세요.\n정말로 테스트결제로 설정하시겠습니까?";
-	}
+    if( pg_msg ){
+        msg += "(주의!) "+pg_msg+" 결제의 결제 설정이 현재 테스트결제 로 되어 있습니다.\n쇼핑몰 운영중이면 반드시 실결제로 설정하여 운영하셔야 합니다.\n실결제로 변경하려면 결제설정 탭 -> 결제 테스트에서 실결제를 선택해 주세요.\n정말로 테스트결제로 설정하시겠습니까?";
+    }
 
-	if( msg ){
-		if (confirm(msg)){
-			return true;
-		} else {
-			return false;
-		}
-	} else {
-		return true;
-	}
+    if( msg ){
+        if (confirm(msg)){
+            return true;
+        } else {
+            return false;
+        }
+    } else {
+        return true;
+    }
 }
 
 $(function() {
 
-	$(document).ready(function () {
+    $(document).ready(function () {
+        
+        $("#de_global_nhnkcp_naverpay").on("click", function(e){
+            if ( $(this).prop('checked') ) {
+                $("#de_easy_nhnkcp_naverpay").prop('checked', true);
+            }
+        });
 
-		function hash_goto_scroll(hash=""){
-			var $elem = hash ? $("#"+hash) : $('#' + window.location.hash.replace('#', ''));
-			if($elem.length) {
+        function hash_goto_scroll(hash=""){
+            var $elem = hash ? $("#"+hash) : $('#' + window.location.hash.replace('#', ''));
+            if($elem.length) {
 
-				var admin_head_height = $("#hd_top").height() + $("#container_title").height() + 30;
+                var admin_head_height = $("#hd_top").height() + $("#container_title").height() + 30;
 
-				$('html, body').animate({
-					scrollTop: ($elem.offset().top - admin_head_height) + 'px'
-				}, 500, 'swing');
-			}
-		}
+                $('html, body').animate({
+                    scrollTop: ($elem.offset().top - admin_head_height) + 'px'
+                }, 500, 'swing');
+            }
+        }
 
-		hash_goto_scroll();
-		
-		$(document).on("click", ".pg_test_conf_link", function(e){
-			e.preventDefault();
+        hash_goto_scroll();
+        
+        $(document).on("click", ".pg_test_conf_link", function(e){
+            e.preventDefault();
 
-			var str_hash = this.href.split("#")[1];
+            var str_hash = this.href.split("#")[1];
 
-			if( str_hash ){
-				hash_goto_scroll(str_hash);
-			}
-		});
-	});
+            if( str_hash ){
+                hash_goto_scroll(str_hash);
+            }
+        });
+    });
 
     //$(".pg_info_fld").hide();
     $(".pg_vbank_url").hide();
@@ -1853,19 +1882,19 @@ $(function() {
         });
     });
 
-	$(document).on("change", "#de_taxsave_use", function(e){
-		var $val = $(this).val();
-		
-		if( parseInt($val) > 0 ){
-			$("#de_taxsave_types").show();
-		} else {
-			$("#de_taxsave_types").hide();
-		}
-	});
-	
-	// 현금영수증 발급수단 중 무통장입금은 무조건 체크처리
-	document.getElementById("de_taxsave_types_account").checked = true;
-	document.getElementById("de_taxsave_types_account").disabled = true;
+    $(document).on("change", "#de_taxsave_use", function(e){
+        var $val = $(this).val();
+        
+        if( parseInt($val) > 0 ){
+            $("#de_taxsave_types").show();
+        } else {
+            $("#de_taxsave_types").hide();
+        }
+    });
+    
+    // 현금영수증 발급수단 중 무통장입금은 무조건 체크처리
+    document.getElementById("de_taxsave_types_account").checked = true;
+    document.getElementById("de_taxsave_types_account").disabled = true;
 });
 </script>
 
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index 86cc93a42..e271a247d 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -82,6 +82,16 @@ if(isset($_POST['de_taxsave_types_transfer']) && $_POST['de_taxsave_types_transf
 	$de_taxsave_types .= ',transfer';
 }
 
+// NHN_KCP 간편결제 체크
+$de_easy_pay_services = '';
+if(isset($_POST['de_easy_pays'])){
+    $tmps = array();
+    foreach( (array) $_POST['de_easy_pays'] as $v ){
+        $tmps[] = preg_replace('/[^0-9a-z_\-]/i', '', $v);
+    }
+    $de_easy_pay_services = implode(",", $tmps);
+}
+
 //KVE-2019-0689, KVE-2019-0691, KVE-2019-0694
 $check_sanitize_keys = array(
 'de_admin_company_name',        //회사명
@@ -356,6 +366,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_card_test                  = '{$de_card_test}',
                 de_card_use                   = '{$de_card_use}',
                 de_easy_pay_use               = '{$de_easy_pay_use}',
+                de_easy_pay_services          = '{$de_easy_pay_services}',
                 de_samsung_pay_use            = '{$de_samsung_pay_use}',
                 de_inicis_lpay_use            = '{$de_inicis_lpay_use}',
                 de_inicis_kakaopay_use        = '{$de_inicis_kakaopay_use}',
diff --git a/adm/shop_admin/couponzoneformupdate.php b/adm/shop_admin/couponzoneformupdate.php
index 864bccf96..eafbe1d23 100644
--- a/adm/shop_admin/couponzoneformupdate.php
+++ b/adm/shop_admin/couponzoneformupdate.php
@@ -121,7 +121,7 @@ if($w == '') {
     $cp = sql_fetch($sql);
 
     if(!$cp['cz_id'])
-        alert('쿠폰정보가 존해하지 않습니다.', './couponzonelist.php');
+        alert('쿠폰정보가 존재하지 않습니다.', './couponzonelist.php');
 
     if ($_POST['cp_img_del'] && $cp['cz_file']) {
         @unlink(G5_DATA_PATH."/coupon/{$cp['cz_file']}");
diff --git a/adm/shop_admin/itemformupdate.php b/adm/shop_admin/itemformupdate.php
index dd8ba58a4..0cd784a29 100644
--- a/adm/shop_admin/itemformupdate.php
+++ b/adm/shop_admin/itemformupdate.php
@@ -22,6 +22,15 @@ $ca_id = isset($ca_id) ? preg_replace('/[^0-9a-z]/i', '', $ca_id) : '';
 $ca_id2 = isset($ca_id2) ? preg_replace('/[^0-9a-z]/i', '', $ca_id2) : '';
 $ca_id3 = isset($ca_id3) ? preg_replace('/[^0-9a-z]/i', '', $ca_id3) : '';
 
+if ($is_admin != 'super') {     // 최고관리자가 아니면 체크
+    $sql = "select b.ca_mb_id from {$g5['g5_shop_item_table']} a , {$g5['g5_shop_category_table']} b where (a.ca_id = b.ca_id) and a.it_id = '$it_id'";
+    $checks = sql_fetch($sql);
+
+    if( ! $checks['ca_mb_id'] || $checks['ca_mb_id'] !== $member['mb_id'] ){
+        alert("해당 분류의 관리회원이 아닙니다.");
+    }
+}
+
 // 파일정보
 if($w == "u") {
     $sql = " select it_img1, it_img2, it_img3, it_img4, it_img5, it_img6, it_img7, it_img8, it_img9, it_img10
diff --git a/adm/shop_admin/itemlistupdate.php b/adm/shop_admin/itemlistupdate.php
index 83a6fc6f4..303e3a899 100644
--- a/adm/shop_admin/itemlistupdate.php
+++ b/adm/shop_admin/itemlistupdate.php
@@ -35,6 +35,16 @@ if ($_POST['act_button'] == "선택수정") {
         $p_it_use = is_array($_POST['it_use']) ? strip_tags($_POST['it_use'][$k]) : '';
         $p_it_soldout = is_array($_POST['it_soldout']) ? strip_tags($_POST['it_soldout'][$k]) : '';
         $p_it_order = is_array($_POST['it_order']) ? strip_tags($_POST['it_order'][$k]) : '';
+        $p_it_id = preg_replace('/[^a-z0-9_\-]/i', '', $_POST['it_id'][$k]);
+
+        if ($is_admin != 'super') {     // 최고관리자가 아니면 체크
+            $sql = "select a.it_id, b.ca_mb_id from {$g5['g5_shop_item_table']} a , {$g5['g5_shop_category_table']} b where (a.ca_id = b.ca_id) and a.it_id = '$p_it_id'";
+            $checks = sql_fetch($sql);
+
+            if( ! $checks['ca_mb_id'] || $checks['ca_mb_id'] !== $member['mb_id'] ){
+                continue;
+            }
+        }
 
         $sql = "update {$g5['g5_shop_item_table']}
                    set ca_id          = '".sql_real_escape_string($p_ca_id)."',
@@ -50,11 +60,11 @@ if ($_POST['act_button'] == "선택수정") {
                        it_soldout     = '".sql_real_escape_string($p_it_soldout)."',
                        it_order       = '".sql_real_escape_string($p_it_order)."',
                        it_update_time = '".G5_TIME_YMDHIS."'
-                 where it_id   = '".preg_replace('/[^a-z0-9_\-]/i', '', $_POST['it_id'][$k])."' ";
+                 where it_id   = '".$p_it_id."' ";
 
         sql_query($sql);
 
-		if( function_exists('shop_seo_title_update') ) shop_seo_title_update(preg_replace('/[^a-z0-9_\-]/i', '', $_POST['it_id'][$k]), true);
+		if( function_exists('shop_seo_title_update') ) shop_seo_title_update($p_it_id, true);
     }
 } else if ($_POST['act_button'] == "선택삭제") {
 
diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 20ad39935..ec2a598e3 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -312,23 +312,6 @@ add_javascript(G5_POSTCODE_JS, 0);    //다음 주소 js
     // 결제방법
     $s_receipt_way = check_pay_name_replace($od['od_settle_case'], $od);
 
-    if($od['od_settle_case'] == '간편결제') {
-        switch($od['od_pg']) {
-            case 'lg':
-                $s_receipt_way = 'PAYNOW';
-                break;
-            case 'inicis':
-                $s_receipt_way = 'KPAY';
-                break;
-            case 'kcp':
-                $s_receipt_way = 'PAYCO';
-                break;
-            default:
-                $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $od);
-                break;
-        }
-    }
-
     if ($od['od_receipt_point'] > 0)
         $s_receipt_way .= "+포인트";
     ?>
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 5b5ad44e4..d1f179860 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -221,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" data-tooltip-text="NHN_KCP 간편결제 : PAYCO &#xa;LG유플러스 간편결제 : PAYNOW &#xa;KG 이니시스 간편결제 : KPAY, 삼성페이, LPAY, 카카오페이(KG이니시스)">PG간편결제</label>
+    <label for="od_settle_case07" data-tooltip-text="NHN_KCP 간편결제 : PAYCO, 네이버페이, 카카오페이(NHN_KCP) &#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>
@@ -305,24 +305,6 @@ if( function_exists('pg_setting_check') ){
         {
             $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $row);
             $s_br = '<br />';
-
-            // 간편결제
-            if($row['od_settle_case'] == '간편결제') {
-                switch($row['od_pg']) {
-                    case 'lg':
-                        $s_receipt_way = 'PAYNOW';
-                        break;
-                    case 'inicis':
-                        $s_receipt_way = 'KPAY';
-                        break;
-                    case 'kcp':
-                        $s_receipt_way = 'PAYCO';
-                        break;
-                    default:
-                        $s_receipt_way = check_pay_name_replace($row['od_settle_case'], $row);
-                        break;
-                }
-            }
         }
         else
         {
@@ -544,12 +526,14 @@ $(function(){
     });
 
     // 상품리스트 닫기
-    $(".orderitemlist-x").on("click", function() {
+    $("#sodr_list").on("click", "#orderitemlist-x", function(e) {
         $("#orderitemlist").remove();
     });
 
-    $("body").on("click", function() {
-        $("#orderitemlist").remove();
+    $("body").on("click", function(e) {
+        if ($(e.target).closest("#orderitemlist").length === 0){
+            $("#orderitemlist").remove();
+        }
     });
 
     // 엑셀배송처리창
diff --git a/adm/shop_admin/sale1date.php b/adm/shop_admin/sale1date.php
index 765bcd288..7acd44ab2 100644
--- a/adm/shop_admin/sale1date.php
+++ b/adm/shop_admin/sale1date.php
@@ -27,6 +27,7 @@ function print_line($save)
         <td class="td_numincome"><?php echo number_format($save['receiptvbank']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptiche']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptcard']); ?></td>
+        <td class="td_numincome"><?php echo number_format($save['receipteasy']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receipthp']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptpoint']); ?></td>
         <td class="td_numcancel1"><?php echo number_format($save['ordercancel']); ?></td>
@@ -65,6 +66,7 @@ $result = sql_query($sql);
         <th scope="col">가상계좌</th>
         <th scope="col">계좌이체</th>
         <th scope="col">카드입금</th>
+        <th scope="col">간편결제</th>
         <th scope="col">휴대폰</th>
         <th scope="col">포인트입금</th>
         <th scope="col">주문취소</th>
@@ -119,10 +121,15 @@ $result = sql_query($sql);
             $tot['receiptcard']    += $row['od_receipt_price'];
         $tot['receiptpoint']  += $row['od_receipt_point'];
         $tot['misu']           += $row['od_misu'];
+
+        if(in_array($row['od_settle_case'], array('간편결제', 'KAKAOPAY', 'lpay', 'inicis_payco', 'inicis_kakaopay', '삼성페이'))) {
+            $save['receipteasy'] += $row['od_receipt_price'];
+            $tot['receipteasy'] += $row['od_receipt_price'];
+        }
     }
 
     if ($i == 0) {
-        echo '<tr><td colspan="12" class="empty_table">자료가 없습니다.</td></tr>';
+        echo '<tr><td colspan="13" class="empty_table">자료가 없습니다.</td></tr>';
     } else {
         print_line($save);
     }
@@ -138,6 +145,7 @@ $result = sql_query($sql);
         <td class="td_num_right"><?php echo number_format($tot['receiptvbank']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptiche']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptcard']); ?></td>
+        <td class="td_num_right"><?php echo number_format($tot['receipteasy']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipthp']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptpoint']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['ordercancel']); ?></td>
diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php
index b7adb8fad..b3eddc508 100644
--- a/adm/shop_admin/sale1month.php
+++ b/adm/shop_admin/sale1month.php
@@ -27,6 +27,7 @@ function print_line($save)
         <td class="td_numincome"><?php echo number_format($save['receiptvbank']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptiche']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptcard']); ?></td>
+        <td class="td_numincome"><?php echo number_format($save['receipteasy']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receipthp']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptpoint']); ?></td>
         <td class="td_numcancel1"><?php echo number_format($save['ordercancel']); ?></td>
@@ -66,6 +67,7 @@ $result = sql_query($sql);
         <th scope="col">가상계좌</th>
         <th scope="col">계좌이체</th>
         <th scope="col">카드입금</th>
+        <th scope="col">간편결제</th>
         <th scope="col">휴대폰</th>
         <th scope="col">포인트입금</th>
         <th scope="col">주문취소</th>
@@ -120,6 +122,11 @@ $result = sql_query($sql);
             $tot['receiptcard']   += $row['od_receipt_price'];
         $tot['receiptpoint']  += $row['od_receipt_point'];
         $tot['misu']          += $row['od_misu'];
+
+        if(in_array($row['od_settle_case'], array('간편결제', 'KAKAOPAY', 'lpay', 'inicis_payco', 'inicis_kakaopay', '삼성페이'))) {
+            $save['receipteasy'] += $row['od_receipt_price'];
+            $tot['receipteasy'] += $row['od_receipt_price'];
+        }
     }
 
     if ($i == 0) {
@@ -139,6 +146,7 @@ $result = sql_query($sql);
         <td class="td_num_right"><?php echo number_format($tot['receiptvbank']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptiche']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptcard']); ?></td>
+        <td class="td_num_right"><?php echo number_format($tot['receipteasy']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipthp']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptpoint']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['ordercancel']); ?></td>
diff --git a/adm/shop_admin/sale1today.php b/adm/shop_admin/sale1today.php
index 73726ef6a..1af2b4b31 100644
--- a/adm/shop_admin/sale1today.php
+++ b/adm/shop_admin/sale1today.php
@@ -41,6 +41,7 @@ $result = sql_query($sql);
         <th scope="col">가상계좌</th>
         <th scope="col">계좌이체</th>
         <th scope="col">카드입금</th>
+        <th scope="col">간편결제</th>
         <th scope="col">휴대폰</th>
         <th scope="col">포인트입금</th>
         <th scope="col">주문취소</th>
@@ -58,7 +59,7 @@ $result = sql_query($sql);
             $href = '<a href="./orderlist.php?sel_field=mb_id&amp;search='.$row['mb_id'].'">';
         }
 
-        $receipt_bank = $receipt_card = $receipt_vbank = $receipt_iche = $receipt_hp = 0;
+        $receipt_bank = $receipt_card = $receipt_vbank = $receipt_iche = $receipt_easy = $receipt_hp = 0;
         if($row['od_settle_case'] == '무통장')
             $receipt_bank = $row['od_receipt_price'];
         if($row['od_settle_case'] == '가상계좌')
@@ -69,7 +70,9 @@ $result = sql_query($sql);
             $receipt_hp = $row['od_receipt_price'];
         if($row['od_settle_case'] == '신용카드')
             $receipt_card = $row['od_receipt_price'];
-
+        if(in_array($row['od_settle_case'], array('간편결제', 'KAKAOPAY', 'lpay', 'inicis_payco', 'inicis_kakaopay', '삼성페이'))) {
+            $receipt_easy = $row['od_receipt_price'];
+        }
     ?>
         <tr>
             <td class="td_alignc"><a href="./orderform.php?od_id=<?php echo $row['od_id']; ?>"><?php echo $row['od_id']; ?></a></td>
@@ -80,6 +83,7 @@ $result = sql_query($sql);
             <td class="td_numincome"><?php echo number_format($receipt_vbank); ?></td>
             <td class="td_numincome"><?php echo number_format($receipt_iche); ?></td>
             <td class="td_numincome"><?php echo number_format($receipt_card); ?></td>
+            <td class="td_numincome"><?php echo number_format($receipt_easy); ?></td>
             <td class="td_numincome"><?php echo number_format($receipt_hp); ?></td>
             <td class="td_numincome"><?php echo number_format($row['od_receipt_point']); ?></td>
             <td class="td_numcancel1"><?php echo number_format($row['od_cancel_price']); ?></td>
@@ -93,13 +97,14 @@ $result = sql_query($sql);
         $tot['receipt_vbank'] += $receipt_vbank;
         $tot['receipt_iche']  += $receipt_iche;
         $tot['receipt_card']  += $receipt_card;
+        $tot['receipt_easy']  += $receipt_easy;
         $tot['receipt_hp']    += $receipt_hp;
         $tot['receipt_point'] += $row['od_receipt_point'];
         $tot['misu']          += $row['od_misu'];
     }
 
     if ($i == 0) {
-        echo '<tr><td colspan="12" class="empty_table">자료가 없습니다</td></tr>';
+        echo '<tr><td colspan="13" class="empty_table">자료가 없습니다</td></tr>';
     }
     ?>
     </tbody>
@@ -112,6 +117,7 @@ $result = sql_query($sql);
         <td class="td_num_right"><?php echo number_format($tot['receipt_vbank']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipt_iche']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipt_card']); ?></td>
+        <td class="td_num_right"><?php echo number_format($tot['receipt_easy']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipt_hp']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipt_point']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['ordercancel']); ?></td>
diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php
index 549754d6b..8e749c035 100644
--- a/adm/shop_admin/sale1year.php
+++ b/adm/shop_admin/sale1year.php
@@ -22,6 +22,7 @@ function print_line($save)
         <td class="td_numincome"><?php echo number_format($save['receiptvbank']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptiche']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptcard']); ?></td>
+        <td class="td_numincome"><?php echo number_format($save['receipteasy']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receipthp']); ?></td>
         <td class="td_numincome"><?php echo number_format($save['receiptpoint']); ?></td>
         <td class="td_numcancel1"><?php echo number_format($save['ordercancel']); ?></td>
@@ -60,6 +61,7 @@ $result = sql_query($sql);
         <th scope="col">가상계좌</th>
         <th scope="col">계좌이체</th>
         <th scope="col">카드입금</th>
+        <th scope="col">간편결제</th>
         <th scope="col">휴대폰</th>
         <th scope="col">포인트입금</th>
         <th scope="col">주문취소</th>
@@ -114,6 +116,11 @@ $result = sql_query($sql);
             $tot['receiptcard']   += $row['od_receipt_price'];
         $tot['receiptpoint']  += $row['od_receipt_point'];
         $tot['misu']          += $row['od_misu'];
+
+        if(in_array($row['od_settle_case'], array('간편결제', 'KAKAOPAY', 'lpay', 'inicis_payco', 'inicis_kakaopay', '삼성페이'))) {
+            $save['receipteasy'] += $row['od_receipt_price'];
+            $tot['receipteasy'] += $row['od_receipt_price'];
+        }
     }
 
     if ($i == 0) {
@@ -133,6 +140,7 @@ $result = sql_query($sql);
         <td class="td_num_right"><?php echo number_format($tot['receiptvbank']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptiche']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptcard']); ?></td>
+        <td class="td_num_right"><?php echo number_format($tot['receipteasy']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receipthp']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['receiptpoint']); ?></td>
         <td class="td_num_right"><?php echo number_format($tot['ordercancel']); ?></td>
diff --git a/adm/sms_admin/num_book.php b/adm/sms_admin/num_book.php
index f4338c307..d6a658567 100644
--- a/adm/sms_admin/num_book.php
+++ b/adm/sms_admin/num_book.php
@@ -13,12 +13,12 @@ $g5['title'] = "휴대폰번호 관리";
 
 if ($page < 1) $page = 1;
 
-$bg_no = isset($bg_no) ? (int) $bg_no : 0;
+$bg_no = isset($bg_no) ? preg_replace('/[^0-9]/i', '', $bg_no) : '';
 $st = isset($st) ? preg_replace('/[^a-z0-9]/i', '', $st) : '';
 
 $sql_korean = $sql_group = $sql_search = $sql_no_hp = '';
 
-if (is_numeric($bg_no))
+if (is_numeric($bg_no) && $bg_no)
     $sql_group = " and bg_no='$bg_no' ";
 else
     $sql_group = "";
diff --git a/bbs/download.php b/bbs/download.php
index 2b2aa1f2b..60e0a7dc2 100644
--- a/bbs/download.php
+++ b/bbs/download.php
@@ -100,7 +100,8 @@ if(preg_match("/[\xA1-\xFE][\xA1-\xFE]/", $file['bf_source'])){
 }
 */
 
-$original = urlencode($file['bf_source']);
+//$original = urlencode($file['bf_source']);
+$original = rawurlencode($file['bf_source']);
 
 @include_once($board_skin_path.'/download.tail.skin.php');
 
@@ -114,7 +115,8 @@ if(preg_match("/msie/i", $_SERVER['HTTP_USER_AGENT']) && preg_match("/5\.5/", $_
 } else if (preg_match("/Firefox/i", $_SERVER['HTTP_USER_AGENT'])){
     header("content-type: file/unknown");
     header("content-length: ".filesize($filepath));
-    header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\"");
+    //header("content-disposition: attachment; filename=\"".basename($file['bf_source'])."\"");
+    header("content-disposition: attachment; filename=\"".$original."\"");
     header("content-description: php generated data");
 } else {
     header("content-type: file/unknown");
diff --git a/bbs/memo_form_update.php b/bbs/memo_form_update.php
index c0244eee0..f95526e76 100644
--- a/bbs/memo_form_update.php
+++ b/bbs/memo_form_update.php
@@ -20,7 +20,7 @@ run_event('memo_form_update_before', $recv_list);
 for ($i=0; $i<count($recv_list); $i++) {
     $row = sql_fetch(" select mb_id, mb_nick, mb_open, mb_leave_date, mb_intercept_date from {$g5['member_table']} where mb_id = '{$recv_list[$i]}' ");
     if ($row) {
-        if ($is_admin || ($row['mb_open'] && (!$row['mb_leave_date'] || !$row['mb_intercept_date']))) {
+        if ($is_admin || ($row['mb_open'] && (!$row['mb_leave_date'] && !$row['mb_intercept_date']))) {
             $member_list['id'][]   = $row['mb_id'];
             $member_list['nick'][] = $row['mb_nick'];
         } else {
diff --git a/bbs/move_update.php b/bbs/move_update.php
index 044586264..0b5f85508 100644
--- a/bbs/move_update.php
+++ b/bbs/move_update.php
@@ -27,6 +27,8 @@ $sql = " select distinct wr_num from $write_table where wr_id in ({$wr_id_list})
 $result = sql_query($sql);
 while ($row = sql_fetch_array($result))
 {
+    $save[$cnt]['wr_contents'] = array();
+
     $wr_num = $row['wr_num'];
     for ($i=0; $i<count($_POST['chk_bo_table']); $i++)
     {
@@ -52,6 +54,8 @@ while ($row = sql_fetch_array($result))
         $result2 = sql_query($sql2);
         while ($row2 = sql_fetch_array($result2))
         {
+            $save[$cnt]['wr_contents'][] = $row2['wr_content'];
+
             $nick = cut_str($member['mb_nick'], $config['cf_cut_name']);
             if (!$row2['wr_is_comment'] && $config['cf_use_copy_log']) {
                 if(strstr($row2['wr_option'], 'html')) {
@@ -210,16 +214,20 @@ if ($sw == 'move')
     {
         if( isset($save[$i]['bf_file']) && $save[$i]['bf_file'] ){
             for ($k=0; $k<count($save[$i]['bf_file']); $k++) {
-                $del_file = $save[$i]['bf_file'][$k];
+                $del_file = run_replace('delete_file_path', clean_relative_paths($save[$i]['bf_file'][$k]), $save[$i]);
 
                 if ( is_file($del_file) && file_exists($del_file) ){
                     @unlink($del_file);
                 }
-
+                
                 // 썸네일 파일 삭제, 먼지손 님 코드 제안
                 delete_board_thumbnail($bo_table, basename($save[$i]['bf_file'][$k]));
             }
         }
+        
+        for ($k=0; $k<count($save[$i]['wr_contents']); $k++){
+            delete_editor_thumbnail($save[$i]['wr_contents'][$k]);
+        }
 
         sql_query(" delete from $write_table where wr_parent = '{$save[$i]['wr_id']}' ");
         sql_query(" delete from {$g5['board_new_table']} where bo_table = '$bo_table' and wr_id = '{$save[$i]['wr_id']}' ");
diff --git a/bbs/qaview.php b/bbs/qaview.php
index 1b5c38227..1bdbd48f3 100644
--- a/bbs/qaview.php
+++ b/bbs/qaview.php
@@ -155,7 +155,8 @@ if(is_file($skin_file)) {
 
     for ($i=1; $i<=2; $i++) {
         if(preg_match("/\.({$config['cf_image_extension']})$/i", $view['qa_file'.$i])) {
-            $view['img_file'][] = '<a href="'.G5_BBS_URL.'/view_image.php?fn='.urlencode('/data/qa/'.$view['qa_file'.$i]).'" target="_blank" class="view_image"><img src="'.G5_DATA_URL.'/qa/'.$view['qa_file'.$i].'"></a>';
+            $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?fn='.urlencode('/'.G5_DATA_DIR.'/qa/'.$view['qa_file'.$i]), '/'.G5_DATA_DIR.'/qa/'.$view['qa_file'.$i], '', '', '', '');
+            $view['img_file'][] = '<a href="'.$attr_href.'" target="_blank" class="view_image"><img src="'.G5_DATA_URL.'/qa/'.$view['qa_file'.$i].'"></a>';
             $view['img_count']++;
             continue;
         }
diff --git a/bbs/rss.php b/bbs/rss.php
index 6042fc6dd..9d6def1d0 100644
--- a/bbs/rss.php
+++ b/bbs/rss.php
@@ -70,7 +70,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++) {
 
 <item>
 <title><?php echo specialchars_replace($row['wr_subject']); ?></title>
-<link><?php echo specialchars_replace(get_pretty_url($bo_table, $wr_id)); ?></link>
+<link><?php echo specialchars_replace(get_pretty_url($bo_table, $row['wr_id'])); ?></link>
 <description><![CDATA[<?php echo $file ?><?php echo conv_content($row['wr_content'], $html) ?>]]></description>
 <dc:creator><?php echo specialchars_replace($row['wr_name']) ?></dc:creator>
 <?php
diff --git a/common.php b/common.php
index 5a8b1eca8..a30b80501 100644
--- a/common.php
+++ b/common.php
@@ -336,10 +336,6 @@ if( $config['cf_cert_use'] || (defined('G5_YOUNGCART_VER') && G5_YOUNGCART_VER)
 
 define('G5_HTTP_BBS_URL',  https_url(G5_BBS_DIR, false));
 define('G5_HTTPS_BBS_URL', https_url(G5_BBS_DIR, true));
-if ($config['cf_editor'])
-    define('G5_EDITOR_LIB', G5_EDITOR_PATH."/{$config['cf_editor']}/editor.lib.php");
-else
-    define('G5_EDITOR_LIB', G5_LIB_PATH."/editor.lib.php");
 
 define('G5_CAPTCHA_DIR',    !empty($config['cf_captcha']) ? $config['cf_captcha'] : 'kcaptcha');
 define('G5_CAPTCHA_URL',    G5_PLUGIN_URL.'/'.G5_CAPTCHA_DIR);
@@ -537,12 +533,22 @@ if ($bo_table) {
             }
         }
     }
+    
+    // 게시판에서 
+    if (isset($board['bo_select_editor']) && $board['bo_select_editor']){
+        $config['cf_editor'] = $board['bo_select_editor'];
+    }
 }
 
 if ($gr_id && !is_array($gr_id)) {
     $group = get_group($gr_id);
 }
 
+if ($config['cf_editor']) {
+    define('G5_EDITOR_LIB', G5_EDITOR_PATH."/{$config['cf_editor']}/editor.lib.php");
+} else {
+    define('G5_EDITOR_LIB', G5_LIB_PATH."/editor.lib.php");
+}
 
 // 회원, 비회원 구분
 $is_member = $is_guest = false;
@@ -736,7 +742,6 @@ include_once(G5_BBS_PATH.'/visit_insert.inc.php');
 // 일정 기간이 지난 DB 데이터 삭제 및 최적화
 include_once(G5_BBS_PATH.'/db_table.optimize.php');
 
-
 // common.php 파일을 수정할 필요가 없도록 확장합니다.
 $extend_file = array();
 $tmp = dir(G5_EXTEND_PATH);
diff --git a/config.php b/config.php
index a2fb6e159..b38221a3b 100644
--- a/config.php
+++ b/config.php
@@ -5,8 +5,8 @@
 ********************/
 
 define('G5_VERSION', '그누보드5');
-define('G5_GNUBOARD_VER', '5.4.2.7');
-define('G5_YOUNGCART_VER', '5.4.2.7.1');
+define('G5_GNUBOARD_VER', '5.4.2.9');
+define('G5_YOUNGCART_VER', '5.4.2.9');
 
 // 이 상수가 정의되지 않으면 각각의 개별 페이지는 별도로 실행될 수 없음
 define('_GNUBOARD_', true);
diff --git a/css/default_shop.css b/css/default_shop.css
index a034d1bd4..53db56a30 100644
--- a/css/default_shop.css
+++ b/css/default_shop.css
@@ -816,7 +816,8 @@ box-shadow: 1px 2px 2px #eee;}
 #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 .kakaopay_icon{background:url('../img/kakao.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .naverpay_icon{background:url('../img/ico-default-naverpay.png') no-repeat 50% 50% #fff;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}
 #sod_frm_paysel .iche_icon{background:url('../img/pay_icon2.png') no-repeat 15px 50% #fff;padding-top:13px}
diff --git a/css/mobile_shop.css b/css/mobile_shop.css
index 8a5dd6b9a..e031d1238 100644
--- a/css/mobile_shop.css
+++ b/css/mobile_shop.css
@@ -226,7 +226,8 @@ box-shadow: 0 0 6px rgba(0,0,0,0.2);}
 #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 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/ico-mobile-kakaopay.png') no-repeat #fff;height:15px;width:43px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
+#m_sod_frm_paysel .naverpay_icon{background:url('../img/ico-mobile-naverpay.png') no-repeat #fff;height:15px;width:40px;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}
 
 #sod_frm_pay{padding:10px;;border-top:1px solid #f3f3f3}
diff --git a/img/ico-default-naverpay.png b/img/ico-default-naverpay.png
new file mode 100644
index 000000000..c5782f4cf
Binary files /dev/null and b/img/ico-default-naverpay.png differ
diff --git a/img/ico-mobile-kakaopay.png b/img/ico-mobile-kakaopay.png
new file mode 100644
index 000000000..9ceab78e4
Binary files /dev/null and b/img/ico-mobile-kakaopay.png differ
diff --git a/img/ico-mobile-naverpay.png b/img/ico-mobile-naverpay.png
new file mode 100644
index 000000000..2f63ba271
Binary files /dev/null and b/img/ico-mobile-naverpay.png differ
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index 6a98b1f0d..cbb98b45b 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -47,6 +47,7 @@ CREATE TABLE IF NOT EXISTS `g5_board` (
   `bo_use_file_content` tinyint(4) NOT NULL DEFAULT '0',
   `bo_use_secret` tinyint(4) NOT NULL DEFAULT '0',
   `bo_use_dhtml_editor` tinyint(4) NOT NULL DEFAULT '0',
+  `bo_select_editor` varchar(50) NOT NULL DEFAULT '',
   `bo_use_rss_view` tinyint(4) NOT NULL DEFAULT '0',
   `bo_use_good` tinyint(4) NOT NULL DEFAULT '0',
   `bo_use_nogood` tinyint(4) NOT NULL DEFAULT '0',
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 9be7ce570..d3cb5f961 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -665,6 +665,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` (
   `od_status` varchar(255) NOT NULL DEFAULT '',  
   `od_hope_date` date NOT NULL DEFAULT '0000-00-00',  
   `od_settle_case` varchar(255) NOT NULL DEFAULT '',
+  `od_other_pay_type` varchar(100) NOT NULL DEFAULT '',
   `od_test` tinyint(4) NOT NULL DEFAULT '0',
   `od_mobile` tinyint(4) NOT NULL DEFAULT '0',
   `od_pg` varchar(255) NOT NULL DEFAULT '',
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 4ea5b8ff7..e8602d980 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -611,7 +611,7 @@ function html_purifier($html)
     //유튜브, 비메오 전체화면 가능하게 하기
     $config->set('Filter.Custom', array(new HTMLPurifier_Filter_Iframevideo()));
     $purifier = new HTMLPurifier($config);
-    return $purifier->purify($html);
+    return run_replace('html_purifier_result', $purifier->purify($html), $purifier, $html);
 }
 
 
@@ -773,7 +773,8 @@ function get_member($mb_id, $fields='*', $is_cache=false)
 {
     global $g5;
     
-    $mb_id = preg_replace("/[^0-9a-z_]+/i", "", $mb_id);
+    if (preg_match("/[^0-9a-z_]+/i", $mb_id))
+        return array();
 
     static $cache = array();
 
@@ -1402,7 +1403,8 @@ function view_file_link($file, $width, $height, $content='')
         $attr = '';
 
     if (preg_match("/\.({$config['cf_image_extension']})$/i", $file)) {
-        $img = '<a href="'.G5_BBS_URL.'/view_image.php?bo_table='.$board['bo_table'].'&amp;fn='.urlencode($file).'" target="_blank" class="view_image">';
+        $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?bo_table='.$board['bo_table'].'&amp;fn='.urlencode($file), $file, $board['bo_table'], $width, $height, $content);
+        $img = '<a href="'.$attr_href.'" target="_blank" class="view_image">';
         $img .= '<img src="'.G5_DATA_URL.'/file/'.$board['bo_table'].'/'.urlencode($file).'" alt="'.$content.'" '.$attr.'>';
         $img .= '</a>';
 
@@ -2317,6 +2319,8 @@ function delete_editor_thumbnail($contents)
 {
     if(!$contents)
         return;
+    
+    run_event('delete_editor_thumbnail_before', $contents);
 
     // $contents 중 img 태그 추출
     $matchs = get_editor_image($contents);
@@ -2337,6 +2341,8 @@ function delete_editor_thumbnail($contents)
                 unlink($filename);
         }
     }
+
+    run_event('delete_editor_thumbnail_after', $contents, $matchs);
 }
 
 // 1:1문의 첨부파일 썸네일 삭제
diff --git a/lib/icode.sms.lib.php b/lib/icode.sms.lib.php
index 6201f0081..a2a79a449 100644
--- a/lib/icode.sms.lib.php
+++ b/lib/icode.sms.lib.php
@@ -237,6 +237,7 @@ class SMS {
             fclose($fp);
         }
 		$this->Data=array();
+        return true;
 	}
 }
 ?>
\ No newline at end of file
diff --git a/lib/register.lib.php b/lib/register.lib.php
index 49afda6fa..254f08779 100644
--- a/lib/register.lib.php
+++ b/lib/register.lib.php
@@ -86,7 +86,7 @@ function exist_mb_nick($reg_mb_nick, $reg_mb_id)
 function reserve_mb_nick($reg_mb_nick)
 {
     global $config;
-    if (preg_match("/[\,]?{$reg_mb_nick}/i", $config['cf_prohibit_id']))
+    if (preg_match("/[\,]?".preg_quote($reg_mb_nick)."/i", $config['cf_prohibit_id']))
         return "이미 예약된 단어로 사용할 수 없는 닉네임 입니다.";
     else
         return "";
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index 66ac31c6f..32cb08716 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -2287,6 +2287,20 @@ function get_shop_order_data($od_id, $type='item')
     return $row;
 }
 
+function is_use_easypay($payname=''){
+    global $default;
+
+    $de_easy_pay_service_array = (isset($default['de_easy_pay_services']) && $default['de_easy_pay_services']) ? explode(',', $default['de_easy_pay_services']) : array();
+
+    if($payname === 'global_nhnkcp' && $de_easy_pay_service_array && ('kcp' !== $default['de_pg_service'])){      // NHN_KCP 외 타PG 사용시
+        if( in_array('global_nhnkcp_naverpay', $de_easy_pay_service_array) && ($default['de_card_test'] || (!$default['de_card_test'] && $default['de_kcp_mid'] && $default['de_kcp_site_key']) ) ){
+            return true;
+        }
+    }
+
+    return false;
+}
+
 function exists_inicis_shop_order($oid, $pp=array(), $od_time='', $od_ip='')
 {
 
@@ -2613,7 +2627,7 @@ function get_item_images_info($it, $size=array(), $image_width, $image_height){
 }
 
 //결제방식 이름을 체크하여 치환 대상인 문자열은 따로 리턴합니다.
-function check_pay_name_replace($payname, $od=array()){
+function check_pay_name_replace($payname, $od=array(), $is_client=0){
 
     if( $payname === 'lpay' ){
         return 'L.pay';
@@ -2623,6 +2637,23 @@ function check_pay_name_replace($payname, $od=array()){
         if(isset($od['od_bank_account']) && $od['od_bank_account'] === '카카오머니'){
             return $payname.'(카카오페이)';
         }
+    } else if($payname === '간편결제'){
+
+        $add_str = $is_client ? '('.$payname.')' : '';
+
+        if( isset($od['od_pg']) && $od['od_pg'] === 'lg' ){
+            return 'PAYNOW';
+        } else if( isset($od['od_pg']) && $od['od_pg'] === 'inicis' ){
+            return 'KPAY';
+        } else if( isset($od['od_pg']) && $od['od_pg'] === 'kcp' ){
+            if( isset($od['od_other_pay_type']) && $od['od_other_pay_type'] === 'OT16' ){
+                return '네이버페이_NHNKCP'.$add_str;
+            } else if( isset($od['od_other_pay_type']) && ($od['od_other_pay_type'] === 'OT13' || $od['od_other_pay_type'] === 'NHNKCP_KAKAOMONEY') ){
+                return '카카오페이_NHNKCP'.$add_str;
+            }
+
+            return 'PAYCO'.$add_str;
+        }
     }
 
     return $payname;
diff --git a/lib/thumbnail.lib.php b/lib/thumbnail.lib.php
index 47e296801..5d190f507 100644
--- a/lib/thumbnail.lib.php
+++ b/lib/thumbnail.lib.php
@@ -110,6 +110,8 @@ function get_view_thumbnail($contents, $thumb_width=0)
     for($i=0; $i<count($matches[1]); $i++) {
 
         $img = $matches[1][$i];
+        $img_tag = isset($matches[0][$i]) ? $matches[0][$i] : '';
+
         preg_match("/src=[\'\"]?([^>\'\"]+[^>\'\"]+)/i", $img, $m);
         $src = $m[1];
         preg_match("/style=[\"\']?([^\"\'>]+)/i", $img, $m);
@@ -161,16 +163,22 @@ function get_view_thumbnail($contents, $thumb_width=0)
                 }
             }
 
-            // 원본 width가 thumb_width보다 작다면
-            if($size[0] <= $thumb_width)
-                continue;
-
             // Animated GIF 체크
             $is_animated = false;
             if($size[2] == 1) {
                 $is_animated = is_animated_gif($srcfile);
+
+                if($replace_content = run_replace('thumbnail_is_animated_gif_content', '', $contents, $srcfile, $is_animated, $img_tag, $data_path, $size)){
+
+                    $contents = $replace_content;
+                    continue;
+                }
             }
 
+            // 원본 width가 thumb_width보다 작다면
+            if($size[0] <= $thumb_width)
+                continue;
+
             // 썸네일 높이
             $thumb_height = round(($thumb_width * $size[1]) / $size[0]);
             $filename = basename($srcfile);
@@ -190,12 +198,12 @@ function get_view_thumbnail($contents, $thumb_width=0)
             } else {
                 $thumb_tag = '<img src="'.G5_URL.str_replace($filename, $thumb_file, $data_path).'" alt="'.$alt.'"/>';
             }
-
+            
             // $img_tag에 editor 경로가 있으면 원본보기 링크 추가
-            $img_tag = $matches[0][$i];
             if(strpos($img_tag, G5_DATA_DIR.'/'.G5_EDITOR_DIR) && preg_match("/\.({$config['cf_image_extension']})$/i", $filename)) {
                 $imgurl = str_replace(G5_URL, "", $src);
-                $thumb_tag = '<a href="'.G5_BBS_URL.'/view_image.php?fn='.urlencode($imgurl).'" target="_blank" class="view_image">'.$thumb_tag.'</a>';
+                $attr_href = run_replace('thumb_view_image_href', G5_BBS_URL.'/view_image.php?fn='.urlencode($imgurl), $filename, '', $width, $height, $alt);
+                $thumb_tag = '<a href="'.$attr_href.'" target="_blank" class="view_image">'.$thumb_tag.'</a>';
             }
 
             $contents = str_replace($img_tag, $thumb_tag, $contents);
@@ -687,8 +695,19 @@ and the roundoff errors in the Gaussian blur process, are welcome.
 }
 
 function is_animated_gif($filename) {
-    if(!($fh = @fopen($filename, 'rb')))
+
+    static $cache = array();
+    $key = md5($filename);
+
+    if( isset($cache[$key]) ){
+        return $cache[$key];
+    }
+
+    if(!($fh = @fopen($filename, 'rb'))){
+        $cache[$key] = false;
         return false;
+    }
+
     $count = 0;
     // 출처 : http://www.php.net/manual/en/function.imagecreatefromgif.php#104473
     // an animated gif contains multiple "frames", with each frame having a
@@ -705,6 +724,11 @@ function is_animated_gif($filename) {
    }
 
     fclose($fh);
-    return $count > 1;
+
+    $cache[$key] = ($count > 1) ? true : false;
+
+    run_event('is_animated_gif_after', $filename, $cache[$key]);
+
+    return $cache[$key];
 }
 ?>
\ No newline at end of file
diff --git a/mobile/shop/kcp/easypay_form.1.php b/mobile/shop/kcp/easypay_form.1.php
new file mode 100644
index 000000000..27d013d95
--- /dev/null
+++ b/mobile/shop/kcp/easypay_form.1.php
@@ -0,0 +1,100 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+?>
+
+<!-- 거래등록 하는 kcp 서버와 통신을 위한 스크립트-->
+<script src="<?php echo G5_MSHOP_URL; ?>/kcp/approval_key.js"></script>
+
+<form name="nhnkcp_pay_form" method="POST" action="<?php echo G5_MSHOP_URL; ?>/kcp/order_approval_form.php">
+<input type="hidden" name="good_name"     value="<?php echo $goods; ?>">
+<input type="hidden" name="good_mny"      value="<?php echo $tot_price ?>" >
+<input type="hidden" name="buyr_name"     value="">
+<input type="hidden" name="buyr_tel1"     value="">
+<input type="hidden" name="buyr_tel2"     value="">
+<input type="hidden" name="buyr_mail"     value="">
+<input type="hidden" name="settle_method" value="">
+<input type="hidden" name="nhnkcp_pay_case" value="">
+<input type="hidden" name="payco_direct"   value="">      <!-- PAYCO 결제창 호출 -->
+<input type="hidden" name="naverpay_direct" value="A" >    <!-- NAVERPAY 결제창 호출 -->
+<input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
+<!-- 주문번호 -->
+<input type="hidden" name="ordr_idxx" value="<?php echo $od_id; ?>">
+<!-- 인증수단(영문 소문자) * 반드시 대소문자 구분 -->
+<input type="hidden" name="ActionResult" value="CARD">
+<!-- 결제등록 키 -->
+<input type="hidden" name="approval_key" id="approval">
+<!-- 수취인이름 -->
+<input type="hidden" name="rcvr_name" value="">
+<!-- 수취인 연락처 -->
+<input type="hidden" name="rcvr_tel1" value="">
+<!-- 수취인 휴대폰 번호 -->
+<input type="hidden" name="rcvr_tel2" value="">
+<!-- 수취인 E-MAIL -->
+<input type="hidden" name="rcvr_add1" value="">
+<!-- 수취인 우편번호 -->
+<input type="hidden" name="rcvr_add2" value="">
+<!-- 수취인 주소 -->
+<input type="hidden" name="rcvr_mail" value="">
+<!-- 수취인 상세 주소 -->
+<input type="hidden" name="rcvr_zipx" value="">
+<!-- 장바구니 상품 개수 -->
+<input type="hidden" name="bask_cntx" value="<?php echo (int)$goods_count + 1; ?>">
+<!-- 장바구니 정보(상단 스크립트 참조) -->
+<input type="hidden" name="good_info" value="<?php echo $good_info; ?>">
+<!-- 배송소요기간 -->
+<input type="hidden" name="deli_term" value="03">
+<!-- 기타 파라메터 추가 부분 - Start - -->
+<input type="hidden" name="param_opt_1"  value="<?php echo $param_opt_1; ?>"/>
+<input type="hidden" name="param_opt_2"  value="<?php echo $param_opt_2; ?>"/>
+<input type="hidden" name="param_opt_3"  value="<?php echo $param_opt_3; ?>"/>
+<input type="hidden" name="disp_tax_yn"  value="N">
+<!-- 기타 파라메터 추가 부분 - End - -->
+<!-- 화면 크기조정 부분 - Start - -->
+<input type="hidden" name="tablet_size"  value="<?php echo $tablet_size; ?>"/>
+<!-- 화면 크기조정 부분 - End - -->
+<!--
+    사용 카드 설정
+    <input type="hidden" name='used_card'    value="CClg:ccDI">
+    /*  무이자 옵션
+            ※ 설정할부    (가맹점 관리자 페이지에 설정 된 무이자 설정을 따른다)                             - "" 로 설정
+            ※ 일반할부    (KCP 이벤트 이외에 설정 된 모든 무이자 설정을 무시한다)                           - "N" 로 설정
+            ※ 무이자 할부 (가맹점 관리자 페이지에 설정 된 무이자 이벤트 중 원하는 무이자 설정을 세팅한다)   - "Y" 로 설정
+    <input type="hidden" name="kcp_noint"       value=""/> */
+
+    /*  무이자 설정
+            ※ 주의 1 : 할부는 결제금액이 50,000 원 이상일 경우에만 가능
+            ※ 주의 2 : 무이자 설정값은 무이자 옵션이 Y일 경우에만 결제 창에 적용
+            예) 전 카드 2,3,6개월 무이자(국민,비씨,엘지,삼성,신한,현대,롯데,외환) : ALL-02:03:04
+            BC 2,3,6개월, 국민 3,6개월, 삼성 6,9개월 무이자 : CCBC-02:03:06,CCKM-03:06,CCSS-03:06:04
+    <input type="hidden" name="kcp_noint_quota" value="CCBC-02:03:06,CCKM-03:06,CCSS-03:06:09"/> */
+-->
+<input type="hidden" name="kcp_noint"       value="<?php echo ($default['de_card_noint_use'] ? '' : 'N'); ?>">
+<?php
+if($default['de_tax_flag_use']) {
+    /* KCP는 과세상품과 비과세상품을 동시에 판매하는 업체들의 결제관리에 대한 편의성을 제공해드리고자,
+       복합과세 전용 사이트코드를 지원해 드리며 총 금액에 대해 복합과세 처리가 가능하도록 제공하고 있습니다
+
+       복합과세 전용 사이트 코드로 계약하신 가맹점에만 해당이 됩니다
+
+       상품별이 아니라 금액으로 구분하여 요청하셔야 합니다
+
+       총결제 금액은 과세금액 + 부과세 + 비과세금액의 합과 같아야 합니다.
+       (good_mny = comm_tax_mny + comm_vat_mny + comm_free_mny)
+
+       복합과세는 order_approval_form.php 파일의 의해 적용됨
+       아래 필드는 order_approval_form.php 파일로 전송하는 것
+    */
+?>
+<input type="hidden" name="tax_flag"          value="TG03">     <!-- 변경불가    -->
+<input type="hidden" name="comm_tax_mny"      value="<?php echo $comm_tax_mny; ?>">         <!-- 과세금액    -->
+<input type="hidden" name="comm_vat_mny"      value="<?php echo $comm_vat_mny; ?>">         <!-- 부가세     -->
+<input type="hidden" name="comm_free_mny"     value="<?php echo $comm_free_mny; ?>">        <!-- 비과세 금액 -->
+<?php
+}
+?>
+</form>
\ No newline at end of file
diff --git a/mobile/shop/kcp/easypay_form.2.php b/mobile/shop/kcp/easypay_form.2.php
new file mode 100644
index 000000000..62bae811c
--- /dev/null
+++ b/mobile/shop/kcp/easypay_form.2.php
@@ -0,0 +1,35 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+?>
+
+<input type="hidden" name="req_tx"         value="">      <!-- 요청 구분          -->
+<input type="hidden" name="res_cd"         value="">      <!-- 결과 코드          -->
+<input type="hidden" name="tran_cd"        value="">      <!-- 트랜잭션 코드      -->
+<input type="hidden" name="ordr_idxx"      value="">      <!-- 주문번호           -->
+<input type="hidden" name="good_mny"       value="">      <!-- 결제금액    -->
+<input type="hidden" name="good_name"      value="">      <!-- 상품명             -->
+<input type="hidden" name="buyr_name"      value="">      <!-- 주문자명           -->
+<input type="hidden" name="buyr_tel1"      value="">      <!-- 주문자 전화번호    -->
+<input type="hidden" name="buyr_tel2"      value="">      <!-- 주문자 휴대폰번호  -->
+<input type="hidden" name="buyr_mail"      value="">      <!-- 주문자 E-mail      -->
+<input type="hidden" name="enc_info"       value="">      <!-- 암호화 정보        -->
+<input type="hidden" name="enc_data"       value="">      <!-- 암호화 데이터      -->
+<input type="hidden" name="use_pay_method" value="">      <!-- 요청된 결제 수단   -->
+<input type="hidden" name="rcvr_name"      value="">      <!-- 수취인 이름        -->
+<input type="hidden" name="rcvr_tel1"      value="">      <!-- 수취인 전화번호    -->
+<input type="hidden" name="rcvr_tel2"      value="">      <!-- 수취인 휴대폰번호  -->
+<input type="hidden" name="rcvr_mail"      value="">      <!-- 수취인 E-Mail      -->
+<input type="hidden" name="rcvr_zipx"      value="">      <!-- 수취인 우편번호    -->
+<input type="hidden" name="rcvr_add1"      value="">      <!-- 수취인 주소        -->
+<input type="hidden" name="rcvr_add2"      value="">      <!-- 수취인 상세 주소   -->
+<input type="hidden" name="param_opt_1"    value="">
+<input type="hidden" name="param_opt_2"    value="">
+<input type="hidden" name="param_opt_3"    value="">
+<input type="hidden" name="disp_tax_yn"    value="N">
+<input type="hidden" name="nhnkcp_pay_case" value="">
+<?php if($default['de_tax_flag_use']) { ?>
+<input type="hidden" name="tax_flag"          value="TG03">     <!-- 변경불가    -->
+<input type="hidden" name="comm_tax_mny"      value="<?php echo $comm_tax_mny; ?>">         <!-- 과세금액    -->
+<input type="hidden" name="comm_vat_mny"      value="<?php echo $comm_vat_mny; ?>">         <!-- 부가세     -->
+<input type="hidden" name="comm_free_mny"     value="<?php echo $comm_free_mny; ?>">        <!-- 비과세 금액 -->
+<?php } ?>
\ No newline at end of file
diff --git a/mobile/shop/kcp/global_m_nhn_kcp.php b/mobile/shop/kcp/global_m_nhn_kcp.php
new file mode 100644
index 000000000..0c258a89a
--- /dev/null
+++ b/mobile/shop/kcp/global_m_nhn_kcp.php
@@ -0,0 +1,10 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+
+include_once(G5_MSHOP_PATH.'/settle_kcp.inc.php');
+?>
\ No newline at end of file
diff --git a/mobile/shop/kcp/m_order.script.php b/mobile/shop/kcp/m_order.script.php
new file mode 100644
index 000000000..bfa82f97e
--- /dev/null
+++ b/mobile/shop/kcp/m_order.script.php
@@ -0,0 +1,83 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+?>
+<script>
+jQuery(function($){
+    $( document ).ready(function() {
+        var pf = document.forderform;
+        
+        // NHN_KCP를 통한 네이버페이가 실행됨
+        $(pf).on("form_sumbit_order_nhnkcp_naverpay", nhnkcp_naverpay_form_submit);
+
+        function nhnkcp_naverpay_form_submit(){
+            var $form = $(this),
+                pf = $form[0],
+                nhnkcp_pay_form = document.nhnkcp_pay_form,
+                nhnkcp_settle_case = jQuery("input[name='od_settle_case']:checked").attr("data-pay"),
+                od_settle_case = jQuery("input[name='od_settle_case']:checked").val();
+
+            if( nhnkcp_settle_case == "naverpay" ){
+                if(typeof nhnkcp_pay_form.naverpay_direct !== "undefined") nhnkcp_pay_form.naverpay_direct.value = "Y";
+            }
+
+            if( ! jQuery("form[name='sm_form']").length ){
+                alert("해당 폼이 존재 하지 않는 결제오류입니다.");
+                return false;
+            }
+
+            if (document.sm_form.good_mny.value < 1000) {
+                <?php // 간편결제수단은 신용카드처럼 취급하며 금액은 1000원 이상이므로, 1000원 이상이 아니면 PG사에서 승인하지 않는다. ?>
+                alert("간편결제는 1000원 이상 결제가 가능합니다.");
+                return false;
+            }
+
+            nhnkcp_pay_form.good_mny.value = document.sm_form.good_mny.value; 
+            nhnkcp_pay_form.good_info.value = "<?php echo $good_info; ?>";
+            nhnkcp_pay_form.settle_method.value = od_settle_case;
+            nhnkcp_pay_form.nhnkcp_pay_case.value = nhnkcp_settle_case;
+
+            if(typeof pf.nhnkcp_pay_case !== "undefined") pf.nhnkcp_pay_case.value = nhnkcp_settle_case;
+
+            nhnkcp_pay_form.buyr_name.value = pf.od_name.value;
+            nhnkcp_pay_form.buyr_mail.value = pf.od_email.value;
+            nhnkcp_pay_form.buyr_tel1.value = pf.od_tel.value;
+            nhnkcp_pay_form.buyr_tel2.value = pf.od_hp.value;
+            nhnkcp_pay_form.rcvr_name.value = pf.od_b_name.value;
+            nhnkcp_pay_form.rcvr_tel1.value = pf.od_b_tel.value;
+            nhnkcp_pay_form.rcvr_tel2.value = pf.od_b_hp.value;
+            nhnkcp_pay_form.rcvr_mail.value = pf.od_email.value;
+            nhnkcp_pay_form.rcvr_zipx.value = pf.od_b_zip.value;
+            nhnkcp_pay_form.rcvr_add1.value = pf.od_b_addr1.value;
+            nhnkcp_pay_form.rcvr_add2.value = pf.od_b_addr2.value;
+
+            // 주문 정보 임시저장
+            var order_data = $(pf).serialize();
+            var save_result = "";
+            $.ajax({
+                type: "POST",
+                data: order_data,
+                url: g5_url+"/shop/ajax.orderdatasave.php",
+                cache: false,
+                async: false,
+                success: function(data) {
+                    save_result = data;
+                }
+            });
+
+            if(save_result) {
+                alert(save_result);
+                return false;
+            }
+
+            nhnkcp_pay_form.submit();
+
+            return false;
+        }
+    });
+});
+</script>
\ No newline at end of file
diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php
index 2dbe2e67e..cee60fafc 100644
--- a/mobile/shop/kcp/order_approval_form.php
+++ b/mobile/shop/kcp/order_approval_form.php
@@ -1,5 +1,10 @@
 <?php
     include_once('./_common.php');
+
+@header('Cache-Control: no-cache, no-store, must-revalidate'); // HTTP 1.1.
+@header('Pragma: no-cache'); // HTTP 1.0.
+@header('Expires: 0'); // Proxies.
+
     /* ============================================================================== */
     /* =   PAGE : 결제 요청 PAGE                                                    = */
     /* = -------------------------------------------------------------------------- = */
@@ -63,6 +68,8 @@
     $comm_free_mny   = $_POST["comm_free_mny"   ]; // 비과세금액
 
     $payco_direct    = $_POST["payco_direct"    ]; // PAYCO 결제창 호출
+    $naverpay_direct    = $_POST["naverpay_direct"]; // NAVERPAY 결제창 호출
+    $kakaopay_direct    = $_POST["kakaopay_direct"]; // KAKAOPAY 결제창 호출
 
 	/*
      * 기타 파라메터 추가 부분 - Start -
@@ -82,6 +89,9 @@
         $rcvr_add1 = iconv('euc-kr', 'utf-8', $rcvr_add1);
         $rcvr_add2 = iconv('euc-kr', 'utf-8', $rcvr_add2);
     }
+    
+    // 에스크로 변수 ( 간편결제의 경우 N 으로 변경 )
+    $escw_used = 'Y';
 
     switch($settle_method)
     {
@@ -104,6 +114,7 @@
         case '간편결제':
             $pay_method = 'CARD';
             $ActionResult = 'card';
+            $escw_used = 'N';
             break;
         default:
             $pay_method = '';
@@ -155,8 +166,11 @@
 
         layer_cont_obj.style.display = "none";
         layer_receipt_obj.style.display = "block";
-
-        v_frm.target = "frm_receipt";
+        
+        // 네이버페이면 반드시 페이지전환 방식이어야 하며, 그 외에는 iframe 방식으로 한다.
+        if(!(typeof v_frm.naverpay_direct !== "undefined" && v_frm.naverpay_direct.value === 1)) {      // 네이버페이가 아니면
+            v_frm.target = "frm_receipt";
+        }
         v_frm.action = PayUrl;
 
 		if(v_frm.Ret_URL.value == "")
@@ -252,7 +266,15 @@ if($enc_data != '' && $enc_info != '' && $tran_cd != '') {
 //echo '<input type="hidden" name="ipgm_date" value="'.$ipgm_date.'">';
 ?>
 
+<?php if($payco_direct){ ?>
 <input type="hidden" name="payco_direct"   value="<?php echo $payco_direct; ?>">      <!-- PAYCO 결제창 호출 -->
+<?php } ?>
+<?php if($naverpay_direct){ ?>
+<input type="hidden" name="naverpay_direct"   value="<?php echo $naverpay_direct; ?>">      <!-- 네이버페이 결제창 호출 -->
+<?php } ?>
+<?php if($kakaopay_direct){ ?>
+<input type="hidden" name="kakaopay_direct"   value="<?php echo $kakaopay_direct; ?>">      <!-- 카카오페이 결제창 호출 -->
+<?php } ?>
 
 <!-- 필수 사항 -->
 
@@ -278,7 +300,7 @@ if($enc_data != '' && $enc_info != '' && $tran_cd != '') {
 <!-- 인증시 필요한 파라미터(변경불가)-->
 <input type="hidden" name="ActionResult" value="<?php echo $ActionResult; ?>">
 <!-- 에스크로 사용유무 에스크로 사용 업체(가상계좌만 해당)는 Y로 세팅 해주시기 바랍니다.-->
-<input type="hidden" name="escw_used"  value="Y">
+<input type="hidden" name="escw_used"  value="<?php echo $escw_used; ?>">
 <!-- 에스크로 결제처리모드 -->
 <input type="hidden" name="pay_mod"   value="<?php echo ($default['de_escrow_use']?'O':'N'); ?>">
 <!-- 수취인이름 -->
diff --git a/mobile/shop/kcp/orderform.1.php b/mobile/shop/kcp/orderform.1.php
index 77457e6c1..d1eecd557 100644
--- a/mobile/shop/kcp/orderform.1.php
+++ b/mobile/shop/kcp/orderform.1.php
@@ -18,8 +18,12 @@ if(!($default['de_iche_use'] || $default['de_vbank_use'] || $default['de_hp_use'
 <input type="hidden" name="buyr_mail"     value="">
 <input type="hidden" name="settle_method" value="">
 <input type="hidden" name="payco_direct"   value="">      <!-- PAYCO 결제창 호출 -->
+<input type="hidden" name="naverpay_direct" value="A" >    <!-- NAVERPAY 결제창 호출 -->
+<input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
 <!-- 주문번호 -->
 <input type="hidden" name="ordr_idxx" value="<?php echo $od_id; ?>">
+<!-- 인증수단(영문 소문자) * 반드시 대소문자 구분 -->
+<input type="hidden" name="ActionResult" value="">
 <!-- 결제등록 키 -->
 <input type="hidden" name="approval_key" id="approval">
 <!-- 수취인이름 -->
diff --git a/mobile/shop/kcp/pp_ax_hub.php b/mobile/shop/kcp/pp_ax_hub.php
index 84fa2507d..9ae59ed55 100644
--- a/mobile/shop/kcp/pp_ax_hub.php
+++ b/mobile/shop/kcp/pp_ax_hub.php
@@ -30,10 +30,10 @@
     /* =   01. 지불 요청 정보 설정                                                  = */
     /* = -------------------------------------------------------------------------- = */
 	$req_tx         = $_POST[ "req_tx"         ]; // 요청 종류
-	$tran_cd        = $_POST[ "tran_cd"        ]; // 처리 종류
+	$tran_cd        = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "tran_cd"        ]); // 처리 종류
 	/* = -------------------------------------------------------------------------- = */
 	$cust_ip        = getenv( "REMOTE_ADDR"    ); // 요청 IP
-	$ordr_idxx      = $_POST[ "ordr_idxx"      ]; // 쇼핑몰 주문번호
+	$ordr_idxx      = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "ordr_idxx"      ]); // 쇼핑몰 주문번호
 	$good_name      = addslashes($_POST[ "good_name"      ]); // 상품명
 	$good_mny       = $_POST[ "good_mny"       ]; // 결제 총금액
 	/* = -------------------------------------------------------------------------- = */
@@ -201,6 +201,16 @@
                 $app_no    = $c_PayPlus->mf_get_res_data( "app_no"    ); // 승인 번호
                 $noinf     = $c_PayPlus->mf_get_res_data( "noinf"     ); // 무이자 여부 ( 'Y' : 무이자 )
                 $quota     = $c_PayPlus->mf_get_res_data( "quota"     ); // 할부 개월 수
+                $od_other_pay_type = $c_PayPlus->mf_get_res_data( "card_other_pay_type" ); // 간편결제유형
+
+                $kcp_pay_method = $c_PayPlus->mf_get_res_data( "pay_method" ); // 카카오페이 결제수단
+                // 카드 코드는 PACA, 카카오머니 코드는 PAKM
+
+                if( $kcp_pay_method == "PAKM" ){    // 카카오머니
+                    $card_mny = $kakaomny_mny = $c_PayPlus->mf_get_res_data( "kakaomny_mny" );
+                    $app_time = $app_kakaomny_time = $c_PayPlus->mf_get_res_data( "app_kakaomny_time" );
+                    $od_other_pay_type = 'NHNKCP_KAKAOMONEY';
+                }
             }
 
 	/* = -------------------------------------------------------------------------- = */
diff --git a/mobile/shop/lg/xpay_approval.php b/mobile/shop/lg/xpay_approval.php
index 028219f30..1e5bbe9d8 100644
--- a/mobile/shop/lg/xpay_approval.php
+++ b/mobile/shop/lg/xpay_approval.php
@@ -131,7 +131,7 @@ $payReqMap['LGD_PAYKEY']             = "";
 
 $_SESSION['PAYREQ_MAP'] = $payReqMap;
 
-$g5['title'] = 'LG 유플러스 eCredit서비스 결제';
+$g5['title'] = '토스페이먼츠 eCredit서비스 결제';
 $g5['body_script'] = ' onload="launchCrossPlatform();"';
 include_once(G5_PATH.'/head.sub.php');
 ?>
diff --git a/mobile/shop/orderform.sub.php b/mobile/shop/orderform.sub.php
index d4168dc1a..b5159ea96 100644
--- a/mobile/shop/orderform.sub.php
+++ b/mobile/shop/orderform.sub.php
@@ -8,6 +8,10 @@ if( is_inicis_simple_pay() ){   //이니시스 삼성페이 또는 Lpay 사용
     require_once(G5_MSHOP_PATH.'/samsungpay/incSamsungpayCommon.php');
 }
 
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_MSHOP_PATH.'/kcp/global_m_nhn_kcp.php');
+}
+
 $tablet_size = "1.0"; // 화면 사이즈 조정 - 기기화면에 맞게 수정(갤럭시탭,아이패드 - 1.85, 스마트폰 - 1.0)
 
 // 개인결제번호제거
@@ -252,6 +256,10 @@ require_once(G5_MSHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
 if( is_inicis_simple_pay() ){   //이니시스 삼성페이 또는 lpay 사용시
     require_once(G5_MSHOP_PATH.'/samsungpay/orderform.1.php');
 }
+
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_MSHOP_PATH.'/kcp/easypay_form.1.php');
+}
 ?>
 </div>
 
@@ -586,6 +594,8 @@ if($is_kakaopay_use) {
             echo '<li><input type="radio" id="od_settle_card" name="od_settle_case" value="신용카드" '.$checked.'> <label for="od_settle_card" class="lb_icon card_icon">신용카드</label></li>'.PHP_EOL;
             $checked = '';
         }
+        
+        $easypay_prints = array();
 
         // PG 간편결제
         if($default['de_easy_pay_use']) {
@@ -602,8 +612,30 @@ if($is_kakaopay_use) {
             }
 
             $multi_settle++;
-            echo '<li><input type="radio" id="od_settle_easy_pay" name="od_settle_case" value="간편결제" '.$checked.'> <label for="od_settle_easy_pay" class="'.$pg_easy_pay_name.' lb_icon">'.$pg_easy_pay_name.'</label></li>'.PHP_EOL;
-            $checked = '';
+
+            if($default['de_pg_service'] === 'kcp' && isset($default['de_easy_pay_services']) && $default['de_easy_pay_services']){
+                $de_easy_pay_service_array = explode(',', $default['de_easy_pay_services']);
+                if( in_array('nhnkcp_payco', $de_easy_pay_service_array) ){
+                    $easypay_prints['nhnkcp_payco'] = '<li><input type="radio" id="od_settle_nhnkcp_payco" name="od_settle_case" data-pay="payco" value="간편결제"> <label for="od_settle_nhnkcp_payco" class="PAYCO nhnkcp_payco lb_icon" title="NHN_KCP - PAYCO">PAYCO</label></li>';
+                }
+                if( in_array('nhnkcp_naverpay', $de_easy_pay_service_array) ){
+                    $easypay_prints['nhnkcp_naverpay'] = '<li><input type="radio" id="od_settle_nhnkcp_naverpay" name="od_settle_case" data-pay="naverpay" value="간편결제" > <label for="od_settle_nhnkcp_naverpay" class="naverpay_icon nhnkcp_naverpay lb_icon" title="NHN_KCP - 네이버페이">네이버페이</label></li>';
+                }
+                if( in_array('nhnkcp_kakaopay', $de_easy_pay_service_array) ){
+                    $easypay_prints['nhnkcp_kakaopay'] = '<li><input type="radio" id="od_settle_nhnkcp_kakaopay" name="od_settle_case" data-pay="kakaopay" value="간편결제" > <label for="od_settle_nhnkcp_kakaopay" class="kakaopay_icon nhnkcp_kakaopay lb_icon" title="NHN_KCP - 카카오페이">카카오페이</label></li>';
+                }
+            } else {
+                $easypay_prints[strtolower($pg_easy_pay_name)] = '<li><input type="radio" id="od_settle_easy_pay" name="od_settle_case" value="간편결제" '.$checked.'> <label for="od_settle_easy_pay" class="'.$pg_easy_pay_name.' lb_icon">'.$pg_easy_pay_name.'</label></li>';
+            }
+        }
+
+        if( ! isset($easypay_prints['nhnkcp_naverpay']) && function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp') ){
+            $easypay_prints['nhnkcp_naverpay'] = '<li><input type="radio" id="od_settle_nhnkcp_naverpay" name="od_settle_case" data-pay="naverpay" value="간편결제" > <label for="od_settle_nhnkcp_naverpay" class="naverpay_icon nhnkcp_naverpay lb_icon" title="NHN_KCP - 네이버페이">네이버페이</label></li>';
+        }
+
+        if($easypay_prints) {
+            $multi_settle++;
+            echo run_replace('shop_orderform_easypay_buttons', implode(PHP_EOL, $easypay_prints), $easypay_prints, $multi_settle);
         }
 
         //이니시스 삼성페이
@@ -696,6 +728,10 @@ if($is_kakaopay_use) {
         require_once(G5_MSHOP_PATH.'/samsungpay/orderform.2.php');
     }
 
+    if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+        require_once(G5_MSHOP_PATH.'/kcp/easypay_form.2.php');
+    }
+
     if($is_kakaopay_use) {
         require_once(G5_SHOP_PATH.'/kakaopay/orderform.2.php');
     }
@@ -730,6 +766,10 @@ if($is_kakaopay_use) {
 if( is_inicis_simple_pay() ){   //삼성페이 사용시
     require_once(G5_MSHOP_PATH.'/samsungpay/order.script.php');
 }
+
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_MSHOP_PATH.'/kcp/m_order.script.php');
+}
 ?>
 <script>
 var zipcode = "";
@@ -1160,7 +1200,7 @@ function calculate_tax()
     });
 
     if($("input[name=od_temp_point]").size())
-        temp_point = parseInt($("input[name=od_temp_point]").val());
+        temp_point = parseInt($("input[name=od_temp_point]").val()) || 0;
 
     tot_mny += (send_cost + send_cost2 - od_coupon - send_coupon - temp_point);
     if(tot_mny < 0) {
@@ -1223,6 +1263,10 @@ function pay_approval()
 
     if( settle_method == "삼성페이" || settle_method == "lpay" || settle_method == "inicis_kakaopay" ){
         form_order_method = 'samsungpay';
+    } else if(settle_method == "간편결제") {
+        if(jQuery("input[name='od_settle_case']:checked" ).attr("data-pay") === "naverpay"){
+            form_order_method = 'nhnkcp_naverpay';
+        }
     }
 
     if( jQuery(pf).triggerHandler("form_sumbit_order_"+form_order_method) !== false ) {
@@ -1239,10 +1283,31 @@ function pay_approval()
         f.rcvr_add1.value = pf.od_b_addr1.value;
         f.rcvr_add2.value = pf.od_b_addr2.value;
         f.settle_method.value = settle_method;
-        if(settle_method == "간편결제")
-            f.payco_direct.value = "Y";
-        else
-            f.payco_direct.value = "";
+
+        if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "";
+        if(typeof f.naverpay_direct !== "undefined") f.naverpay_direct.value = "A";
+        if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "A";
+        if(typeof f.ActionResult !== "undefined") f.ActionResult.value = "";
+        if(typeof f.pay_method !== "undefined") f.pay_method.value = "";
+
+        if(settle_method == "간편결제"){
+            var nhnkcp_easy_pay = jQuery("input[name='od_settle_case']:checked" ).attr("data-pay");
+
+            if(nhnkcp_easy_pay === "naverpay"){
+                if(typeof f.naverpay_direct !== "undefined"){
+                    f.naverpay_direct.value = "Y";
+                }
+            } else if(nhnkcp_easy_pay === "kakaopay"){
+                if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "Y";
+            } else {
+                if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "Y";
+            }
+
+            if(typeof f.ActionResult !== "undefined") f.ActionResult.value = "CARD";    // 대소문자 구분
+            if(typeof f.pay_method !== "undefined") f.pay_method.value = "card";        // 대소문자 구분
+
+        }
+
         <?php } else if($default['de_pg_service'] == 'lg') { ?>
         var pay_method = "";
         var easy_pay = "";
@@ -1472,7 +1537,7 @@ function payment_check(f)
         if (f.od_temp_point.value)
         {
             var point_unit = parseInt(<?php echo $default['de_settle_point_unit']; ?>);
-            temp_point = parseInt(f.od_temp_point.value);
+            temp_point = parseInt(f.od_temp_point.value) || 0;
 
             if (temp_point < 0) {
                 alert("포인트를 0 이상 입력하세요.");
diff --git a/mobile/shop/orderformupdate.php b/mobile/shop/orderformupdate.php
index 2c2f8df90..a6eaf97b6 100644
--- a/mobile/shop/orderformupdate.php
+++ b/mobile/shop/orderformupdate.php
@@ -7,6 +7,11 @@ if( is_inicis_order_pay($od_settle_case) && !empty($_POST['P_HASH']) ){
     $default['de_pg_service'] = 'inicis';
 }
 
+// 타 PG 사용시 NHN KCP 네이버페이로 결제 요청이 왔다면 $default['de_pg_service'] 값을 kcp 로 변경합니다.
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp') && isset($_POST['enc_data']) && $_POST['enc_data'] && isset($_POST['site_cd']) && isset($_POST['nhnkcp_pay_case']) && $_POST['nhnkcp_pay_case'] === "naverpay"){
+    $default['de_pg_service'] = 'kcp';
+}
+
 if( $default['de_pg_service'] == 'inicis' && get_session('ss_order_id') ){
     if( $exist_order = get_shop_order_data(get_session('ss_order_id')) ){    //이미 상품이 주문되었다면 리다이렉트
         if($exist_order['od_tno']){
@@ -45,6 +50,18 @@ if (get_cart_count($tmp_cart_id) == 0) {    // 장바구니에 담기
     alert('장바구니가 비어 있습니다.\\n\\n이미 주문하셨거나 장바구니에 담긴 상품이 없는 경우입니다.', G5_SHOP_URL.'/cart.php');
 }
 
+$sql = "select * from {$g5['g5_shop_order_table']} limit 1";
+$check_tmp = sql_fetch($sql);
+
+if(!isset($check_tmp['od_other_pay_type'])){
+    $sql = "ALTER TABLE `{$g5['g5_shop_order_table']}` 
+            ADD COLUMN `od_other_pay_type` VARCHAR(100) NOT NULL DEFAULT '' AFTER `od_settle_case`; ";
+    sql_query($sql, false);
+}
+
+// 변수 초기화
+$od_other_pay_type = '';
+
 $error = "";
 // 장바구니 상품 재고 검사
 $sql = " select it_id,
@@ -616,6 +633,7 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_mobile         = '1',
                 od_ip             = '$REMOTE_ADDR',
                 od_settle_case    = '$od_settle_case',
+                od_other_pay_type = '$od_other_pay_type',
                 od_test           = '{$default['de_card_test']}'
                 ";
 $result = sql_query($sql, false);
diff --git a/mobile/shop/orderinquiryview.php b/mobile/shop/orderinquiryview.php
index 83773bc37..b57724921 100644
--- a/mobile/shop/orderinquiryview.php
+++ b/mobile/shop/orderinquiryview.php
@@ -237,7 +237,6 @@ if($od['od_pg'] == 'lg') {
         $app_no_subj = '';
         $disp_bank = true;
         $disp_receipt = false;
-        $easy_pay_name = '';
         if($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == 'KAKAOPAY' || is_inicis_order_pay($od['od_settle_case']) ) {
             $app_no_subj = '승인번호';
             $app_no = $od['od_app_no'];
@@ -247,19 +246,6 @@ if($od['od_pg'] == 'lg') {
             $app_no_subj = '승인번호';
             $app_no = $od['od_app_no'];
             $disp_bank = false;
-            switch($od['od_pg']) {
-                case 'lg':
-                    $easy_pay_name = 'PAYNOW';
-                    break;
-                case 'inicis':
-                    $easy_pay_name = 'KPAY';
-                    break;
-                case 'kcp':
-                    $easy_pay_name = 'PAYCO';
-                    break;
-                default:
-                    break;
-            }
         } else if($od['od_settle_case'] == '휴대폰') {
             $app_no_subj = '휴대폰번호';
             $app_no = $od['od_bank_account'];
@@ -291,7 +277,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 check_pay_name_replace($od['od_settle_case'], $od, 1); ?></td>
                 </tr>
                 <tr>
                     <th scope="row">결제금액</th>
@@ -309,7 +295,7 @@ if($od['od_pg'] == 'lg') {
                 }
 
                 // 승인번호, 휴대폰번호, 거래번호
-                if($app_no_subj)
+                if($app_no_subj && $app_no)
                 {
                 ?>
                 <tr>
diff --git a/mobile/shop/settle_kcp.inc.php b/mobile/shop/settle_kcp.inc.php
index 2b6e79852..7c41ebff2 100644
--- a/mobile/shop/settle_kcp.inc.php
+++ b/mobile/shop/settle_kcp.inc.php
@@ -47,7 +47,7 @@ $g_conf_site_cd = $default['de_kcp_mid'];
 $g_conf_site_key = $default['de_kcp_site_key'];
 
 // 테스트 결제 때 PAYCO site_cd, site_key 재설정
-if($default['de_card_test'] && ($_POST['settle_method'] == '간편결제' || $_POST['od_settle_case'] == '간편결제')) {
+if($default['de_card_test'] && (($_POST['settle_method'] == '간편결제' || $_POST['od_settle_case'] == '간편결제') && (isset($_POST['payco_direct']) && $_POST['payco_direct'] === 'Y') )) {
     $g_conf_site_cd = 'S6729';
     $g_conf_site_key = '';
 }
diff --git a/mobile/skin/board/gallery/list.skin.php b/mobile/skin/board/gallery/list.skin.php
index 843aa83c8..2a7ffb6fd 100644
--- a/mobile/skin/board/gallery/list.skin.php
+++ b/mobile/skin/board/gallery/list.skin.php
@@ -99,7 +99,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                         $img_content = '<span class="no_img"><i class="fa fa-picture-o" aria-hidden="true"></i></span>';
                     }
 
-                    echo $img_content;
+                    echo run_replace('thumb_image_tag', $img_content, $thumb);
                 }
                 ?>
                 </a>
diff --git a/mobile/skin/board/gallery/style.css b/mobile/skin/board/gallery/style.css
index 3b4ed8f56..a1a7762b2 100644
--- a/mobile/skin/board/gallery/style.css
+++ b/mobile/skin/board/gallery/style.css
@@ -158,7 +158,7 @@
 #bo_gall .gall_li_wr {position:relative;}
 #bo_gall .gall_li_chk {display:inline-block;position:absolute;top:10px;left:10px}
 #bo_gall .gall_li:nth-child(2n+1) {clear:both}
-#bo_gall .gall_li .gall_img img{width:100%;height:auto}
+#bo_gall .gall_li .gall_img img, #bo_gall .gall_li .gall_img video{width:100%;height:auto}
 #bo_gall .gall_li .gall_img .no_img,
 #bo_gall .gall_li .gall_notice {display:block;background:#eaeaea;color:#d0d0d0;font-size:3em;text-align:center;padding:25% 0}
 
diff --git a/mobile/skin/latest/basic/latest.skin.php b/mobile/skin/latest/basic/latest.skin.php
index 591befd3b..434bbc945 100644
--- a/mobile/skin/latest/basic/latest.skin.php
+++ b/mobile/skin/latest/basic/latest.skin.php
@@ -38,7 +38,7 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".$img_content."</a> ";
+                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
                 echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
diff --git a/mobile/skin/latest/basic/style.css b/mobile/skin/latest/basic/style.css
index 0762c0372..b5730bdb2 100644
--- a/mobile/skin/latest/basic/style.css
+++ b/mobile/skin/latest/basic/style.css
@@ -9,7 +9,7 @@
 .lt ul li:after {display:block;visibility:hidden;clear:both;content:""}
 .lt ul li:hover a.lt_tit {color:#3a8afd}
 .lt .lt_thumb {display:inline-block;float:left;margin-right:10px}
-.lt .lt_thumb img {width:138px;height:auto;overflow:hidden}
+.lt .lt_thumb img, .lt .lt_thumb video{width:138px;height:auto;overflow:hidden}
 .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px}
 .lt .lt_info {display:inline-block;position:relative;line-height:20px;color:#828282;font-size:0.925em;vertical-align:top}
 .lt .lt_date {color:#828282}
diff --git a/mobile/skin/shop/basic/itemuselist.skin.php b/mobile/skin/shop/basic/itemuselist.skin.php
index 421981d93..dcff7603c 100644
--- a/mobile/skin/shop/basic/itemuselist.skin.php
+++ b/mobile/skin/shop/basic/itemuselist.skin.php
@@ -81,7 +81,7 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_MSHOP_SKIN_URL.'/style.css">',
 	            			<div class="review_summ">
 	            				<?php echo get_itemuselist_thumbnail($row['it_id'], $row['is_content'], 50, 50); ?>
 	            				<p>
-	            					<span>상품명입니다.</span>
+	            					<span><?php echo get_text($row['is_subject']); ?></span>
 	            					<span class="sound_only">평가점수</span><img src="<?php echo G5_URL; ?>/shop/img/s_star<?php echo $star; ?>.png" alt="별<?php echo $star; ?>개" width="80">
 	            				</p>
 	            			</div>
diff --git a/plugin/editor/cheditor5/imageUpload/config.php b/plugin/editor/cheditor5/imageUpload/config.php
index ac4e4956c..dc5f2ba8b 100644
--- a/plugin/editor/cheditor5/imageUpload/config.php
+++ b/plugin/editor/cheditor5/imageUpload/config.php
@@ -1,10 +1,6 @@
 <?php
 include_once("_common.php");
 
-if( strpos($config['cf_editor'], 'cheditor5') === false ){
-    exit;
-}
-
 define("CHE_UPLOAD_IMG_CHECK", 1);  // �̹��� ������ ����� �Ҽ� �ִ��� ���θ� üũ�մϴ�. ( �ش� ������ �̹��� �������� üũ�մϴ�. 1�̸� ���, 0�̸� ��� ���� )
 
 // ---------------------------------------------------------------------------
diff --git a/plugin/kcaptcha/kcaptcha.lib.php b/plugin/kcaptcha/kcaptcha.lib.php
index 50a3cef69..fc897b5a1 100644
--- a/plugin/kcaptcha/kcaptcha.lib.php
+++ b/plugin/kcaptcha/kcaptcha.lib.php
@@ -50,13 +50,13 @@ class KCAPTCHA{
             $transparent = (imagecolorat($font, $i, 0) >> 24) == 127;
 
             if(!$reading_symbol && !$transparent){
-                $font_metrics[$alphabet{$symbol}]=array('start'=>$i);
+                $font_metrics[$alphabet[$symbol]]=array('start'=>$i);
                 $reading_symbol=true;
                 continue;
             }
 
             if($reading_symbol && $transparent){
-                $font_metrics[$alphabet{$symbol}]['end']=$i;
+                $font_metrics[$alphabet[$symbol]]['end']=$i;
                 $reading_symbol=false;
                 $symbol++;
                 continue;
@@ -75,7 +75,7 @@ class KCAPTCHA{
         $odd=mt_rand(0,1);
         if($odd==0) $odd=-1;
         for($i=0;$i<$length;$i++){
-            $m=$font_metrics[$this->keystring{$i}];
+            $m=$font_metrics[$this->keystring[$i]];
 
             $y=(($i%2)*$fluctuation_amplitude - $fluctuation_amplitude/2)*$odd
                 + mt_rand(-round($fluctuation_amplitude/3), round($fluctuation_amplitude/3))
diff --git a/shop/kcp/global_nhn_kcp.php b/shop/kcp/global_nhn_kcp.php
new file mode 100644
index 000000000..6591ba278
--- /dev/null
+++ b/shop/kcp/global_nhn_kcp.php
@@ -0,0 +1,10 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+
+include_once(G5_SHOP_PATH.'/settle_kcp.inc.php');
+?>
\ No newline at end of file
diff --git a/shop/kcp/global_nhn_kcp_form.1.php b/shop/kcp/global_nhn_kcp_form.1.php
new file mode 100644
index 000000000..8fa45e217
--- /dev/null
+++ b/shop/kcp/global_nhn_kcp_form.1.php
@@ -0,0 +1,321 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+?>
+<script type="text/javascript">
+/****************************************************************/
+/* m_Completepayment  설명                                      */
+/****************************************************************/
+/* 인증완료시 재귀 함수                                         */
+/* 해당 함수명은 절대 변경하면 안됩니다.                        */
+/* 해당 함수의 위치는 payplus.js 보다먼저 선언되어여 합니다.    */
+/* Web 방식의 경우 리턴 값이 form 으로 넘어옴                   */
+/* EXE 방식의 경우 리턴 값이 json 으로 넘어옴                   */
+/****************************************************************/
+var kcp_close_eveng_ing = 0;
+
+function m_Completepayment( FormOrJson, closeEvent )
+{
+    var frm = document.nhnkcp_pay_form;
+
+    /********************************************************************/
+    /* FormOrJson은 가맹점 임의 활용 금지                               */
+    /* frm 값에 FormOrJson 값이 설정 됨 frm 값으로 활용 하셔야 됩니다.  */
+    /* FormOrJson 값을 활용 하시려면 기술지원팀으로 문의바랍니다.       */
+    /********************************************************************/
+    GetField( frm, FormOrJson );
+
+    if( frm.res_cd.value == "0000" )
+    {
+        document.getElementById("display_pay_button").style.display = "none" ;
+        document.getElementById("display_pay_process").style.display = "" ;
+
+        frm.submit();
+    }
+    else
+    {
+        if( ! kcp_close_eveng_ing ){
+            
+            kcp_close_eveng_ing = 1;
+            alert( "[" + frm.res_cd.value + "] " + frm.res_msg.value );
+
+            setTimeout(function(){
+                kcp_close_eveng_ing = 0;
+            }, 500);
+
+            closeEvent();
+        }
+    }
+}
+</script>
+
+<script src="<?php echo $g_conf_js_url; ?>"></script>
+<script>
+/* Payplus Plug-in 실행 */
+function jsf__pay( form )
+{
+    try
+    {
+        KCP_Pay_Execute( form );
+    }
+    catch (e)
+    {
+        /* IE 에서 결제 정상종료시 throw로 스크립트 종료 */
+    }
+}
+</script>
+
+<form name="nhnkcp_pay_form" id="nhnkcp_pay_form" method="POST" action="<?php echo $order_action_url; ?>" style="display:none">
+<?php
+    /* ============================================================================== */
+    /* =   2. 가맹점 필수 정보 설정                                                 = */
+    /* = -------------------------------------------------------------------------- = */
+    /* =   ※ 필수 - 결제에 반드시 필요한 정보입니다.                               = */
+    /* = -------------------------------------------------------------------------- = */
+    // 요청종류 : 승인(pay)/취소,매입(mod) 요청시 사용
+?>
+    <input type="hidden" name="req_tx"          value="pay">
+    <input type="hidden" name="site_cd"         value="<?php echo $default['de_kcp_mid']; ?>">
+    <input type="hidden" name="site_name"       value="<?php echo $g_conf_site_name; ?>">
+    <input type="hidden" name="def_site_cd"     value="<?php echo $default['de_kcp_mid']; ?>">
+    <input type="hidden" name="od_settle_case"  value="">
+    <input type="hidden" name="nhnkcp_pay_case" value="">
+<?php
+    /*
+    할부옵션 : Payplus Plug-in에서 카드결제시 최대로 표시할 할부개월 수를 설정합니다.(0 ~ 18 까지 설정 가능)
+    ※ 주의  - 할부 선택은 결제금액이 50,000원 이상일 경우에만 가능, 50000원 미만의 금액은 일시불로만 표기됩니다
+               예) value 값을 "5" 로 설정했을 경우 => 카드결제시 결제창에 일시불부터 5개월까지 선택가능
+    */
+?>
+    <input type="hidden" name="pay_method"  value="">
+    <input type="hidden" name="ordr_idxx"   value="<?php echo $od_id; ?>">
+    <input type="hidden" name="good_name"   value="<?php echo $goods; ?>">
+    <input type="hidden" name="good_mny"    value="<?php echo $tot_price; ?>">
+    <input type="hidden" name="buyr_name"   value="">
+    <input type="hidden" name="buyr_mail"   value="">
+    <input type="hidden" name="buyr_tel1"   value="">
+    <input type="hidden" name="buyr_tel2"   value="">
+
+    <input type="hidden" name="rcvr_name"     value="">
+    <input type="hidden" name="rcvr_tel1"     value="">
+    <input type="hidden" name="rcvr_tel2"     value="">
+    <input type="hidden" name="rcvr_mail"     value="">
+    <input type="hidden" name="rcvr_zipx"     value="">
+    <input type="hidden" name="rcvr_add1"     value="">
+    <input type="hidden" name="rcvr_add2"     value="">
+
+    <input type="hidden" name="payco_direct"   value="">      <!-- PAYCO 결제창 호출 -->
+    <input type="hidden" name="naverpay_direct" value="A" >    <!-- NAVERPAY 결제창 호출 -->
+    <input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
+
+    <input type="hidden" name="quotaopt"    value="12">
+
+    <!-- 필수 항목 : 결제 금액/화폐단위 -->
+    <input type="hidden" name="currency"    value="WON">
+
+<?php
+    /* = -------------------------------------------------------------------------- = */
+    /* =   2. 가맹점 필수 정보 설정 END                                             = */
+    /* ============================================================================== */
+?>
+
+<?php
+    /* ============================================================================== */
+    /* =   3. Payplus Plugin 필수 정보(변경 불가)                                   = */
+    /* = -------------------------------------------------------------------------- = */
+    /* =   결제에 필요한 주문 정보를 입력 및 설정합니다.                            = */
+    /* = -------------------------------------------------------------------------- = */
+?>
+    <!-- PLUGIN 설정 정보입니다(변경 불가) -->
+    <input type="hidden" name="module_type"     value="01">
+    <!-- 복합 포인트 결제시 넘어오는 포인트사 코드 : OK캐쉬백(SCSK), 베네피아 복지포인트(SCWB) -->
+    <input type="hidden" name="epnt_issu"       value="">
+<!--
+      ※ 필 수
+          필수 항목 : Payplus Plugin에서 값을 설정하는 부분으로 반드시 포함되어야 합니다
+          값을 설정하지 마십시오
+-->
+    <input type="hidden" name="res_cd"          value="">
+    <input type="hidden" name="res_msg"         value="">
+    <input type="hidden" name="tno"             value="">
+    <input type="hidden" name="trace_no"        value="">
+    <input type="hidden" name="enc_info"        value="">
+    <input type="hidden" name="enc_data"        value="">
+    <input type="hidden" name="ret_pay_method"  value="">
+    <input type="hidden" name="tran_cd"         value="">
+    <input type="hidden" name="bank_name"       value="">
+    <input type="hidden" name="bank_issu"       value="">
+    <input type="hidden" name="use_pay_method"  value="">
+
+    <!--  현금영수증 관련 정보 : Payplus Plugin 에서 설정하는 정보입니다 -->
+    <input type="hidden" name="cash_tsdtime"    value="">
+    <input type="hidden" name="cash_yn"         value="">
+    <input type="hidden" name="cash_authno"     value="">
+    <input type="hidden" name="cash_tr_code"    value="">
+    <input type="hidden" name="cash_id_info"    value="">
+
+    <!-- 2012년 8월 18일 정자상거래법 개정 관련 설정 부분 -->
+    <!-- 제공 기간 설정 0:일회성 1:기간설정(ex 1:2012010120120131)  -->
+    <!--
+        2012.08.18 부터 개정 시행되는 '전자상거래 등에서의 소비자보호에 관한 법률'에 따른 코드 변경
+        이용기간이 제한되는 컨텐츠 상품이나 정기 과금 상품 등에 한하여 '용역의 제공기간'을
+        표기/적용하여야 하며 이와 무관한 실물 배송상품 등의 결제에는 해당되지 않습니다.
+        0 : 일반결제
+        good_expr의 나머지 적용 방식에 대해서는 KCP에서 제공하는 매뉴얼을 참고해 주세요.
+    -->
+    <input type="hidden" name="good_expr" value="0">
+
+    <!-- 가맹점에서 관리하는 고객 아이디 설정을 해야 합니다.(필수 설정) -->
+	<input type="hidden" name="shop_user_id"    value=""/>
+	<!-- 복지포인트 결제시 가맹점에 할당되어진 코드 값을 입력해야합니다.(필수 설정) -->
+    <input type="hidden" name="pt_memcorp_cd"   value=""/>
+
+    <!-- 에스크로 항목 -->
+
+    <!-- 에스크로 사용 여부 : 반드시 Y 로 세팅 -->
+    <input type="hidden" name="escw_used" value="Y">
+
+    <!-- 에스크로 결제처리 모드 : 에스크로: Y, 일반: N, KCP 설정 조건: O -->
+    <input type="hidden" name="pay_mod" value="<?php echo ($default['de_escrow_use']?"O":"N"); ?>">
+
+    <!-- 배송 소요일 : 예상 배송 소요일을 입력 -->
+    <input type="hidden" name="deli_term" value="03">
+
+    <!-- 장바구니 상품 개수 : 장바구니에 담겨있는 상품의 개수를 입력 -->
+    <input type="hidden" name="bask_cntx" value="<?php echo (int)$goods_count + 1; ?>">
+
+    <!-- 장바구니 상품 상세 정보 (자바 스크립트 샘플(create_goodInfo()) 참고) -->
+    <input type="hidden" name="good_info" value="">
+
+<?php
+    /* = -------------------------------------------------------------------------- = */
+    /* =   3. Payplus Plugin 필수 정보 END                                          = */
+    /* ============================================================================== */
+?>
+
+<?php
+    /* ============================================================================== */
+    /* =   4. 옵션 정보                                                             = */
+    /* = -------------------------------------------------------------------------- = */
+    /* =   ※ 옵션 - 결제에 필요한 추가 옵션 정보를 입력 및 설정합니다.             = */
+    /* = -------------------------------------------------------------------------- = */
+
+    /* PayPlus에서 보이는 신용카드사 삭제 파라미터 입니다
+    ※ 해당 카드를 결제창에서 보이지 않게 하여 고객이 해당 카드로 결제할 수 없도록 합니다. (카드사 코드는 매뉴얼을 참고)
+    <input type="hidden" name="not_used_card" value="CCPH:CCSS:CCKE:CCHM:CCSH:CCLO:CCLG:CCJB:CCHN:CCCH"> */
+
+    /* 신용카드 결제시 OK캐쉬백 적립 여부를 묻는 창을 설정하는 파라미터 입니다
+         OK캐쉬백 포인트 가맹점의 경우에만 창이 보여집니다
+        <input type="hidden" name="save_ocb"        value="Y"> */
+
+    /* 고정 할부 개월 수 선택
+           value값을 "7" 로 설정했을 경우 => 카드결제시 결제창에 할부 7개월만 선택가능
+    <input type="hidden" name="fix_inst"        value="07"> */
+
+    /*  무이자 옵션
+            ※ 설정할부    (가맹점 관리자 페이지에 설정 된 무이자 설정을 따른다)                             - "" 로 설정
+            ※ 일반할부    (KCP 이벤트 이외에 설정 된 모든 무이자 설정을 무시한다)                           - "N" 로 설정
+            ※ 무이자 할부 (가맹점 관리자 페이지에 설정 된 무이자 이벤트 중 원하는 무이자 설정을 세팅한다)   - "Y" 로 설정
+    <input type="hidden" name="kcp_noint"       value=""> */
+
+
+    /*  무이자 설정
+            ※ 주의 1 : 할부는 결제금액이 50,000 원 이상일 경우에만 가능
+            ※ 주의 2 : 무이자 설정값은 무이자 옵션이 Y일 경우에만 결제 창에 적용
+            예) 전 카드 2,3,6개월 무이자(국민,비씨,엘지,삼성,신한,현대,롯데,외환) : ALL-02:03:04
+            BC 2,3,6개월, 국민 3,6개월, 삼성 6,9개월 무이자 : CCBC-02:03:06,CCKM-03:06,CCSS-03:06:04
+    <input type="hidden" name="kcp_noint_quota" value="CCBC-02:03:06,CCKM-03:06,CCSS-03:06:09"> */
+
+    /* 사용카드 설정 여부 파라미터 입니다.(통합결제창 노출 유무)
+    <input type="hidden" name="used_card_YN"        value="Y">
+    /* 사용카드 설정 파라미터 입니다. (해당 카드만 결제창에 보이게 설정하는 파라미터입니다. used_card_YN 값이 Y일때 적용됩니다.
+    /<input type="hidden" name="used_card"        value="CCBC:CCKM:CCSS">
+
+    /* 해외카드 구분하는 파라미터 입니다.(해외비자, 해외마스터, 해외JCB로 구분하여 표시)
+    <input type="hidden" name="used_card_CCXX"        value="Y">
+
+    /*  가상계좌 은행 선택 파라미터
+         ※ 해당 은행을 결제창에서 보이게 합니다.(은행코드는 매뉴얼을 참조) */
+?>
+
+<input type="hidden" name="kcp_noint"       value="<?php echo ($default['de_card_noint_use'] ? '' : 'N'); ?>">
+
+<?php
+if($default['de_tax_flag_use']) {
+    /* KCP는 과세상품과 비과세상품을 동시에 판매하는 업체들의 결제관리에 대한 편의성을 제공해드리고자,
+       복합과세 전용 사이트코드를 지원해 드리며 총 금액에 대해 복합과세 처리가 가능하도록 제공하고 있습니다
+
+       복합과세 전용 사이트 코드로 계약하신 가맹점에만 해당이 됩니다
+
+       상품별이 아니라 금액으로 구분하여 요청하셔야 합니다
+
+       총결제 금액은 과세금액 + 부과세 + 비과세금액의 합과 같아야 합니다.
+       (good_mny = comm_tax_mny + comm_vat_mny + comm_free_mny) */
+?>
+    <input type="hidden" name="tax_flag"          value="TG03">     <!-- 변경불가    -->
+    <input type="hidden" name="comm_tax_mny"	  value="<?php echo $comm_tax_mny; ?>">         <!-- 과세금액    -->
+    <input type="hidden" name="comm_vat_mny"      value="<?php echo $comm_vat_mny; ?>">         <!-- 부가세	    -->
+    <input type="hidden" name="comm_free_mny"     value="<?php echo $comm_free_mny; ?>">        <!-- 비과세 금액 -->
+<?php
+}
+?>
+    <input type="hidden" name="wish_vbank_list" value="">
+<?php
+
+
+    /*  가상계좌 입금 기한 설정하는 파라미터 - 발급일 + 3일
+    <input type="hidden" name="vcnt_expire_term" value="3"> */
+
+
+    /*  가상계좌 입금 시간 설정하는 파라미터
+         HHMMSS형식으로 입력하시기 바랍니다
+         설정을 안하시는경우 기본적으로 23시59분59초가 세팅이 됩니다
+         <input type="hidden" name="vcnt_expire_term_time" value="120000"> */
+
+
+    /* 포인트 결제시 복합 결제(신용카드+포인트) 여부를 결정할 수 있습니다.- N 일경우 복합결제 사용안함
+        <input type="hidden" name="complex_pnt_yn" value="N">    */
+
+
+    /* 문화상품권 결제시 가맹점 고객 아이디 설정을 해야 합니다.(필수 설정)
+        <input type="hidden" name="tk_shop_id" value="">    */
+
+
+    /* 현금영수증 등록 창을 출력 여부를 설정하는 파라미터 입니다
+         ※ Y : 현금영수증 등록 창 출력
+         ※ N : 현금영수증 등록 창 출력 안함
+         ※ 주의 : 현금영수증 사용 시 KCP 상점관리자 페이지에서 현금영수증 사용 동의를 하셔야 합니다 */
+?>
+    <input type="hidden" name="disp_tax_yn"     value="N">
+<?php
+    /* 결제창에 가맹점 사이트의 로고를 플러그인 좌측 상단에 출력하는 파라미터 입니다
+       업체의 로고가 있는 URL을 정확히 입력하셔야 하며, 최대 150 X 50  미만 크기 지원
+
+    ※ 주의 : 로고 용량이 150 X 50 이상일 경우 site_name 값이 표시됩니다. */
+?>
+    <input type="hidden" name="site_logo"       value="">
+<?php
+    /* 결제창 영문 표시 파라미터 입니다. 영문을 기본으로 사용하시려면 Y로 세팅하시기 바랍니다
+        2010-06월 현재 신용카드와 가상계좌만 지원됩니다
+        <input type="hidden" name="eng_flag"      value="Y"> */
+?>
+
+<?php
+     /* skin_indx 값은 스킨을 변경할 수 있는 파라미터이며 총 7가지가 지원됩니다.
+        변경을 원하시면 1부터 7까지 값을 넣어주시기 바랍니다. */
+?>
+    <input type="hidden" name="skin_indx"      value="1">
+
+<?php
+    /* 상품코드 설정 파라미터 입니다.(상품권을 따로 구분하여 처리할 수 있는 옵션기능입니다.)
+    <input type="hidden" name="good_cd"      value=""> */
+
+    /* = -------------------------------------------------------------------------- = */
+    /* =   4. 옵션 정보 END                                                         = */
+    /* ============================================================================== */
+?>
+</form>
\ No newline at end of file
diff --git a/shop/kcp/global_nhn_kcp_order.script.php b/shop/kcp/global_nhn_kcp_order.script.php
new file mode 100644
index 000000000..9d72cb5b8
--- /dev/null
+++ b/shop/kcp/global_nhn_kcp_order.script.php
@@ -0,0 +1,81 @@
+<?php
+if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+
+// 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있는지 체크, 그렇지 않다면 return;
+if( !(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')) ){
+    return;
+}
+?>
+<script>
+jQuery(function($){
+    $( document ).ready(function() {
+        var pf = document.forderform;
+        
+        $(pf).on("form_sumbit_order_nhnkcp_naverpay", nhnkcp_naverpay_form_submit);
+        
+        function nhnkcp_naverpay_form_submit(){
+            var $form = $(this),
+                pf = $form[0],
+                nhnkcp_pay_form = document.nhnkcp_pay_form,
+                nhnkcp_settle_case = jQuery("input[name='od_settle_case']:checked").attr("data-pay"),
+                od_settle_case = jQuery("input[name='od_settle_case']:checked").val();
+
+            if (pf.good_mny.value < 1000) {
+                <?php // 간편결제수단은 신용카드처럼 취급하며 금액은 1000원 이상이므로, 1000원 이상이 아니면 PG사에서 승인하지 않는다. ?>
+                alert("간편결제는 1000원 이상 결제가 가능합니다.");
+                return false;
+            }
+
+            if( nhnkcp_settle_case == "naverpay" ){
+                if(typeof nhnkcp_pay_form.naverpay_direct !== "undefined") nhnkcp_pay_form.naverpay_direct.value = "Y";
+            }
+            
+            nhnkcp_pay_form.pay_method.value = "100000000000";
+            nhnkcp_pay_form.good_mny.value = pf.good_mny.value;
+            nhnkcp_pay_form.good_name.value = pf.od_goods_name.value;
+            nhnkcp_pay_form.good_info.value = "<?php echo $good_info; ?>";
+            nhnkcp_pay_form.od_settle_case.value = od_settle_case;
+            nhnkcp_pay_form.nhnkcp_pay_case.value = nhnkcp_settle_case;
+
+            nhnkcp_pay_form.buyr_name.value = pf.od_name.value;
+            nhnkcp_pay_form.buyr_mail.value = pf.od_email.value;
+            nhnkcp_pay_form.buyr_tel1.value = pf.od_tel.value;
+            nhnkcp_pay_form.buyr_tel2.value = pf.od_hp.value;
+            nhnkcp_pay_form.rcvr_name.value = pf.od_b_name.value;
+            nhnkcp_pay_form.rcvr_tel1.value = pf.od_b_tel.value;
+            nhnkcp_pay_form.rcvr_tel2.value = pf.od_b_hp.value;
+            nhnkcp_pay_form.rcvr_mail.value = pf.od_email.value;
+            nhnkcp_pay_form.rcvr_zipx.value = pf.od_b_zip.value;
+            nhnkcp_pay_form.rcvr_add1.value = pf.od_b_addr1.value;
+            nhnkcp_pay_form.rcvr_add2.value = pf.od_b_addr2.value;
+            
+            $("input,select,textarea", this).each(
+                function(index){
+                    var $clone_el = $(this).clone(),
+                        clone_el_name = $clone_el.attr("name"),
+                        clone_name_attr = "[name='"+clone_el_name+"']";
+                    
+                    if( $clone_el.prop("type") == "radio" || $clone_el.prop("type") == "checkbox" ){
+                        if( $clone_el.attr("checked") != "checked" ){
+                            clone_el_name = "";
+                        }
+                    }
+
+                    if( clone_el_name && ! (/^(LGD_|CST_|it_price|cp_price|requestByJs|timestamp|signature|returnUrl|mKey|charset|payViewType|closeUrl|popupUrl|quotabase|tax|od_settle_case)/i.test(clone_el_name)) ){
+                        if( $(nhnkcp_pay_form).find(clone_name_attr).length ){
+                            $(nhnkcp_pay_form).find(clone_name_attr).val( $clone_el.val() );
+                        } else {
+                            $(nhnkcp_pay_form).append($clone_el);
+                        }
+                    }
+                }
+            );
+            
+            jsf__pay( nhnkcp_pay_form );
+
+            return false;
+        }
+
+    });
+});
+</script>
\ No newline at end of file
diff --git a/shop/kcp/orderform.2.php b/shop/kcp/orderform.2.php
index f9c0fa4f9..d526997ae 100644
--- a/shop/kcp/orderform.2.php
+++ b/shop/kcp/orderform.2.php
@@ -13,6 +13,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="site_name"       value="<?php echo $g_conf_site_name; ?>">
     <input type="hidden" name="def_site_cd"     value="<?php echo $default['de_kcp_mid']; ?>">
 
+    <!-- <input type="hidden" name="KCP_PAY_MODULE"  value="kcp_web" > -->
 <?php
     /*
     할부옵션 : Payplus Plug-in에서 카드결제시 최대로 표시할 할부개월 수를 설정합니다.(0 ~ 18 까지 설정 가능)
@@ -38,6 +39,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="rcvr_add2"     value="">
 
     <input type="hidden" name="payco_direct"   value="">      <!-- PAYCO 결제창 호출 -->
+    <input type="hidden" name="naverpay_direct" value="A" >    <!-- NAVERPAY 결제창 호출 -->
+    <input type="hidden" name="kakaopay_direct" value="A" >    <!-- KAKAOPAY 결제창 호출 -->
 
     <input type="hidden" name="quotaopt"    value="12">
 
diff --git a/shop/kcp/pp_ax_hub.php b/shop/kcp/pp_ax_hub.php
index 246156cac..5cd5ebef5 100644
--- a/shop/kcp/pp_ax_hub.php
+++ b/shop/kcp/pp_ax_hub.php
@@ -40,10 +40,10 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     /* =   01. 지불 요청 정보 설정                                                  = */
     /* = -------------------------------------------------------------------------- = */
 	$req_tx         = $_POST[ "req_tx"         ]; // 요청 종류
-	$tran_cd        = $_POST[ "tran_cd"        ]; // 처리 종류
+	$tran_cd        = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "tran_cd"        ]); // 처리 종류
 	/* = -------------------------------------------------------------------------- = */
 	$cust_ip        = getenv( "REMOTE_ADDR"    ); // 요청 IP
-	$ordr_idxx      = $_POST[ "ordr_idxx"      ]; // 쇼핑몰 주문번호
+	$ordr_idxx      = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "ordr_idxx"      ]); // 쇼핑몰 주문번호
 	$good_name      = addslashes($_POST[ "good_name"]); // 상품명
 	$good_mny       = $_POST[ "good_mny"       ]; // 결제 총금액
 	/* = -------------------------------------------------------------------------- = */
@@ -269,6 +269,16 @@ if ( $req_tx == "pay" )
             $card_bin_type_01 = $c_PayPlus->mf_get_res_data( "card_bin_type_01" ); // 카드구분1
             $card_bin_type_02 = $c_PayPlus->mf_get_res_data( "card_bin_type_02" ); // 카드구분2
             $card_mny = $c_PayPlus->mf_get_res_data( "card_mny" ); // 카드결제금액
+            $od_other_pay_type = $c_PayPlus->mf_get_res_data( "card_other_pay_type" ); // 간편결제유형
+
+            $kcp_pay_method = $c_PayPlus->mf_get_res_data( "pay_method" ); // 카카오페이 결제수단
+            // 카드 코드는 PACA, 카카오머니 코드는 PAKM
+
+            if( $kcp_pay_method == "PAKM" ){    // 카카오머니
+                $card_mny = $kakaomny_mny = $c_PayPlus->mf_get_res_data( "kakaomny_mny" );
+                $app_time = $app_kakaomny_time = $c_PayPlus->mf_get_res_data( "app_kakaomny_time" );
+                $od_other_pay_type = 'NHNKCP_KAKAOMONEY';
+            }
 
             /* = -------------------------------------------------------------- = */
             /* =   05-1.1. 복합결제(포인트+신용카드) 승인 결과 처리               = */
diff --git a/shop/kcp/pp_cli_hub.php b/shop/kcp/pp_cli_hub.php
index b185360c5..e73fcb5d6 100644
--- a/shop/kcp/pp_cli_hub.php
+++ b/shop/kcp/pp_cli_hub.php
@@ -62,7 +62,7 @@ setlocale(LC_CTYPE, 'ko_KR.euc-kr');
     $req_tx     = $_POST[ "req_tx"     ];                             // 요청 종류
     $trad_time  = $_POST[ "trad_time"  ];                             // 원거래 시각
     /* = -------------------------------------------------------------------------- = */
-    $ordr_idxx  = $_POST[ "ordr_idxx"  ];                             // 주문 번호
+    $ordr_idxx  = preg_replace('/[^0-9A-Za-z_\-\.]/i', '', $_POST[ "ordr_idxx"  ]);                             // 주문 번호
     $buyr_name  = $_POST[ "buyr_name"  ];                             // 주문자 이름
     $buyr_tel1  = $_POST[ "buyr_tel1"  ];                             // 주문자 전화번호
     $buyr_mail  = $_POST[ "buyr_mail"  ];                             // 주문자 E-Mail
@@ -95,6 +95,7 @@ setlocale(LC_CTYPE, 'ko_KR.euc-kr');
 
     $buyr_name = iconv("utf-8", "cp949", $buyr_name);
     $good_name = iconv("utf-8", "cp949", $good_name);
+    $tx_cd = '';
 
     /* ============================================================================== */
     /* =   02. 인스턴스 생성 및 초기화                                              = */
diff --git a/shop/lg/taxsave_result.php b/shop/lg/taxsave_result.php
index bbf78d07d..b92033a40 100644
--- a/shop/lg/taxsave_result.php
+++ b/shop/lg/taxsave_result.php
@@ -208,7 +208,7 @@ switch($LGD_PAYTYPE) {
 ?>
 
 <div id="lg_req_tx" class="new_win">
-    <h1 id="win_title">현금영수증 - LG유플러스 eCredit</h1>
+    <h1 id="win_title">현금영수증 - 토스페이먼츠 eCredit</h1>
 
     <div class="tbl_head01 tbl_wrap">
         <table>
diff --git a/shop/naverpay/naverpay_item.php b/shop/naverpay/naverpay_item.php
index dfde296fe..f63a4890f 100644
--- a/shop/naverpay/naverpay_item.php
+++ b/shop/naverpay/naverpay_item.php
@@ -56,7 +56,7 @@ foreach($itemIds as $it_id) {
 ?>
 <item id="<?php echo $id; ?>">
 <?php if($it['ec_mall_pid']) { ?>
-<name><![CDATA[<?php echo $it['ec_mall_pid']; ?>]]></name>
+<mall_pid><![CDATA[<?php echo $it['ec_mall_pid']; ?>]]></mall_pid>
 <?php } ?>
 <name><![CDATA[<?php echo $name; ?>]]></name>
 <url><?php echo shop_item_url($it_id); ?></url>
diff --git a/shop/naverpay/naverpay_order.php b/shop/naverpay/naverpay_order.php
index d96b31cb8..63789889d 100644
--- a/shop/naverpay/naverpay_order.php
+++ b/shop/naverpay/naverpay_order.php
@@ -87,11 +87,11 @@ $sup_options = array();
 if($_POST['naverpay_form'] == 'item.php')
     $back_uri = shop_item_url($_POST['it_id'][0]);
 else if($_POST['naverpay_form'] == 'cart.php')
-    $back_uri = '/cart.php';
+    $back_uri = G5_SHOP_URL.'/cart.php';
 else
     $back_uri = '';
 
-define('NAVERPAY_BACK_URL', G5_SHOP_URL.$back_uri);
+define('NAVERPAY_BACK_URL', $back_uri);
 
 for($i=0; $i<$count; $i++) {
     $it_id = preg_replace($pattern, '', $_POST['it_id'][$i]);
diff --git a/shop/orderform.sub.php b/shop/orderform.sub.php
index e5f472bc5..e2c70a106 100644
--- a/shop/orderform.sub.php
+++ b/shop/orderform.sub.php
@@ -8,6 +8,10 @@ if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //
     require_once(G5_SHOP_PATH.'/inicis/lpay_common.php');
 }
 
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_SHOP_PATH.'/kcp/global_nhn_kcp.php');
+}
+
 // 결제대행사별 코드 include (스크립트 등)
 require_once(G5_SHOP_PATH.'/'.$default['de_pg_service'].'/orderform.1.php');
 
@@ -15,6 +19,10 @@ if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //
     require_once(G5_SHOP_PATH.'/inicis/lpay_form.1.php');
 }
 
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_SHOP_PATH.'/kcp/global_nhn_kcp_form.1.php');
+}
+
 if($is_kakaopay_use) {
     require_once(G5_SHOP_PATH.'/kakaopay/orderform.1.php');
 }
@@ -605,6 +613,8 @@ if($is_kakaopay_use) {
                     echo '<input type="radio" id="od_settle_card" name="od_settle_case" value="신용카드" '.$checked.'> <label for="od_settle_card" class="lb_icon card_icon">신용카드</label>'.PHP_EOL;
                     $checked = '';
                 }
+                
+                $easypay_prints = array();
 
                 // PG 간편결제
                 if($default['de_easy_pay_use']) {
@@ -621,8 +631,31 @@ if($is_kakaopay_use) {
                     }
 
                     $multi_settle++;
-                    echo '<input type="radio" id="od_settle_easy_pay" name="od_settle_case" value="간편결제" '.$checked.'> <label for="od_settle_easy_pay" class="'.$pg_easy_pay_name.' lb_icon">'.$pg_easy_pay_name.'</label>'.PHP_EOL;
-                    $checked = '';
+
+                    if($default['de_pg_service'] === 'kcp' && isset($default['de_easy_pay_services']) && $default['de_easy_pay_services']){
+                        $de_easy_pay_service_array = explode(',', $default['de_easy_pay_services']);
+                        if( in_array('nhnkcp_payco', $de_easy_pay_service_array) ){
+                            $easypay_prints['nhnkcp_payco'] = '<input type="radio" id="od_settle_nhnkcp_payco" name="od_settle_case" data-pay="payco" value="간편결제"> <label for="od_settle_nhnkcp_payco" class="PAYCO nhnkcp_payco lb_icon" title="NHN_KCP - PAYCO">PAYCO</label>';
+                        }
+                        if( in_array('nhnkcp_naverpay', $de_easy_pay_service_array) ){
+                            $easypay_prints['nhnkcp_naverpay'] = '<input type="radio" id="od_settle_nhnkcp_naverpay" name="od_settle_case" data-pay="naverpay" value="간편결제" > <label for="od_settle_nhnkcp_naverpay" class="naverpay_icon nhnkcp_naverpay lb_icon" title="NHN_KCP - 네이버페이">네이버페이</label>';
+                        }
+                        if( in_array('nhnkcp_kakaopay', $de_easy_pay_service_array) ){
+                            $easypay_prints['nhnkcp_kakaopay'] = '<input type="radio" id="od_settle_nhnkcp_kakaopay" name="od_settle_case" data-pay="kakaopay" value="간편결제" > <label for="od_settle_nhnkcp_kakaopay" class="kakaopay_icon nhnkcp_kakaopay lb_icon" title="NHN_KCP - 카카오페이">카카오페이</label>';
+                        }
+                    } else {
+                        $easypay_prints[strtolower($pg_easy_pay_name)] = '<input type="radio" id="od_settle_easy_pay" name="od_settle_case" value="간편결제"> <label for="od_settle_easy_pay" class="'.$pg_easy_pay_name.' lb_icon">'.$pg_easy_pay_name.'</label>';
+                    }
+
+                }
+
+                if( ! isset($easypay_prints['nhnkcp_naverpay']) && function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp') ){
+                    $easypay_prints['nhnkcp_naverpay'] = '<input type="radio" id="od_settle_nhnkcp_naverpay" name="od_settle_case" data-pay="naverpay" value="간편결제" > <label for="od_settle_nhnkcp_naverpay" class="naverpay_icon nhnkcp_naverpay lb_icon" title="NHN_KCP - 네이버페이">네이버페이</label>';
+                }
+
+                if($easypay_prints) {
+                    $multi_settle++;
+                    echo run_replace('shop_orderform_easypay_buttons', implode(PHP_EOL, $easypay_prints), $easypay_prints, $multi_settle);
                 }
 
                 //이니시스 Lpay
@@ -734,6 +767,9 @@ if($is_kakaopay_use) {
 if( $default['de_inicis_lpay_use'] || $default['de_inicis_kakaopay_use'] ){   //이니시스 L.pay 또는 이니시스 카카오페이 사용시
     require_once(G5_SHOP_PATH.'/inicis/lpay_order.script.php');
 }
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp')){  // 타 PG 사용시 NHN KCP 네이버페이 사용이 설정되어 있다면
+    require_once(G5_SHOP_PATH.'/kcp/global_nhn_kcp_order.script.php');
+}
 ?>
 <script>
 var zipcode = "";
@@ -1266,17 +1302,11 @@ function forderform_check(f)
 
     var temp_point = 0;
     if (typeof(f.od_temp_point) != "undefined") {
+        var point_unit = parseInt(<?php echo $default['de_settle_point_unit']; ?>);
+        temp_point = parseInt(f.od_temp_point.value) || 0;
+
         if (f.od_temp_point.value)
         {
-            var point_unit = parseInt(<?php echo $default['de_settle_point_unit']; ?>);
-            temp_point = parseInt(f.od_temp_point.value);
-
-            if (temp_point < 0) {
-                alert("포인트를 0 이상 입력하세요.");
-                f.od_temp_point.select();
-                return false;
-            }
-
             if (temp_point > od_price) {
                 alert("상품 주문금액(배송비 제외) 보다 많이 포인트결제할 수 없습니다.");
                 f.od_temp_point.select();
@@ -1300,11 +1330,11 @@ function forderform_check(f)
                 f.od_temp_point.select();
                 return false;
             }
+        }
 
-            // pg 결제 금액에서 포인트 금액 차감
-            if(settle_method != "무통장") {
-                f.good_mny.value = od_price + send_cost + send_cost2 - send_coupon - temp_point;
-            }
+        // pg 결제 금액에서 포인트 금액 차감
+        if(settle_method != "무통장") {
+            f.good_mny.value = od_price + send_cost + send_cost2 - send_coupon - temp_point;
         }
     }
 
@@ -1363,14 +1393,20 @@ function forderform_check(f)
 
     if( settle_method == "lpay" || settle_method == "inicis_kakaopay" ){      //이니시스 L.pay 또는 이니시스 카카오페이 이면 ( 이니시스의 삼성페이는 모바일에서만 단독실행 가능함 )
         form_order_method = 'samsungpay';
+    } else if(settle_method == "간편결제") {
+        if(jQuery("input[name='od_settle_case']:checked" ).attr("data-pay") === "naverpay"){
+            form_order_method = 'nhnkcp_naverpay';
+        }
     }
 
     if( jQuery(f).triggerHandler("form_sumbit_order_"+form_order_method) !== false ) {
-
+        
         // pay_method 설정
         <?php if($default['de_pg_service'] == 'kcp') { ?>
         f.site_cd.value = f.def_site_cd.value;
-        f.payco_direct.value = "";
+        if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "";
+        if(typeof f.naverpay_direct !== "undefined") f.naverpay_direct.value = "A";
+        if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "A";
         switch(settle_method)
         {
             case "계좌이체":
@@ -1386,11 +1422,21 @@ function forderform_check(f)
                 f.pay_method.value   = "100000000000";
                 break;
             case "간편결제":
-                <?php if($default['de_card_test']) { ?>
-                f.site_cd.value      = "S6729";
-                <?php } ?>
                 f.pay_method.value   = "100000000000";
-                f.payco_direct.value = "Y";
+                
+                var nhnkcp_easy_pay = jQuery("input[name='od_settle_case']:checked" ).attr("data-pay");
+                
+                if(nhnkcp_easy_pay === "naverpay"){
+                    if(typeof f.naverpay_direct !== "undefined") f.naverpay_direct.value = "Y";
+                } else if(nhnkcp_easy_pay === "kakaopay"){
+                    if(typeof f.kakaopay_direct !== "undefined") f.kakaopay_direct.value = "Y";
+                } else {
+                    if(typeof f.payco_direct !== "undefined") f.payco_direct.value = "Y";
+                    <?php if($default['de_card_test']) { ?>
+                    f.site_cd.value      = "S6729";
+                    <?php } ?>
+                }
+
                 break;
             default:
                 f.pay_method.value   = "무통장";
diff --git a/shop/orderformupdate.php b/shop/orderformupdate.php
index eb9eeec98..fc7e52dcc 100644
--- a/shop/orderformupdate.php
+++ b/shop/orderformupdate.php
@@ -7,6 +7,11 @@ if( in_array($od_settle_case, array('lpay', 'inicis_kakaopay')) ){
     $default['de_pg_service'] = 'inicis';
 }
 
+// 타 PG 사용시 NHN KCP 네이버페이로 결제 요청이 왔다면 $default['de_pg_service'] 값을 kcp 로 변경합니다.
+if(function_exists('is_use_easypay') && is_use_easypay('global_nhnkcp') && isset($_POST['enc_data']) && $_POST['enc_data'] && isset($_POST['site_cd']) && isset($_POST['nhnkcp_pay_case']) && $_POST['nhnkcp_pay_case'] === "naverpay"){
+    $default['de_pg_service'] = 'kcp';
+}
+
 if(function_exists('add_order_post_log')) add_order_post_log('init');
 
 if(($od_settle_case != '무통장' && $od_settle_case != 'KAKAOPAY') && $default['de_pg_service'] == 'lg' && !$_POST['LGD_PAYKEY']){
@@ -25,6 +30,18 @@ if (get_cart_count($tmp_cart_id) == 0) {    // 장바구니에 담기
     alert('장바구니가 비어 있습니다.\\n\\n이미 주문하셨거나 장바구니에 담긴 상품이 없는 경우입니다.', G5_SHOP_URL.'/cart.php');
 }
 
+$sql = "select * from {$g5['g5_shop_order_table']} limit 1";
+$check_tmp = sql_fetch($sql);
+
+if(!isset($check_tmp['od_other_pay_type'])){
+    $sql = "ALTER TABLE `{$g5['g5_shop_order_table']}` 
+            ADD COLUMN `od_other_pay_type` VARCHAR(100) NOT NULL DEFAULT '' AFTER `od_settle_case`; ";
+    sql_query($sql, false);
+}
+
+// 변수 초기화
+$od_other_pay_type = '';
+
 $error = "";
 // 장바구니 상품 재고 검사
 $sql = " select it_id,
@@ -574,6 +591,7 @@ $sql = " insert {$g5['g5_shop_order_table']}
                 od_time           = '".G5_TIME_YMDHIS."',
                 od_ip             = '$REMOTE_ADDR',
                 od_settle_case    = '$od_settle_case',
+                od_other_pay_type = '$od_other_pay_type',
                 od_test           = '{$default['de_card_test']}'
                 ";
 $result = sql_query($sql, false);
diff --git a/shop/orderinquiryview.php b/shop/orderinquiryview.php
index 6fb244884..b2c4c7ffb 100644
--- a/shop/orderinquiryview.php
+++ b/shop/orderinquiryview.php
@@ -237,19 +237,6 @@ if($od['od_pg'] == 'lg') {
             $app_no_subj = '승인번호';
             $app_no = $od['od_app_no'];
             $disp_bank = false;
-            switch($od['od_pg']) {
-                case 'lg':
-                    $easy_pay_name = 'PAYNOW';
-                    break;
-                case 'inicis':
-                    $easy_pay_name = 'KPAY';
-                    break;
-                case 'kcp':
-                    $easy_pay_name = 'PAYCO';
-                    break;
-                default:
-                    break;
-            }
         } else if($od['od_settle_case'] == '휴대폰') {
             $app_no_subj = '휴대폰번호';
             $app_no = $od['od_bank_account'];
@@ -281,7 +268,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'], $od) ); ?></td>
+                    <td><?php echo check_pay_name_replace($od['od_settle_case'], $od, 1); ?></td>
                 </tr>
                 <tr>
                     <th scope="row">결제금액</th>
@@ -299,7 +286,7 @@ if($od['od_pg'] == 'lg') {
                 }
 
                 // 승인번호, 휴대폰번호, 거래번호
-                if($app_no_subj)
+                if($app_no_subj && $app_no)
                 {
                 ?>
                 <tr>
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index 8a50868fa..a7dea635f 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                                 $img_content = '<span class="no_image">no image</span>';
                             }
 
-                            echo $img_content;
+                            echo run_replace('thumb_image_tag', $img_content, $thumb);
                         }
                          ?>
                         </a>
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index c58c86801..e41dc44d1 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -126,7 +126,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
 #bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden}
 #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block}
-#bo_gall .gall_img img {max-width:100%;height:auto !important}
+#bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important}
 #bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px 0}
diff --git a/skin/latest/pic_block/latest.skin.php b/skin/latest/pic_block/latest.skin.php
index dcd824410..58b7f4519 100644
--- a/skin/latest/pic_block/latest.skin.php
+++ b/skin/latest/pic_block/latest.skin.php
@@ -25,7 +25,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
     ?>
         <li class="gallery_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
+            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
diff --git a/skin/latest/pic_block/style.css b/skin/latest/pic_block/style.css
index a7c8601fe..b76196799 100644
--- a/skin/latest/pic_block/style.css
+++ b/skin/latest/pic_block/style.css
@@ -12,7 +12,7 @@
 .pic_lt li {float:left;width:25%;padding:0 10px}
 .pic_lt li.gallery_li:nth-child(4n+1) {clear: both!important}
 .pic_lt li .lt_img {margin:5px 0;display:block}
-.pic_lt li .lt_img img {width:100%;height:auto}
+.pic_lt li .lt_img img, .pic_lt li .lt_img video {width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}
 .pic_lt li .fa-heart {color:#ff0000}
 .pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
diff --git a/skin/latest/pic_list/latest.skin.php b/skin/latest/pic_list/latest.skin.php
index 1a8a08ed4..50ad31951 100644
--- a/skin/latest/pic_list/latest.skin.php
+++ b/skin/latest/pic_list/latest.skin.php
@@ -27,7 +27,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.$img_content.'</a>';
+            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
diff --git a/skin/latest/pic_list/style.css b/skin/latest/pic_list/style.css
index 9c8db93f2..b263aa2f0 100644
--- a/skin/latest/pic_list/style.css
+++ b/skin/latest/pic_list/style.css
@@ -12,7 +12,7 @@
 .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px}
 .pic_li_lt li .lt_img {display:none}
 .pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block}
-.pic_li_lt li:first-child .lt_img img {width:100%;height:auto}
+.pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto}
 .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 
 .pic_li_lt li .fa-heart {color:#ff0000}
diff --git a/skin/shop/basic/boxbanner.skin.php b/skin/shop/basic/boxbanner.skin.php
index 3f1d86b15..d6bd9fd3e 100644
--- a/skin/shop/basic/boxbanner.skin.php
+++ b/skin/shop/basic/boxbanner.skin.php
@@ -28,7 +28,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         else if ($row['bn_url'] && $row['bn_url'] != 'http://') {
             $banner .= '<a href="'.G5_SHOP_URL.'/bannerhit.php?bn_id='.$row['bn_id'].'"'.$bn_new_win.'>';
         }
-        echo $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'" alt="'.get_text($row['bn_alt']).'" width="'.$size[0].'" height="'.$size[1].'"'.$bn_border.'>';
+        echo $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'?'.preg_replace('/[^0-9]/i', '', $row['bn_time']).'" alt="'.get_text($row['bn_alt']).'" width="'.$size[0].'" height="'.$size[1].'"'.$bn_border.'>';
         if($banner)
             echo '</a>'.PHP_EOL;
         echo '</li>'.PHP_EOL;
diff --git a/skin/shop/basic/list.10.skin.php b/skin/shop/basic/list.10.skin.php
index 3f30b0880..78f494096 100644
--- a/skin/shop/basic/list.10.skin.php
+++ b/skin/shop/basic/list.10.skin.php
@@ -115,7 +115,9 @@ foreach((array) $list as $row){
         // 위시리스트 + 공유 버튼 시작
         echo "<div class=\"sct_op_btn\">\n";
         echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-        echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+        if ($this->view_sns) {
+            echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+        }
         
         echo "<div class=\"sct_sns_wrap\">";
         if ($this->view_sns) {
diff --git a/skin/shop/basic/list.40.skin.php b/skin/shop/basic/list.40.skin.php
index e592b1eb0..b0771d72d 100644
--- a/skin/shop/basic/list.40.skin.php
+++ b/skin/shop/basic/list.40.skin.php
@@ -103,7 +103,9 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+    }
 	
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
diff --git a/skin/shop/basic/main.30.skin.php b/skin/shop/basic/main.30.skin.php
index c76984401..33ece4711 100644
--- a/skin/shop/basic/main.30.skin.php
+++ b/skin/shop/basic/main.30.skin.php
@@ -112,8 +112,10 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작 {
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
-	
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+	}
+
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
         $sns_top = $this->img_height + 10;
diff --git a/skin/shop/basic/main.40.skin.php b/skin/shop/basic/main.40.skin.php
index e6ee4fd45..23f3045e9 100644
--- a/skin/shop/basic/main.40.skin.php
+++ b/skin/shop/basic/main.40.skin.php
@@ -105,8 +105,10 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작 {
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
-	
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+	}
+
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
         $sns_top = $this->img_height + 10;
diff --git a/skin/shop/basic/mainbanner.10.skin.php b/skin/shop/basic/mainbanner.10.skin.php
index d38cfcb63..e6dfa06ec 100644
--- a/skin/shop/basic/mainbanner.10.skin.php
+++ b/skin/shop/basic/mainbanner.10.skin.php
@@ -44,7 +44,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         else if ($row['bn_url'] && $row['bn_url'] != 'http://') {
             $banner .= '<a href="'.G5_SHOP_URL.'/bannerhit.php?bn_id='.$row['bn_id'].'"'.$bn_new_win.'>';
         }
-        $item_html .= $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'" width="'.$size[0].'" alt="'.get_text($row['bn_alt']).'"'.$bn_border.'>';
+        $item_html .= $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'?'.preg_replace('/[^0-9]/i', '', $row['bn_time']).'" width="'.$size[0].'" alt="'.get_text($row['bn_alt']).'"'.$bn_border.'>';
         if($banner)
             $item_html .= '</a>';
         $item_html .= '</div>';
diff --git a/theme/basic/css/default_shop.css b/theme/basic/css/default_shop.css
index bc5f08b78..0cfbe8221 100644
--- a/theme/basic/css/default_shop.css
+++ b/theme/basic/css/default_shop.css
@@ -806,7 +806,8 @@ box-shadow: 1px 2px 2px #eee;}
 #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 .kakaopay_icon{background:url('../../../img/kakao.png') no-repeat 50% 50% #fff;overflow:hidden;text-indent:-999px}
+#sod_frm_paysel .naverpay_icon{background:url('../../../img/ico-default-naverpay.png') no-repeat 50% 50% #fff;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}
 #sod_frm_paysel .iche_icon{background:url('../../../img/pay_icon2.png') no-repeat 15px 50% #fff}
@@ -1159,6 +1160,7 @@ a.btn_frmline.is-long-text{height:auto;width:160px}
 .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 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 .naverpay_icon{background:url(../../../img/ico-default-naverpay.png) no-repeat 50% 50% #fff;border-radius:30px;height:22px;width:50px;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}
 .sod_frm_mobile #sod_frm_pay h2{margin:10px 0;font-size:1.25em}
diff --git a/theme/basic/css/mobile_shop.css b/theme/basic/css/mobile_shop.css
index 31bef87c0..ee8c659ca 100644
--- a/theme/basic/css/mobile_shop.css
+++ b/theme/basic/css/mobile_shop.css
@@ -224,7 +224,8 @@ box-shadow: 0 0 6px rgba(0,0,0,0.2);}
 #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 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/ico-mobile-kakaopay.png') no-repeat #fff;height:15px;width:43px;display:inline-block;overflow:hidden;text-indent:-999px;background-size:35px auto}
+#m_sod_frm_paysel .naverpay_icon{background:url('../../../img/ico-mobile-naverpay.png') no-repeat #fff;height:15px;width:40px;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}
 
 #sod_frm_pay{padding:10px;;border-top:1px solid #f3f3f3}
@@ -907,6 +908,7 @@ box-shadow:0 0 8px rgba(65,98,255,0.8)}
 #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 .naverpay_icon{background:url('../../../img/ico-default-naverpay.png') no-repeat 50% 50% #fff;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}
 #sod_frm_paysel .iche_icon{background:url('../../../img/pay_icon2.png') no-repeat 15px 50% #fff}
diff --git a/theme/basic/mobile/skin/board/gallery/list.skin.php b/theme/basic/mobile/skin/board/gallery/list.skin.php
index 843aa83c8..2a7ffb6fd 100644
--- a/theme/basic/mobile/skin/board/gallery/list.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/list.skin.php
@@ -99,7 +99,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                         $img_content = '<span class="no_img"><i class="fa fa-picture-o" aria-hidden="true"></i></span>';
                     }
 
-                    echo $img_content;
+                    echo run_replace('thumb_image_tag', $img_content, $thumb);
                 }
                 ?>
                 </a>
diff --git a/theme/basic/mobile/skin/board/gallery/style.css b/theme/basic/mobile/skin/board/gallery/style.css
index 3b4ed8f56..a1a7762b2 100644
--- a/theme/basic/mobile/skin/board/gallery/style.css
+++ b/theme/basic/mobile/skin/board/gallery/style.css
@@ -158,7 +158,7 @@
 #bo_gall .gall_li_wr {position:relative;}
 #bo_gall .gall_li_chk {display:inline-block;position:absolute;top:10px;left:10px}
 #bo_gall .gall_li:nth-child(2n+1) {clear:both}
-#bo_gall .gall_li .gall_img img{width:100%;height:auto}
+#bo_gall .gall_li .gall_img img, #bo_gall .gall_li .gall_img video{width:100%;height:auto}
 #bo_gall .gall_li .gall_img .no_img,
 #bo_gall .gall_li .gall_notice {display:block;background:#eaeaea;color:#d0d0d0;font-size:3em;text-align:center;padding:25% 0}
 
diff --git a/theme/basic/mobile/skin/latest/basic/latest.skin.php b/theme/basic/mobile/skin/latest/basic/latest.skin.php
index 591befd3b..434bbc945 100644
--- a/theme/basic/mobile/skin/latest/basic/latest.skin.php
+++ b/theme/basic/mobile/skin/latest/basic/latest.skin.php
@@ -38,7 +38,7 @@ $is_show_next_prev = ($list_count > 4) ? 1 : 0;
                 //echo $list[$i]['icon_reply']." ";
                 
                 if( $img_content ){
-                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".$img_content."</a> ";
+                    echo "<a href=\"".$list[$i]['href']."\" class=\"lt_thumb\">".run_replace('thumb_image_tag', $img_content, $thumb)."</a> ";
                 }
                 
                 echo "<a href=\"".$list[$i]['href']."\" class=\"lt_tit\">";
diff --git a/theme/basic/mobile/skin/latest/basic/style.css b/theme/basic/mobile/skin/latest/basic/style.css
index 0762c0372..57c7e62f6 100644
--- a/theme/basic/mobile/skin/latest/basic/style.css
+++ b/theme/basic/mobile/skin/latest/basic/style.css
@@ -9,7 +9,7 @@
 .lt ul li:after {display:block;visibility:hidden;clear:both;content:""}
 .lt ul li:hover a.lt_tit {color:#3a8afd}
 .lt .lt_thumb {display:inline-block;float:left;margin-right:10px}
-.lt .lt_thumb img {width:138px;height:auto;overflow:hidden}
+.lt .lt_thumb img, .lt .lt_thumb video {width:138px !important;height:auto;overflow:hidden}
 .lt .lt_tit {display:block;font-size:1.2em;font-weight:bold;max-height:60px;overflow:hidden;padding-bottom:10px}
 .lt .lt_info {display:inline-block;position:relative;line-height:20px;color:#828282;font-size:0.925em;vertical-align:top}
 .lt .lt_date {color:#828282}
diff --git a/theme/basic/mobile/skin/shop/basic/itemuselist.skin.php b/theme/basic/mobile/skin/shop/basic/itemuselist.skin.php
index 421981d93..dcff7603c 100644
--- a/theme/basic/mobile/skin/shop/basic/itemuselist.skin.php
+++ b/theme/basic/mobile/skin/shop/basic/itemuselist.skin.php
@@ -81,7 +81,7 @@ add_stylesheet('<link rel="stylesheet" href="'.G5_MSHOP_SKIN_URL.'/style.css">',
 	            			<div class="review_summ">
 	            				<?php echo get_itemuselist_thumbnail($row['it_id'], $row['is_content'], 50, 50); ?>
 	            				<p>
-	            					<span>상품명입니다.</span>
+	            					<span><?php echo get_text($row['is_subject']); ?></span>
 	            					<span class="sound_only">평가점수</span><img src="<?php echo G5_URL; ?>/shop/img/s_star<?php echo $star; ?>.png" alt="별<?php echo $star; ?>개" width="80">
 	            				</p>
 	            			</div>
diff --git a/theme/basic/shop/orderinquiryview.php b/theme/basic/shop/orderinquiryview.php
index e50d3dd70..691dd6441 100644
--- a/theme/basic/shop/orderinquiryview.php
+++ b/theme/basic/shop/orderinquiryview.php
@@ -194,19 +194,6 @@ if($od['od_pg'] == 'lg') {
             $app_no_subj = '승인번호';
             $app_no = $od['od_app_no'];
             $disp_bank = false;
-            switch($od['od_pg']) {
-                case 'lg':
-                    $easy_pay_name = 'PAYNOW';
-                    break;
-                case 'inicis':
-                    $easy_pay_name = 'KPAY';
-                    break;
-                case 'kcp':
-                    $easy_pay_name = 'PAYCO';
-                    break;
-                default:
-                    break;
-            }
         } else if($od['od_settle_case'] == '휴대폰') {
             $app_no_subj = '휴대폰번호';
             $app_no = $od['od_bank_account'];
@@ -415,7 +402,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'], $od) ); ?></span>
+	                <span><?php echo check_pay_name_replace($od['od_settle_case'], $od, 1); ?></span>
 	            </li>
 	            <li>
 	                <strong>결제금액</strong>
@@ -433,7 +420,7 @@ if($od['od_pg'] == 'lg') {
 	            }
 	
 	            // 승인번호, 휴대폰번호, 거래번호
-	            if($app_no_subj)
+	            if($app_no_subj && $app_no)
 	            {
 	            ?>
 	            <li>
diff --git a/theme/basic/skin/board/gallery/list.skin.php b/theme/basic/skin/board/gallery/list.skin.php
index 8a50868fa..a7dea635f 100644
--- a/theme/basic/skin/board/gallery/list.skin.php
+++ b/theme/basic/skin/board/gallery/list.skin.php
@@ -120,7 +120,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
                                 $img_content = '<span class="no_image">no image</span>';
                             }
 
-                            echo $img_content;
+                            echo run_replace('thumb_image_tag', $img_content, $thumb);
                         }
                          ?>
                         </a>
diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css
index c58c86801..e41dc44d1 100644
--- a/theme/basic/skin/board/gallery/style.css
+++ b/theme/basic/skin/board/gallery/style.css
@@ -126,7 +126,7 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202)}
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
 #bo_gall .gall_img {border-bottom:1px solid #eee;text-align:center;height:200px;max-height:200px;overflow:hidden}
 #bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice {display:block}
-#bo_gall .gall_img img {max-width:100%;height:auto !important}
+#bo_gall .gall_img img, #bo_gall .gall_img video {max-width:100%;height:auto !important}
 #bo_gall .gall_img span {display:inline-block;background:#eaeaea;text-align:center;line-height:200px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px 0}
diff --git a/theme/basic/skin/latest/pic_block/latest.skin.php b/theme/basic/skin/latest/pic_block/latest.skin.php
index 791e2b48b..2682480e0 100644
--- a/theme/basic/skin/latest/pic_block/latest.skin.php
+++ b/theme/basic/skin/latest/pic_block/latest.skin.php
@@ -25,7 +25,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
     $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
     ?>
         <li class="galley_li">
-            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo $img_content; ?></a>
+            <a href="<?php echo $list[$i]['href'] ?>" class="lt_img"><?php echo run_replace('thumb_image_tag', $img_content, $thumb); ?></a>
             <?php
             if ($list[$i]['icon_secret']) echo "<i class=\"fa fa-lock\" aria-hidden=\"true\"></i><span class=\"sound_only\">비밀글</span> ";
 
diff --git a/theme/basic/skin/latest/pic_block/style.css b/theme/basic/skin/latest/pic_block/style.css
index 6b5dbb8af..fe377172b 100644
--- a/theme/basic/skin/latest/pic_block/style.css
+++ b/theme/basic/skin/latest/pic_block/style.css
@@ -12,7 +12,7 @@
 .pic_lt li {float:left;width:25%;padding:0 10px}
 .pic_lt li.galley_li:nth-child(4n+1) {clear: both!important}
 .pic_lt li .lt_img {margin:5px 0;display:block}
-.pic_lt li .lt_img img {width:100%;height:auto}
+.pic_lt li .lt_img img, .pic_lt li .lt_img video{width:100%;height:auto}
 .pic_lt li a:hover {color:#a22121}
 .pic_lt li .fa-heart {color:#ff0000}
 .pic_lt li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle}
diff --git a/theme/basic/skin/latest/pic_list/latest.skin.php b/theme/basic/skin/latest/pic_list/latest.skin.php
index 1a8a08ed4..50ad31951 100644
--- a/theme/basic/skin/latest/pic_list/latest.skin.php
+++ b/theme/basic/skin/latest/pic_list/latest.skin.php
@@ -27,7 +27,7 @@ $list_count = (is_array($list) && $list) ? count($list) : 0;
                 $thumb['alt'] = '이미지가 없습니다.';
             }
             $img_content = '<img src="'.$img.'" alt="'.$thumb['alt'].'" >';
-            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.$img_content.'</a>';
+            $img_link_html = '<a href="'.$list[$i]['href'].'" class="lt_img" >'.run_replace('thumb_image_tag', $img_content, $thumb).'</a>';
         }
     ?>
         <li>
diff --git a/theme/basic/skin/latest/pic_list/style.css b/theme/basic/skin/latest/pic_list/style.css
index 9c8db93f2..b263aa2f0 100644
--- a/theme/basic/skin/latest/pic_list/style.css
+++ b/theme/basic/skin/latest/pic_list/style.css
@@ -12,7 +12,7 @@
 .pic_li_lt li {border-bottom:1px solid #e5ecee;margin-bottom:10px}
 .pic_li_lt li .lt_img {display:none}
 .pic_li_lt li:first-child .lt_img {display:block;margin:0 0 10px;display:block}
-.pic_li_lt li:first-child .lt_img img {width:100%;height:auto}
+.pic_li_lt li:first-child .lt_img img, .pic_li_lt li .lt_img video {width:100%;height:auto}
 .pic_li_lt li .pic_li_tit {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle}
 
 .pic_li_lt li .fa-heart {color:#ff0000}
diff --git a/theme/basic/skin/shop/basic/boxbanner.skin.php b/theme/basic/skin/shop/basic/boxbanner.skin.php
index 3f1d86b15..ca479c497 100644
--- a/theme/basic/skin/shop/basic/boxbanner.skin.php
+++ b/theme/basic/skin/shop/basic/boxbanner.skin.php
@@ -1,4 +1,4 @@
-    <?php
+<?php
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
@@ -28,7 +28,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         else if ($row['bn_url'] && $row['bn_url'] != 'http://') {
             $banner .= '<a href="'.G5_SHOP_URL.'/bannerhit.php?bn_id='.$row['bn_id'].'"'.$bn_new_win.'>';
         }
-        echo $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'" alt="'.get_text($row['bn_alt']).'" width="'.$size[0].'" height="'.$size[1].'"'.$bn_border.'>';
+        echo $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'?'.preg_replace('/[^0-9]/i', '', $row['bn_time']).'" alt="'.get_text($row['bn_alt']).'" width="'.$size[0].'" height="'.$size[1].'"'.$bn_border.'>';
         if($banner)
             echo '</a>'.PHP_EOL;
         echo '</li>'.PHP_EOL;
diff --git a/theme/basic/skin/shop/basic/list.10.skin.php b/theme/basic/skin/shop/basic/list.10.skin.php
index e9008889e..5d038bce8 100644
--- a/theme/basic/skin/shop/basic/list.10.skin.php
+++ b/theme/basic/skin/shop/basic/list.10.skin.php
@@ -115,7 +115,9 @@ foreach((array) $list as $row){
         // 위시리스트 + 공유 버튼 시작
         echo "<div class=\"sct_op_btn\">\n";
         echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-        echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+        if ($this->view_sns) {
+            echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+        }
         
         echo "<div class=\"sct_sns_wrap\">";
         if ($this->view_sns) {
diff --git a/theme/basic/skin/shop/basic/list.40.skin.php b/theme/basic/skin/shop/basic/list.40.skin.php
index e592b1eb0..a7152c2cf 100644
--- a/theme/basic/skin/shop/basic/list.40.skin.php
+++ b/theme/basic/skin/shop/basic/list.40.skin.php
@@ -103,8 +103,10 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
-	
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+	}
+
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
         $sns_top = $this->img_height + 10;
diff --git a/theme/basic/skin/shop/basic/main.30.skin.php b/theme/basic/skin/shop/basic/main.30.skin.php
index 2e87da026..548a40f12 100644
--- a/theme/basic/skin/shop/basic/main.30.skin.php
+++ b/theme/basic/skin/shop/basic/main.30.skin.php
@@ -112,8 +112,10 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작 {
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
-	
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+	}
+
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
         $sns_top = $this->img_height + 10;
diff --git a/theme/basic/skin/shop/basic/main.40.skin.php b/theme/basic/skin/shop/basic/main.40.skin.php
index 66ebd376c..3893452b0 100644
--- a/theme/basic/skin/shop/basic/main.40.skin.php
+++ b/theme/basic/skin/shop/basic/main.40.skin.php
@@ -105,8 +105,10 @@ foreach((array) $list as $row){
 	// 위시리스트 + 공유 버튼 시작 {
 	echo "<div class=\"sct_op_btn\">\n";
 	echo "<button type=\"button\" class=\"btn_wish\" data-it_id=\"{$row['it_id']}\"><span class=\"sound_only\">위시리스트</span><i class=\"fa fa-heart-o\" aria-hidden=\"true\"></i></button>\n";
-	echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
-	
+    if ($this->view_sns) {
+	    echo "<button type=\"button\" class=\"btn_share\"><span class=\"sound_only\">공유하기</span><i class=\"fa fa-share-alt\" aria-hidden=\"true\"></i></button>\n";
+	}
+
 	echo "<div class=\"sct_sns_wrap\">";
 	if ($this->view_sns) {
         $sns_top = $this->img_height + 10;
diff --git a/theme/basic/skin/shop/basic/mainbanner.10.skin.php b/theme/basic/skin/shop/basic/mainbanner.10.skin.php
index dad95fc34..fe97751a7 100644
--- a/theme/basic/skin/shop/basic/mainbanner.10.skin.php
+++ b/theme/basic/skin/shop/basic/mainbanner.10.skin.php
@@ -44,7 +44,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
         else if ($row['bn_url'] && $row['bn_url'] != 'http://') {
             $banner .= '<a href="'.G5_SHOP_URL.'/bannerhit.php?bn_id='.$row['bn_id'].'"'.$bn_new_win.'>';
         }
-        $item_html .= $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'" width="'.$size[0].'" alt="'.get_text($row['bn_alt']).'"'.$bn_border.'>';
+        $item_html .= $banner.'<img src="'.G5_DATA_URL.'/banner/'.$row['bn_id'].'?'.preg_replace('/[^0-9]/i', '', $row['bn_time']).'" width="'.$size[0].'" alt="'.get_text($row['bn_alt']).'"'.$bn_border.'>';
         if($banner)
             $item_html .= '</a>';
         $item_html .= '</div>';