Changeset 18882 for branches/version-2_5-dev/data/class
- Timestamp:
- 2010/11/04 12:57:08 (14 years ago)
- 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
- Location:
- branches/version-2_5-dev/data/class
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/SC_Product.php
r18876 r18882 180 180 $classCategories['']['']['name'] = '選択してください'; 181 181 $classCategories['']['']['product_class_id'] = $arrProductClass[0]['product_class_id']; 182 // 商品種別 TODO 暫定的に down を使用する183 $classCategories['']['']['product_type'] = $arrProductClass[0][' down'];182 // 商品種別 183 $classCategories['']['']['product_type'] = $arrProductClass[0]['product_type_id']; 184 184 $this->product_class_id[$productId] = $arrProductClass[0]['product_class_id']; 185 // 商品種別 TODO 暫定的に down を使用する186 $this->product_type[$productId] = $arrProductClass[0][' down'];185 // 商品種別 186 $this->product_type[$productId] = $arrProductClass[0]['product_type_id']; 187 187 foreach ($arrProductClass as $productsClass) { 188 188 $productsClass1 = $productsClass['classcategory_id1']; … … 225 225 // 商品規格ID 226 226 $classCategories[$productsClass1][$productsClass2]['product_class_id'] = $productsClass['product_class_id']; 227 // 商品種別 TODO 暫定的に down を使用する228 $classCategories[$productsClass1][$productsClass2]['product_type'] = $productsClass[' down'];227 // 商品種別 228 $classCategories[$productsClass1][$productsClass2]['product_type'] = $productsClass['product_type_id']; 229 229 } 230 230 … … 255 255 T1.product_class_id, 256 256 T1.del_flg, 257 T1. down,257 T1.product_type_id, 258 258 T1.down_filename, 259 259 T1.down_realfilename, -
branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
r18876 r18882 72 72 $this->arrDELIVERYDATE = $masterData->getMasterData("mtb_delivery_date"); 73 73 $this->arrAllowedTag = $masterData->getMasterData("mtb_allowed_tag"); 74 $this->arrProductType = $masterData->getMasterData("mtb_product_type"); 74 75 $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList("dtb_maker", "maker_id", "name"); 75 $this->arrDown = $masterData->getMasterData("mtb_down");76 76 $this->tpl_nonclass = true; 77 77 } … … 366 366 sale_limit, 367 367 point_rate, 368 down,368 product_type_id, 369 369 down_filename, 370 370 down_realfilename … … 403 403 $this->arrForm['status'] = DEFAULT_PRODUCT_DISP; 404 404 } 405 if($this->arrForm[' down'] == "") {406 $this->arrForm[' down'] = DEFAULT_PRODUCT_DOWN;405 if($this->arrForm['product_type_id'] == "") { 406 $this->arrForm['product_type_id'] = DEFAULT_PRODUCT_DOWN; 407 407 } 408 408 … … 631 631 632 632 //ダウンロード商品チェック 633 if($array[' down'] == "2") {633 if($array['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { 634 634 $objErr->doFunc(array("ダウンロードファイル名", "down_filename", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 635 635 if($array['down_realfilename'] == "") { … … 638 638 } 639 639 //実商品チェック 640 if($array[' down'] == "1") {640 if($array['product_type_id'] == PRODUCT_TYPE_NORMAL) { 641 641 if($array['down_filename'] != "") { 642 $objErr->arrErr['down_filename'] = "※ 実商品の場合はダウンロードファイル名を設定できません。<br />";642 $objErr->arrErr['down_filename'] = "※ 通常商品の場合はダウンロードファイル名を設定できません。<br />"; 643 643 } 644 644 if($array['down_realfilename'] != "") { 645 $objErr->arrErr['down_realfilename'] = "※ 実商品の場合はダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />";645 $objErr->arrErr['down_realfilename'] = "※ 通常商品の場合はダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />"; 646 646 } 647 647 } … … 855 855 856 856 // 配列の添字を定義 857 $checkArray = array('product_class_id', 'product_id', 'product_code', 'stock', 'stock_unlimited', 'price01', 'price02', 'sale_limit', 'deliv_fee', 'point_rate' ,' down', 'down_filename', 'down_realfilename');857 $checkArray = array('product_class_id', 'product_id', 'product_code', 'stock', 'stock_unlimited', 'price01', 'price02', 'sale_limit', 'deliv_fee', 'point_rate' ,'product_type_id', 'down_filename', 'down_realfilename'); 858 858 $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $checkArray); 859 859 $sqlval = SC_Utils_Ex::arrayDefineIndexes($sqlval, $checkArray); -
branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
r18828 r18882 54 54 $this->tpl_subno = 'product'; 55 55 $this->tpl_subtitle = '商品登録(商品規格)'; 56 $masterData = new SC_DB_MasterData_Ex();57 $this->arrDown = $masterData->getMasterData("mtb_down");58 56 } 59 57 … … 217 215 $pVal['price01'] = $arrList['price01:'.$i]; 218 216 $pVal['price02'] = $arrList['price02:'.$i]; 219 $pVal[' down'] = $arrList['down:'.$i];217 $pVal['product_type_id'] = $arrList['product_type_id:'.$i]; 220 218 $pVal['down_filename'] = $arrList['down_filename:'.$i]; 221 219 $pVal['down_realfilename'] = $arrList['down_realfilename:'.$i]; … … 346 344 347 345 //ダウンロード商品チェック 348 if($array[" down:".$no] == "2") {346 if($array["product_type_id:".$no] == PRODUCT_TYPE_DOWNLOAD) { 349 347 $objErr->doFunc(array("ダウンロードファイル名", "down_filename:".$no, STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 350 348 if($array["down_realfilename:".$no] == "") { … … 353 351 } 354 352 //実商品チェック 355 else if($array[" down:".$no] == "1") {353 else if($array["product_type_id:".$no] == PRODUCT_TYPE_DOWNLOAD) { 356 354 if($array["down_filename:".$no] != "") { 357 355 $objErr->arrErr["down_filename:".$no] = "※ 実商品の場合はダウンロードファイル名を設定できません。<br />";
Note: See TracChangeset
for help on using the changeset viewer.