Changeset 20435


Ignore:
Timestamp:
2011/02/28 12:35:00 (10 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20110228022635-lhbqmawf5ha1owcm
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
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:

ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110228033442-6xdnkx60gndn599k
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 ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
data/class/helper/SC_Helper_Mail.php ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
data/class/pages/admin/LC_Page_Admin_Home.php ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
data/class/pages/mypage/LC_Page_Mypage_Order.php ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
html/install/index.php ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20110228033314-etfanuj9rt6tjhk0
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:
9 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/SC_Fpdf.php

    r20116 r20435  
    328328        $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; 
    329329        $where = "order_id = ?"; 
    330         $objQuery->setOrder("product_class_id"); 
     330        $objQuery->setOrder("order_detail_id"); 
    331331        $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id)); 
    332332        return $arrRet; 
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Mail.php

    r20361 r20435  
    102102        $arrRet = $objQuery->select("*", "dtb_order", $where, array($order_id)); 
    103103        $arrOrder = $arrRet[0]; 
     104        $objQuery->setOrder('order_detail_id'); 
    104105        $arrTplVar->arrOrderDetail = $objQuery->select("*", "dtb_order_detail", $where, array($order_id)); 
    105106 
  • branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php

    r20428 r20435  
    755755        foreach ($arrParams as $arrDetail) { 
    756756            $arrValues = $objQuery->extractOnlyColsOf($table, $arrDetail); 
     757            $arrValues['order_detail_id'] = $objQuery->nextVal('dtb_order_detail_order_detail_id'); 
    757758            $arrValues['order_id'] = $order_id; 
    758759            $objQuery->insert($table, $arrValues); 
     
    822823              ON T2.product_class_id = T3.product_class_id 
    823824__EOS__; 
     825        $objQuery->setOrder('T2.order_detail_id'); 
    824826        return $objQuery->select($col, $from, 'T1.order_id = ?', array($order_id)); 
    825827    } 
  • branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php

    r20434 r20435  
    256256                        dtb_order_detail AS det 
    257257                    WHERE 
    258                         ord.order_id = det.order_id LIMIT 1 
     258                        ord.order_id = det.order_id 
     259                    ORDER BY det.order_detail_id 
     260                    LIMIT 1 
    259261                    ) AS product_name, 
    260262                    (SELECT 
  • branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php

    r20312 r20435  
    9797        $table  = "dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)"; 
    9898        $where  = "order_id = ?"; 
    99         $objQuery->setOrder("product_class_id"); 
     99        $objQuery->setOrder("order_detail_id"); 
    100100        $arrOrderDetail = $objQuery->select($col, $table, $where, array($order_id)); 
    101101        return $arrOrderDetail; 
  • branches/version-2_5-dev/html/install/index.php

    r20424 r20435  
    999999                 array("dtb_news", "news_id"), 
    10001000                 array("dtb_order", "order_id"), 
     1001                 array("dtb_order_detail", "order_detail_id"), 
    10011002                 array("dtb_other_deliv", "other_deliv_id"), 
    10021003                 array("dtb_pagelayout", "page_id"), 
  • branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

    r20411 r20435  
    707707 
    708708CREATE TABLE dtb_order_detail ( 
     709    order_detail_id int NOT NULL, 
    709710    order_id int NOT NULL, 
    710711    product_id int NOT NULL, 
     
    716717    price numeric, 
    717718    quantity numeric, 
    718     point_rate numeric 
     719    point_rate numeric, 
     720    PRIMARY KEY (order_detail_id) 
    719721) ENGINE=InnoDB; 
    720722 
  • branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

    r20411 r20435  
    707707 
    708708CREATE TABLE dtb_order_detail ( 
     709    order_detail_id int NOT NULL, 
    709710    order_id int NOT NULL, 
    710711    product_id int NOT NULL, 
     
    716717    price numeric, 
    717718    quantity numeric, 
    718     point_rate numeric 
     719    point_rate numeric, 
     720    PRIMARY KEY (order_detail_id) 
    719721); 
    720722 
  • branches/version-2_5-dev/html/install/sql/insert_data.sql

    r20433 r20435  
    476476 
    477477', ' 
    478  
    479 =============================================================== 
     478============================================ 
    480479 
    481480 
     
    485484 
    486485ご質問やご不明な点がございましたら、こちらからお願いいたします。 
    487 http://------.co.jp 
    488486 
    489487', 0, 0, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
Note: See TracChangeset for help on using the changeset viewer.