Changeset 18875 for branches/version-2_5-dev/data/class

Timestamp:

2010/10/29 21:00:06 (16 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:18874

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/order/product_select.tpl 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fproduct_select.tpl
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17293@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php

bzr:mapping-version:

v4

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

2355

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-10-29 21:00:01.309999943 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-10-29T12:00:01.310000Z

Message:

規格のデータベースを木構造に(#781)

• 商品追加時の規格のプルダウンを修正
• 追加商品検索時のパフォーマンス改善

Location:

branches/version-2_5-dev/data/class/pages/admin/order

Files:

• LC_Page_Admin_Order_Edit.php (modified) (5 diffs)
• LC_Page_Admin_Order_ProductSelect.php (modified) (5 diffs)

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -214 +214 @@
             // POST情報で上書き
             $this->objFormParam->setParam($_POST);
-            if (!empty($_POST['add_product_id'])) {
-                $this->lfInsertProduct($_POST['add_product_id'], $_POST['add_classcategory_id1'], $_POST['add_classcategory_id2']);
-            } elseif (!empty($_POST['edit_product_id'])) {
-                $this->lfUpdateProduct($_POST['edit_product_id'], $_POST['edit_classcategory_id1'], $_POST['edit_classcategory_id2'], $_POST['no']);
+            if (!empty($_POST['add_product_class_id'])) {
+                $this->lfInsertProduct($_POST['add_product_class_id']);
+            } elseif (!empty($_POST['edit_product_class_id'])) {
+                $this->lfUpdateProduct($_POST['edit_product_class_id'], $_POST['no']);
             }
             $arrData = $_POST;
@@ -695 +695 @@
     }
 
-    function lfInsertProduct($product_id, $classcategory_id1, $classcategory_id2) {
-        $arrProduct = $this->lfGetProductsClass($product_id, $classcategory_id1, $classcategory_id2);
+    function lfInsertProduct($product_class_id) {
+        $objProduct = new SC_Product();
+        $arrProduct = $this->lfGetProductsClass($objProduct->getDetailAndProductsClass($product_class_id));
         $this->arrForm = $this->objFormParam->getFormParamList();
         $existes = false;
@@ -704 +705 @@
             foreach ($this->arrForm['product_class_id']['value'] AS $key=>$val) {
                 // 既に同じ商品がある場合
-                if ($val == $product_id && $this->arrForm['product_id']['classcategory_id1'][$key] == $classcategory_id1 && $this->arrForm['product_id']['classcategory_id2'][$key] == $classcategory_id2) {
+                if ($val == $product_class_id) {
                     $existes = true;
                     $existes_key = $key;
@@ -720 +721 @@
     }
 
-    function lfUpdateProduct($product_id, $classcategory_id1, $classcategory_id2, $no) {
-        $arrProduct = $this->lfGetProductsClass($product_id, $classcategory_id1, $classcategory_id2);
+    function lfUpdateProduct($product_class_id, $no) {
+        $objProduct = new SC_Product();
+        $arrProduct = $this->lfGetProductsClass($objProduct->getDetailAndProductsClass($product_class_id));
         $this->arrForm = $this->objFormParam->getFormParamList();
         $this->lfSetProductData($arrProduct, $no);
@@ -732 +734 @@
             }
             if ($no === null) {
-                $this->arrForm[$key]['value'][] = $arrProduct[$key];
+                $this->arrForm[$key]['value'][] = $val;
             } else {
-                $this->arrForm[$key]['value'][$no] = $arrProduct[$key];
-            }
-        }
-    }
-
-    function lfGetProductsClass($product_class_id) {
-        $objDb = new SC_Helper_DB_Ex();
-        $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
-        $arrRet = $objDb->sfGetProductsClass(array($product_class_id), true);
-
-        $arrProduct['price'] = $arrRet['price02'];
+                $this->arrForm[$key]['value'][$no] = $val;
+            }
+        }
+    }
+
+    function lfGetProductsClass($productsClass) {
+        $arrProduct['price'] = $productsClass['price02'];
         $arrProduct['quantity'] = 1;
-        $arrProduct['product_id'] = $arrRet['product_id'];
-        $arrProduct['product_class_id'] = $arrRet['product_class_id'];
-        $arrProduct['point_rate'] = $arrRet['point_rate'];
-        $arrProduct['product_code'] = $arrRet['product_code'];
-        $arrProduct['product_name'] = $arrRet['name'];
-        $arrProduct['classcategory_name1'] = $arrClassCatName[$arrRet['classcategory_id1']];
-        $arrProduct['classcategory_name2'] = $arrClassCatName[$arrRet['classcategory_id2']];
+        $arrProduct['product_id'] = $productsClass['product_id'];
+        $arrProduct['product_class_id'] = $productsClass['product_class_id'];
+        $arrProduct['point_rate'] = $productsClass['point_rate'];
+        $arrProduct['product_code'] = $productsClass['product_code'];
+        $arrProduct['product_name'] = $productsClass['name'];
+        $arrProduct['classcategory_name1'] = $productsClass['classcategory_name1'];
+        $arrProduct['classcategory_name2'] = $productsClass['classcategory_name2'];
 
         return $arrProduct;
     }
+
 
     /**

branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

@@ -25 +25 @@
 // {{{ requires
 require_once(CLASS_PATH . "pages/LC_Page.php");
+require_once(DATA_PATH . 'module/Services/JSON.php');
 
 /**
@@ -111 +112 @@
             }
 
-            /*
-             * FIXME パフォーマンスに問題があるため SC_Product::lists() を使用する
-             */
             $objProduct = new SC_Product();
             $productIds = $objProduct->findProductIds($objQuery, $arrval);
@@ -142 +140 @@
             $this->arrProducts = $objProduct->lists($objQuery, $arrval);
             $objProduct->setProductsClassByProductIds($productIds);
+            $objJson = new Services_JSON();
+            $this->tpl_javascript .= 'productsClassCategories = ' . $objJson->encode($objProduct->classCategories) . '; ';
+
+            foreach ($this->arrProducts as $arrProduct) {
+                $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});\n";
+            }
+
+            $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
+            $this->tpl_onload .= 'fnOnLoad(); ';
+
             // 規格1クラス名
             $this->tpl_class_name1 = $objProduct->className1;
@@ -155 +163 @@
             // 規格2が設定されている
             $this->tpl_classcat_find2 = $objProduct->classCat2_find;
-
+            $this->tpl_product_class_id = $objProduct->product_class_id;
             $this->tpl_stock_find = $objProduct->stock_find;
-            $this->tpl_product_class_id = $objProduct->product_class_id;
-            $this->tpl_product_type = $objProduct->product_type;
-
-            // FIXME 規格のプルダウンを要修正
-            $this->tpl_javascript = "";
         }
 
