Changeset 21328

Timestamp:

2011/11/11 00:18:04 (11 years ago)

Author:

Seasoft

Message:

#1545 (SC_Product#alldtlSQL dtb_products_class.del_flg = 0 を常に付加する)

Location:

branches/version-2_11-dev/data/class

Files:

• SC_Product.php (modified) (5 diffs)
• helper/SC_Helper_DB.php (modified) (1 diff)
• pages/admin/products/LC_Page_Admin_Products.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_Product.php

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

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

@@ -657 +657 @@
         // 在庫無し商品の非表示
         if (NOSTOCK_HIDDEN) {
-            $sql_where_dtl = '(stock >= 1 OR stock_unlimited = 1)';
-            $from = $objProduct->alldtlSQL($sql_where_dtl);
+            $where_products_class = '(stock >= 1 OR stock_unlimited = 1)';
+            $from = $objProduct->alldtlSQL($where_products_class);
         }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('del_flg = 0');
+        $from = $objProduct->alldtlSQL();
 
         $objQuery->setLimitOffset($limit, $offset);