diff --git a/.gitignore b/.gitignore
index 9ea483ecd..bcecf93c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 !.gitignore
-.htaccess
+/.htaccess
 data/
 test/
 sirgle/
diff --git a/_common.php b/_common.php
index 0da77b7c1..8d16d0880 100644
--- a/_common.php
+++ b/_common.php
@@ -1,7 +1,7 @@
 <?php
 include_once('./common.php');
 
-if(isset($default['de_root_index_use']) && $default['de_root_index_use']) {
+if((isset($default['de_root_index_use']) && $default['de_root_index_use']) || (isset($default['de_shop_layout_use']) && $default['de_shop_layout_use'])) {
     if (!defined('G5_USE_SHOP') || !G5_USE_SHOP)
         die('<p>쇼핑몰 설치 후 이용해 주십시오.</p>');
 
diff --git a/_head.php b/_head.php
index 79e267fb7..a0558a12a 100644
--- a/_head.php
+++ b/_head.php
@@ -1,5 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/head.php');
+if(isset($default['de_shop_layout_use']) && $default['de_shop_layout_use'])
+    include_once(G5_SHOP_PATH.'/_head.php');
+else
+    include_once(G5_PATH.'/head.php');
 ?>
\ No newline at end of file
diff --git a/_tail.php b/_tail.php
index ae47c3b51..d5ba5c009 100644
--- a/_tail.php
+++ b/_tail.php
@@ -1,5 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_PATH.'/tail.php');
+if(isset($default['de_shop_layout_use']) && $default['de_shop_layout_use'])
+    include_once(G5_SHOP_PATH.'/_tail.php');
+else
+    include_once(G5_PATH.'/tail.php');
 ?>
\ No newline at end of file
diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 657365d0f..106b78094 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -43,6 +43,18 @@ if(!isset($default['de_root_index_use'])) {
     sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
                     ADD `de_root_index_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_admin_info_email` ", true);
 }
+
+// 무이자 할부 사용설정 필드 추가
+if(!isset($default['de_card_noint_use'])) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                    ADD `de_card_noint_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_card_use` ", true);
+}
+
+// 레이아웃 선택 설정 필드추가
+if(!isset($default['de_shop_layout_use'])) {
+    sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
+                    ADD `de_shop_layout_use` tinyint(4) NOT NULL DEFAULT '0' AFTER `de_root_index_use` ", true);
+}
 ?>
 
 <form name="fconfig" action="./configformupdate.php" onsubmit="return fconfig_check(this)" method="post" enctype="MULTIPART/FORM-DATA">
@@ -473,6 +485,16 @@ if(!isset($default['de_root_index_use'])) {
                 </select>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="de_card_noint_use">신용카드 무이자할부사용</label></th>
+            <td>
+                <?php echo help("주문시 신용카드 무이자할부를 가능하게 할것인지를 설정합니다.<br>사용으로 설정하시면 KCP 가맹점 관리자 페이지에서 설정하신 무이자할부 설정이 적용됩니다.<br>사용안함으로 설정하시면 KCP 무이자 이벤트 카드를 제외한 모든 카드의 무이자 설정이 적용되지 않습니다.", 50); ?>
+                <select id="de_card_noint_use" name="de_card_noint_use">
+                    <option value="0" <?php echo get_selected($default['de_card_noint_use'], 0); ?>>사용안함</option>
+                    <option value="1" <?php echo get_selected($default['de_card_noint_use'], 1); ?>>사용</option>
+                </select>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="de_taxsave_use">현금영수증<br>발급사용</label></th>
             <td>
@@ -631,16 +653,7 @@ if(!isset($default['de_root_index_use'])) {
             <td>
                 <?php echo help("이용 중이거나 이용하실 배송업체를 선택하세요.", 50); ?>
                 <select name="de_delivery_company" id="de_delivery_company">
-                    <option value="">없음</option>
-                    <option value="자체배송" <?php echo get_selected($default['de_delivery_company'], "자체배송"); ?>>자체배송</option>
-                    <?php
-                    $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY));
-                    for ($i=0; $i<count($dlcomp); $i++) {
-                        if (trim($dlcomp[$i])=="") continue;
-                        list($value, $url, $tel) = explode("^", $dlcomp[$i]);
-                        echo "<option value=\"$value\" ".get_selected($default['de_delivery_company'], $value).">$value</option>\n";
-                    }
-                    ?>
+                    <?php echo get_delivery_company($default['de_delivery_company']); ?>
                 </select>
             </td>
         </tr>
