Index: /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18825)
+++ /branches/version-2_5-dev/html/install/sql/create_table_mysql.sql	(revision 18858)
@@ -766,6 +766,4 @@
     product_id int NOT NULL,
     product_class_id int NOT NULL,
-    classcategory_id1 int NOT NULL,
-    classcategory_id2 int NOT NULL,
     product_name text NOT NULL,
     product_code text,
Index: /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18825)
+++ /branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql	(revision 18858)
@@ -768,6 +768,4 @@
     product_id int NOT NULL,
     product_class_id int NOT NULL,
-    classcategory_id1 int NOT NULL,
-    classcategory_id2 int NOT NULL,
     product_name text NOT NULL,
     product_code text,
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18852)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php	(revision 18858)
@@ -547,11 +547,8 @@
                 $sqlval['product_id'] = $arrData['product_id'];
                 $sqlval['product_class_id'] = $arrData['product_class_id'];
-                // FIXME product_class_id のみで対応予定のため暫定対応
-                $sqlval['classcategory_id1'] = is_null($arrData['classcategory_id1']) ? 0 : $sqlval['classcategory_id1'];
-                $sqlval['classcategory_id2'] = is_null($arrData['classcategory_id2']) ? 0 : $sqlval['classcategory_id2'];
                 $sqlval['product_name'] = $arrData['name'];
                 $sqlval['product_code'] = $arrData['product_code'];
-                $sqlval['classcategory_name1'] = $arrData['name1'];
-                $sqlval['classcategory_name2'] = $arrData['name2'];
+                $sqlval['classcategory_name1'] = $arrData['classcategory_name1'];
+                $sqlval['classcategory_name2'] = $arrData['classcategory_name2'];
                 $sqlval['point_rate'] = $arrCart[$i]['point_rate'];
                 $sqlval['price'] = $arrCart[$i]['price'];
Index: /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 18852)
+++ /branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php	(revision 18858)
@@ -155,5 +155,5 @@
 
             // 集計結果を受注一時テーブルに反映
-            unset($arrData[0]); // TODO
+            unset($arrData[0]); // FIXME
             unset($arrData[1]);
             $objDb->sfRegistTempOrder($uniqid, $arrData);
Index: /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18853)
+++ /branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php	(revision 18858)
@@ -447,7 +447,6 @@
     function lfGetOrderDetail($order_id) {
         $objQuery = new SC_Query();
-        $col = "product_id, classcategory_id1, classcategory_id2, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate";
+        $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate";
         $where = "order_id = ?";
-        $objQuery->setOrder("classcategory_id1, classcategory_id2");
         $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id));
         return $arrRet;