Changeset 21409 for branches

Timestamp:

2012/01/17 16:26:02 (12 years ago)

Author:

Seasoft

Message:

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

Location:

branches/version-2_11-dev/data

Files:

• Smarty/templates/admin/products/product_select.tpl (modified) (1 diff)
• class/SC_Product.php (modified) (4 diffs)
• class/helper/SC_Helper_DB.php (modified) (1 diff)
• class/pages/admin/products/LC_Page_Admin_Products.php (modified) (1 diff)

branches/version-2_11-dev/data/Smarty/templates/admin/products/product_select.tpl

@@ -88 +88 @@
                     <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}-->" />
                 </td>
-                <td>
-                    <!--{$arrProducts[cnt].product_code_min|h}-->
-                    <!--{if $arrProducts[cnt].product_code_min != $arrProducts[cnt].product_code_max}-->
-                        ～ <!--{$arrProducts[cnt].product_code_max|h}-->
-                    <!--{/if}-->
-                </td>
+                <td><!--{$arrProducts[cnt].product_code|default:"-"|h}--></td>
                 <td><!--{$arrProducts[cnt].name|h}--></td>
                 <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

@@ -165 +165 @@
             ,update_date
 __EOS__;
-        $res = $objQuery->select($col, $this->alldtlSQL());
+        $where = 'dtb_products_class.del_flg = 0';
+        $res = $objQuery->select($col, $this->alldtlSQL($where));
         return $res;
     }
@@ -221 +222 @@
     function getDetail($productId) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
-        $result = $objQuery->select("*", $this->alldtlSQL('product_id = ?'),
+        $result = $objQuery->select("*", $this->alldtlSQL("product_id = ? AND del_flg = 0"),
                                     "product_id = ?",
                                     array($productId, $productId));
@@ -688 +689 @@
         $where_clause = '';
         if (!SC_Utils_Ex::isBlank($where_products_class)) {
-            $where_products_class = 'AND (' . $where_products_class . ')';
+            $where_clause = 'WHERE ' . $where_products_class;
         }
         /*
@@ -773 +774 @@
                               COUNT(*) as class_count
                         FROM dtb_products_class
-                        WHERE del_flg = 0 $where_products_class
+                        $where_clause
                         GROUP BY product_id
                     ) AS T4

branches/version-2_11-dev/data/class/helper/SC_Helper_DB.php

@@ -657 +657 @@
         // 在庫無し商品の非表示
         if (NOSTOCK_HIDDEN) {
-            $where_products_class = '(stock >= 1 OR stock_unlimited = 1)';
-            $from = $objProduct->alldtlSQL($where_products_class);
+            $sql_where_dtl = '(stock >= 1 OR stock_unlimited = 1)';
+            $from = $objProduct->alldtlSQL($sql_where_dtl);
         }else{
             $from = 'dtb_products as alldtl';

branches/version-2_11-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php

@@ -383 +383 @@
         // 読み込む列とテーブルの指定
         $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";
-        $from = $objProduct->alldtlSQL();
+        $from = $objProduct->alldtlSQL('del_flg = 0');
 
         $objQuery->setLimitOffset($limit, $offset);