Changeset 19695 for branches/version-2_5-dev/data/class/pages/admin

Timestamp:

2010/11/30 19:38:05 (16 years ago)

Author:

nanasess

bzr:base-revision:

[email protected]

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/Smarty/templates/admin/products/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fconfirm.tpl
data/Smarty/templates/admin/products/product.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct.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_confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fproducts%2Fproduct_class_confirm.tpl
data/class/SC_Product.php 18277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2FSC_Product.php
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Product.php
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

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

bzr:revno:

2425

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-11-30 19:37:58.640000105 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2010-11-30T10:37:58.640000Z

Message:

#823 商品種別によってカートを分ける

• 商品登録時に支払方法を設定するよう修正

Location:

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

Files:

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

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

@@ -145 +145 @@
                 $productStatus= $objProduct->getProductStatus(array($_POST['product_id']));
                 $this->arrForm['product_status'] = $productStatus[$_POST['product_id']];
+                $this->arrForm['payment_ids'] = $objProduct->getEnablePaymentIds(array($this->arrForm['product_class_id']));
 
                 // DBデータから画像ファイル名の読込
@@ -638 +639 @@
             }
 
+            // 支払方法チェック
+            if (empty($array['payment_ids'])) {
+                $objErr->arrErr['payment_ids'] = "※ 支払方法は、いずれかを選択してください。<br />";
+            }
+
             //ダウンロード商品チェック
             if($array['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) {
@@ -882 +888 @@
 
         }
+
+        $objProduct = new SC_Product();
+        $objProduct->setPaymentOptions($sqlval['product_class_id'], $arrList['payment_ids']);
     }
 

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 = '商品登録(商品規格)';
+        $this->arrPayments = SC_Helper_DB_Ex::sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
     }
 
@@ -290 +291 @@
                 $objQuery->insert("dtb_products_class", $pVal);
             }
+
+            // 支払方法登録
+            $objProduct = new SC_Product();
+            $objProduct->setPaymentOptions($pVal['product_class_id'], $arrList['payment_ids:'.$i]);
             $i++;
         }
@@ -355 +360 @@
                 if($array["stock_unlimited:".$no] != '1') {
                     $objErr->doFunc(array("在庫数", "stock:".$no, AMOUNT_LEN), array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
+                }
+
+                // 支払方法チェック
+                if (empty($array['payment_ids:' . $no])) {
+                    $objErr->arrErr['payment_ids:' . $no] = "※ 支払方法は、いずれかを選択してください。<br />";
                 }
 
@@ -442 +452 @@
         $this->arrForm['select_class_id2'] = $this->arrForm["class_id2"];
         $this->arrClassCat = $this->getAllClassCategory($this->arrForm["class_id1"], $this->arrForm["class_id2"]);
+        $objProduct = new SC_Product();
         $total = count($this->arrClassCat);
+        // XXX $i = 1 にすれば ($i+1) は $i で良い？
         for ($i = 0; $i < $total; $i++) {
             if ($existsValue) {
                 foreach ($productsClass as $key => $val) {
-                    if(!$usepostValue){
-                        $this->arrForm[$key . ":" . ($i+1)] = $val;
-                    }
+                    if(!$usepostValue){
+                        $this->arrForm[$key . ":" . ($i+1)] = $val;
+                    }
                 }
             }
             foreach ($existsProductsClass[$i] as $key => $val) {
-                if(!$usepostValue){
-                    $this->arrForm[$key . ":" . ($i+1)] = $val;
-                }
-                if($key=="down"){
+                if(!$usepostValue){
+                    $this->arrForm[$key . ":" . ($i+1)] = $val;
+                }
+
+                switch ($key) {
+                case 'down':
                     $this->objDownFile->addFile("ダウンロード販売用ファイル". ":" . ($i+1), 'down_realfilename'. ":" . ($i+1), explode(",", DOWNLOAD_EXTENSION),DOWN_SIZE, true, 0, 0);
+                    break;
+
+                    case 'product_class_id':
+                        $this->arrForm["payment_ids:" . ($i+1)] = $objProduct->getEnablePaymentIds(array($val));
+                        break;
+                default:
                 }
             }