Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php

    r18876 r18882  
    7272        $this->arrDELIVERYDATE = $masterData->getMasterData("mtb_delivery_date"); 
    7373        $this->arrAllowedTag = $masterData->getMasterData("mtb_allowed_tag"); 
     74        $this->arrProductType = $masterData->getMasterData("mtb_product_type"); 
    7475        $this->arrMaker = SC_Helper_DB_Ex::sfGetIDValueList("dtb_maker", "maker_id", "name"); 
    75         $this->arrDown = $masterData->getMasterData("mtb_down"); 
    7676        $this->tpl_nonclass = true; 
    7777    } 
     
    366366                              sale_limit, 
    367367                              point_rate, 
    368                               down, 
     368                              product_type_id, 
    369369                              down_filename, 
    370370                              down_realfilename 
     
    403403            $this->arrForm['status'] = DEFAULT_PRODUCT_DISP; 
    404404        } 
    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; 
    407407        } 
    408408 
     
    631631 
    632632            //ダウンロード商品チェック 
    633             if($array['down'] == "2") { 
     633            if($array['product_type_id'] == PRODUCT_TYPE_DOWNLOAD) { 
    634634                $objErr->doFunc(array("ダウンロードファイル名", "down_filename", STEXT_LEN), array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    635635                if($array['down_realfilename'] == "") { 
     
    638638            } 
    639639            //実商品チェック 
    640             if($array['down'] == "1") { 
     640            if($array['product_type_id'] == PRODUCT_TYPE_NORMAL) { 
    641641                if($array['down_filename'] != "") { 
    642                     $objErr->arrErr['down_filename'] = "※ 商品の場合はダウンロードファイル名を設定できません。<br />"; 
     642                    $objErr->arrErr['down_filename'] = "※ 通常商品の場合はダウンロードファイル名を設定できません。<br />"; 
    643643                } 
    644644                if($array['down_realfilename'] != "") { 
    645                     $objErr->arrErr['down_realfilename'] = "※ 商品の場合はダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />"; 
     645                    $objErr->arrErr['down_realfilename'] = "※ 通常商品の場合はダウンロード商品用ファイルをアップロードできません。<br />ファイルを取り消してください。<br />"; 
    646646                } 
    647647            } 
     
    855855 
    856856        // 配列の添字を定義 
    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'); 
    858858        $sqlval = SC_Utils_Ex::sfArrayIntersectKeys($arrList, $checkArray); 
    859859        $sqlval = SC_Utils_Ex::arrayDefineIndexes($sqlval, $checkArray); 
Note: See TracChangeset for help on using the changeset viewer.