Changeset 18858


Ignore:
Timestamp:
2010/10/18 11:36:23 (16 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18857
bzr:committer:
Kentaro Ohkouchi <[email protected]>
bzr:file-ids:

data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.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
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
[email protected]
bzr:revno:
2338
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:timestamp:
2010-10-18 11:36:20.461999893 +0900
bzr:user-agent:
bzr2.2.0+bzr-svn1.0.3
svn:original-date:
2010-10-18T02:36:20.462000Z
Message:

#781(規格のデータベースを木構造に)

  • 受注詳細で product_class_id を使用するように修正
Location:
branches/version-2_5-dev
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r18853 r18858  
    447447    function lfGetOrderDetail($order_id) { 
    448448        $objQuery = new SC_Query(); 
    449         $col = "product_id, classcategory_id1, classcategory_id2, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; 
     449        $col = "product_id, product_class_id, product_code, product_name, classcategory_name1, classcategory_name2, price, quantity, point_rate"; 
    450450        $where = "order_id = ?"; 
    451         $objQuery->setOrder("classcategory_id1, classcategory_id2"); 
    452451        $arrRet = $objQuery->select($col, "dtb_order_detail", $where, array($order_id)); 
    453452        return $arrRet; 

  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php

    r18852 r18858  
    547547                $sqlval['product_id'] = $arrData['product_id']; 
    548548                $sqlval['product_class_id'] = $arrData['product_class_id']; 
    549                 // FIXME product_class_id のみで対応予定のため暫定対応 
    550                 $sqlval['classcategory_id1'] = is_null($arrData['classcategory_id1']) ? 0 : $sqlval['classcategory_id1']; 
    551                 $sqlval['classcategory_id2'] = is_null($arrData['classcategory_id2']) ? 0 : $sqlval['classcategory_id2']; 
    552549                $sqlval['product_name'] = $arrData['name']; 
    553550                $sqlval['product_code'] = $arrData['product_code']; 
    554                 $sqlval['classcategory_name1'] = $arrData['name1']; 
    555                 $sqlval['classcategory_name2'] = $arrData['name2']; 
     551                $sqlval['classcategory_name1'] = $arrData['classcategory_name1']; 
     552                $sqlval['classcategory_name2'] = $arrData['classcategory_name2']; 
    556553                $sqlval['point_rate'] = $arrCart[$i]['point_rate']; 
    557554                $sqlval['price'] = $arrCart[$i]['price']; 

  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

    r18852 r18858  
    155155 
    156156            // 集計結果を受注一時テーブルに反映 
    157             unset($arrData[0]); // TODO 
     157            unset($arrData[0]); // FIXME 
    158158            unset($arrData[1]); 
    159159            $objDb->sfRegistTempOrder($uniqid, $arrData); 

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

    r18825 r18858  
    766766    product_id int NOT NULL, 
    767767    product_class_id int NOT NULL, 
    768     classcategory_id1 int NOT NULL, 
    769     classcategory_id2 int NOT NULL, 
    770768    product_name text NOT NULL, 
    771769    product_code text, 

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

    r18825 r18858  
    768768    product_id int NOT NULL, 
    769769    product_class_id int NOT NULL, 
    770     classcategory_id1 int NOT NULL, 
    771     classcategory_id2 int NOT NULL, 
    772770    product_name text NOT NULL, 
    773771    product_code text, 
Note: See TracChangeset for help on using the changeset viewer.