Ignore:
Timestamp:
2011/03/10 23:23:15 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20594
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/Smarty/templates/admin/products/product_class_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_confirm.tpl
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/pages/admin/products/LC_Page_Admin_Products.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products.php
data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 15486@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ClassCategory.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/user_data/packages/admin/js/admin.js 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fjs%2Fadmin.js
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110310142305-qjs7yo89ouuc2kyb
bzr:revno:
3322
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/products/product_class.tpl ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
data/Smarty/templates/admin/products/product_class_confirm.tpl ohkouchi@loop-az.jp-20110310120612-5yubhkd34q0kh1wv
data/class/SC_Product.php ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
data/class/helper/SC_Helper_DB.php ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
data/class/pages/admin/products/LC_Page_Admin_Products.php ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
html/install/sql/insert_data.sql ohkouchi@loop-az.jp-20110310141144-qucx7d0zkt4jgao9
html/user_data/packages/admin/js/admin.js ohkouchi@loop-az.jp-20110310121605-jifwd9debb5hzvwo
bzr:timestamp:
2011-03-10 23:23:05.288000107 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-03-10T14:23:05.288000Z
Message:
  • #1097([管理画面]商品管理(商品規格登録):規格編集で、登録されていない行にもチェックが入っている)
  • #1064([管理画面]商品管理(商品規格登録):規格編集で、登録されている規格を外して登録しても削除されない)
  • #991(商品規格登録での不具合)
  • #1101([フロント]商品(一覧、詳細):規格削除しても価格表記に削除した価格も出ている)
  • 商品規格管理画面を全面的にリファクタリング
  • TODO 入力チェック, ダウンロード販売用ファイルには後続のコミットで対応します
File:
1 edited

Legend:

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

    r20538 r20595  
    178178    function getDetail($productId) { 
    179179        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    180         $result = $objQuery->select("*", $this->alldtlSQL("product_id = ?"), 
     180        $result = $objQuery->select("*", $this->alldtlSQL("product_id = ? AND del_flg = 0"), 
    181181                                    "product_id = ?", 
    182182                                    array($productId, $productId)); 
     
    203203     * 
    204204     * @param array $arrProductId 商品ID の配列 
     205     * @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 false 
    205206     * @return void 
    206207     */ 
    207     function setProductsClassByProductIds($arrProductId) { 
     208    function setProductsClassByProductIds($arrProductId, $has_deleted = false) { 
    208209 
    209210        $arrProductsClass = array(); 
    210211        foreach ($arrProductId as $productId) { 
    211             $arrProductClass = $this->getProductsClassFullByProductId($productId); 
     212            $arrProductClass = $this->getProductsClassFullByProductId($productId, $has_deleted); 
    212213 
    213214            $classCats1 = array(); 
     
    326327            T2.level, 
    327328            T3.name AS classcategory_name, 
     329            T3.rank, 
    328330            T4.name AS class_name, 
    329331            T4.class_id 
     
    338340                   ON T3.class_id = T4.class_id 
    339341__EOS__; 
     342 
     343        $objQuery->setOrder('T3.rank DESC'); // XXX 
    340344        $arrRet = $objQuery->select($col, $table, "", $params); 
    341345        $levels = array(); 
     
    358362                T1.level, 
    359363                T2.name AS classcategory_name, 
     364                T2.rank, 
    360365                T3.name AS class_name, 
    361366                T3.class_id 
     
    369374__EOS__; 
    370375 
     376            $objQuery->setOrder('T2.rank DESC'); // XXX 
    371377            $arrParents = $objQuery->select($col, $table, "", $parents); 
    372378 
    373             unset($parents); 
    374379            foreach ($arrParents as $rows) { 
    375380                $parents[] = $rows['parent_class_combination_id']; 
     
    396401            $arrProductsClass[] = $val; 
    397402        } 
    398  
    399403        return $arrProductsClass; 
    400404    } 
     
    402406    /** 
    403407     * 商品規格IDから商品規格を取得する. 
     408     * 
     409     * 削除された商品規格は取得しない. 
     410     * 
     411     * @param integer $productClassId 商品規格ID 
     412     * @return array 商品規格の配列 
    404413     */ 
    405414    function getProductsClass($productClassId) { 
    406415        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    407         $objQuery->setWhere('product_class_id = ?'); 
     416        $objQuery->setWhere('product_class_id = ? AND T1.del_flg = 0'); 
    408417        $objQuery->setOrder("T2.level DESC"); 
    409418        $results = $this->getProductsClassByQuery($objQuery, $productClassId); 
     
    416425     * 
    417426     * @param array $productIds 商品IDの配列 
     427     * @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 false 
    418428     * @return array 商品規格の配列 
    419429     */ 
    420     function getProductsClassByProductIds($productIds = array()) { 
     430    function getProductsClassByProductIds($productIds = array(), $has_deleted = false) { 
    421431        if (empty($productIds)) { 
    422432            return array(); 
    423433        } 
    424434        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    425         $objQuery->setWhere('product_id IN (' . implode(', ', array_pad(array(), count($productIds), '?')) . ')'); 
     435        $where = 'product_id IN (' . implode(', ', array_pad(array(), count($productIds), '?')) . ')'; 
     436        if (!$has_deleted) { 
     437            $where .= ' AND T1.del_flg = 0'; 
     438        } 
     439        $objQuery->setWhere($where); 
    426440        $objQuery->setOrder("T2.level DESC"); 
    427441        return $this->getProductsClassByQuery($objQuery, $productIds); 
     
    443457     * 
    444458     * @param array $productId 商品ID 
     459     * @param boolean $has_deleted 削除された商品規格も含む場合 true; 初期値 false 
    445460     * @return array すべての組み合わせの商品規格の配列 
    446461     */ 
    447     function getProductsClassFullByProductId($productId) { 
    448         $results = $this->getProductsClassByProductIds(array($productId)); 
     462    function getProductsClassFullByProductId($productId, $has_deleted = false) { 
     463        $results = $this->getProductsClassByProductIds(array($productId), $has_deleted); 
    449464        return $this->getProductsClassFull($results); 
    450465    } 
Note: See TracChangeset for help on using the changeset viewer.