Changeset 18821


Ignore:
Timestamp:
2010/09/22 15:36:18 (14 years ago)
Author:
nanasess
bzr:base-revision:
ohkouchi@loop-az.jp-20100922045637-hg4d16iz3p5nwr0a
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
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-20100922063309-8pburg1g0megkbhi
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20100922063615-kjy72v9964adf7d8
bzr:revno:
2304
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:timestamp:
2010-09-22 15:36:15.023999929 +0900
bzr:user-agent:
bzr2.2.0+bzr-svn1.0.3
svn:original-date:
2010-09-22T06:36:15.024000Z
Message:

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

  • ポイントの表示が不正だったのを修正
Location:
branches/version-2_5-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/class/SC_Product.php

    r18820 r18821  
    371371            $whereCause = " WHERE " . $where; 
    372372        } 
    373  
     373        /* 
     374         * point_rate は商品規格(dtb_products_class)ごとに保持しているが, 
     375         * 商品(dtb_products)ごとの設定なので MAX のみを取得する. 
     376         */ 
    374377        $sql = <<< __EOS__ 
    375378            ( 
    … …  
    436439                    T4.stock_unlimited_min, 
    437440                    T4.stock_unlimited_max, 
     441                    T4.point_rate, 
    438442                    T4.class_count 
    439443               FROM dtb_products 
    … …  
    450454                              MIN(stock_unlimited) AS stock_unlimited_min, 
    451455                              MAX(stock_unlimited) AS stock_unlimited_max, 
     456                              MAX(point_rate) AS point_rate, 
    452457                              COUNT(*) as class_count 
    453458                         FROM dtb_products_class 

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

    r18820 r18821  
    396396 
    397397INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(1, 1, 10, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    398 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(2, 1, 11, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 5, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    399 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(3, 1, 12, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    400 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(4, 1, 13, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    401 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(5, 1, 14, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    402 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(6, 1, 15, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    403 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(7, 1, 16, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    404 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(8, 1, 17, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    405 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(9, 1, 18, 'ice-01', NULL, 1, NULL, 150, 120, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    406 INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(10, 2, NULL, 'nabe-01', 100, 0, 5, 1700, 1650, NULL, NULL, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     398INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(2, 1, 11, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     399INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(3, 1, 12, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     400INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(4, 1, 13, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     401INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(5, 1, 14, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     402INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(6, 1, 15, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     403INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(7, 1, 16, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     404INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(8, 1, 17, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     405INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(9, 1, 18, 'ice-01', NULL, 1, NULL, 150, 120, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
     406INSERT INTO dtb_products_class (product_class_id, product_id, class_combination_id, product_code, stock, stock_unlimited, sale_limit, price01, price02, deliv_fee, point_rate, status, creator_id, create_date, update_date, del_flg, down, down_filename, down_realfilename) VALUES(10, 2, NULL, 'nabe-01', 100, 0, 5, 1700, 1650, NULL, 10, NULL, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 0, 1, NULL, NULL); 
    407407 
    408408INSERT INTO dtb_class_combination (class_combination_id, parent_class_combination_id, classcategory_id, level) VALUES(1, NULL, 3, 1); 
Note: See TracChangeset for help on using the changeset viewer.