From d4f0c9b27496a189b580178e5cd6f80d3edcef7d Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 7 Feb 2014 12:59:23 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=81=ED=92=88=20=EB=B0=B0=EC=86=A1?=
 =?UTF-8?q?=EB=B9=84=20=EC=84=A4=EC=A0=95=EC=97=90=EC=84=9C=20=EB=B0=B0?=
 =?UTF-8?q?=EC=86=A1=EB=B9=84=20=EA=B2=B0=EC=A0=9C=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=EA=B0=80=20=EC=84=A0=ED=83=9D=ED=95=A0=20=EC=88=98=20?=
 =?UTF-8?q?=EC=9E=88=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

---
 adm/shop_admin/itemform.php               | 22 ++++++++++++++++++----
 mobile/skin/shop/basic/item.form.skin.php |  7 +------
 skin/shop/basic/item.form.skin.php        |  7 +------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/adm/shop_admin/itemform.php b/adm/shop_admin/itemform.php
index 2b90ffc16..a9ac190ed 100644
--- a/adm/shop_admin/itemform.php
+++ b/adm/shop_admin/itemform.php
@@ -1013,6 +1013,13 @@ $(function(){
     $(function() {
         <?php
         switch($it['it_sc_type']) {
+            case 1:
+                echo '$("#sc_con_method").hide();'.PHP_EOL;
+                echo '$("#sc_con_basic").hide();'.PHP_EOL;
+                echo '$("#sc_con_minimum").hide();'.PHP_EOL;
+                echo '$("#sc_con_qty").hide();'.PHP_EOL;
+                echo '$("#sc_grp").attr("rowspan","1");'.PHP_EOL;
+                break;
             case 2:
                 echo '$("#sc_con_method").show();'.PHP_EOL;
                 echo '$("#sc_con_basic").show();'.PHP_EOL;
@@ -1035,11 +1042,11 @@ $(function(){
                 echo '$("#sc_grp").attr("rowspan","4");'.PHP_EOL;
                 break;
             default:
-                echo '$("#sc_con_method").hide();'.PHP_EOL;
+                echo '$("#sc_con_method").show();'.PHP_EOL;
                 echo '$("#sc_con_basic").hide();'.PHP_EOL;
                 echo '$("#sc_con_minimum").hide();'.PHP_EOL;
                 echo '$("#sc_con_qty").hide();'.PHP_EOL;
-                echo '$("#sc_grp").attr("rowspan","1");'.PHP_EOL;
+                echo '$("#sc_grp").attr("rowspan","2");'.PHP_EOL;
                 break;
         }
         ?>
@@ -1047,6 +1054,13 @@ $(function(){
             var type = $(this).val();
 
             switch(type) {
+                case "1":
+                    $("#sc_con_method").hide();
+                    $("#sc_con_basic").hide();
+                    $("#sc_con_minimum").hide();
+                    $("#sc_con_qty").hide();
+                    $("#sc_grp").attr("rowspan","1");
+                    break;
                 case "2":
                     $("#sc_con_method").show();
                     $("#sc_con_basic").show();
@@ -1069,11 +1083,11 @@ $(function(){
                     $("#sc_grp").attr("rowspan","4");
                     break;
                 default:
-                    $("#sc_con_method").hide();
+                    $("#sc_con_method").show();
                     $("#sc_con_basic").hide();
                     $("#sc_con_minimum").hide();
                     $("#sc_con_qty").hide();
-                    $("#sc_grp").attr("rowspan","1");
+                    $("#sc_grp").attr("rowspan","2");
                     break;
             }
         });
diff --git a/mobile/skin/shop/basic/item.form.skin.php b/mobile/skin/shop/basic/item.form.skin.php
index 6765cc929..8ef470703 100644
--- a/mobile/skin/shop/basic/item.form.skin.php
+++ b/mobile/skin/shop/basic/item.form.skin.php
@@ -145,14 +145,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <?php
         $ct_send_cost_label = '배송비결제';
 
-        if($default['de_send_cost_case'] == '무료')
-            $sc_method = '무료배송';
-        else
-            $sc_method = '주문시 결제';
-
         if($it['it_sc_type'] == 1)
             $sc_method = '무료배송';
-        else if($it['it_sc_type'] > 1) {
+        else {
             if($it['it_sc_method'] == 1)
                 $sc_method = '수령후 지불';
             else if($it['it_sc_method'] == 2) {
diff --git a/skin/shop/basic/item.form.skin.php b/skin/shop/basic/item.form.skin.php
index f978dd22d..62e57282c 100644
--- a/skin/shop/basic/item.form.skin.php
+++ b/skin/shop/basic/item.form.skin.php
@@ -158,14 +158,9 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
         <?php
         $ct_send_cost_label = '배송비결제';
 
-        if($default['de_send_cost_case'] == '무료')
-            $sc_method = '무료배송';
-        else
-            $sc_method = '주문시 결제';
-
         if($it['it_sc_type'] == 1)
             $sc_method = '무료배송';
-        else if($it['it_sc_type'] > 1) {
+        else {
             if($it['it_sc_method'] == 1)
                 $sc_method = '수령후 지불';
             else if($it['it_sc_method'] == 2) {