Changeset 21410 for branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php

Timestamp:

2012/01/17 16:32:25 (12 years ago)

Author:

Seasoft

Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21326 #1536
r21325 #1528
r21324 #1547,#1546
r21323 #1546
r21322 #1543
r21321 #1536
r21320 #1536
r21319 #1544
r21318 #1521,#1522
r21317 #1431

File:

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

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

@@ -311 +311 @@
         $arrProducts = $objProduct->getListByProductIds($objQuery, $arrProductId);
 
+        //取得している並び順で並び替え
+        $arrProducts2 = array();
+        foreach($arrProducts as $item) {
+            $arrProducts2[ $item['product_id'] ] = $item;
+        }
+        $arrProducts = array();
+        foreach($arrProductId as $product_id) {
+            $arrProducts[] = $arrProducts2[$product_id];
+        }
+
         // 規格を設定
         $objProduct->setProductsClassByProductIds($arrProductId);
@@ -373 +383 @@
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $arrSearch  = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
-        // カテゴリ検索条件
+        // カテゴリー検索条件
         if ($arrSearchData['category_id'] > 0) {
             $arrSearch['category']  = $objQuery->get('category_name', 'dtb_category', 'category_id = ?', array($arrSearchData['category_id']));
@@ -398 +408 @@
         // 検索結果対象となる商品の数を取得
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
-        $objQuery->setWhere($searchCondition['where_for_count']);
+        $objQuery->setWhere($searchCondition['where']);
         $objProduct = new SC_Product_Ex();
         return $objProduct->findProductCount($objQuery, $searchCondition['arrval']);
@@ -423 +433 @@
         // 商品検索条件の作成（未削除、表示）
         $searchCondition['where'] = "alldtl.del_flg = 0 AND alldtl.status = 1 ";
+
+        // 在庫無し商品の非表示
+        if (NOSTOCK_HIDDEN === true) {
+            $searchCondition['where'] .= ' AND (stock >= 1 OR stock_unlimited = 1)';
+        }
 
         if (strlen($searchCondition["where_category"]) >= 1) {
@@ -450 +465 @@
             $searchCondition['arrval'][] = $arrSearchData['maker_id'];
         }
-
-        $searchCondition['where_for_count'] = $searchCondition['where'];
-
-        // 在庫無し商品の非表示
-        if (NOSTOCK_HIDDEN) {
-            $searchCondition['where'] .= ' AND (stock >= 1 OR stock_unlimited = 1)';
-            $searchCondition['where_for_count'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
-        }
-
         return $searchCondition;
     }