Changeset 19686 for branches/version-2_5-dev/data/class

Timestamp:

2010/11/29 01:52:45 (16 years ago)

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <[email protected]>

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:

[email protected]

bzr:repository-uuid:

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

bzr:revision-id:

[email protected]

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 [email protected]
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php [email protected]
html/install/index.php [email protected]
html/install/sql/create_table_mysql.sql [email protected]
html/install/sql/create_table_pgsql.sql [email protected]
html/install/sql/insert_data.sql [email protected]

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 を削除

File:

• branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php (modified) (8 diffs)

branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery_Input.php

@@ -55 +55 @@
         $masterData = new SC_DB_MasterData_Ex();
         $this->arrPref = $masterData->getMasterData("mtb_pref", array("pref_id", "pref_name", "rank"));
+        $this->arrProductType = $masterData->getMasterData("mtb_product_type");
         $this->tpl_subtitle = '配送業者設定';
         $this->mode = isset($_POST['mode']) ? $_POST['mode'] : '';
@@ -132 +133 @@
                 $this->objFormParam->addParam("名称", "service_name", STEXT_LEN, "KVa", array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
                 $this->objFormParam->addParam("伝票No.確認URL", "confirm_url", STEXT_LEN, "n", array("URL_CHECK", "MAX_LENGTH_CHECK"), "http://");
+                $this->objFormParam->addParam("取扱商品種別", "product_type_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
 
                 for($cnt = 1; $cnt <= DELIVTIME_MAX; $cnt++) {
@@ -153 +155 @@
     }
 
-    
     /**
      * 配送情報を登録する
@@ -168 +169 @@
         $sqlval['service_name'] = $arrRet['service_name'];
         $sqlval['confirm_url'] = $arrRet['confirm_url'];
+        $sqlval['product_type_id'] = $arrRet['product_type_id'];
         $sqlval['creator_id'] = $_SESSION['member_id'];
         $sqlval['update_date'] = 'Now()';
@@ -214 +216 @@
                     if(strcmp($arrRet[$keyname], "") != 0) {
                         $sqlval = array('fee' => $arrRet[$keyname]);
-                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND pref = ?", array($deliv_id, $cnt));
+                        $objQuery->update("dtb_delivfee", $sqlval, "deliv_id = ? AND fee_id = ?", array($deliv_id, $cnt));
                     }
                 }
@@ -251 +253 @@
                         $sqlval['pref'] = $cnt;
                         // INSERTの実行
-                        $sqlval['fee_id'] = $objQuery->nextVal('dtb_delivfee_fee_id');
+                        $sqlval['fee_id'] = $cnt;
                         $objQuery->insert("dtb_delivfee", $sqlval);
                     }
@@ -260 +262 @@
         return $deliv_id;
     }
-    
 
     /* 配送業者情報の取得 */
@@ -270 +271 @@
 
         // 配送業者一覧の取得
-        $col = "deliv_id, name, service_name, confirm_url";
+        $col = "deliv_id, name, service_name, confirm_url, product_type_id";
         $where = "deliv_id = ?";
         $table = "dtb_deliv";