From 90e333bb4df67eb1497c8145d767235533134d15 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Mon, 18 Nov 2013 10:50:16 +0900
Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=20=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/orderlist.php | 9 +++++----
 install/gnuboard5shop.sql    | 2 --
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/adm/shop_admin/orderlist.php b/adm/shop_admin/orderlist.php
index 2ba790cb0..e487a8052 100644
--- a/adm/shop_admin/orderlist.php
+++ b/adm/shop_admin/orderlist.php
@@ -494,7 +494,8 @@ $(function(){
 function set_date(today)
 {
     <?php
-    $date_term = date('w', G5_SERVER_TIME) - 1;
+    $date_term = date('w', G5_SERVER_TIME);
+    $week_term = $date_term + 7;
     ?>
     if (today == "오늘") {
         document.getElementById("fr_date").value = "<?php echo G5_TIME_YMD; ?>";
@@ -503,14 +504,14 @@ function set_date(today)
         document.getElementById("fr_date").value = "<?php echo date('Y-m-d', G5_SERVER_TIME - 86400); ?>";
         document.getElementById("to_date").value = "<?php echo date('Y-m-d', G5_SERVER_TIME - 86400); ?>";
     } else if (today == "이번주") {
-        document.getElementById("fr_date").value = "<?php echo date('Y-m-d', strtotime('this Monday', G5_SERVER_TIME - (86400 * $date_term))); ?>";
+        document.getElementById("fr_date").value = "<?php echo date('Y-m-d', strtotime('-'.$date_term.' days', G5_SERVER_TIME)); ?>";
         document.getElementById("to_date").value = "<?php echo date('Y-m-d', G5_SERVER_TIME); ?>";
     } else if (today == "이번달") {
         document.getElementById("fr_date").value = "<?php echo date('Y-m-01', G5_SERVER_TIME); ?>";
         document.getElementById("to_date").value = "<?php echo date('Y-m-d', G5_SERVER_TIME); ?>";
     } else if (today == "지난주") {
-        document.getElementById("fr_date").value = "<?php echo date('Y-m-d', strtotime('last Monday', G5_SERVER_TIME - (86400 * $date_term))); ?>";
-        document.getElementById("to_date").value = "<?php echo date('Y-m-d', strtotime('last Sunday', G5_SERVER_TIME - (86400 * $date_term))); ?>";
+        document.getElementById("fr_date").value = "<?php echo date('Y-m-d', strtotime('-'.$week_term.' days', G5_SERVER_TIME)); ?>";
+        document.getElementById("to_date").value = "<?php echo date('Y-m-d', strtotime('-'.($week_term - 6).' days', G5_SERVER_TIME)); ?>";
     } else if (today == "지난달") {
         document.getElementById("fr_date").value = "<?php echo date('Y-m-01', strtotime('-1 Month', G5_SERVER_TIME)); ?>";
         document.getElementById("to_date").value = "<?php echo date('Y-m-t', strtotime('-1 Month', G5_SERVER_TIME)); ?>";
diff --git a/install/gnuboard5shop.sql b/install/gnuboard5shop.sql
index a8dbeee47..0485820aa 100644
--- a/install/gnuboard5shop.sql
+++ b/install/gnuboard5shop.sql
@@ -94,7 +94,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_category` (
   `ca_5_subj` varchar(255) NOT NULL DEFAULT '',
   `ca_6_subj` varchar(255) NOT NULL DEFAULT '',
   `ca_7_subj` varchar(255) NOT NULL DEFAULT '',
-  `ca_7_subj` varchar(255) NOT NULL DEFAULT '',
   `ca_8_subj` varchar(255) NOT NULL DEFAULT '',
   `ca_9_subj` varchar(255) NOT NULL DEFAULT '',
   `ca_10_subj` varchar(255) NOT NULL DEFAULT '',
@@ -457,7 +456,6 @@ CREATE TABLE IF NOT EXISTS `g5_shop_item` (
   `it_5_subj` varchar(255) NOT NULL DEFAULT '',
   `it_6_subj` varchar(255) NOT NULL DEFAULT '',
   `it_7_subj` varchar(255) NOT NULL DEFAULT '',
-  `it_7_subj` varchar(255) NOT NULL DEFAULT '',
   `it_8_subj` varchar(255) NOT NULL DEFAULT '',
   `it_9_subj` varchar(255) NOT NULL DEFAULT '',
   `it_10_subj` varchar(255) NOT NULL DEFAULT '',