Changeset 20435

Timestamp:

2011/02/28 12:35:00 (13 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_Fpdf.php 17182@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Fpdf.php
data/class/helper/SC_Helper_Mail.php 15618@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mail.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/LC_Page_Admin_Home.php 15287@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2FLC_Page_Admin_Home.php
data/class/pages/mypage/LC_Page_Mypage_Order.php 16238@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Order.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

3163

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/class/SC_Fpdf.php [email protected]
data/class/helper/SC_Helper_Mail.php [email protected]
data/class/helper/SC_Helper_Purchase.php [email protected]
data/class/pages/admin/LC_Page_Admin_Home.php [email protected]
data/class/pages/mypage/LC_Page_Mypage_Order.php [email protected]
html/install/index.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/insert_data.sql [email protected]

bzr:timestamp:

2011-02-28 12:34:42.974999905 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-02-28T03:34:42.975000Z

Message:

#937(dtb_order_detail に主キーが無い)

• dtb_order_detail.order_detail_id を作成
• 受注詳細の並び順を order_detail_id に変更

#624(軽微な表示乱れを修正)

• 受注完了のメッセージを修正

Location:

branches/version-2_5-dev

Files:

• data/class/SC_Fpdf.php (modified) (1 diff)
• data/class/helper/SC_Helper_Mail.php (modified) (1 diff)
• data/class/helper/SC_Helper_Purchase.php (modified) (2 diffs)
• data/class/pages/admin/LC_Page_Admin_Home.php (modified) (1 diff)
• data/class/pages/mypage/LC_Page_Mypage_Order.php (modified) (1 diff)
• html/install/index.php (modified) (1 diff)
• html/install/sql/create_table_mysql.sql (modified) (2 diffs)
• html/install/sql/create_table_pgsql.sql (modified) (2 diffs)
• html/install/sql/insert_data.sql (modified) (2 diffs)

branches/version-2_5-dev/data/class/SC_Fpdf.php

@@ -328 +328 @@
         $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

@@ -102 +102 @@
         $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));
 

branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

@@ -755 +755 @@
         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);
@@ -822 +823 @@
               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

@@ -256 +256 @@
                         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

branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php

@@ -97 +97 @@
         $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

@@ -999 +999 @@
                  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"),

branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

@@ -707 +707 @@
 
 CREATE TABLE dtb_order_detail (
+    order_detail_id int NOT NULL,
     order_id int NOT NULL,
     product_id int NOT NULL,
@@ -716 +717 @@
     price numeric,
     quantity numeric,
-    point_rate numeric
+    point_rate numeric,
+    PRIMARY KEY (order_detail_id)
 ) ENGINE=InnoDB;
 

branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

@@ -707 +707 @@
 
 CREATE TABLE dtb_order_detail (
+    order_detail_id int NOT NULL,
     order_id int NOT NULL,
     product_id int NOT NULL,
@@ -716 +717 @@
     price numeric,
     quantity numeric,
-    point_rate numeric
+    point_rate numeric,
+    PRIMARY KEY (order_detail_id)
 );
 

branches/version-2_5-dev/html/install/sql/insert_data.sql

@@ -476 +476 @@
 
 ', '
-
-===============================================================
+============================================
 
 
@@ -485 +484 @@
 
 ご質問やご不明な点がございましたら、こちらからお願いいたします。
-http://------.co.jp
 
 ', 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);