Changeset 19993 for branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php

Timestamp:

2011/01/19 23:34:04 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/admin/products/complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fcomplete.tpl
data/Smarty/templates/admin/products/product_class.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class.tpl
data/Smarty/templates/admin/products/product_class_complete.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_complete.tpl
data/Smarty/templates/admin/products/product_class_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_confirm.tpl
data/Smarty/templates/default/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Fdetail.tpl
data/Smarty/templates/default/products/list.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Flist.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.php
html/user_data/packages/admin/css/admin_contents.css 18900@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fhtml%2Fuser_data%2Fpackages%2Fadmin%2Fcss%2Fadmin_contents.css

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20110119143400-y3x781u6k7nxuu9c

bzr:revno:

2722

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/admin/products/complete.tpl ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
data/Smarty/templates/admin/products/product_class.tpl ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
data/Smarty/templates/admin/products/product_class_complete.tpl ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
data/Smarty/templates/admin/products/product_class_confirm.tpl ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh
html/user_data/packages/admin/css/admin_contents.css ohkouchi@loop-az.jp-20110119143115-v4oyz2sza3zwz8oh

bzr:timestamp:

2011-01-19 23:34:00.638999939 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-01-19T14:34:00.639000Z

Message:

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

• 管理画面規格管理, フロント商品一覧/詳細を修正

#792（ダウンロード販売機能）

• 規格管理画面からアップロードできなかったのを修正

File:

• branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php (modified) (14 diffs)

branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php

@@ -54 +54 @@
         $this->tpl_subno = 'product';
         $this->tpl_subtitle = '商品登録(商品規格)';
+        $masterData = new SC_DB_MasterData_Ex();
+        $this->arrProductType = $masterData->getMasterData("mtb_product_type");
         $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
     }
@@ -61 +63 @@
         while (isset($_POST['classcategory_id1:' . $i])) {
             //ファイル系処理
-            $this->objDownFile->addFile("ダウンロード販売用ファイル". ":" . $i, 'down_realfilename'. ":" . $i, explode(",", DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
+            $this->objDownFile->addFile("ダウンロード販売用ファイル", 'down_realfilename'. ":" . $i, explode(",", DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
             $i++;
         }
@@ -96 +98 @@
         // Downファイル管理クラス
         $this->objDownFile = new SC_UploadFile(DOWN_TEMP_REALDIR, DOWN_SAVE_REALDIR);
-
+        $this->lfInitDownFile();
         switch ($_POST['mode']) {
         case 'edit':
@@ -103 +105 @@
             // エラーチェック
             $this->arrErr = $this->lfProductClassError($this->arrForm);
-            if ($this->arrErr == null){
-            //if (SC_Utils_Ex::isBlank($this->arrErr)) {
+            if (empty($this->arrErr)){
                 $this->tpl_mainpage = 'products/product_class_confirm.tpl';
                 $this->lfProductConfirmPage(); // 確認ページ表示
             } else {
-                $this->doPreEdit(false,true);
+                $this->doPreEdit(false ,true);
                 // Hiddenからのデータを引き継ぐ
                 $this->objDownFile->setHiddenFileList($_POST);
@@ -115 +116 @@
                 // Form用に配列を渡す。
                 $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+                $this->doDisp();
             }
             break;
@@ -133 +135 @@
         // ダウンロード商品ファイルアップロード
         case 'upload_down':
-            $this->doPreEdit();
+            $this->doPreEdit(true);
             // Hiddenからのデータを引き継ぐ
             $this->objDownFile->setHiddenKikakuFileList($_POST);
@@ -144 +146 @@
             // Form用に配列を渡す。
             $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->doDisp();
             break;
         // ダウンロードファイルの削除
         case 'delete_down':
-            $this->doPreEdit();
+            $this->doPreEdit(true);
             // Hiddenからのデータを引き継ぐ
             $this->objDownFile->setHiddenKikakuFileList($_POST);
@@ -156 +159 @@
             // Form用に配列を渡す。
             $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->doDisp();
             break;
         case 'confirm_return':
@@ -170 +174 @@
             // Form用に配列を渡す。
             $this->arrForm = array_merge((array)$this->arrForm, (array)$this->objDownFile->getFormKikakuDownFile());
+            $this->doDisp();
             break;
         case 'complete':
@@ -220 +225 @@
             $exists[$val['product_class_id']] = $val;
         }
-
         $i = 1;
-        while (isset($arrList['classcategory_id1:' . $i])) {
+        while (isset($arrList['check:' . $i])) {
             $pVal = array();
             $pVal['product_id'] = $product_id;;
@@ -365 +369 @@
                 }
 
+                // 商品種別チェック
+                if (empty($array['product_type_id:' . $no])) {
+                    $objErr->arrErr['product_type_id:' . $no] = "※ 商品種別は、いずれかを選択してください。<br />";
+                }
+
                 // 支払方法チェック
                 if (empty($array['payment_ids:' . $no])) {
@@ -388 +397 @@
             }
             if(count($objErr->arrErr) > 0) {
-                $objErr->arrErr["error:".$no] = $objErr->arrErr["product_code:".$no];
-                $objErr->arrErr["error:".$no].= $objErr->arrErr["price01:".$no];
-                $objErr->arrErr["error:".$no].= $objErr->arrErr["price02:".$no];
-                $objErr->arrErr["error:".$no].= $objErr->arrErr["stock:".$no];
+                $objErr->arrErr["error:".$no] = $objErr->arrErr["product_type_id:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["payment_ids:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["product_code:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["price01:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["price02:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["stock:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["stock:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["down_filename:".$no];
+                $objErr->arrErr["error:".$no] .= $objErr->arrErr["down_realfilename:".$no];
+
             }
             $no++;
@@ -427 +442 @@
         $this->arrForm['select_class_id1'] = $_POST['select_class_id1'];
         $this->arrForm['select_class_id2'] = $_POST['select_class_id2'];
-
-        $this->arrErr = $this->lfClassError();
-        if (SC_Utils_Ex::isBlank($this->arrErr)) {
+        $dispError = $this->lfClassError();
+        if (SC_Utils_Ex::isBlank($dispError)) {
             $this->arrClassCat = $this->getAllClassCategory($_POST['select_class_id1'], $_POST['select_class_id2']);
 
@@ -441 +455 @@
             }
         }
+        $this->arrErr = array_merge((array) $this->arrErr, $dispError);
         $this->tpl_onload.= "fnCheckAllStockLimit('$total', '" . DISABLED_RGB . "');";
     }