[Svn-src-all:842] [version-2_5-dev 19729] #855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
Seasoft
admin ＠ mail.ec-cube.net
2010年 12月 16日 (木) 23:12:59 JST
Subversion committed to /home/svn/open 19729
http://svn.ec-cube.net/open_trac/changeset/19729
┌────────────────────────────┐
│更新者 : Seasoft │
│更新日時: 2010-12-16 23:12:59 +0900 (木, 16 12月 2010)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#855(SC_Query の #select, #getRow, #getCol, #get, #min, #max の引数順を統一する)
* SC_Query#get を改訂
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_5-dev/data/class/SC_Customer.php
U branches/version-2_5-dev/data/class/SC_Query.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
U branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php
U branches/version-2_5-dev/data/class/module/SC_Module.php
U branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
U branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
U branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
U branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php
U branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
U branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php
U branches/version-2_5-dev/data/class/util/SC_Utils.php
変更: branches/version-2_5-dev/data/class/SC_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Customer.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/SC_Customer.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -180,12 +180,12 @@
&& SC_Utils_Ex::sfIsInt($_SESSION['customer']['customer_id'])) {
$objQuery = new SC_Query();
- $email = $objQuery->get("dtb_customer", "email", "customer_id = ?", array($_SESSION['customer']['customer_id']));
+ $email = $objQuery->get("email", "dtb_customer", "customer_id = ?", array($_SESSION['customer']['customer_id']));
if($email == $_SESSION['customer']['email']) {
// モバイルサイトの場合は携帯のメールアドレスが登録されていることもチェックする。
// ただし $dont_check_email_mobile が true の場合はチェックしない。
if (defined('MOBILE_SITE') && !$dont_check_email_mobile) {
- $email_mobile = $objQuery->get("dtb_customer", "email_mobile", "customer_id = ?", array($_SESSION['customer']['customer_id']));
+ $email_mobile = $objQuery->get("email_mobile", "dtb_customer", "customer_id = ?", array($_SESSION['customer']['customer_id']));
return isset($email_mobile);
}
return true;
変更: branches/version-2_5-dev/data/class/SC_Query.php
===================================================================
--- branches/version-2_5-dev/data/class/SC_Query.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/SC_Query.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -540,7 +540,7 @@
* @param array $arrval ブレースホルダに挿入する値
* @return mixed SQL の実行結果
*/
- function get($table, $col, $where = "", $arrval = array()) {
+ function get($col, $table, $where = "", $arrval = array()) {
$sqlse = $this->getSql($col, $table, $where);
// SQL文の実行
$ret = $this->getOne($sqlse, $arrval);
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -1271,7 +1271,7 @@
$where.= " AND $andwhere";
}
// 対象項目のランクを取得
- $rank = $objQuery->get($table, "rank", $where, array($id));
+ $rank = $objQuery->get("rank", $table, $where, array($id));
// ランクの最大値を取得
$maxrank = $objQuery->max($table, "rank", $andwhere);
// ランクが最大値よりも小さい場合に実行する。
@@ -1282,7 +1282,7 @@
$where.= " AND $andwhere";
}
$uprank = $rank + 1;
- $up_id = $objQuery->get($table, $colname, $where, array($uprank));
+ $up_id = $objQuery->get($colname, $table, $where, array($uprank));
// ランク入れ替えの実行
$sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?";
if($andwhere != "") {
@@ -1311,7 +1311,7 @@
$where.= " AND $andwhere";
}
// 対象項目のランクを取得
- $rank = $objQuery->get($table, "rank", $where, array($id));
+ $rank = $objQuery->get("rank", $table, $where, array($id));
// ランクが1(最小値)よりも大きい場合に実行する。
if($rank > 1) {
@@ -1321,7 +1321,7 @@
$where.= " AND $andwhere";
}
$downrank = $rank - 1;
- $down_id = $objQuery->get($table, $colname, $where, array($downrank));
+ $down_id = $objQuery->get($colname, $table, $where, array($downrank));
// ランク入れ替えの実行
$sqlup = "UPDATE $table SET rank = ? WHERE $colname = ?";
if($andwhere != "") {
@@ -1353,7 +1353,7 @@
} else {
$getWhere = "$keyIdColumn = ?";
}
- $rank = $objQuery->get($tableName, "rank", $getWhere, array($keyId));
+ $rank = $objQuery->get("rank", $tableName, $getWhere, array($keyId));
$max = $objQuery->max($tableName, "rank", $where);
@@ -1416,7 +1416,7 @@
if($andwhere != "") {
$where.= " AND $andwhere";
}
- $rank = $objQuery->get($table, "rank", $where, array($id));
+ $rank = $objQuery->get("rank", $table, $where, array($id));
if(!$delete) {
// ランクを最下位にする、DELフラグON
@@ -1485,7 +1485,7 @@
// 旧カテゴリでのランク削除処理
// 移動レコードのランクを取得する。
$where = "$id_name = ?";
- $rank = $objQuery->get($table, "rank", $where, array($id));
+ $rank = $objQuery->get("rank", $table, $where, array($id));
// 削除レコードのランクより上のレコードを一つ下にずらす。
$where = "rank > ? AND $cat_name = ?";
$sqlup = "UPDATE $table SET rank = (rank - 1) WHERE $where";
@@ -1668,7 +1668,7 @@
}
}
}
- $ret = $objQuery->get($table, $col, $where, $arrval);
+ $ret = $objQuery->get($col, $table, $where, $arrval);
if($ret != "") {
return true;
変更: branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Mobile.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -94,7 +94,7 @@
$objQuery = new SC_Query;
foreach ($_REQUEST as $key => $value) {
- $session_id = $objQuery->get('dtb_mobile_ext_session_id', 'session_id',
+ $session_id = $objQuery->get('session_id', 'dtb_mobile_ext_session_id',
'param_key = ? AND param_value = ? AND url = ? AND create_date >= ?',
array($key, $value, $url, $time));
if (isset($session_id)) {
@@ -366,7 +366,7 @@
'(email IS NULL AND create_date < ?) OR (email IS NOT NULL AND receive_date < ?)',
array($time, $time));
- $kara_mail_id = $objQuery->get('dtb_mobile_kara_mail', 'kara_mail_id', 'token = ?', array($token));
+ $kara_mail_id = $objQuery->get('kara_mail_id', 'dtb_mobile_kara_mail', 'token = ?', array($token));
if (!isset($kara_mail_id)) {
return false;
}
変更: branches/version-2_5-dev/data/class/module/SC_Module.php
===================================================================
--- branches/version-2_5-dev/data/class/module/SC_Module.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/module/SC_Module.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -100,7 +100,7 @@
*/
function _getName() {
$objQuery = new SC_Query;
- return $objQuery->get('dtb_module', 'module_name', 'module_code = ?', $this->getCode());
+ return $objQuery->get('module_name', 'dtb_module', 'module_code = ?', $this->getCode());
}
/**
@@ -154,7 +154,7 @@
$moduleCode = $this->getCode();
$objQuery = new SC_Query;
$ret = $objQuery->get(
- 'dtb_module', 'sub_data', 'module_code = ?', array($moduleCode)
+ 'sub_data', 'dtb_module', 'module_code = ?', array($moduleCode)
);
if (isset($ret)) {
変更: branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/LC_Page_Admin_Home.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -160,7 +160,7 @@
$col = "SUM(point)";
$where = "del_flg = 0";
$from = "dtb_customer";
- $ret = $objQuery->get($from, $col, $where);
+ $ret = $objQuery->get($col, $from, $where);
return $ret;
}
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -118,7 +118,7 @@
// 編集項目のカテゴリ名をDBより取得する。
$objQuery = new SC_Query();
$where = "category_id = ?";
- $cat_name = $objQuery->get("dtb_category", "category_name", $where, array($_POST['category_id']));
+ $cat_name = $objQuery->get("category_name", "dtb_category", $where, array($_POST['category_id']));
// 入力項目にカテゴリ名を入力する。
$this->arrForm['category_name'] = $cat_name;
// POSTデータを引き継ぐ
@@ -189,9 +189,9 @@
$objQuery->begin();
// 移動したデータのrank、level、parent_category_idを取得
- $rank = $objQuery->get("dtb_category", "rank", "category_id = ?", array($keys[0]));
- $level = $objQuery->get("dtb_category", "level", "category_id = ?", array($keys[0]));
- $parent = $objQuery->get("dtb_category", "parent_category_id", "category_id = ?", array($keys[0]));
+ $rank = $objQuery->get("rank", "dtb_category", "category_id = ?", array($keys[0]));
+ $level = $objQuery->get("level", "dtb_category", "category_id = ?", array($keys[0]));
+ $parent = $objQuery->get("parent_category_id", "dtb_category", "category_id = ?", array($keys[0]));
// 同一level内のrank配列を作成
$objQuery->setOption("ORDER BY rank DESC");
@@ -279,7 +279,7 @@
} else {
// 親のランクを自分のランクとする。
$where = "category_id = ?";
- $rank = $objQuery->get("dtb_category", "rank", $where, array($parent_category_id));
+ $rank = $objQuery->get("rank", "dtb_category", $where, array($parent_category_id));
// 追加レコードのランク以上のレコードを一つあげる。
$sqlup = "UPDATE dtb_category SET rank = (rank + 1) WHERE rank >= ?";
$objQuery->exec($sqlup, array($rank));
@@ -287,7 +287,7 @@
$where = "category_id = ?";
// 自分のレベルを取得する(親のレベル + 1)
- $level = $objQuery->get("dtb_category", "level", $where, array($parent_category_id)) + 1;
+ $level = $objQuery->get("level", "dtb_category", $where, array($parent_category_id)) + 1;
// 入力データを渡す。
$sqlval = $this->objFormParam->getHashArray();
@@ -344,7 +344,7 @@
// 階層チェック
if(!isset($objErr->arrErr['category_name'])) {
$objQuery = new SC_Query();
- $level = $objQuery->get("dtb_category", "level", "category_id = ?", array($_POST['parent_category_id']));
+ $level = $objQuery->get("level", "dtb_category", "category_id = ?", array($_POST['parent_category_id']));
if($level >= LEVEL_MAX) {
$objErr->arrErr['category_name'] = "※ ".LEVEL_MAX."階層以上の登録はできません。<br>";
@@ -381,7 +381,7 @@
// 親IDを取得する。
$col = "$pid_name";
$where = "$id_name = ?";
- $pid = $objQuery->get($table, $col, $where, $id);
+ $pid = $objQuery->get($col, $table, $where, $id);
// すべての子を取得する。
$col = "$id_name";
$where = "del_flg = 0 AND $pid_name = ? ORDER BY rank DESC";
@@ -402,7 +402,7 @@
// 親IDを取得する。
$col = "$pid_name";
$where = "$id_name = ?";
- $pid = $objQuery->get($table, $col, $where, $id);
+ $pid = $objQuery->get($col, $table, $where, $id);
// すべての子を取得する。
$col = "$id_name";
$where = "del_flg = 0 AND $pid_name = ? ORDER BY rank DESC";
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -110,7 +110,7 @@
case 'pre_edit':
// 編集項目をDBより取得する。
$where = "class_id = ?";
- $class_name = $objQuery->get("dtb_class", "name", $where, array($_POST['class_id']));
+ $class_name = $objQuery->get("name", "dtb_class", $where, array($_POST['class_id']));
// 入力項目にカテゴリ名を入力する。
$this->arrForm['name'] = $class_name;
// POSTデータを引き継ぐ
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -78,7 +78,7 @@
// 規格IDのチェック
if(SC_Utils_Ex::sfIsInt($_GET['class_id'])) {
// 規格名の取得
- $this->tpl_class_name = $objQuery->get("dtb_class", "name", "class_id = ?", array($_GET['class_id']));
+ $this->tpl_class_name = $objQuery->get("name", "dtb_class", "class_id = ?", array($_GET['class_id']));
if($this->tpl_class_name != "") {
// 規格IDの引き継ぎ
$this->arrHidden['class_id'] = $_GET['class_id'];
@@ -134,7 +134,7 @@
case 'pre_edit':
// 編集項目をDBより取得する。
$where = "classcategory_id = ?";
- $name = $objQuery->get("dtb_classcategory", "name", $where, array($_POST['classcategory_id']));
+ $name = $objQuery->get("name", "dtb_classcategory", $where, array($_POST['classcategory_id']));
// 入力項目にカテゴリ名を入力する。
$this->arrForm['name'] = $name;
// POSTデータを引き継ぐ
@@ -173,7 +173,7 @@
$objQuery->begin();
// 親規格IDの存在チェック
$where = "del_flg <> 1 AND class_id = ?";
- $ret = $objQuery->get("dtb_class", "class_id", $where, array($_POST['class_id']));
+ $ret = $objQuery->get("class_id", "dtb_class", $where, array($_POST['class_id']));
if($ret != "") {
// INSERTする値を作成する。
$sqlval['name'] = $_POST['name'];
変更: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products_UploadCSVCategory.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -257,7 +257,7 @@
if ($sqlval['parent_category_id'] == 0) {
$sqlval['level'] = 1;
} else {
- $parent_level = $objQuery->get("dtb_category", "level", "category_id = ?", array($sqlval['parent_category_id']));
+ $parent_level = $objQuery->get("level", "dtb_category", "category_id = ?", array($sqlval['parent_category_id']));
$sqlval['level'] = $parent_level + 1;
}
@@ -288,7 +288,7 @@
} else {
// 親のランクを自分のランクとする。
$where = "category_id = ?";
- $sqlval['rank'] = $objQuery->get("dtb_category", "rank", $where, array($sqlval['parent_category_id']));
+ $sqlval['rank'] = $objQuery->get("rank", "dtb_category", $where, array($sqlval['parent_category_id']));
// 追加レコードのランク以上のレコードを一つあげる。
$sqlup = "UPDATE dtb_category SET rank = rank + 1 WHERE rank >= ?";
$objQuery->exec($sqlup, array($sqlval['rank']));
@@ -334,7 +334,7 @@
// 階層チェック
if (!isset($objErr->arrErr['category_name']) && !isset($objErr->arrErr['parent_category_id'])) {
- $level = $objQuery->get("dtb_category", "level", "category_id = ?", array($parent_category_id));
+ $level = $objQuery->get("level", "dtb_category", "category_id = ?", array($parent_category_id));
if ($level >= LEVEL_MAX) {
$objErr->arrErr['category_name'] = "※ ".LEVEL_MAX."階層以上の登録はできません。<br>";
}
変更: branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/admin/system/LC_Page_Admin_System_Delete.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -114,7 +114,7 @@
function renumberRank(&$objQuery, $id) {
$where = "member_id = ?";
// ランクの取得
- $rank = $objQuery->get("dtb_member", "rank", $where, array($id));
+ $rank = $objQuery->get("rank", "dtb_member", $where, array($id));
// 削除したレコードより上のランキングを下げてRANKの空きを埋める。
$sqlup =<<<END
変更: branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/entry/LC_Page_Entry.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -330,7 +330,7 @@
$objMail->sendMail();
// 完了ページに移動させる。
- $customer_id = $objQuery->get("dtb_customer", "customer_id", "secret_key = ?", array($this->uniqid));
+ $customer_id = $objQuery->get("customer_id", "dtb_customer", "secret_key = ?", array($this->uniqid));
$this->objDisplay->redirect($this->getLocation("./complete.php", array("ci" => $customer_id)));
exit;
}
変更: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Review.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -118,13 +118,13 @@
//重複タイトルでない
if($flag == 0){
//商品名の取得
- $arrForm['name'] = $objQuery->get("dtb_products", "name", "product_id = ? ", array($arrForm['product_id']));
+ $arrForm['name'] = $objQuery->get("name", "dtb_products", "product_id = ? ", array($arrForm['product_id']));
$this->arrForm = $arrForm;
$this->tpl_mainpage = 'products/review_confirm.tpl';
}
} else {
//商品名の取得
- $arrForm['name'] = $objQuery->get("dtb_products", "name", "product_id = ? ", array($arrForm['product_id']));
+ $arrForm['name'] = $objQuery->get("name", "dtb_products", "product_id = ? ", array($arrForm['product_id']));
$this->arrForm = $arrForm;
}
break;
@@ -135,7 +135,7 @@
}
//商品名の取得
- $this->arrForm['name'] = $objQuery->get("dtb_products", "name", "product_id = ? ", array($this->arrForm['product_id']));
+ $this->arrForm['name'] = $objQuery->get("name", "dtb_products", "product_id = ? ", array($this->arrForm['product_id']));
if(empty($this->arrForm['name'])) {
SC_Utils_Ex::sfDispSiteError(PAGE_ERROR);
}
変更: branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -157,7 +157,7 @@
// ログイン済みの状態にする。
$objQuery = new SC_Query();
- $email = $objQuery->get("dtb_customer", "email", "secret_key = ?", array($registSecretKey));
+ $email = $objQuery->get("email", "dtb_customer", "secret_key = ?", array($registSecretKey));
$objCustomer->setLogin($email);
$this->objDisplay->redirect($this->getLocation("./complete.php"));
exit;
@@ -212,7 +212,7 @@
$where1 = "secret_key = ? AND status = 2";
$customer = $objQuery->select("*", "dtb_customer", $where1, array($secret));
// 初回購入情報の読み込み
- $order_temp_id = $objQuery->get("dtb_order_temp", "order_temp_id");
+ $order_temp_id = $objQuery->get("order_temp_id", "dtb_order_temp");
// 購入情報の更新
if ($order_temp_id != null) {
$arrCustomer['customer_id'] = $customer[0]['customer_id'];
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -137,7 +137,7 @@
}
//その他情報の取得
- $other_data = $objQuery->get("dtb_order", "memo02", "order_id = ? ", array($order_id));
+ $other_data = $objQuery->get("memo02", "dtb_order", "order_id = ? ", array($order_id));
if($other_data != "") {
$arrOther = unserialize($other_data);
@@ -157,7 +157,7 @@
$this->tpl_conv_page = AFF_SHOPPING_COMPLETE;
$this->tpl_aff_option = "order_id=$order_id";
//合計価格の取得
- $total = $objQuery->get("dtb_order", "total", "order_id = ? ", array($order_id));
+ $total = $objQuery->get("total", "dtb_order", "order_id = ? ", array($order_id));
if($total != "") {
$this->tpl_aff_option.= "|total=$total";
}
変更: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -509,7 +509,7 @@
if(count($arrID['product_id']) > 0) {
$id = implode(",", $arrID['product_id']);
//商品から発送目安の取得
- $deliv_date = $objQuery->get("dtb_products", "MAX(deliv_date_id)", "product_id IN (".$id.")");
+ $deliv_date = $objQuery->get("MAX(deliv_date_id)", "dtb_products", "product_id IN (".$id.")");
//発送目安
switch($deliv_date) {
//即日発送
変更: branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php
===================================================================
--- branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/session/sessionfactory/SC_SessionFactory_UseRequest.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -88,7 +88,7 @@
$objQuery = new SC_Query;
foreach ($_REQUEST as $key => $value) {
- $session_id = $objQuery->get('dtb_mobile_ext_session_id', 'session_id',
+ $session_id = $objQuery->get('session_id', 'dtb_mobile_ext_session_id',
'param_key = ? AND param_value = ? AND url = ? AND create_date >= ?',
array($key, $value, $url, $time));
if (isset($session_id)) {
変更: branches/version-2_5-dev/data/class/util/SC_Utils.php
===================================================================
--- branches/version-2_5-dev/data/class/util/SC_Utils.php 2010-12-16 13:53:12 UTC (rev 19728)
+++ branches/version-2_5-dev/data/class/util/SC_Utils.php 2010-12-16 14:12:59 UTC (rev 19729)
@@ -864,11 +864,9 @@
}
function sfGetProductClassId($product_id, $classcategory_id1, $classcategory_id2) {
- // $where = "product_id = ? AND classcategory_id1 = ? AND classcategory_id2 = ?";
$where = "product_id = ?";
$objQuery = new SC_Query();
- // $ret = $objQuery->get("dtb_products_class", "product_class_id", $where, Array($product_id, $classcategory_id1, $classcategory_id2));
- $ret = $objQuery->get("dtb_products_class", "product_class_id", $where, Array($product_id));
+ $ret = $objQuery->get("product_class_id", "dtb_products_class", $where, Array($product_id));
return $ret;
}
Svn-src-all メーリングリストの案内