Changeset 17581 for branches/comu-ver2/data/class/pages

Timestamp:

2008/08/29 08:46:00 (16 years ago)

Author:

Seasoft

Message:

merge r17540,r17541,r17543,r17550,r17551,r17560,r17564,r17565,r17566

Location:

branches/comu-ver2/data/class/pages/admin/products

Files:

• LC_Page_Admin_Products_Product.php (modified) (3 diffs)
• LC_Page_Admin_Products_ProductClass.php (modified) (7 diffs)

branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

@@ -237 +237 @@
         // サブ情報表示・非表示のチェックに使用する。
         $this->sub_find = $sub_find;
-
         $objView->assignobj($this);
         $objView->display(MAIN_FRAME);
@@ -331 +330 @@
                                                       "product_id = ?",
                                                       array($product_id));
-
+        //編集時に規格IDが変わってしまうのを防ぐために規格が登録されていなければ規格IDを取得する
+        if( $this->lfCheckNonClass($_POST['product_id']) ){
+            $arrRet[0]['product_class_id'] = SC_Utils::sfGetProductClassId($product_id,"0","0");
+        }
         return $arrRet[0];
     }
@@ -482 +484 @@
 
         // 規格登録
-        SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id);
+        SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
 
         // 関連商品登録

branches/comu-ver2/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php

@@ -134 +134 @@
                 $this->arrClassCat = $this->lfGetClassCatListEdit($_POST['product_id']);
             }
-
             $this->lfProductClassPage();   // 規格登録ページ
             break;
@@ -148 +147 @@
                 $this->arrClassCat = $this->lfGetClassCatListDisp($_POST['select_class_id1'], $_POST['select_class_id2']);
             }
-
             $this->lfProductClassPage();   // 規格登録ページ
             break;
@@ -230 +228 @@
         $this->arrForm['product_name'] = $product_name;
     }
-
+    
+    /**
+     * デフォルトの表示
+     *
+     * @param object $objQuery
+     * @param integer $product_id 製品のID
+     * @param integer $max 表示される最大値
+     */
     function lfSetDefaultClassCat($objQuery, $product_id, $max) {
 
         // デフォルト値の読込
-        $col = "product_code, price01, price02, stock, stock_unlimited";
+        $col = "product_class_id, product_code, price01, price02, stock, stock_unlimited";
         $arrRet = $objQuery->select($col, "dtb_products_class", "product_id = ? AND classcategory_id1 = 0 AND classcategory_id2 = 0", array($product_id));;
 
@@ -240 +245 @@
             $no = 1;
             for($cnt = 0; $cnt < $max; $cnt++) {
+                $this->arrForm["product_class_id:".$no] = $arrRet[0]['product_class_id'];
                 $this->arrForm["product_code:".$no] = $arrRet[0]['product_code'];
                 $this->arrForm['stock:'.$no] = $arrRet[0]['stock'];
@@ -266 +272 @@
             $sql.= "WHERE class_id1 = ? AND class_id2 = 0 ORDER BY rank1 DESC;";
             $arrRet = $objQuery->getall($sql, array($class_id1));
-
+            
         }
 
@@ -312 +318 @@
         // デフォルト値を設定
         $this->lfSetDefaultClassCat($objQuery, $product_id, $max);
-
         $no = 1;
-
         for($cnt = 0; $cnt < $max; $cnt++) {
             $this->arrForm["classcategory_id1:".$no] = $arrList[$cnt]['classcategory_id1'];
             $this->arrForm["classcategory_id2:".$no] = $arrList[$cnt]['classcategory_id2'];
+            $this->arrForm["product_class_id:".$no] = $arrList[$cnt]['product_class_id'];
             if($arrList[$cnt]['product_id'] != "") {
                 $this->arrForm["product_code:".$no] = $arrList[$cnt]['product_code'];
@@ -356 +361 @@
                 $sqlval['classcategory_id1'] = $arrList["classcategory_id1:".$cnt];
                 $sqlval['classcategory_id2'] = $arrList["classcategory_id2:".$cnt];
+                if( strlen($arrList["product_class_id:".$cnt]) > 0 ){
+                    $sqlval['product_class_id'] = $arrList["product_class_id:".$cnt];
+                }
                 $sqlval['product_code'] = $arrList["product_code:".$cnt];
                 $sqlval['stock'] = $arrList["stock:".$cnt];