From ddf29b5df13c298aa09536effa996aa72daf0a97 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Thu, 17 Oct 2013 11:15:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EB=82=B4=EC=97=AD?=
 =?UTF-8?q?=EC=9D=98=20=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C=EC=97=90=20"?=
 =?UTF-8?q?=EC=A4=80=EB=B9=84"=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php | 37 +++++++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 3e4c44670..2bcfdb1da 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -145,6 +145,8 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <label for="od_status02">주문</label>
     <input type="radio" name="od_status" value="입금" id="od_status03" <?php echo get_checked($od_status, '입금'); ?>>
     <label for="od_status03">입금</label>
+    <input type="radio" name="od_status" value="준비" id="od_status03" <?php echo get_checked($od_status, '준비'); ?>>
+    <label for="od_status03">준비</label>
     <input type="radio" name="od_status" value="배송" id="od_status04" <?php echo get_checked($od_status, '배송'); ?>>
     <label for="od_status04">배송</label>
     <input type="radio" name="od_status" value="완료" id="od_status05" <?php echo get_checked($od_status, '완료'); ?>>
@@ -406,12 +408,37 @@ function forderlist_submit(f)
     }
 
     var chk = document.getElementsByName("chk[]");
-    for (var i=0; i<chk.length; i++) {
-        if (chk[i].checked) {
+    for (var i=0; i<chk.length; i++) 
+    {
+        if (chk[i].checked) 
+        {
             var k = chk[i].value;
-            if (!(f.elements['current_settle_case['+k+']'].value == "무통장"  && f.od_status.value == "입금")) {
-                alert("무통장의 경우에만 입금 처리 가능합니다.");
-                return false;
+            var current_settle_case = f.elements['current_settle_case['+k+']'].value;
+            var current_status = f.elements['current_status['+k+']'].value;
+            var change_status = f.od_status.value;
+
+            switch (change_status)
+            {
+                case "입금" : 
+                    if (!(current_status == "주문" && current_settle_case == "무통장")) {
+                        alert("주문상태의 '무통장'(결제수단)인 경우에만 입금 처리 가능합니다.");
+                        return false;
+                    }
+                    break;
+
+                case "준비" : 
+                    if (current_status != "입금") {
+                        alert("입금상태의 주문만 '준비'로 변경이 가능합니다.");
+                        return false;
+                    }
+                    break;
+
+                case "배송" : 
+                    if (current_status != "준비") {
+                        alert("준비상태의 주문만 '배송'으로 변경이 가능합니다.");
+                        return false;
+                    }
+                    break;
             }
         }
     }

From 9378e00b16ac385f5e6caf2626a0037c938d6e04 Mon Sep 17 00:00:00 2001
From: gnuboard <kagla@naver.com>
Date: Thu, 17 Oct 2013 11:16:29 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=ED=98=84=ED=99=A9?=
 =?UTF-8?q?=EC=9D=98=20=EC=9E=85=EA=B8=88=EC=97=90=20=EB=A7=81=ED=81=AC=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

---
 adm/shop_admin/index.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/index.php b/adm/shop_admin/index.php
index af4dcd6f0..b6f194668 100644
--- a/adm/shop_admin/index.php
+++ b/adm/shop_admin/index.php
@@ -21,31 +21,31 @@ $pg_anchor = '<ul class="anchor">
     <?php echo $pg_anchor; ?>
 
     <div class="local_desc01 local_desc">
-        <p>
+        <ul>
         <?php
         $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '주문' ";
         $row = sql_fetch($sql);
-        echo "<a href=\"./orderlist.php?od_status=주문\">주문 : ".$row['cnt']."</a>";
+        echo "<li><a href=\"./orderlist.php?od_status=주문\">주문 : ".$row['cnt']."</a></li>";
         ?>
 
         <?php
         $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '입금' ";
         $row = sql_fetch($sql);
-        echo "입금 : ".$row['cnt'];
+        echo "<li><a href=\"./orderlist.php?od_status=입금\">입금 : ".$row['cnt']."</a></li>";
         ?>
 
         <?php
         $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '준비' ";
         $row = sql_fetch($sql);
-        echo "준비 : ".$row['cnt'];
+        echo "<li>준비 : ".$row['cnt']."</li>";
         ?>
 
         <?php
         $sql = " select count(*) as cnt from {$g5['g5_shop_order_table']} where od_status = '배송' ";
         $row = sql_fetch($sql);
-        echo "배송 : ".$row['cnt'];
+        echo "<li>배송 : ".$row['cnt']."</li>";
         ?>
-        </p>
+        </ul>
     </div>
 </section>