[Svn-src-all:1539] [version-2_5-dev 20435] #937(dtb_order_detail に主キーが無い)
nanasess
admin ＠ mail.ec-cube.net
2011年 2月 28日 (月) 12:35:00 JST
Subversion committed to /home/svn/open 20435
http://svn.ec-cube.net/open_trac/changeset/20435
┌────────────────────────────┐
│更新者 : nanasess │
│更新日時: 2011-02-28 12:35:00 +0900 (月, 28 2月 2011)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#937(dtb_order_detail に主キーが無い)
* dtb_order_detail.order_detail_id を作成
* 受注詳細の並び順を order_detail_id に変更
#624(軽微な表示乱れを修正)
* 受注完了のメッセージを修正
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Fpdf.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
U branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_5-dev/html/install/index.php
U branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
U branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
U branches/version-2_5-dev/html/install/sql/insert_data.sql
変更: branches/version-2_5-dev/data/class/SC_Fpdf.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Fpdf.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/data/class/SC_Fpdf.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -327,7 +327,7 @@
$objQuery = new SC_Query();
$col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate";
$where = "order_id = ?";
- $objQuery->setOrder("product_class_id");
+ $objQuery->setOrder("order_detail_id");
$arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id));
return $arrRet;
}
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -101,6 +101,7 @@
$where = "order_id = ?";
$arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id));
$arrOrder = $arrRet[0];
+ $objQuery->setOrder('order_detail_id');
$arrTplVar->arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id));
$objProduct = new SC_Product();
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -754,6 +754,7 @@
$objQuery->delete($table, $where, array($order_id));
foreach ($arrParams as $arrDetail) {
$arrValues = $objQuery->extractOnlyColsOf($table, $arrDetail);
+ $arrValues['order_detail_id'] = $objQuery->nextVal('dtb_order_detail_order_detail_id');
$arrValues['order_id'] = $order_id;
$objQuery->insert($table, $arrValues);
}
@@ -821,6 +822,7 @@
JOIN dtb_products_class T3
ON T2.product_class_id = T3.product_class_id
__EOS__;
+ $objQuery->setOrder('T2.order_detail_id');
return $objQuery->select($col, $from, 'T1.order_id = ?', array($order_id));
}
変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -255,7 +255,9 @@
FROM
dtb_order_detail AS det
WHERE
- ord.order_id = det.order_id LIMIT 1
+ ord.order_id = det.order_id
+ ORDER BY det.order_detail_id
+ LIMIT 1
) AS product_name,
(SELECT
pay.payment_method
変更: branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -96,7 +96,7 @@
$col = "product_class_id, quantity";
$table = "dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)";
$where = "order_id = ?";
- $objQuery->setOrder("product_class_id");
+ $objQuery->setOrder("order_detail_id");
$arrOrderDetail = $objQuery->select($col, $table, $where, array($order_id));
return $arrOrderDetail;
}
変更: branches/version-2_5-dev/html/install/index.php
===================================================================
--- branches/version-2_5-dev/html/install/index.php 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/html/install/index.php 2011-02-28 03:35:00 UTC (rev 20435)
@@ -998,6 +998,7 @@
array("dtb_module_update_logs", "log_id"),
array("dtb_news", "news_id"),
array("dtb_order", "order_id"),
+ array("dtb_order_detail", "order_detail_id"),
array("dtb_other_deliv", "other_deliv_id"),
array("dtb_pagelayout", "page_id"),
array("dtb_payment", "payment_id"),
変更: branches/version-2_5-dev/html/install/sql/create_table_mysql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/html/install/sql/create_table_mysql.sql 2011-02-28 03:35:00 UTC (rev 20435)
@@ -706,6 +706,7 @@
) ENGINE=InnoDB;
CREATE TABLE dtb_order_detail (
+ order_detail_id int NOT NULL,
order_id int NOT NULL,
product_id int NOT NULL,
product_class_id int NOT NULL,
@@ -715,7 +716,8 @@
classcategory_name2 text,
price numeric,
quantity numeric,
- point_rate numeric
+ point_rate numeric,
+ PRIMARY KEY (order_detail_id)
) ENGINE=InnoDB;
CREATE TABLE dtb_member (
変更: branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql 2011-02-28 03:35:00 UTC (rev 20435)
@@ -706,6 +706,7 @@
);
CREATE TABLE dtb_order_detail (
+ order_detail_id int NOT NULL,
order_id int NOT NULL,
product_id int NOT NULL,
product_class_id int NOT NULL,
@@ -715,7 +716,8 @@
classcategory_name2 text,
price numeric,
quantity numeric,
- point_rate numeric
+ point_rate numeric,
+ PRIMARY KEY (order_detail_id)
);
CREATE TABLE dtb_member (
変更: branches/version-2_5-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-28 02:26:53 UTC (rev 20434)
+++ branches/version-2_5-dev/html/install/sql/insert_data.sql 2011-02-28 03:35:00 UTC (rev 20435)
@@ -475,16 +475,14 @@
下記ご注文内容にお間違えがないかご確認下さい。
', '
+============================================
-===============================================================
-
このメッセージはお客様へのお知らせ専用ですので、
このメッセージへの返信としてご質問をお送りいただいても回答できません。
ご了承ください。
ご質問やご不明な点がございましたら、こちらからお願いいたします。
-http://------.co.jp
', 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_mailtemplate (template_id, subject, header, footer, creator_id, del_flg, create_date, update_date) VALUES (5, 'お問い合わせを受け付けました', NULL, NULL, 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
Svn-src-all メーリングリストの案内