Changeset 22796 for branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

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

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

@@ -32 +32 @@
  * @version $Id$
  */
-class LC_Page_Products_List extends LC_Page_Ex 
-{
+class LC_Page_Products_List extends LC_Page_Ex {
 
     // {{{ properties
@@ -69 +68 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
 
@@ -85 +83 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         parent::process();
         $this->action();
@@ -97 +94 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objProduct = new SC_Product_Ex();
@@ -147 +143 @@
         }
 
-        $this->tpl_rnd = SC_Utils_Ex::sfGetRandomString(3);
+        $this->tpl_rnd          = SC_Utils_Ex::sfGetRandomString(3);
+
+
     }
 
@@ -155 +153 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -165 +162 @@
      * @return integer カテゴリID
      */
-    function lfGetCategoryId($category_id)
-    {
+    function lfGetCategoryId($category_id) {
 
         // 指定なしの場合、0 を返す
@@ -190 +186 @@
 
     /* 商品一覧の表示 */
-    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct)
-    {
+    function lfGetProductsList($searchCondition, $disp_number, $startno, $linemax, &$objProduct) {
 
         $arrOrderVal = array();
@@ -229 +224 @@
                     ,product_id DESC
 __EOS__;
-                $objQuery->setOrder($order);
+                    $objQuery->setOrder($order);
                 break;
         }
@@ -249 +244 @@
 
     /* 入力内容のチェック */
-    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2)
-    {
+    function lfCheckError($product_id, &$arrForm, $tpl_classcat_find1, $tpl_classcat_find2) {
 
         // 入力データを渡す。
@@ -274 +268 @@
      * @return void
      */
-    function lfGetDisplayNum($display_number)
-    {
+    function lfGetDisplayNum($display_number) {
         // 表示件数
         return (SC_Utils_Ex::sfIsInt($display_number))
@@ -287 +280 @@
      * @return str
      */
-    function lfGetPageTitle($mode, $category_id = 0)
-    {
+    function lfGetPageTitle($mode, $category_id = 0) {
         if ($mode == 'search') {
             return '検索結果';
@@ -294 +286 @@
             return '全商品';
         } else {
-            $objCategory = new SC_Helper_Category_Ex();
-            $arrCat = $objCategory->get($category_id);
-            return $arrCat['category_name'];
+            $arrCat = SC_Helper_DB_Ex::sfGetCat($category_id);
+            return $arrCat['name'];
         }
     }
@@ -305 +296 @@
      * @return array
      */
-    function lfGetSearchConditionDisp($arrSearchData)
-    {
+    function lfGetSearchConditionDisp($arrSearchData) {
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
         $arrSearch  = array('category' => '指定なし', 'maker' => '指定なし', 'name' => '指定なし');
@@ -316 +306 @@
         // メーカー検索条件
         if (strlen($arrSearchData['maker_id']) > 0) {
-            $objMaker = new SC_Helper_Maker_Ex();
-            $maker = $objMaker->get($arrSearchData['maker_id']);
-            $arrSearch['maker']     = $maker['name'];
+            $arrSearch['maker']     = $objQuery->get('name', 'dtb_maker', 'maker_id = ?', array($arrSearchData['maker_id']));
         }
 
@@ -333 +321 @@
      * @return int
      */
-    function lfGetProductAllNum($searchCondition)
-    {
+    function lfGetProductAllNum($searchCondition) {
         // 検索結果対象となる商品の数を取得
         $objQuery   =& SC_Query_Ex::getSingletonInstance();
@@ -347 +334 @@
      * @return array
      */
-    function lfGetSearchCondition($arrSearchData)
-    {
+    function lfGetSearchCondition($arrSearchData) {
         $searchCondition = array(
             'where'             => '',
@@ -391 +377 @@
         }
 
+        $searchCondition['where_for_count'] = $searchCondition['where'];
+
         // 在庫無し商品の非表示
         if (NOSTOCK_HIDDEN) {
             $searchCondition['where'] .= ' AND EXISTS(SELECT * FROM dtb_products_class WHERE product_id = alldtl.product_id AND del_flg = 0 AND (stock >= 1 OR stock_unlimited = 1))';
-        }
-
-        // XXX 一時期内容が異なっていたことがあるので別要素にも格納している。
-        $searchCondition['where_for_count'] = $searchCondition['where'];
+            $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;
@@ -407 +393 @@
      * @return str
      */
-    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id)
-    {
+    function lfSetSelectedData(&$arrProducts, $arrForm, $arrErr, $product_id) {
         $js_fnOnLoad = '';
         foreach ($arrProducts as $key => $value) {
@@ -429 +414 @@
      * @return void
      */
-    function lfAddCart($arrForm, $referer)
-    {
+    function lfAddCart($arrForm, $referer) {
         $product_class_id = $arrForm['product_class_id'];
         $objCartSess = new SC_CartSession_Ex();
@@ -444 +428 @@
      * @return Array $arrProducts 商品一覧情報
      */
-    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage)
-    {
+    function setStatusDataTo($arrProducts, $arrStatus, $arrStatusImage) {
 
         foreach ($arrProducts['productStatus'] as $product_id => $arrValues) {
@@ -465 +448 @@
     /**
      *
-     * @return void
-     */
-    function doJson()
-    {
+     * @param type $objProduct 
+     * @return void
+     */
+    function doJson(&$objProduct) {
         $this->arrProducts = $this->setStatusDataTo($this->arrProducts, $this->arrSTATUS, $this->arrSTATUS_IMAGE);
-        SC_Product_Ex::setPriceTaxTo($this->arrProducts);
+        $this->arrProducts = $objProduct->setPriceTaxTo($this->arrProducts);
 
         // 一覧メイン画像の指定が無い商品のための処理
@@ -486 +469 @@
      * @return void
      */
-    function doDefault(&$objProduct)
-    {
+    function doDefault(&$objProduct) {
         //商品一覧の表示処理
         $strnavi            = $this->objNavi->strnavi;
@@ -536 +518 @@
                 $this->lfAddCart($this->arrForm, $_SERVER['HTTP_REFERER']);
 
-                // 開いているカテゴリーツリーを維持するためのパラメーター
-                $arrQueryString = array(
-                    'category_id' => $this->arrForm['category_id'],
-                );
-
-                SC_Response_Ex::sendRedirect(CART_URLPATH, $arrQueryString);
+
+                SC_Response_Ex::sendRedirect(CART_URLPATH);
                 SC_Response_Ex::actionExit();
             }
@@ -552 +530 @@
         }
 
-        $this->tpl_javascript   .= 'function fnOnLoad()
-        {' . $js_fnOnLoad . '}';
+        $this->tpl_javascript   .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
         $this->tpl_onload       .= 'fnOnLoad(); ';
     }