Changeset 19686


Ignore:
Timestamp:
2010/11/29 01:52:45 (11 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19685
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/admin/basis/delivery_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fdelivery_input.tpl
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php 15297@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery_Input.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.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/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20101128165240-56jcd9ko9qpl9wod
bzr:revno:
2416
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/admin/basis/delivery_input.tpl nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
html/install/index.php nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20101128165039-wq91etdnmqgyis3a
bzr:timestamp:
2010-11-29 01:52:40.494999886 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2010-11-28T16:52:40.495000Z
Message:

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

  • 配送業者設定で商品種別を選択できるよう修正
  • dtb_delivfee.fee を numeric に変更
  • dtb_delivfee.fee_id を deliv_id ごとの連番に修正
  • dtb_delivfee_fee_id_seq を削除
Location:
branches/version-2_5-dev
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/Smarty/templates/admin/basis/delivery_input.tpl

    r18873 r19686  
    7979 
    8080  </table> 
    81    
     81 
     82  <h2>取扱商品種別</h2> 
     83  <!--{assign var=key value="product_type_id"}--> 
     84  <table> 
     85    <tr> 
     86      <th>商品種別</th> 
     87      <td><span class="attention"><!--{$arrErr[$key]}--></span><!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value}--></td> 
     88    </tr> 
     89  </table> 
     90 
    8291  <!--{if $smarty.const.INPUT_DELIV_FEE}--> 
    8392  <h2>配送料登録</h2> 
  • branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php

    r19670 r19686  
    5555        $masterData = new SC_DB_MasterData_Ex(); 
    5656        $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank")); 
     57        $this->arrProductType = $masterData->getMasterData("mtb_product_type"); 
    5758        $this->tpl_subtitle = '配送業者設定'; 
    5859        $this->mode = isset($_POST['mode']) ? $_POST['mode'] : ''; 
     
    132133                $this->objFormParam->addParam("名称", "service_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
    133134                $this->objFormParam->addParam("伝票No.確認URL", "confirm_url", STEXT_LEN, "n", array("URL_CHECK", "MAX_LENGTH_CHECK"), "http://"); 
     135                $this->objFormParam->addParam("取扱商品種別", "product_type_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); 
    134136 
    135137                for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) { 
     
    153155    } 
    154156 
    155      
    156157    /** 
    157158     * 配送情報を登録する 
     
    168169        $sqlval['service_name'] = $arrRet['service_name']; 
    169170        $sqlval['confirm_url'] = $arrRet['confirm_url']; 
     171        $sqlval['product_type_id'] = $arrRet['product_type_id']; 
    170172        $sqlval['creator_id'] = $_SESSION['member_id']; 
    171173        $sqlval['update_date'] = 'Now()'; 
     
    214216                    if(strcmp($arrRet[$keyname], "") != 0) { 
    215217                        $sqlval = array('fee' => $arrRet[$keyname]); 
    216                         $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND pref = ?", array($deliv_id, $cnt)); 
     218                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND fee_id = ?", array($deliv_id, $cnt)); 
    217219                    } 
    218220                } 
     
    251253                        $sqlval['pref'] = $cnt; 
    252254                        // INSERTの実行 
    253                         $sqlval['fee_id'] = $objQuery->nextVal('dtb_delivfee_fee_id'); 
     255                        $sqlval['fee_id'] = $cnt; 
    254256                        $objQuery->insert("dtb_delivfee", $sqlval); 
    255257                    } 
     
    260262        return $deliv_id; 
    261263    } 
    262      
    263264 
    264265    /* 配送業者情報の取得 */ 
     
    270271 
    271272        // 配送業者一覧の取得 
    272         $col = "deliv_id, name, service_name, confirm_url"; 
     273        $col = "deliv_id, name, service_name, confirm_url, product_type_id"; 
    273274        $where = "deliv_id = ?"; 
    274275        $table = "dtb_deliv"; 
  • branches/version-2_5-dev/html/install/index.php

    r19675 r19686  
    957957                 array("dtb_customer", "customer_id"), 
    958958                 array("dtb_deliv", "deliv_id"), 
    959                  array("dtb_delivfee", "fee_id"), 
    960959                 array("dtb_holiday", "holiday_id"), 
    961960                 array("dtb_kiyaku", "kiyaku_id"), 
  • branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

    r19678 r19686  
    179179    deliv_id int NOT NULL, 
    180180    fee_id int  NOT NULL, 
    181     fee text NOT NULL, 
     181    fee numeric NOT NULL, 
    182182    pref smallint, 
    183183    PRIMARY KEY (deliv_id, fee_id) 
  • branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

    r19678 r19686  
    179179    deliv_id int NOT NULL, 
    180180    fee_id int NOT NULL, 
    181     fee text NOT NULL, 
     181    fee numeric NOT NULL, 
    182182    pref smallint, 
    183183    PRIMARY KEY (deliv_id, fee_id) 
  • branches/version-2_5-dev/html/install/sql/insert_data.sql

    r19678 r19686  
    233233INSERT INTO dtb_deliv (deliv_id, product_type_id, name, service_name, confirm_url, rank, status, del_flg, creator_id, create_date, update_date) VALUES (1, 1, 'サンプル業者', 'サンプル業者', NULL, 1, 1, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP); 
    234234 
    235 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 1, '1000', 1); 
    236 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 2, '1000', 2); 
    237 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 3, '1000', 3); 
    238 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 4, '1000', 4); 
    239 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 5, '1000', 5); 
    240 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 6, '1000', 6); 
    241 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 7, '1000', 7); 
    242 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 8, '1000', 8); 
    243 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 9, '1000', 9); 
    244 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 10, '1000', 10); 
    245 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 11, '1000', 11); 
    246 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 12, '1000', 12); 
    247 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 13, '1000', 13); 
    248 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 14, '1000', 14); 
    249 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 15, '1000', 15); 
    250 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 16, '1000', 16); 
    251 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 17, '1000', 17); 
    252 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 18, '1000', 18); 
    253 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 19, '1000', 19); 
    254 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 20, '1000', 20); 
    255 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 21, '1000', 21); 
    256 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 22, '1000', 22); 
    257 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 23, '1000', 23); 
    258 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 24, '1000', 24); 
    259 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 25, '1000', 25); 
    260 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 26, '1000', 26); 
    261 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 27, '1000', 27); 
    262 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 28, '1000', 28); 
    263 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 29, '1000', 29); 
    264 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 30, '1000', 30); 
    265 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 31, '1000', 31); 
    266 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 32, '1000', 32); 
    267 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 33, '1000', 33); 
    268 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 34, '1000', 34); 
    269 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 35, '1000', 35); 
    270 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 36, '1000', 36); 
    271 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 37, '1000', 37); 
    272 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 38, '1000', 38); 
    273 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 39, '1000', 39); 
    274 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 40, '1000', 40); 
    275 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 41, '1000', 41); 
    276 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 42, '1000', 42); 
    277 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 43, '1000', 43); 
    278 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 44, '1000', 44); 
    279 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 45, '1000', 45); 
    280 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 46, '1000', 46); 
    281 INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 47, '1000', 47); 
     235INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 1, 1000, 1); 
     236INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 2, 1000, 2); 
     237INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 3, 1000, 3); 
     238INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 4, 1000, 4); 
     239INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 5, 1000, 5); 
     240INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 6, 1000, 6); 
     241INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 7, 1000, 7); 
     242INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 8, 1000, 8); 
     243INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 9, 1000, 9); 
     244INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 10, 1000, 10); 
     245INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 11, 1000, 11); 
     246INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 12, 1000, 12); 
     247INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 13, 1000, 13); 
     248INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 14, 1000, 14); 
     249INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 15, 1000, 15); 
     250INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 16, 1000, 16); 
     251INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 17, 1000, 17); 
     252INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 18, 1000, 18); 
     253INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 19, 1000, 19); 
     254INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 20, 1000, 20); 
     255INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 21, 1000, 21); 
     256INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 22, 1000, 22); 
     257INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 23, 1000, 23); 
     258INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 24, 1000, 24); 
     259INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 25, 1000, 25); 
     260INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 26, 1000, 26); 
     261INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 27, 1000, 27); 
     262INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 28, 1000, 28); 
     263INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 29, 1000, 29); 
     264INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 30, 1000, 30); 
     265INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 31, 1000, 31); 
     266INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 32, 1000, 32); 
     267INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 33, 1000, 33); 
     268INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 34, 1000, 34); 
     269INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 35, 1000, 35); 
     270INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 36, 1000, 36); 
     271INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 37, 1000, 37); 
     272INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 38, 1000, 38); 
     273INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 39, 1000, 39); 
     274INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 40, 1000, 40); 
     275INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 41, 1000, 41); 
     276INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 42, 1000, 42); 
     277INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 43, 1000, 43); 
     278INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 44, 1000, 44); 
     279INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 45, 1000, 45); 
     280INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 46, 1000, 46); 
     281INSERT INTO dtb_delivfee (deliv_id, fee_id, fee, pref) VALUES (1, 47, 1000, 47); 
    282282 
    283283INSERT INTO dtb_delivtime (deliv_id, time_id, deliv_time) VALUES (1, 1, '午前'); 
Note: See TracChangeset for help on using the changeset viewer.