@@ -721,6 +734,16 @@ if(!isset($default['de_root_index_use'])) {
                 </select>
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="de_shop_layout_use">쇼핑몰 레이아웃 사용</label></th>
+            <td>
+                <?php echo help('커뮤니티의 레이아웃을 쇼핑몰과 동일하게 적용하시려면 사용으로 설정해 주십시오.'); ?>
+                <select name="de_shop_layout_use" id="de_shop_layout_use">
+                    <option value="0" <?php echo get_selected($default['de_shop_layout_use'], 0); ?>>사용안함</option>
+                    <option value="1" <?php echo get_selected($default['de_shop_layout_use'], 1); ?>>사용</option>
+                </select>
+            </td>
+        </tr>
         <tr>
             <th scope="row">관련상품출력</th>
             <td>
diff --git a/adm/shop_admin/configformupdate.php b/adm/shop_admin/configformupdate.php
index c0cc2ef09..e91235647 100644
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@@ -34,6 +34,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_admin_info_name          = '$de_admin_info_name',
                 de_admin_info_email         = '$de_admin_info_email',
                 de_root_index_use           = '$de_root_index_use',
+                de_shop_layout_use          = '$de_shop_layout_use',
                 de_shop_skin                = '$de_shop_skin',
                 de_shop_mobile_skin         = '$de_shop_mobile_skin',
                 de_type1_list_use           = '$de_type1_list_use',
@@ -109,6 +110,7 @@ $sql = " update {$g5['g5_shop_default_table']}
                 de_bank_account             = '$de_bank_account',
                 de_card_test                = '$de_card_test',
                 de_card_use                 = '$de_card_use',
+                de_card_noint_use           = '$de_card_noint_use',
                 de_card_point               = '$de_card_point',
                 de_settle_min_point         = '$de_settle_min_point',
                 de_settle_max_point         = '$de_settle_max_point',
diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index a2edc1b7a..9878a9ec0 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -384,9 +384,14 @@ if(!sql_query(" select mb_id from {$g5['g5_shop_order_delete_table']} limit 1 ",
         </td>
         <td headers="th_delicom">
             <?php if ($od_status == '준비') { ?>
-                <input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10">
+                <select name="od_delivery_company[<?php echo $i; ?>]">
+                    <?php echo get_delivery_company($delivery_company); ?>
+                </select>
+                <?php
+                /*<input type="text" name="od_delivery_company[<?php echo $i; ?>]" value="<?php echo $delivery_company; ?>" class="frm_input" size="10"> */
+                ?>
             <?php } else if ($od_status == '배송' || $od_status ==  '완료') { ?>
-                <?php echo $row['od_delivery_company']; ?>
+                <?php echo $delivery_company; ?>
             <?php } else { ?>
                 -
             <?php } ?>
diff --git a/adm/shop_admin/ordermail.inc.php b/adm/shop_admin/ordermail.inc.php
index e631fd865..2dad63e5c 100644
--- a/adm/shop_admin/ordermail.inc.php
+++ b/adm/shop_admin/ordermail.inc.php
@@ -22,10 +22,10 @@ if ($od_send_mail)
               where od_id = '{$od['od_id']}'
               order by ct_id ";
     $result = sql_query($sql);
-    for ($i=0; $ct=mysql_fetch_array($result); $i++) {
-        $cart_list[$i]['it_id']   = $ct['it_id'];
-        $cart_list[$i]['it_name'] = $ct['it_name'];
-        $cart_list[$i]['it_opt']  = $ct['ct_option'];
+    for ($j=0; $ct=mysql_fetch_array($result); $j++) {
+        $cart_list[$j]['it_id']   = $ct['it_id'];
+        $cart_list[$j]['it_name'] = $ct['it_name'];
+        $cart_list[$j]['it_opt']  = $ct['ct_option'];
 
         $ct_status = $ct['ct_status'];
         if ($ct_status == "준비") {
@@ -34,8 +34,8 @@ if ($od_send_mail)
             $ct_status = "배송중";
         }
 
-        $cart_list[$i]['ct_status'] = $ct_status;
-        $cart_list[$i]['ct_qty']    = $ct['ct_qty'];
+        $cart_list[$j]['ct_status'] = $ct_status;
+        $cart_list[$j]['ct_qty']    = $ct['ct_qty'];
     }
 
 
diff --git a/bbs/_common.php b/bbs/_common.php
index b556cc9d3..c53246a99 100644
--- a/bbs/_common.php
+++ b/bbs/_common.php
@@ -1,3 +1,10 @@
 <?php
 include_once('../common.php');
+
+if(isset($default['de_shop_layout_use']) && $default['de_shop_layout_use']) {
+    if (!defined('G5_USE_SHOP') || !G5_USE_SHOP)
+        die('<p>쇼핑몰 설치 후 이용해 주십시오.</p>');
+
+    define('_SHOP_', true);
+}
 ?>
\ No newline at end of file
diff --git a/bbs/qawrite_update.php b/bbs/qawrite_update.php
index 396080891..c6fde25d5 100644
--- a/bbs/qawrite_update.php
+++ b/bbs/qawrite_update.php
@@ -33,6 +33,9 @@ if (!empty($msg)) {
     alert($msg);
 }
 
+if($qa_hp)
+    $qa_hp = preg_replace('/[^0-9\-]/', '', strip_tags($qa_hp));
+
 // 090710
 if (substr_count($qa_content, '&#') > 50) {
     alert('내용에 올바르지 않은 코드가 다수 포함되어 있습니다.');
diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 53f8a69d7..9a0759018 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -41,10 +41,6 @@ define('G5_DELIVERY_COMPANY',
     .'(KG옐로우캡택배^http://www.yellowcap.co.kr/custom/inquiry_result.asp?invoice_no=^1588-0123)'
     .'(KGB택배^http://www.kgbls.co.kr/sub5/trace.asp?f_slipno=^1577-4577)'
 );
-
-define('G5_SHOP_SEARCH_SKIN', 'list.10.skin.php'); // 상품검색스킨
-define('G5_SHOP_SEARCH_MOD', 4); // 상품검색 1라인에 몇개
-define('G5_SHOP_SEARCH_ROW', 5); // 상품검색 라인수
 //------------------------------------------------------------------------------
 // 쇼핑몰 상수 모음 끝
 //------------------------------------------------------------------------------
@@ -82,7 +78,7 @@ define('G5_OD_STATUS_FINISH'    , '배송완료');
 '배송완료'      : 배송이 완료된 상태에서만 포인트적립이 가능합니다.
 '취소'          : 입금확인중이나 결제완료후 취소가 가능합니다.
 '반품'          : 배송완료 후에만 반품처리가 가능합니다.
-'품절'          : 
+'품절'          :
 
 
 # 13.10.04
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index dbfcb56a5..5b1177987 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -507,7 +507,8 @@ CREATE TABLE IF NOT EXISTS `g5_memo` (
   `me_send_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
   `me_read_datetime` datetime NOT NULL default '0000-00-00 00:00:00',
   `me_memo` text NOT NULL,
-  PRIMARY KEY  (`me_id`)
+  PRIMARY KEY  (`me_id`),
+  KEY `me_recv_mb_id` (`me_recv_mb_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index 8e136507a..eb2ca00ea 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -194,6 +194,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_admin_info_name` varchar(255) NOT NULL DEFAULT '',
   `de_admin_info_email` varchar(255) NOT NULL DEFAULT '',
   `de_root_index_use` tinyint(4) NOT NULL DEFAULT '0',
+  `de_shop_layout_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_shop_skin` varchar(255) NOT NULL DEFAULT '',
   `de_shop_mobile_skin` varchar(255) NOT NULL DEFAULT '',
   `de_type1_list_use` tinyint(4) NOT NULL DEFAULT '0',
@@ -269,6 +270,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_default` (
   `de_bank_account` text NOT NULL,
   `de_card_test` int(11) NOT NULL DEFAULT '0',
   `de_card_use` int(11) NOT NULL DEFAULT '0',
+  `de_card_noint_use` tinyint(4) NOT NULL DEFAULT '0',
   `de_card_point` int(11) NOT NULL DEFAULT '0',
   `de_settle_min_point` int(11) NOT NULL DEFAULT '0',
   `de_settle_max_point` int(11) NOT NULL DEFAULT '0',
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 5505fedc9..6e4360f02 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -1531,7 +1531,7 @@ function get_table_define($table, $crlf="\n")
         $schema_create     .= implode($columns, ', ') . ')';
     } // end while
 
-    $schema_create .= $crlf . ') DEFAULT CHARSET=utf8';
+    $schema_create .= $crlf . ') ENGINE=MyISAM DEFAULT CHARSET=utf8';
 
     return $schema_create;
 } // end of the 'PMA_getTableDef()' function
diff --git a/lib/shop.lib.php b/lib/shop.lib.php
index c090de176..187f743f9 100644
--- a/lib/shop.lib.php
+++ b/lib/shop.lib.php
@@ -1092,7 +1092,10 @@ function print_item_options($it_id, $cart_id)
     for($i=0; $row=sql_fetch_array($result); $i++) {
         if($i == 0)
             $str .= '<ul>'.PHP_EOL;
-        $str .= '<li>'.$row['ct_option'].' '.$row['ct_qty'].'개 (+'.display_price($row['io_price']).')</li>'.PHP_EOL;
+        $price_plus = '';
+        if($row['io_price'] >= 0)
+            $price_plus = '+';
+        $str .= '<li>'.$row['ct_option'].' '.$row['ct_qty'].'개 ('.$price_plus.display_price($row['io_price']).')</li>'.PHP_EOL;
     }
 
     if($i > 0)
@@ -2065,6 +2068,22 @@ function save_order_point($ct_status="완료")
 }
 
 
+// 배송업체 리스트 얻기
+function get_delivery_company($company)
+{
+    $option = '<option value="">없음</option>'.PHP_EOL;
+    $option .= '<option value="자체배송" '.get_selected($company, '자체배송').'>자체배송</option>'.PHP_EOL;
+
+    $dlcomp = explode(")", str_replace("(", "", G5_DELIVERY_COMPANY));
+    for ($i=0; $i<count($dlcomp); $i++) {
+        if (trim($dlcomp[$i])=="") continue;
+        list($value, $url, $tel) = explode("^", $dlcomp[$i]);
+        $option .= '<option value="'.$value.'" '.get_selected($company, $value).'>'.$value.'</option>'.PHP_EOL;
+    }
+
+    return $option;
+}
+
 //==============================================================================
 // 쇼핑몰 라이브러리 모음 끝
 //==============================================================================
diff --git a/mobile/_head.php b/mobile/_head.php
index 6f97d69de..f85e42763 100644
--- a/mobile/_head.php
+++ b/mobile/_head.php
@@ -1,5 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_MOBILE_PATH.'/head.php');
+if(isset($default['de_shop_layout_use']) && $default['de_shop_layout_use'])
+    include_once(G5_SHOP_PATH.'/_head.php');
+else
+    include_once(G5_PATH.'/head.php');
 ?>
\ No newline at end of file
diff --git a/mobile/_tail.php b/mobile/_tail.php
index c9cb4b7c7..7cca285ef 100644
--- a/mobile/_tail.php
+++ b/mobile/_tail.php
@@ -1,5 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
-include_once(G5_MOBILE_PATH.'/tail.php');
+if(isset($default['de_shop_layout_use']) && $default['de_shop_layout_use'])
+    include_once(G5_SHOP_PATH.'/_tail.php');
+else
+    include_once(G5_PATH.'/tail.php');
 ?>
\ No newline at end of file
diff --git a/mobile/shop/index.php b/mobile/shop/index.php
index 0186a4c9b..81620c124 100644
--- a/mobile/shop/index.php
+++ b/mobile/shop/index.php
@@ -1,9 +1,9 @@
 <?php
-include_once("./_common.php");
+include_once('./_common.php');
 
 define("_INDEX_", TRUE);
 
-include_once(G5_MSHOP_PATH.'/shop.head.php');
+include_once(G5_MSHOP_PATH.'/_head.php');
 ?>
 
 <script src="<?php echo G5_JS_URL; ?>/swipe.js"></script>
@@ -158,5 +158,5 @@ $(function() {
 </script>
 
 <?php
-include_once(G5_MSHOP_PATH.'/shop.tail.php');
+include_once(G5_MSHOP_PATH.'/_tail.php');
 ?>
\ 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 3d1ddfb54..54a637e7d 100644
--- a/mobile/shop/kcp/order_approval_form.php
+++ b/mobile/shop/kcp/order_approval_form.php
@@ -297,6 +297,7 @@
             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']) {
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 4d733fdb4..758ff1143 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -298,6 +298,7 @@ ob_end_clean();
                 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는 과세상품과 비과세상품을 동시에 판매하는 업체들의 결제관리에 대한 편의성을 제공해드리고자,
diff --git a/mobile/shop/shop.head.php b/mobile/shop/shop.head.php
index 2cefa06b4..fe79800b7 100644
--- a/mobile/shop/shop.head.php
+++ b/mobile/shop/shop.head.php
@@ -2,9 +2,11 @@
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 include_once(G5_PATH.'/head.sub.php');
+include_once(G5_LIB_PATH.'/outlogin.lib.php');
 include_once(G5_LIB_PATH.'/visit.lib.php');
 include_once(G5_LIB_PATH.'/connect.lib.php');
 include_once(G5_LIB_PATH.'/popular.lib.php');
+include_once(G5_LIB_PATH.'/latest.lib.php');
 ?>
 
 <header id="hd">
diff --git a/mobile/skin/qa/basic/write.skin.php b/mobile/skin/qa/basic/write.skin.php
index c7fa1e568..afd1a6ef4 100644
--- a/mobile/skin/qa/basic/write.skin.php
+++ b/mobile/skin/qa/basic/write.skin.php
@@ -63,7 +63,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <tr>
             <th scope="row"><label for="qa_hp">휴대폰</label></th>
             <td>
-                <input type="text" name="qa_hp" value="<?php echo $write['qa_hp']; ?>" id="qa_hp" <?php echo $req_hp; ?> class="<?php echo $req_email.' '; ?>frm_input" size="30">
+                <input type="text" name="qa_hp" value="<?php echo $write['qa_hp']; ?>" id="qa_hp" <?php echo $req_hp; ?> class="<?php echo $req_hp.' '; ?>frm_input" size="30">
                 <?php if($qaconfig['qa_use_sms']) { ?>
                 <input type="checkbox" name="qa_sms_recv" value="1" <?php if($write['qa_sms_recv']) echo 'checked="checked"'; ?>> 답변등록 SMS알림 수신
                 <?php } ?>
@@ -166,6 +166,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        <?php if ($is_hp) { ?>
+        var hp = f.qa_hp.value.replace(/[0-9\-]/g, "");
+        if(hp.length > 0) {
+            alert("휴대폰번호는 숫자, - 으로만 입력해 주십시오.");
+            return false;
+        }
+        <?php } ?>
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;
diff --git a/shop/_head.php b/shop/_head.php
index dfcef8a8d..96f125286 100644
--- a/shop/_head.php
+++ b/shop/_head.php
@@ -1,4 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-include_once(G5_SHOP_PATH.'/shop.head.php');
+
+if(G5_IS_MOBILE)
+    include_once(G5_MSHOP_PATH.'/shop.head.php');
+else
+    include_once(G5_SHOP_PATH.'/shop.head.php');
 ?>
\ No newline at end of file
diff --git a/shop/_tail.php b/shop/_tail.php
index cf2d7a276..d2327ec8a 100644
--- a/shop/_tail.php
+++ b/shop/_tail.php
@@ -1,4 +1,8 @@
 <?php
 if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
-include_once(G5_SHOP_PATH.'/shop.tail.php');
+
+if(G5_IS_MOBILE)
+    include_once(G5_MSHOP_PATH.'/shop.tail.php');
+else
+    include_once(G5_SHOP_PATH.'/shop.tail.php');
 ?>
\ No newline at end of file
diff --git a/shop/index.php b/shop/index.php
index 13acc7970..8dfad6637 100644
--- a/shop/index.php
+++ b/shop/index.php
@@ -8,9 +8,6 @@ if (G5_IS_MOBILE) {
 
 define("_INDEX_", TRUE);
 
-include_once(G5_LIB_PATH.'/latest.lib.php');
-include_once(G5_LIB_PATH.'/poll.lib.php');
-
 include_once(G5_SHOP_PATH.'/shop.head.php');
 ?>
 
diff --git a/shop/mail/ordermail.mail.php b/shop/mail/ordermail.mail.php
index 142cd0e46..4781e9306 100644
--- a/shop/mail/ordermail.mail.php
+++ b/shop/mail/ordermail.mail.php
@@ -37,11 +37,11 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
         </tr>
         <thead>
         <tbody>
-        <?php for ($i=0; $i<count($cart_list); $i++) { ?>
+        <?php for ($h=0; $h<count($cart_list); $h++) { ?>
         <tr>
-            <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$i]['it_name']; ?></a></td>
-            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['it_opt']; ?></td>
-            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$i]['ct_status']; ?></td>
+            <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL; ?>/item.php?it_id=<?php echo $cart_list[$h]['it_id']; ?>" target="_blank" style="text-decoration:none"><?php echo $cart_list[$h]['it_name']; ?></a></td>
+            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['it_opt']; ?></td>
+            <td style="<?php echo $td_st; ?>;text-align:center"><?php echo $cart_list[$h]['ct_status']; ?></td>
         </tr>
         <?php } // end for ?>
         </tbody>
diff --git a/shop/mail/orderupdate1.mail.php b/shop/mail/orderupdate1.mail.php
index d5a2f3c09..2d38c1fca 100644
--- a/shop/mail/orderupdate1.mail.php
+++ b/shop/mail/orderupdate1.mail.php
@@ -40,14 +40,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
             <th scope="row" style="<?php echo $th_st; ?>">상품명</th>
             <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
         </tr>
-        <tr>
-            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
-            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
-        </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
             <td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
         </tr>
+        <tr>
+            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
+            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
+        </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">소계</th>
             <td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['stotal_price']); ?></td>
diff --git a/shop/mail/orderupdate2.mail.php b/shop/mail/orderupdate2.mail.php
index d246c5f40..cf9e985c7 100644
--- a/shop/mail/orderupdate2.mail.php
+++ b/shop/mail/orderupdate2.mail.php
@@ -40,14 +40,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
             <th scope="row" style="<?php echo $th_st; ?>">상품명</th>
             <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
         </tr>
-        <tr>
-            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
-            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
-        </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
             <td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
         </tr>
+        <tr>
+            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
+            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
+        </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">소계</th>
             <td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['stotal_price']); ?></td>
diff --git a/shop/mail/orderupdate3.mail.php b/shop/mail/orderupdate3.mail.php
index 54855458b..0c12420a5 100644
--- a/shop/mail/orderupdate3.mail.php
+++ b/shop/mail/orderupdate3.mail.php
@@ -39,14 +39,14 @@ $ft_a_st = 'display:block;padding:30px 0;background:#484848;color:#fff;text-alig
             <th scope="row" style="<?php echo $th_st; ?>">상품명</th>
             <td style="<?php echo $td_st; ?>"><a href="<?php echo G5_SHOP_URL.'/item.php?it_id='.$list[$i]['it_id']; ?>" target="_blank" style="text-decoration:none"><span style="display:inline-block;vertical-align:middle"><?php echo $list[$i]['it_simg']; ?></span> <?php echo $list[$i]['it_name']; ?></a></td>
         </tr>
-        <tr>
-            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
-            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
-        </tr>
         <tr>
             <th scope="row" style="<?php echo $th_st; ?>">판매가격</th>
             <td style="<?php echo $td_st; ?>"><?php echo display_price($list[$i]['ct_price']); ?></td>
         </tr>
+        <tr>
+            <th scope="row" style="<?php echo $th_st; ?>">선택옵션 </th>
+            <td style="<?php echo $td_st; ?>"><?php echo $list[$i]['it_opt']; ?></td>
+        </tr>
         </tbody>
         </table>
 
diff --git a/shop/orderform.php b/shop/orderform.php
index 3b4e452e9..d5eb4d98b 100644
--- a/shop/orderform.php
+++ b/shop/orderform.php
@@ -539,6 +539,8 @@ function get_intall_file()
              ※ 해당 은행을 결제창에서 보이게 합니다.(은행코드는 매뉴얼을 참조) */
     ?>
 
+    <input type="hidden" name="kcp_noint"       value="<?php echo ($default['de_card_noint_use'] ? '' : 'N'); ?>">
+
     <?php
     if($default['de_tax_flag_use']) {
         /* KCP는 과세상품과 비과세상품을 동시에 판매하는 업체들의 결제관리에 대한 편의성을 제공해드리고자,
diff --git a/shop/ordermail1.inc.php b/shop/ordermail1.inc.php
index 8c84590e0..ed2604ff3 100644
--- a/shop/ordermail1.inc.php
+++ b/shop/ordermail1.inc.php
@@ -36,7 +36,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $sum = sql_fetch($sql);
 
     // 옵션정보
-    $sql2 = " select ct_option, ct_qty
+    $sql2 = " select ct_option, ct_qty, io_price
                 from {$g5['g5_shop_cart_table']}
                 where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1'
                 order by io_type asc, ct_id asc ";
@@ -48,7 +48,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     for($k=0; $row2=sql_fetch_array($result2); $k++) {
         if($k == 0)
             $options .= '<ul'.$options_ul.'>'.PHP_EOL;
-        $options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
+        $price_plus = '';
+        if($row2['io_price'] >= 0)
+            $price_plus = '+';
+        $options .= '<li'.$options_li.'>'.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개</li>'.PHP_EOL;
     }
 
     if($k > 0)
diff --git a/shop/ordermail2.inc.php b/shop/ordermail2.inc.php
index d138bb646..03996e394 100644
--- a/shop/ordermail2.inc.php
+++ b/shop/ordermail2.inc.php
@@ -57,7 +57,7 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     $sum = sql_fetch($sql);
 
     // 옵션정보
-    $sql2 = " select ct_option, ct_qty
+    $sql2 = " select ct_option, ct_qty, io_price
                 from {$g5['g5_shop_cart_table']}
                 where it_id = '{$row['it_id']}' and od_id = '$od_id' and ct_select = '1'
                 order by io_type asc, ct_id asc ";
@@ -69,7 +69,10 @@ for ($i=0; $row=sql_fetch_array($result); $i++)
     for($k=0; $row2=sql_fetch_array($result2); $k++) {
         if($k == 0)
             $options .= '<ul'.$options_ul.'>'.PHP_EOL;
-        $options .= '<li'.$options_li.'>'.$row2['ct_option'].' '.$row2['ct_qty'].'개</li>'.PHP_EOL;
+        $price_plus = '';
+        if($row2['io_price'] >= 0)
+            $price_plus = '+';
+        $options .= '<li'.$options_li.'>'.$row2['ct_option'].' ('.$price_plus.display_price($row2['io_price']).') '.$row2['ct_qty'].'개</li>'.PHP_EOL;
     }
 
     if($k > 0)
diff --git a/shop/shop.head.php b/shop/shop.head.php
index 3ca3bb27c..946306dc7 100644
--- a/shop/shop.head.php
+++ b/shop/shop.head.php
@@ -7,6 +7,7 @@ include_once(G5_LIB_PATH.'/poll.lib.php');
 include_once(G5_LIB_PATH.'/visit.lib.php');
 include_once(G5_LIB_PATH.'/connect.lib.php');
 include_once(G5_LIB_PATH.'/popular.lib.php');
+include_once(G5_LIB_PATH.'/latest.lib.php');
 ?>
 
 <!-- 상단 시작 { -->
diff --git a/skin/qa/basic/write.skin.php b/skin/qa/basic/write.skin.php
index 817e8f943..e34181369 100644
--- a/skin/qa/basic/write.skin.php
+++ b/skin/qa/basic/write.skin.php
@@ -63,7 +63,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <tr>
             <th scope="row"><label for="qa_hp">휴대폰</label></th>
             <td>
-                <input type="text" name="qa_hp" value="<?php echo $write['qa_hp']; ?>" id="qa_hp" <?php echo $req_hp; ?> class="<?php echo $req_email.' '; ?>frm_input" size="30">
+                <input type="text" name="qa_hp" value="<?php echo $write['qa_hp']; ?>" id="qa_hp" <?php echo $req_hp; ?> class="<?php echo $req_hp.' '; ?>frm_input" size="30">
                 <?php if($qaconfig['qa_use_sms']) { ?>
                 <input type="checkbox" name="qa_sms_recv" value="1" <?php if($write['qa_sms_recv']) echo 'checked="checked"'; ?>> 답변등록 SMS알림 수신
                 <?php } ?>
@@ -166,6 +166,14 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             return false;
         }
 
+        <?php if ($is_hp) { ?>
+        var hp = f.qa_hp.value.replace(/[0-9\-]/g, "");
+        if(hp.length > 0) {
+            alert("휴대폰번호는 숫자, - 으로만 입력해 주십시오.");
+            return false;
+        }
+        <?php } ?>
+
         document.getElementById("btn_submit").disabled = "disabled";
 
         return true;