Changeset 18432 for branches/version-2/data/class/pages/products/LC_Page_Products_List.php

Timestamp:

2009/12/07 15:08:06 (14 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.2 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=207）

File:

• branches/version-2/data/class/pages/products/LC_Page_Products_List.php (modified) (5 diffs)

branches/version-2/data/class/pages/products/LC_Page_Products_List.php

@@ -246 +246 @@
             $tpl_subtitle = "検索結果";
             $tpl_search_mode = true;
-        }elseif (empty($arrCategory_id)) {
+        }elseif (empty($arrCategory_id[0])) {
             $tpl_subtitle = "全商品";
         }else{
@@ -380 +380 @@
         $objDb = new SC_Helper_DB_Ex();
         $this->tpl_pageno = defined("MOBILE_SITE") ? @$_GET['pageno'] : @$_POST['pageno'];
-
-        //表示順序
-        switch($orderby) {
-
-        //価格順
-        case 'price':
-            $col = "DISTINCT price02_min, product_id, product_code_min, product_code_max,"
-                . " name, comment1, comment2, comment3,"
-                . " main_list_comment, main_image, main_list_image,"
-                . " price01_min, price01_max, price02_max,"
-                . " stock_min, stock_max, stock_unlimited_min, stock_unlimited_max,"
-                . " point_rate, sale_limit, sale_unlimited, deliv_date_id, deliv_fee,"
-                . " status, product_flag, create_date, del_flg";
-            $from = "vw_products_allclass AS T1";
-            $order = "price02_min, product_id";
-            break;
-
-        //新着順
-        case 'date':
-            $col = "DISTINCT create_date, product_id, product_code_min, product_code_max,"
-                . " name, comment1, comment2, comment3,"
-                . " main_list_comment, main_image, main_list_image,"
-                . " price01_min, price01_max, price02_min, price02_max,"
-                . " stock_min, stock_max, stock_unlimited_min, stock_unlimited_max,"
-                . " point_rate, sale_limit, sale_unlimited, deliv_date_id, deliv_fee,"
-                . " status, product_flag, del_flg";
-            $from = "vw_products_allclass AS T1";
-            $order = "create_date DESC, product_id";
-            break;
-
-        default:
-            $col = "DISTINCT T1.product_id, product_code_min, product_code_max,"
-                . " price01_min, price01_max, price02_min, price02_max,"
-                . " stock_min, stock_max, stock_unlimited_min,"
-                . " stock_unlimited_max, del_flg, status, name, comment1,"
-                . " comment2, comment3, main_list_comment, main_image,"
-                . " main_list_image, product_flag, deliv_date_id, sale_limit,"
-                . " point_rate, sale_unlimited, create_date, deliv_fee, "
-                . " T4.product_rank, T4.category_rank";
-            $from = "vw_products_allclass AS T1"
-                . " JOIN ("
-                . " SELECT max(T3.rank) AS category_rank,"
-                . "        max(T2.rank) AS product_rank,"
-                . "        T2.product_id"
-                . "   FROM dtb_product_categories T2"
-                . "   JOIN dtb_category T3 USING (category_id)"
-                . " GROUP BY product_id) AS T4 USING (product_id)";
-            $order = "T4.category_rank DESC, T4.product_rank DESC";
-            break;
-        }
-
+        $arrval = array();
+        $arrval_order = array();
+        $arrval_category = array();
+
+        // カテゴリからのWHERE文字列取得
+
+        if ( $category_id ) {
+            list($tmp_where, $arrval_category) = $objDb->sfGetCatWhere($category_id);
+            if (strlen($tmp_where) >= 1) {
+                $where_category = "AND $tmp_where";
+                //並び替え用（MySQL4.1対応）
+                $where_category_order = "AND " ."T2.".trim($tmp_where);
+            }
+        }
+
+        // ▼対象商品IDの抽出
         // 商品検索条件の作成（未削除、表示）
         $where = "del_flg = 0 AND status = 1 ";
-        // カテゴリからのWHERE文字列取得
-        if ( $category_id ) {
-            list($tmp_where, $arrval) = $objDb->sfGetCatWhere($category_id);
-            if($tmp_where != "") {
-                $where.= " AND $tmp_where";
-            }
+
+        // 在庫無し商品の非表示
+        if (NOSTOCK_HIDDEN === true) {
+            $where .= ' AND (stock_max >= 1 OR stock_unlimited_max = 1)';
+        }
+
+        if (strlen($where_category) >= 1) {
+            $where.= " $where_category";
+            $arrval = array_merge($arrval, $arrval_category);
         }
 
@@ -457 +425 @@
         }
 
-        if (empty($arrval)) {
-            $arrval = array();
-        }
+        $arrProduct_id = $objQuery->getCol('vw_products_allclass AS allcls', 'DISTINCT product_id', $where, $arrval);
+        // ▲対象商品IDの抽出
 
         // 行数の取得
-        $linemax = count($objQuery->getAll("SELECT DISTINCT product_id "
-                                         . "FROM vw_products_allclass AS allcls "
-                                         . (!empty($where) ? " WHERE " . $where
-                                                           : ""), $arrval));
+        $linemax = count($arrProduct_id);
 
         $this->tpl_linemax = $linemax;   // 何件が該当しました。表示用
@@ -478 +442 @@
         $startno = $this->objNavi->start_row;                 // 開始行
 
+        // ▼商品詳細取得
+        $col = <<< __EOS__
+             product_id
+            ,product_code_min
+            ,product_code_max
+            ,name
+            ,comment1
+            ,comment2
+            ,comment3
+            ,main_list_comment
+            ,main_image
+            ,main_list_image
+            ,price01_min
+            ,price01_max
+            ,price02_min
+            ,price02_max
+            ,stock_min
+            ,stock_max
+            ,stock_unlimited_min
+            ,stock_unlimited_max
+            ,point_rate
+            ,sale_limit
+            ,sale_unlimited
+            ,deliv_date_id
+            ,deliv_fee
+            ,status
+            ,product_flag
+            ,del_flg
+__EOS__;
+
+        $from = "vw_products_allclass_detail AS alldtl";
+
+        // WHERE 句
+        $where = '0=0';
+        if (is_array($arrProduct_id) && !empty($arrProduct_id)) {
+            $where .= ' AND product_id IN (' . implode(',', $arrProduct_id) . ')';
+        }
+
+        //表示順序
+        switch($orderby) {
+
+            //販売価格順
+            case 'price':
+                $order = "price02_min, product_id";
+                break;
+
+            //新着順
+            case 'date':
+                $order = "create_date DESC, product_id";
+                break;
+
+            default:
+                $order = <<< __EOS__
+                    (
+                        SELECT
+                             T3.rank
+                        FROM
+                            dtb_product_categories T2
+                            JOIN dtb_category T3
+                                USING (category_id)
+                        WHERE T2.product_id = alldtl.product_id
+                            $where_category_order
+                        ORDER BY T3.rank DESC, T2.rank DESC
+                        LIMIT 1
+                    ) DESC
+                    ,(
+                        SELECT
+                            T2.rank
+                        FROM
+                            dtb_product_categories T2
+                            JOIN dtb_category T3
+                                USING (category_id)
+                        WHERE T2.product_id = alldtl.product_id
+                            $where_category_order
+                        ORDER BY T3.rank DESC, T2.rank DESC
+                        LIMIT 1
+                    ) DESC
+                    ,product_id
+__EOS__;
+                $arrval_order = array_merge($arrval_category, $arrval_category);
+                break;
+        }
+
         // 取得範囲の指定(開始行番号、行数のセット)
         $objQuery->setlimitoffset($disp_num, $startno);
@@ -484 +531 @@
 
         // 検索結果の取得
-        $this->arrProducts = $objQuery->select($col, $from, $where, $arrval);
+        $this->arrProducts = $objQuery->select($col, $from, $where, $arrval_order);
+        // ▲商品詳細取得
 
         // 規格名一覧