Changeset 21281

Timestamp:

2011/10/14 14:52:48 (13 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20111014055117-ks65o676o13tcva3

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20111014055245-thdx0ig4572gpwxq

bzr:revno:

3978

bzr:revprop:branch-nick:

branches/version-2_11-dev

bzr:root:

branches/version-2_11-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: ohkouchi@loop-az.jp-20111014055245-thdx0ig4572gpwxq
sha1: 8fd8294bc722d5a8a481a0989dea5cbbe9cf0c64

bzr:text-parents:

data/class/pages/products/LC_Page_Products_Detail.php svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_11-dev:21256

bzr:timestamp:

2011-10-14 14:52:45.061000109 +0900

bzr:user-agent:

bzr2.4.1+bzr-svn1.1.0

Message:

#1505 (モバイルで企画が登録されていない商品がカートに入らない)

• 空の添字が生成されないよう修正

File:

• branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php (modified) (2 diffs)

branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -129 +129 @@
 
         $this->tpl_stock_find = $objProduct->stock_find[$product_id];
-        $this->tpl_product_class_id = $objProduct->classCategories[$product_id]['']['']['product_class_id'];
-        $this->tpl_product_type = $objProduct->classCategories[$product_id]['']['']['product_type'];
+        $this->tpl_product_class_id = $objProduct->classCategories[$product_id]['__unselected']['__unselected']['product_class_id'];
+        $this->tpl_product_type = $objProduct->classCategories[$product_id]['__unselected']['__unselected']['product_type'];
 
         $this->tpl_javascript .= 'classCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories[$product_id]) . ';';
@@ -232 +232 @@
                     }
 
-                    $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$this->objFormParam->getValue('classcategory_id1')]['#' . $this->objFormParam->getValue('classcategory_id2')]['product_class_id'];
+                    $value1 = $this->objFormParam->getValue('classcategory_id1');
+                    $value2 = $this->objFormParam->getValue('classcategory_id2');
+
+                    if ($value1 == '') {
+                        $value1 = '__unselected';
+                    }
+                    if ($value2 == '') {
+                        $value2 = '__unselected';
+                    } else {
+                        $value2 = '#' . $value2;
+                    }
+
+                    $this->tpl_product_class_id = $objProduct->classCategories[$product_id][$value1][$value2]['product_class_id'];
 
                     // 数量の入力を行う