Changeset 21409


Ignore:
Timestamp:
2012/01/17 16:26:02 (9 years ago)
Author:
Seasoft
Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21329 #1548
r21328 #1545

Location:
branches/version-2_11-dev/data
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/Smarty/templates/admin/products/product_select.tpl

    r21329 r21409  
    8888                    <img src="<!--{$smarty.const.ROOT_URLPATH}-->resize_image.php?image=<!--{$arrProducts[cnt].main_list_image|sfNoImageMainList|h}-->&amp;width=65&amp;height=65" alt="<!--{$arrRecommend[$recommend_no].name|h}-->" /> 
    8989                </td> 
    90                 <td> 
    91                     <!--{$arrProducts[cnt].product_code_min|h}--> 
    92                     <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}--> 
    93                         ~ <!--{$arrProducts[cnt].product_code_max|h}--> 
    94                     <!--{/if}--> 
    95                 </td> 
     90                <td><!--{$arrProducts[cnt].product_code|default:"-"|h}--></td> 
    9691                <td><!--{$arrProducts[cnt].name|h}--></td> 
    9792                <td align="center"><a href="#" onclick="return func_submit(<!--{$arrProducts[cnt].product_id|h}-->)">決定</a></td> 
  • branches/version-2_11-dev/data/class/SC_Product.php

    r21405 r21409  
    165165            ,update_date 
    166166__EOS__; 
    167         $res = $objQuery->select($col, $this->alldtlSQL()); 
     167        $where = 'dtb_products_class.del_flg = 0'; 
     168        $res = $objQuery->select($col, $this->alldtlSQL($where)); 
    168169        return $res; 
    169170    } 
     
    221222    function getDetail($productId) { 
    222223        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    223         $result = $objQuery->select("*", $this->alldtlSQL('product_id = ?'), 
     224        $result = $objQuery->select("*", $this->alldtlSQL("product_id = ? AND del_flg = 0"), 
    224225                                    "product_id = ?", 
    225226                                    array($productId, $productId)); 
     
    688689        $where_clause = ''; 
    689690        if (!SC_Utils_Ex::isBlank($where_products_class)) { 
    690             $where_products_class = 'AND (' . $where_products_class . ')'; 
     691            $where_clause = 'WHERE ' . $where_products_class; 
    691692        } 
    692693        /* 
     
    773774                              COUNT(*) as class_count 
    774775                        FROM dtb_products_class 
    775                         WHERE del_flg = 0 $where_products_class 
     776                        $where_clause 
    776777                        GROUP BY product_id 
    777778                    ) AS T4 
  • branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php

    r21402 r21409  
    657657        // 在庫無し商品の非表示 
    658658        if (NOSTOCK_HIDDEN) { 
    659             $where_products_class = '(stock >= 1 OR stock_unlimited = 1)'; 
    660             $from = $objProduct->alldtlSQL($where_products_class); 
     659            $sql_where_dtl = '(stock >= 1 OR stock_unlimited = 1)'; 
     660            $from = $objProduct->alldtlSQL($sql_where_dtl); 
    661661        }else{ 
    662662            $from = 'dtb_products as alldtl'; 
  • branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php

    r21328 r21409  
    383383        // 読み込む列とテーブルの指定 
    384384        $col = "product_id, name, main_list_image, status, product_code_min, product_code_max, price02_min, price02_max, stock_min, stock_max, stock_unlimited_min, stock_unlimited_max, update_date"; 
    385         $from = $objProduct->alldtlSQL(); 
     385        $from = $objProduct->alldtlSQL('del_flg = 0'); 
    386386 
    387387        $objQuery->setLimitOffset($limit, $offset); 
Note: See TracChangeset for help on using the changeset viewer.