From b166d5860ff90be7a0826451ff1f3aed1f14a906 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 21 Nov 2013 18:12:33 +0900
Subject: [PATCH 01/10] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=EC=B7=A8=EC=86=8C=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 42b0e4dfb..2109c5617 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -644,6 +644,12 @@ $result = sql_query($sql);
 
     <div class="btn_confirm01 btn_confirm">
         <input type="submit" value="결제/배송내역 수정" class="btn_submit">
+        <?php if($od['od_misu'] > 0) { ?>
+        <a href="./personalpayform.php?popup=yes&amp;od_id=<?php echo $od_id; ?>" id="personalpay_add">개인결제추가</a>
+        <?php } ?>
+        <?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && ($od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체')) { ?>
+        <a href="./orderpartcancel.php?od_id=<?php echo $od_id; ?>" id="orderpartcancel"><?php echo $od['od_settle_case']; ?> 부분취소</a>
+        <?php } ?>
         <a href="./orderlist.php?<?php echo $qstr; ?>">목록</a>
     </div>
     </form>
@@ -828,15 +834,6 @@ $result = sql_query($sql);
     </form>
 </section>
 
-<div class="btn_list03 btn_list">
-    <?php if($od['od_misu'] > 0) { ?>
-    <a href="./personalpayform.php?popup=yes&amp;od_id=<?php echo $od_id; ?>" id="personalpay_add">개인결제추가</a>
-    <?php } ?>
-    <?php if($od['od_misu'] < 0 && ($od['od_receipt_price'] - $od['od_refund_price']) > 0 && $od['od_settle_case'] == '신용카드' || $od['od_settle_case'] == '계좌이체') { ?>
-    <a href="./orderpartcancel.php?od_id=<?php echo $od_id; ?>" id="orderpartcancel"><?php echo $od['od_settle_case']; ?> 부분취소</a>
-    <?php } ?>
-</div>
-
 <script>
 $(function() {
     // 전체 옵션선택

From f0f44707f30fe6b64a747eac6488e2d0825b8f14 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Thu, 21 Nov 2013 18:18:28 +0900
Subject: [PATCH 02/10] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=EC=83=81=EC=84=B8=EC=97=90=EC=84=9C=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9D=B8=EA=B2=B0=EC=A0=9C=20=EC=B6=94=EA=B0=80=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderform.php       | 2 +-
 adm/shop_admin/personalpayform.php | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/adm/shop_admin/orderform.php b/adm/shop_admin/orderform.php
index 2109c5617..b80d94ecd 100644
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@@ -860,7 +860,7 @@ $(function() {
     // 개인결제추가
     $("#personalpay_add").on("click", function() {
         var href = this.href;
-        window.open(href, "personalpaywin", "left=100, top=100, width=700, height=650, scrollbars=yes");
+        window.open(href, "personalpaywin", "left=100, top=100, width=700, height=560, scrollbars=yes");
         return false;
     });
 
diff --git a/adm/shop_admin/personalpayform.php b/adm/shop_admin/personalpayform.php
index 0499b3571..b46b74d5f 100644
--- a/adm/shop_admin/personalpayform.php
+++ b/adm/shop_admin/personalpayform.php
@@ -57,12 +57,15 @@ $pg_anchor = '<ul class="anchor">
 <input type="hidden" name="stx" value="<?php echo $stx; ?>">
 <input type="hidden" name="page" value="<?php echo $page; ?>">
 <input type="hidden" name="popup" value="<?php echo $popup; ?>">
+<?php if($popup == 'yes') { ?>
+<input type="hidden" name="pp_use" value="1">
+<?php } ?>
 
 <?php echo $wrp_tag_st; ?>
 
     <section id="anc_spp_info">
         <h2 class="h2_frm">주문 정보</h2>
-        <?php echo $pg_anchor; ?>
+        <?php if($popup != 'yes') echo $pg_anchor; ?>
         <div class="local_desc02 local_desc">
             <p>주문 관련 기본 정보입니다.</p>
         </div>
@@ -108,6 +111,7 @@ $pg_anchor = '<ul class="anchor">
         <?php } ?>
     </div>
 
+    <?php if($popup != 'yes') { ?>
     <section id="anc_spp_pay" class="cbox">
         <h2>결제 정보</h2>
         <?php echo $pg_anchor; ?>
@@ -179,6 +183,7 @@ $pg_anchor = '<ul class="anchor">
         <a href="./personalpayformupdate.php?w=d&amp;pp_id=<?php echo $pp['pp_id']; ?>" onclick="return del_confirm();">삭제</a>
         <?php } ?>
     </div>
+    <?php } ?>
 
 <?php echo $wrp_tag_end; ?>
 </form>

From b60a509ae6f73326e761083564115298070c4d31 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 09:01:44 +0900
Subject: [PATCH 03/10] =?UTF-8?q?drop=20=EB=AA=85=EB=A0=B9=20=EB=B9=A0?=
 =?UTF-8?q?=EC=A7=84=20=EA=B2=83=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/gnuboard5.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index e960e3394..cc177af55 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -327,6 +327,7 @@ CREATE TABLE IF NOT EXISTS `g5_config` (
 -- Table structure for table `g5_cert_history`
 --
 
+DROP TABLE IF EXISTS `g5_cert_history`;
 CREATE TABLE IF NOT EXISTS `g5_cert_history` (
   `cr_id` int(11) NOT NULL auto_increment,
   `mb_id` varchar(20) NOT NULL DEFAULT '',
@@ -707,6 +708,7 @@ CREATE TABLE IF NOT EXISTS `g5_autosave` (
 -- Table structure for table `g5_qa_config`
 --
 
+DROP TABLE IF EXISTS `g5_qa_config`;
 CREATE TABLE IF NOT EXISTS `g5_qa_config` (
   `qa_title` varchar(255) NOT NULL DEFAULT'',
   `qa_category` varchar(255) NOT NULL DEFAULT'',
@@ -745,6 +747,7 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
 -- Table structure for table `g5_qa_content`
 --
 
+DROP TABLE IF EXISTS `g5_qa_content`;
 CREATE TABLE IF NOT EXISTS `g5_qa_content` (
   `qa_id` int(11) NOT NULL AUTO_INCREMENT,
   `qa_num` int(11) NOT NULL DEFAULT '0',  

From 9126d6dff00d0a239400fe96877d6c2636c3720b Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 09:07:58 +0900
Subject: [PATCH 04/10] =?UTF-8?q?drop=20=EB=B9=A0=EC=A7=84=20=EA=B2=83=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install/gnuboard5shop.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index c48953f96..4b086f50a 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -162,6 +162,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_coupon` (
 -- Table structure for table `g5_shop_coupon_log`
 --
 
+DROP TABLE IF EXISTS `g5_shop_coupon_log`;
 CREATE TABLE IF NOT EXISTS `g5_shop_coupon_log` (
   `cl_id` int(11) NOT NULL AUTO_INCREMENT,
   `cp_id` varchar(255) NOT NULL DEFAULT '',
@@ -663,6 +664,7 @@ CREATE TABLE IF NOT EXISTS `g5_shop_order` (
 -- Table structure for table `g5_shop_order_address`
 --
 
+DROP TABLE IF EXISTS `g5_shop_order_address`;
 CREATE TABLE IF NOT EXISTS `g5_shop_order_address` (
   `ad_id` int(11) NOT NULL AUTO_INCREMENT,
   `mb_id` varchar(255) NOT NULL DEFAULT '',

From c52cf6fef5f33ef2375ddeb6b184cbcb7ed6a0cd Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 11:02:24 +0900
Subject: [PATCH 05/10] =?UTF-8?q?kcp=20=EA=B2=B0=EC=A0=9C=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=ED=9B=84=20=EC=A3=BC=EB=AC=B8=ED=8F=BC=EC=9D=98=20?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=B2=84=ED=8A=BC=20=EA=B0=80=EB=A0=A4?=
 =?UTF-8?q?=EC=A7=80=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/kcp/order_approval_form.php | 6 ------
 mobile/shop/orderform.php               | 9 ++++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mobile/shop/kcp/order_approval_form.php b/mobile/shop/kcp/order_approval_form.php
index da687279c..3d1ddfb54 100644
--- a/mobile/shop/kcp/order_approval_form.php
+++ b/mobile/shop/kcp/order_approval_form.php
@@ -202,12 +202,6 @@
             of.param_opt_2.value    = "<?php echo $param_opt_2; ?>";
             of.param_opt_3.value    = "<?php echo $param_opt_3; ?>";
 
-            var od = window.opener.document;
-            od.getElementById("display_pay_button").style.display = "none";
-            //od.getElementById("show_req_btn").style.display = "none";
-            //od.getElementById("show_progress").style.display = "block";
-            //od.getElementById("show_pay_btn").style.display = "inline";
-
             //alert("주문하기를 클릭하셔야 주문이 완료됩니다.");
             window.opener.forderform_check();
             window.close();
diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 9976e6539..1c67d0413 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -1325,7 +1325,14 @@ function forderform_check()
         return false;
     }
 
-    f.submit();
+    document.getElementById("display_pay_button").style.display = "none";
+    //document.getElementById("show_req_btn").style.display = "none";
+    //document.getElementById("show_progress").style.display = "block";
+    //document.getElementById("show_pay_btn").style.display = "inline";
+
+    setTimeout(function() {
+        f.submit();
+    }, 300);
 }
 
 // 주문폼 필드체크

From 4f1b6ee3a545177e5877327d5f4a915c6beec6e4 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 11:09:30 +0900
Subject: [PATCH 06/10] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=A3=BC?=
 =?UTF-8?q?=EB=AC=B8=ED=8F=BC=EC=97=90=20=EC=A3=BC=EB=AC=B8=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C=20=EC=A4=91=20=EC=95=88=EB=82=B4=20=EB=A9=94=EC=84=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/orderform.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mobile/shop/orderform.php b/mobile/shop/orderform.php
index 1c67d0413..e034b97c9 100644
--- a/mobile/shop/orderform.php
+++ b/mobile/shop/orderform.php
@@ -764,13 +764,13 @@ ob_end_clean();
     <input type="hidden" name="comm_free_mny"     value="<?php echo $comm_free_mny; ?>">        <!-- 비과세 금액 -->
     <?php } ?>
 
-    <p id="show_progress" style="display:none;">반드시 주문하기 버튼을 클릭 하셔야만 결제가 진행됩니다.</p>
-
     <div id="display_pay_button" class="btn_confirm">
         <span id="show_req_btn"><input type="button" name="submitChecked" onClick="kcp_approval();" value="결제등록요청"class="btn_submit"></span>
         <span id="show_pay_btn" style="display:none;"><input type="button" onClick="forderform_check();" value="주문하기" class="btn_submit"></span>
         <a href="javascript:history.go(-1);" class="btn_cancel">취소</a>
     </div>
+
+    <p id="show_progress" style="display:none;">주문완료 중입니다. 잠시만 기다려 주십시오.</p>
     </form>
 
     <?php if ($default['de_escrow_use']) { ?>
@@ -1326,9 +1326,7 @@ function forderform_check()
     }
 
     document.getElementById("display_pay_button").style.display = "none";
-    //document.getElementById("show_req_btn").style.display = "none";
-    //document.getElementById("show_progress").style.display = "block";
-    //document.getElementById("show_pay_btn").style.display = "inline";
+    document.getElementById("show_progress").style.display = "block";
 
     setTimeout(function() {
         f.submit();

From 3abf00f181fc6e909421cdb4118a9bf23af5b14d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 13:13:42 +0900
Subject: [PATCH 07/10] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=ED=9B=84=EA=B8=B0=20=EC=83=81=ED=92=88=EB=AC=B8?=
 =?UTF-8?q?=EC=9D=98=20=EC=9E=91=EC=84=B1=20=ED=9B=84=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/shop/basic/itemqaform.skin.php  | 1 +
 mobile/skin/shop/basic/itemuseform.skin.php | 1 +
 shop/itemqaformupdate.php                   | 5 ++++-
 shop/itemuseformupdate.php                  | 5 ++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/mobile/skin/shop/basic/itemqaform.skin.php b/mobile/skin/shop/basic/itemqaform.skin.php
index 54d714630..ec81607cd 100644
--- a/mobile/skin/shop/basic/itemqaform.skin.php
+++ b/mobile/skin/shop/basic/itemqaform.skin.php
@@ -12,6 +12,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="w" value="<?php echo $w; ?>">
     <input type="hidden" name="it_id" value="<?php echo $it_id; ?>">
     <input type="hidden" name="iq_id" value="<?php echo $iq_id; ?>">
+    <input type="hidden" name="is_mobile_shop" value="1">
 
     <div class="tbl_frm01 tbl_wrap">
         <table>
diff --git a/mobile/skin/shop/basic/itemuseform.skin.php b/mobile/skin/shop/basic/itemuseform.skin.php
index 39865a610..84261b9cf 100644
--- a/mobile/skin/shop/basic/itemuseform.skin.php
+++ b/mobile/skin/shop/basic/itemuseform.skin.php
@@ -12,6 +12,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
     <input type="hidden" name="w" value="<?php echo $w; ?>">
     <input type="hidden" name="it_id" value="<?php echo $it_id; ?>">
     <input type="hidden" name="is_id" value="<?php echo $is_id; ?>">
+    <input type="hidden" name="is_mobile_shop" value="1">
 
     <div class="tbl_frm01 tbl_wrap">
         <table>
diff --git a/shop/itemqaformupdate.php b/shop/itemqaformupdate.php
index 7658c83d5..f7ea42867 100644
--- a/shop/itemqaformupdate.php
+++ b/shop/itemqaformupdate.php
@@ -19,7 +19,10 @@ if ($w == "" || $w == "u") {
     if (!$iq_question) alert("질문을 입력하여 주십시오.");
 }
 
-$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_qa";
+if($is_mobile_shop)
+    $url = './iteminfo.php?it_id='.$it_id.'&info=qa';
+else
+    $url = "./item.php?it_id=$it_id&_=".get_token()."#sit_qa";
 
 if ($w == "")
 {
diff --git a/shop/itemuseformupdate.php b/shop/itemuseformupdate.php
index c4859e669..6c8c9d907 100644
--- a/shop/itemuseformupdate.php
+++ b/shop/itemuseformupdate.php
@@ -23,7 +23,10 @@ if ($w == "" || $w == "u") {
     if (!$is_content) alert("내용을 입력하여 주십시오.");
 }
 
-$url = "./item.php?it_id=$it_id&_=".get_token()."#sit_use";
+if($is_mobile_shop)
+    $url = './iteminfo.php?it_id='.$it_id.'&info=use';
+else
+    $url = "./item.php?it_id=$it_id&_=".get_token()."#sit_use";
 
 if ($w == "")
 {

From b227f7a0e213aac4cc513831e068311fec7036be Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 13:32:07 +0900
Subject: [PATCH 08/10] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EC=83=81?=
 =?UTF-8?q?=ED=92=88=EB=AC=B8=EC=9D=98=20=EC=82=AC=EC=9A=A9=ED=9B=84?=
 =?UTF-8?q?=EA=B8=B0=20=ED=8F=BC=20=EC=97=90=EB=94=94=ED=84=B0=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/itemqaform.php                  | 10 ++++++++++
 mobile/shop/itemuseform.php                 | 10 ++++++++++
 mobile/skin/shop/basic/itemqaform.skin.php  |  6 ++----
 mobile/skin/shop/basic/itemuseform.skin.php |  6 ++----
 shop/itemqaform.php                         | 10 ++++++++++
 shop/itemuseform.php                        | 10 ++++++++++
 skin/shop/basic/itemqaform.skin.php         |  6 ++----
 skin/shop/basic/itemuseform.skin.php        |  6 ++----
 8 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/mobile/shop/itemqaform.php b/mobile/shop/itemqaform.php
index 3f9e90fa9..a49f9fec7 100644
--- a/mobile/shop/itemqaform.php
+++ b/mobile/shop/itemqaform.php
@@ -36,6 +36,16 @@ if ($w == "u")
 
 include_once(G5_PATH.'/head.sub.php');
 
+$is_dhtml_editor = false;
+// 모바일에서는 DHTML 에디터 사용불가
+if ($config['cf_editor'] && !G5_IS_MOBILE) {
+    $is_dhtml_editor = true;
+}
+$editor_html = editor_html('iq_question', $qa['iq_question'], $is_dhtml_editor);
+$editor_js = '';
+$editor_js .= get_editor_js('iq_question', $is_dhtml_editor);
+$editor_js .= chk_editor_js('iq_question', $is_dhtml_editor);
+
 $itemqaform_skin = G5_MSHOP_SKIN_PATH.'/itemqaform.skin.php';
 
 if(!file_exists($itemqaform_skin)) {
diff --git a/mobile/shop/itemuseform.php b/mobile/shop/itemuseform.php
index 44b6baabf..8baa878cd 100644
--- a/mobile/shop/itemuseform.php
+++ b/mobile/shop/itemuseform.php
@@ -31,6 +31,16 @@ if ($w == "") {
 
 include_once(G5_PATH.'/head.sub.php');
 
+$is_dhtml_editor = false;
+// 모바일에서는 DHTML 에디터 사용불가
+if ($config['cf_editor'] && !G5_IS_MOBILE) {
+    $is_dhtml_editor = true;
+}
+$editor_html = editor_html('is_content', $use['is_content'], $is_dhtml_editor);
+$editor_js = '';
+$editor_js .= get_editor_js('is_content', $is_dhtml_editor);
+$editor_js .= chk_editor_js('is_content', $is_dhtml_editor);
+
 $itemuseform_skin = G5_MSHOP_SKIN_PATH.'/itemuseform.skin.php';
 
 if(!file_exists($itemuseform_skin)) {
diff --git a/mobile/skin/shop/basic/itemqaform.skin.php b/mobile/skin/shop/basic/itemqaform.skin.php
index ec81607cd..30fc37000 100644
--- a/mobile/skin/shop/basic/itemqaform.skin.php
+++ b/mobile/skin/shop/basic/itemqaform.skin.php
@@ -42,7 +42,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </tr>
         <tr>
             <th scope="row"><label for="iq_question">질문</label></th>
-            <td><?php echo editor_html('iq_question', $qa['iq_question']); ?></td>
+            <td><?php echo $editor_html; ?></td>
         </tr>
         </tbody>
         </table>
@@ -58,9 +58,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <script type="text/javascript">
 function fitemqa_submit(f)
 {
-    <?php echo get_editor_js('iq_question'); ?>
-
-    <?php echo chk_editor_js('iq_question'); ?>
+    <?php echo $editor_js; ?>
 
     return true;
 }
diff --git a/mobile/skin/shop/basic/itemuseform.skin.php b/mobile/skin/shop/basic/itemuseform.skin.php
index 84261b9cf..cb9144b80 100644
--- a/mobile/skin/shop/basic/itemuseform.skin.php
+++ b/mobile/skin/shop/basic/itemuseform.skin.php
@@ -27,7 +27,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </tr>
         <tr>
             <th scope="row"><label for="" style="width:200px;">내용</label></th>
-            <td><?php echo editor_html('is_content', $use['is_content']); ?></td>
+            <td><?php echo $editor_html; ?></td>
         </tr>
         <tr>
             <th scope="row">평가</th>
@@ -76,9 +76,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <script type="text/javascript">
 function fitemuse_submit(f)
 {
-    <?php echo get_editor_js('is_content'); ?>
-
-    <?php echo chk_editor_js('is_content'); ?>
+    <?php echo $editor_js; ?>
 
     return true;
 }
diff --git a/shop/itemqaform.php b/shop/itemqaform.php
index 0784d15a2..c1855ec7b 100644
--- a/shop/itemqaform.php
+++ b/shop/itemqaform.php
@@ -42,6 +42,16 @@ if ($w == "u")
 
 include_once(G5_PATH.'/head.sub.php');
 
+$is_dhtml_editor = false;
+// 모바일에서는 DHTML 에디터 사용불가
+if ($config['cf_editor'] && !G5_IS_MOBILE) {
+    $is_dhtml_editor = true;
+}
+$editor_html = editor_html('iq_question', $qa['iq_question'], $is_dhtml_editor);
+$editor_js = '';
+$editor_js .= get_editor_js('iq_question', $is_dhtml_editor);
+$editor_js .= chk_editor_js('iq_question', $is_dhtml_editor);
+
 $itemqaform_skin = G5_SHOP_SKIN_PATH.'/itemqaform.skin.php';
 
 if(!file_exists($itemqaform_skin)) {
diff --git a/shop/itemuseform.php b/shop/itemuseform.php
index 42f0ae9da..355143086 100644
--- a/shop/itemuseform.php
+++ b/shop/itemuseform.php
@@ -37,6 +37,16 @@ if ($w == "") {
 
 include_once(G5_PATH.'/head.sub.php');
 
+$is_dhtml_editor = false;
+// 모바일에서는 DHTML 에디터 사용불가
+if ($config['cf_editor'] && !G5_IS_MOBILE) {
+    $is_dhtml_editor = true;
+}
+$editor_html = editor_html('is_content', $use['is_content'], $is_dhtml_editor);
+$editor_js = '';
+$editor_js .= get_editor_js('is_content', $is_dhtml_editor);
+$editor_js .= chk_editor_js('is_content', $is_dhtml_editor);
+
 $itemuseform_skin = G5_SHOP_SKIN_PATH.'/itemuseform.skin.php';
 
 if(!file_exists($itemuseform_skin)) {
diff --git a/skin/shop/basic/itemqaform.skin.php b/skin/shop/basic/itemqaform.skin.php
index 5068861d9..342fa5e89 100644
--- a/skin/shop/basic/itemqaform.skin.php
+++ b/skin/shop/basic/itemqaform.skin.php
@@ -41,7 +41,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </tr>
         <tr>
             <th scope="row"><label for="iq_question">질문</label></th>
-            <td><?php echo editor_html('iq_question', get_text($qa['iq_question'])); ?></td>
+            <td><?php echo $editor_html; ?></td>
         </tr>
         </tbody>
         </table>
@@ -57,9 +57,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <script type="text/javascript">
 function fitemqa_submit(f)
 {
-    <?php echo get_editor_js('iq_question'); ?>
-
-    <?php echo chk_editor_js('iq_question'); ?>
+    <?php echo $editor_js; ?>
 
     return true;
 }
diff --git a/skin/shop/basic/itemuseform.skin.php b/skin/shop/basic/itemuseform.skin.php
index 577e263df..7c0bde7c2 100644
--- a/skin/shop/basic/itemuseform.skin.php
+++ b/skin/shop/basic/itemuseform.skin.php
@@ -26,7 +26,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         </tr>
         <tr>
             <th scope="row"><label for="" style="width:200px;">내용</label></th>
-            <td><?php echo editor_html('is_content', get_text($use['is_content'])); ?></td>
+            <td><?php echo $editor_html; ?></td>
         </tr>
         <tr>
             <th scope="row">평점</th>
@@ -75,9 +75,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 <script type="text/javascript">
 function fitemuse_submit(f)
 {
-    <?php echo get_editor_js('is_content'); ?>
-
-    <?php echo chk_editor_js('is_content'); ?>
+    <?php echo $editor_js; ?>
 
     return true;
 }

From be91d12b9dd03aef94d0861b86abf35d13768e83 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 13:36:39 +0900
Subject: [PATCH 09/10] =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=9B=84=EA=B8=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=B3=84=ED=91=9C=20=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/itemuseform.php                 |  2 +-
 mobile/skin/shop/basic/itemuseform.skin.php | 10 +++++-----
 shop/itemuseform.php                        |  2 +-
 skin/shop/basic/itemuseform.skin.php        | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mobile/shop/itemuseform.php b/mobile/shop/itemuseform.php
index 8baa878cd..295f22baa 100644
--- a/mobile/shop/itemuseform.php
+++ b/mobile/shop/itemuseform.php
@@ -14,7 +14,7 @@ $is_id = escape_trim($_REQUEST['is_id']);
 check_itemuse_write();
 
 if ($w == "") {
-    $is_score = 10;
+    $is_score = 5;
 } else if ($w == "u") {
     $use = sql_fetch(" select * from {$g5['g5_shop_item_use_table']} where is_id = '$is_id' ");
     if (!$use) {
diff --git a/mobile/skin/shop/basic/itemuseform.skin.php b/mobile/skin/shop/basic/itemuseform.skin.php
index cb9144b80..a84597e7a 100644
--- a/mobile/skin/shop/basic/itemuseform.skin.php
+++ b/mobile/skin/shop/basic/itemuseform.skin.php
@@ -34,27 +34,27 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             <td>
                 <ul id="sit_use_write_star">
                     <li>
-                        <input type="radio" name="is_score" value="10" id="is_score10" <?php echo ($is_score==10)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="5" id="is_score10" <?php echo ($is_score==5)?'checked="checked"':''; ?>>
                         <label for="is_score10">매우만족</label>
                         <img src="<?php echo G5_SHOP_URL; ?>/img/s_star5.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="8" id="is_score8" <?php echo ($is_score==8)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="4" id="is_score8" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
                         <label for="is_score8">만족</label>
                         <img src="<?php echo G5_SHOP_URL; ?>/img/s_star4.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="6" id="is_score6" <?php echo ($is_score==6)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="3" id="is_score6" <?php echo ($is_score==3)?'checked="checked"':''; ?>>
                         <label for="is_score6">보통</label>
                         <img src="<?php echo G5_SHOP_URL; ?>/img/s_star3.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="2" id="is_score4" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
                         <label for="is_score4">불만</label>
                         <img src="<?php echo G5_SHOP_URL; ?>/img/s_star2.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="1" id="is_score2" <?php echo ($is_score==1)?'checked="checked"':''; ?>>
                         <label for="is_score2">매우불만</label>
                         <img src="<?php echo G5_SHOP_URL; ?>/img/s_star1.png">
                     </li>
diff --git a/shop/itemuseform.php b/shop/itemuseform.php
index 355143086..5bee27b78 100644
--- a/shop/itemuseform.php
+++ b/shop/itemuseform.php
@@ -20,7 +20,7 @@ $is_id = escape_trim($_REQUEST['is_id']);
 check_itemuse_write();
 
 if ($w == "") {
-    $is_score = 10;
+    $is_score = 5;
 } else if ($w == "u") {
     $use = sql_fetch(" select * from {$g5['g5_shop_item_use_table']} where is_id = '$is_id' ");
     if (!$use) {
diff --git a/skin/shop/basic/itemuseform.skin.php b/skin/shop/basic/itemuseform.skin.php
index 7c0bde7c2..0c9236cba 100644
--- a/skin/shop/basic/itemuseform.skin.php
+++ b/skin/shop/basic/itemuseform.skin.php
@@ -33,27 +33,27 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
             <td>
                 <ul id="sit_use_write_star">
                     <li>
-                        <input type="radio" name="is_score" value="5" id="is_score5" <?php echo ($is_score==10)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="5" id="is_score5" <?php echo ($is_score==5)?'checked="checked"':''; ?>>
                         <label for="is_score5">매우만족</label>
                         <img src="<?php echo G5_URL; ?>/shop/img/s_star5.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==8)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="4" id="is_score4" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
                         <label for="is_score4">만족</label>
                         <img src="<?php echo G5_URL; ?>/shop/img/s_star4.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="3" id="is_score3" <?php echo ($is_score==6)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="3" id="is_score3" <?php echo ($is_score==3)?'checked="checked"':''; ?>>
                         <label for="is_score3">보통</label>
                         <img src="<?php echo G5_URL; ?>/shop/img/s_star3.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==4)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="2" id="is_score2" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
                         <label for="is_score2">불만</label>
                         <img src="<?php echo G5_URL; ?>/shop/img/s_star2.png">
                     </li>
                     <li>
-                        <input type="radio" name="is_score" value="1" id="is_score1" <?php echo ($is_score==2)?'checked="checked"':''; ?>>
+                        <input type="radio" name="is_score" value="1" id="is_score1" <?php echo ($is_score==1)?'checked="checked"':''; ?>>
                         <label for="is_score1">매우불만</label>
                         <img src="<?php echo G5_URL; ?>/shop/img/s_star1.png">
                     </li>

From 5db2bef37c12112d674a093567c0a472162d3b2f Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 22 Nov 2013 14:38:09 +0900
Subject: [PATCH 10/10] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EA=B2=B0=EC=A0=9C=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=ED=9B=84=20=EC=A3=BC=EB=AC=B8=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/shop/kcp/personalpay_approval_form.php |  7 -------
 mobile/shop/personalpayform.php               | 11 ++++++++---
 mobile/shop/personalpayformupdate.php         | 18 ++++++++++++++++++
 shop/personalpayformupdate.php                | 18 ++++++++++++++++++
 4 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/mobile/shop/kcp/personalpay_approval_form.php b/mobile/shop/kcp/personalpay_approval_form.php
index e2d21269d..dec078156 100644
--- a/mobile/shop/kcp/personalpay_approval_form.php
+++ b/mobile/shop/kcp/personalpay_approval_form.php
@@ -202,13 +202,6 @@
             of.param_opt_2.value    = "<?php echo $param_opt_2; ?>";
             of.param_opt_3.value    = "<?php echo $param_opt_3; ?>";
 
-            var od = window.opener.document;
-            od.getElementById("display_pay_button").style.display = "none";
-            //od.getElementById("show_req_btn").style.display = "none";
-            //od.getElementById("show_progress").style.display = "block";
-            //od.getElementById("show_pay_btn").style.display = "inline";
-
-            //alert("주문하기를 클릭하셔야 주문이 완료됩니다.");
             window.opener.fpersonalpayform_check();
             window.close();
         } else {
diff --git a/mobile/shop/personalpayform.php b/mobile/shop/personalpayform.php
index e2b0e661a..90c0733a0 100644
--- a/mobile/shop/personalpayform.php
+++ b/mobile/shop/personalpayform.php
@@ -210,13 +210,13 @@ if($default['de_escrow_use']) {
     <input type="hidden" name="param_opt_2"    value="">
     <input type="hidden" name="param_opt_3"    value="">
 
-    <p id="show_progress" style="display:none;">반드시 결제하기 버튼을 클릭 하셔야만 결제가 진행됩니다.</p>
-
     <div id="display_pay_button" class="btn_confirm">
         <span id="show_req_btn"><input type="button" name="submitChecked" onClick="kcp_approval();" value="결제등록요청"class="btn_submit"></span>
         <span id="show_pay_btn" style="display:none;"><input type="button" onClick="fpersonalpayform_check();" value="결제하기" class="btn_submit"></span>
         <a href="javascript:history.go(-1);" class="btn_cancel">취소</a>
     </div>
+
+    <p id="show_progress" style="display:none;">결제진행 중입니다. 잠시만 기다려 주십시오.</p>
     </form>
 
     <?php if ($default['de_escrow_use']) { ?>
@@ -318,7 +318,12 @@ function fpersonalpayform_check()
         return false;
     }
 
-    f.submit();
+    document.getElementById("display_pay_button").style.display = "none";
+    document.getElementById("show_progress").style.display = "block";
+
+    setTimeout(function() {
+        f.submit();
+    }, 300);
 }
 
 // 결제폼 필드체크
diff --git a/mobile/shop/personalpayformupdate.php b/mobile/shop/personalpayformupdate.php
index 8ae300905..74f3510e6 100644
--- a/mobile/shop/personalpayformupdate.php
+++ b/mobile/shop/personalpayformupdate.php
@@ -141,6 +141,24 @@ if($pp_receipt_price > 0 && $pp['pp_id'] && $pp['od_id']) {
 
         die("<p>$sql<p>" . mysql_errno() . " : " .  mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}");
     }
+
+    // 미수금 정보 업데이트
+    $info = get_order_info($pp['od_id']);
+
+    $sql = " update {$g5['g5_shop_order_table']}
+                set od_misu     = '{$info['od_misu']}' ";
+    if($info['od_misu'] == 0)
+        $sql .= " , od_status = '입금' ";
+    $sql .= " where od_id = '{$pp['od_id']}' ";
+    sql_query($sql, FALSE);
+
+    // 장바구니 상태변경
+    if($info['od_misu'] == 0) {
+        $sql = " update {$g5['g5_shop_cart_table']}
+                    set ct_status = '입금'
+                    where od_id = '{$pp['od_id']}' ";
+        sql_query($sql, FALSE);
+    }
 }
 
 // 개인결제번호제거
diff --git a/shop/personalpayformupdate.php b/shop/personalpayformupdate.php
index 521053ac1..553598c85 100644
--- a/shop/personalpayformupdate.php
+++ b/shop/personalpayformupdate.php
@@ -133,6 +133,24 @@ if($pp_receipt_price > 0 && $pp['pp_id'] && $pp['od_id']) {
 
         die("<p>$sql<p>" . mysql_errno() . " : " .  mysql_error() . "<p>error file : {$_SERVER['PHP_SELF']}");
     }
+
+    // 미수금 정보 업데이트
+    $info = get_order_info($pp['od_id']);
+
+    $sql = " update {$g5['g5_shop_order_table']}
+                set od_misu     = '{$info['od_misu']}' ";
+    if($info['od_misu'] == 0)
+        $sql .= " , od_status = '입금' ";
+    $sql .= " where od_id = '{$pp['od_id']}' ";
+    sql_query($sql, FALSE);
+
+    // 장바구니 상태변경
+    if($info['od_misu'] == 0) {
+        $sql = " update {$g5['g5_shop_cart_table']}
+                    set ct_status = '입금'
+                    where od_id = '{$pp['od_id']}' ";
+        sql_query($sql, FALSE);
+    }
 }
 
 // 개인결제번호제거