@@ -201 +204 @@
         }
     }
-
-    // FIXME SC_Product クラスを使用する
-    /* 規格セレクトボックスの作成 */
-    function lfMakeSelect($product_id, $arrClassName, $arrClassCatName) {
-
-        $classcat_find1 = false;
-        $classcat_find2 = false;
-        // 在庫ありの商品の有無
-        $stock_find = false;
-
-        // 商品規格情報の取得
-        $arrProductsClass = $this->lfGetProductsClass($product_id);
-
-        // 規格1クラス名の取得
-        $this->tpl_class_name1[$product_id] =
-            isset($arrClassName[$arrProductsClass[0]['class_id1']])
-            ? $arrClassName[$arrProductsClass[0]['class_id1']]
-            : "";
-
-        // 規格2クラス名の取得
-        $this->tpl_class_name2[$product_id] =
-            isset($arrClassName[$arrProductsClass[0]['class_id2']])
-            ? $arrClassName[$arrProductsClass[0]['class_id2']]
-            : "";
-
-        // すべての組み合わせ数
-        $count = count($arrProductsClass);
-
-        $classcat_id1 = "";
-
-        $arrSele = array();
-        $arrList = array();
-
-        $list_id = 0;
-        $arrList[0] = "\tlist". $product_id. "_0 = new Array('選択してください'";
-        $arrVal[0] = "\tval". $product_id. "_0 = new Array(''";
-
-        for ($i = 0; $i < $count; $i++) {
-            // 在庫のチェック
-            if($arrProductsClass[$i]['stock'] <= 0 && $arrProductsClass[$i]['stock_unlimited'] != '1') {
-                continue;
-            }
-
-            $stock_find = true;
-
-            // 規格1のセレクトボックス用
-            if($classcat_id1 != $arrProductsClass[$i]['classcategory_id1']){
-                $arrList[$list_id].=");\n";
-                $arrVal[$list_id].=");\n";
-                $classcat_id1 = $arrProductsClass[$i]['classcategory_id1'];
-                $arrSele[$classcat_id1] = $arrClassCatName[$classcat_id1];
-                $list_id++;
-
-                $arrList[$list_id] = "";
-                $arrVal[$list_id] = "";
-            }
-
-            // 規格2のセレクトボックス用
-            $classcat_id2 = $arrProductsClass[$i]['classcategory_id2'];
-
-            // セレクトボックス表示値
-            if($arrList[$list_id] == "") {
-                $arrList[$list_id] = "\tlist". $product_id. "_". $list_id. " = new Array('選択してください', '". $arrClassCatName[$classcat_id2]. "'";
-            } else {
-                $arrList[$list_id].= ", '".$arrClassCatName[$classcat_id2]."'";
-            }
-
-            // セレクトボックスPOST値
-            if($arrVal[$list_id] == "") {
-                $arrVal[$list_id] = "\tval". $product_id. "_". $list_id. " = new Array('', '". $classcat_id2. "'";
-            } else {
-                $arrVal[$list_id].= ", '".$classcat_id2."'";
-            }
-        }
-
-        $arrList[$list_id].=");\n";
-        $arrVal[$list_id].=");\n";
-
-        // 規格1
-        $this->arrClassCat1[$product_id] = $arrSele;
-
-        $lists = "\tlists".$product_id. " = new Array(";
-        $no = 0;
-        foreach($arrList as $val) {
-            $this->tpl_javascript.= $val;
-            if ($no != 0) {
-                $lists.= ",list". $product_id. "_". $no;
-            } else {
-                $lists.= "list". $product_id. "_". $no;
-            }
-            $no++;
-        }
-        $this->tpl_javascript.= $lists.");\n";
-
-        $vals = "\tvals".$product_id. " = new Array(";
-        $no = 0;
-        foreach($arrVal as $val) {
-            $this->tpl_javascript.= $val;
-            if ($no != 0) {
-                $vals.= ",val". $product_id. "_". $no;
-            } else {
-                $vals.= "val". $product_id. "_". $no;
-            }
-            $no++;
-        }
-        $this->tpl_javascript.= $vals.");\n";
-
-        // 選択されている規格2ID
-        $classcategory_id = "classcategory_id". $product_id;
-
-        $classcategory_id_2 = $classcategory_id . "_2";
-        if (!isset($classcategory_id_2)) $classcategory_id_2 = "";
-        if (!isset($_POST[$classcategory_id_2])) $_POST[$classcategory_id_2] = "";
-
-        $this->tpl_onload .= "lnSetSelect('" . $classcategory_id ."_1', "
-            . "'" . $classcategory_id_2 . "',"
-            . "'" . $product_id . "',"
-            . "'" . $_POST[$classcategory_id_2] ."'); ";
-
-        // 規格1が設定されている
-        if($arrProductsClass[0]['classcategory_id1'] != '0') {
-            $classcat_find1 = true;
-        }
-
-        // 規格2が設定されている
-        if($arrProductsClass[0]['classcategory_id2'] != '0') {
-            $classcat_find2 = true;
-        }
-
-        $this->tpl_classcat_find1[$product_id] = $classcat_find1;
-        $this->tpl_classcat_find2[$product_id] = $classcat_find2;
-        $this->tpl_stock_find[$product_id] = $stock_find;
-    }
-
-    /* 商品規格情報の取得 */
-    function lfGetProductsClass($product_id) {
-        $arrRet = array();
-        if(SC_Utils_Ex::sfIsInt($product_id)) {
-            // 商品規格取得
-            $objQuery = new SC_Query();
-            $col = "product_class_id, classcategory_id1, classcategory_id2, class_id1, class_id2, stock, stock_unlimited";
-            $table = "vw_product_class AS prdcls";
-            $where = "product_id = ?";
-            $objQuery->setOrder("rank1 DESC, rank2 DESC");
-            $arrRet = $objQuery->select($col, $table, $where, array($product_id));
-        }
-        return $arrRet;
-    }
 }
 ?>