Changeset 18882 for branches/version-2_5-dev/data/class/SC_Product.php

Timestamp:

2010/11/04 12:57:08 (12 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

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
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql

bzr:mapping-version:

v4

bzr:repository-uuid:

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

bzr:revision-id:

ohkouchi@loop-az.jp-20101104035705-abeyiznymhr557j6

bzr:revno:

2361

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:timestamp:

2010-11-04 12:57:05.384000063 +0900

bzr:user-agent:

bzr2.2.0+bzr-svn1.0.3

svn:original-date:

2010-11-04T03:57:05.384000Z

Message:

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

• 「実商品・ダウンロード」を「商品種別」に変更

File:

• branches/version-2_5-dev/data/class/SC_Product.php (modified) (3 diffs)

branches/version-2_5-dev/data/class/SC_Product.php

@@ -180 +180 @@
             $classCategories['']['']['name'] = '選択してください';
             $classCategories['']['']['product_class_id'] = $arrProductClass[0]['product_class_id'];
-            // 商品種別 TODO 暫定的に down を使用する
-            $classCategories['']['']['product_type'] = $arrProductClass[0]['down'];
+            // 商品種別
+            $classCategories['']['']['product_type'] = $arrProductClass[0]['product_type_id'];
             $this->product_class_id[$productId] = $arrProductClass[0]['product_class_id'];
-            // 商品種別 TODO 暫定的に down を使用する
-            $this->product_type[$productId] = $arrProductClass[0]['down'];
+            // 商品種別
+            $this->product_type[$productId] = $arrProductClass[0]['product_type_id'];
             foreach ($arrProductClass as $productsClass) {
                 $productsClass1 = $productsClass['classcategory_id1'];
@@ -225 +225 @@
                 // 商品規格ID
                 $classCategories[$productsClass1][$productsClass2]['product_class_id'] = $productsClass['product_class_id'];
-                // 商品種別 TODO 暫定的に down を使用する
-                $classCategories[$productsClass1][$productsClass2]['product_type'] = $productsClass['down'];
+                // 商品種別
+                $classCategories[$productsClass1][$productsClass2]['product_type'] = $productsClass['product_type_id'];
             }
 
@@ -255 +255 @@
             T1.product_class_id,
             T1.del_flg,
-            T1.down,
+            T1.product_type_id,
             T1.down_filename,
             T1.down_realfilename,