From b78898aacc0fa1991ee50015c84496fa7e58395c Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 24 Sep 2013 15:36:35 +0900
Subject: [PATCH 1/3] =?UTF-8?q?G5=5FOD=5FSTATUS=5FSETTLE=20=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=9C=EC=99=84=EB=A3=8C=20->=20=EC=9E=85=EA=B8=88=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/shop.extend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index c01ac62f2..08c5be949 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -49,7 +49,7 @@ define('G5_MSHOP_SKIN_URL',  G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['d
 
 // 주문상태 상수
 define('G5_OD_STATUS_ORDER'     , '입금확인중');
-define('G5_OD_STATUS_SETTLE'    , '결제완료');
+define('G5_OD_STATUS_SETTLE'    , '입금완료');
 define('G5_OD_STATUS_READY'     , '배송준비중');
 define('G5_OD_STATUS_DELIVERY'  , '배송중');
 define('G5_OD_STATUS_FINISH'    , '배송완료');

From 8ccd13634e44c71ccceba49c72c289d2f8942a55 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 24 Sep 2013 15:37:23 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=EB=92=A4=EC=97=90=20=EC=9E=88=EB=8D=98=20?=
 =?UTF-8?q?=EB=9D=BC=EB=94=94=EC=98=A4=EB=B2=84=ED=8A=BC=EC=9D=84=20?=
 =?UTF-8?q?=EC=8B=A4=EA=B2=B0=EC=A0=9C,=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=EA=B2=B0=EC=A0=9C=20=EC=95=9E=EC=9C=BC=EB=A1=9C=20=EC=98=AE?=
 =?UTF-8?q?=EA=B9=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/configform.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/adm/shop_admin/configform.php b/adm/shop_admin/configform.php
index 71e6e4a43..d95eb2da3 100644
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@@ -557,10 +557,10 @@ $pg_anchor = '<ul class="anchor">
         <th scope="row">신용카드 결제테스트</th>
         <td>
             <?php echo help("신용카드를 테스트 하실 경우에 체크하세요. 결제단위 최소 1,000원"); ?>
-            <label for="de_card_test1">실결제 </label>
             <input type="radio" name="de_card_test" value="0" <?php echo $default['de_card_test']==0?"checked":""; ?> id="de_card_test1">
-            <label for="de_card_test2">테스트결제</label>
+            <label for="de_card_test1">실결제 </label>
             <input type="radio" name="de_card_test" value="1" <?php echo $default['de_card_test']==1?"checked":""; ?> id="de_card_test2">
+            <label for="de_card_test2">테스트결제</label>
             <div id="scf_cardtest">
                 <a href="https://admin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank">실결제 관리자</a>
                 <a href="http://testadmin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank">테스트 관리자</a>

From 6c1351f775af07f872a2aa703bbd0b1f5fc23987 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Tue, 24 Sep 2013 15:46:45 +0900
Subject: [PATCH 3/3] =?UTF-8?q?G5=5FOD=5FSTATUS=5FSETTLE=20=EC=9E=85?=
 =?UTF-8?q?=EA=B8=88=EC=99=84=EB=A3=8C=20=EB=A5=BC=20=EA=B2=B0=EC=A0=9C?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EB=A1=9C=20=EC=9B=90=EB=B3=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/shop.extend.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extend/shop.extend.php b/extend/shop.extend.php
index 08c5be949..c01ac62f2 100644
--- a/extend/shop.extend.php
+++ b/extend/shop.extend.php
@@ -49,7 +49,7 @@ define('G5_MSHOP_SKIN_URL',  G5_MOBILE_URL .'/'.G5_SKIN_DIR.'/shop/'.$default['d
 
 // 주문상태 상수
 define('G5_OD_STATUS_ORDER'     , '입금확인중');
-define('G5_OD_STATUS_SETTLE'    , '입금완료');
+define('G5_OD_STATUS_SETTLE'    , '결제완료');
 define('G5_OD_STATUS_READY'     , '배송준비중');
 define('G5_OD_STATUS_DELIVERY'  , '배송중');
 define('G5_OD_STATUS_FINISH'    , '배송완료');