☆スキーウエアNOW ON SALE！！☆★２ピース上下スーツ★ 【エァウォーク】幼児用ウエアAWT‐5524 ピンク（桃色）サイズ：100・110・120
沖縄産スナックパイン1玉（500g〜800g） N−95Ｄ23L/C3 
technorati RobotReplay 2004/09/30から 今日： 昨日： 最近のツッコミ10発 |
2008-04-04 EC-CUBE更新内容2008-04-04 [長年日記]_ [EC-CUBE] EC-CUBE更新内容1
Date: 2008-04-04 11:01:34 +0900 (Fri, 04 Apr 2008)
New Revision: 43
Modified:
eccube2/trunk/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php
eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
Log:
auto commit
Modified: eccube2/trunk/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- eccube2/trunk/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2008-04-02 12:01:28 UTC (rev 42)
+++ eccube2/trunk/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2008-04-04 02:01:34 UTC (rev 43)
@@ -216,7 +216,7 @@
* @return string 変換後の SQL 文
*/
function sfChangeILIKE($sql){
- $changesql = eregi_replace("(ILIKE )", "LIKE BINARY ", $sql);
+ $changesql = eregi_replace("(ILIKE )", "LIKE ", $sql);
return $changesql;
}
Modified: eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php 2008-04-02 12:01:28 UTC (rev 42)
+++ eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products.php 2008-04-04 02:01:34 UTC (rev 43)
@@ -179,8 +179,8 @@
$view_where = $where;
break;
case 'search_name': // 商品名
- $where .= " AND name LIKE ?";
- $view_where .= " AND name LIKE ?";
+ $where .= " AND name ILIKE ?";
+ $view_where .= " AND name ILIKE ?";
$arrval[] = "%$val%";
break;
case 'search_category_id': // カテゴリー
Modified: eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2008-04-02 12:01:28 UTC (rev 42)
+++ eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_ProductSelect.php 2008-04-04 02:01:34 UTC (rev 43)
@@ -84,7 +84,7 @@
switch ($key) {
case 'search_name':
- $where .= " AND name LIKE ?";
+ $where .= " AND name ILIKE ?";
$arrval[] = "%$val%";
break;
case 'search_category_id':
_ [EC-CUBE] EC-CUBE更新内容2コミットしたバグ管理画面の商品CSV出力で規格名1、規格名2、カテゴリIDが強制出力されるが取り込まれました。
Date: 2008-04-04 15:01:40 +0900 (Fri, 04 Apr 2008)
New Revision: 44
Modified:
eccube2/trunk/data/class/pages/admin/LC_Page_Admin_Home.php
eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php
eccube2/trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
eccube2/trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
Log:
auto commit
Modified: eccube2/trunk/data/class/pages/admin/LC_Page_Admin_Home.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/LC_Page_Admin_Home.php 2008-04-04 02:01:34 UTC (rev 43)
+++ eccube2/trunk/data/class/pages/admin/LC_Page_Admin_Home.php 2008-04-04 06:01:40 UTC (rev 44)
@@ -31,7 +31,7 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Admin_Home.php 16737 2007-11-07 12:58:46Z adachi $
+ * @version $Id: LC_Page_Admin_Home.php 17204 2008-04-04 05:49:30Z satou $
*/
class LC_Page_Admin_Home extends LC_Page {
@@ -137,7 +137,7 @@
WHERE del_flg = 0 AND to_char(create_date,'YYYY/MM/DD') = to_char(now() - interval '1 days','YYYY/MM/DD') AND status <> " . ORDER_CANCEL;
}else if (DB_TYPE == "mysql") {
$sql = "SELECT ".$method."(total) FROM dtb_order
- WHERE del_flg = 0 AND cast(substring(create_date,1, 10) as date) = DATE_ADD(current_date, interval -1 day) AND status <> " . ORDER_CANCEL;
+ WHERE del_flg = 0 AND cast(create_date as date) = DATE_ADD(current_date, interval -1 day) AND status <> " . ORDER_CANCEL;
}
$return = $conn->getOne($sql);
}
@@ -181,8 +181,8 @@
AND to_char(A.create_date,'YYYY/MM/DD') != to_char(now(),'YYYY/MM/DD')";
}else if (DB_TYPE == "mysql") {
$sql = "SELECT COUNT(*) FROM dtb_review AS A LEFT JOIN dtb_products AS B ON A.product_id = B.product_id
- WHERE A.del_flg = 0 AND B.del_flg = 0 AND cast(substring(A.create_date,1, 10) as date) = DATE_ADD(current_date, interval -1 day)
- AND cast(substring(A.create_date,1, 10) as date) != cast(substring(now(),1, 10) as date)";
+ WHERE A.del_flg = 0 AND B.del_flg = 0 AND cast(A.create_date as date) = DATE_ADD(current_date, interval -1 day)
+ AND cast(A.create_date as date) != current_date";
}
$return = $conn->getOne($sql);
return $return;
Modified: eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2008-04-04 02:01:34 UTC (rev 43)
+++ eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents.php 2008-04-04 06:01:40 UTC (rev 44)
@@ -111,7 +111,7 @@
//---- 編集データ取得
if ($_POST["mode"] == "search" && is_numeric($_POST["news_id"])) {
- $sql = "SELECT *, cast(substring(news_date,1, 10) as date) as cast_news_date FROM dtb_news WHERE news_id = ? ";
+ $sql = "SELECT *, cast(news_date as date) as cast_news_date FROM dtb_news WHERE news_id = ? ";
$result = $conn->getAll($sql, array($_POST["news_id"]));
foreach($result[0] as $key => $val ){
$this->$key = $val;
@@ -167,7 +167,7 @@
//---- 全データ取得
- $sql = "SELECT *, cast(substring(news_date,1, 10) as date) as cast_news_date FROM dtb_news WHERE del_flg = '0' ORDER BY rank DESC";
+ $sql = "SELECT *, cast(news_date as date) as cast_news_date FROM dtb_news WHERE del_flg = '0' ORDER BY rank DESC";
$this->list_data = $conn->getAll($sql);
$this->line_max = count($this->list_data);
$sql = "SELECT MAX(rank) FROM dtb_news WHERE del_flg = '0'"; // rankの最大値を取得
Modified: eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php 2008-04-04 02:01:34 UTC (rev 43)
+++ eccube2/trunk/data/class/pages/admin/contents/LC_Page_Admin_Contents_Inquiry.php 2008-04-04 06:01:40 UTC (rev 44)
@@ -97,7 +97,7 @@
, "3"=>"チェックボックス", "4"=>"ラジオボタン"
);
- $sql = "SELECT *, cast(substring(create_date, 1, 10) as date) as disp_date FROM dtb_question WHERE del_flg = 0 ORDER BY question_id";
+ $sql = "SELECT *, cast(create_date as date) as disp_date FROM dtb_question WHERE del_flg = 0 ORDER BY question_id";
$result = $conn->getAll($sql);
$this->list_data = $result;
Modified: eccube2/trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2008-04-04 02:01:34 UTC (rev 43)
+++ eccube2/trunk/data/class/pages/admin/mail/LC_Page_Admin_Mail_Template.php 2008-04-04 06:01:40 UTC (rev 44)
@@ -86,8 +86,9 @@
}
- $sql = "SELECT *, (substring(create_date, 1, 19)) as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC";
+ $sql = "SELECT *, create_date as disp_date FROM dtb_mailmaga_template WHERE del_flg = 0 ORDER BY create_date DESC";
$this->list_data = $conn->getAll($sql);
+ $this->list_data['disp_date'] = substr($this->list_data['disp_date'], 0, 19);
$objView->assignobj($this);
$objView->display(MAIN_FRAME);
Modified: eccube2/trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php
===================================================================
--- eccube2/trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2008-04-04 02:01:34 UTC (rev 43)
+++ eccube2/trunk/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_News.php 2008-04-04 06:01:40 UTC (rev 44)
@@ -97,7 +97,7 @@
function lfGetNews(){
$conn = new SC_DBConn();
- $sql = "SELECT *, cast(substring(news_date,1,10) as date) as news_date_disp FROM dtb_news WHERE del_flg = '0' ORDER BY rank DESC";
+ $sql = "SELECT *, cast(news_date as date) as news_date_disp FROM dtb_news WHERE del_flg = '0' ORDER BY rank DESC";
$list_data = $conn->getAll($sql);
return $list_data;
}
_ [EC-CUBE] EC-CUBE更新内容3
Date: 2008-04-04 16:01:38 +0900 (Fri, 04 Apr 2008)
New Revision: 45
Modified:
eccube2/trunk/data/class/SC_DbConn.php
eccube2/trunk/data/class/helper/SC_Helper_CSV.php
eccube2/trunk/data/class/util/SC_Utils.php
eccube2/trunk/data/mtb_constants_init.php
eccube2/trunk/html/install/sql/insert_data.sql
Log:
auto commit
Modified: eccube2/trunk/data/class/SC_DbConn.php
===================================================================
--- eccube2/trunk/data/class/SC_DbConn.php 2008-04-04 06:01:40 UTC (rev 44)
+++ eccube2/trunk/data/class/SC_DbConn.php 2008-04-04 07:01:38 UTC (rev 45)
@@ -44,6 +44,9 @@
// Debugモード指定
$options['debug'] = PEAR_DB_DEBUG;
+ // 持続的接続オプション
+ $options['persistent'] = PEAR_DB_PERSISTENT;
+
// 既に接続されていないか、新規接続要望の場合は接続する。
if(!isset($objDbConn->connection) || $new) {
if($dsn != "") {
Modified: eccube2/trunk/data/class/helper/SC_Helper_CSV.php
===================================================================
--- eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 06:01:40 UTC (rev 44)
+++ eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 07:01:38 UTC (rev 45)
@@ -10,7 +10,7 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: SC_Helper_CSV.php 16741 2007-11-08 00:43:24Z adachi $
+ * @version $Id: SC_Helper_CSV.php 17206 2008-04-04 06:41:15Z satou $
*/
class SC_Helper_CSV {
@@ -104,7 +104,7 @@
$objDb = new SC_Helper_DB_Ex();
$from = "vw_product_class AS prdcls";
- $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols);
+ $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols, true, array('category_id'));
$objQuery = new SC_Query();
$objQuery->setoption($option);
@@ -113,29 +113,37 @@
$max = count($list_data);
// 規格分類名一覧
- $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
+ if (!empty($arrOutputCols['classcategory_id1']) || !empty($arrOutputCols['classcategory_id2'])) {
+ $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
+ }
if (!isset($data)) $data = "";
for($i = 0; $i < $max; $i++) {
// 関連商品情報の付与
- $list_data[$i]['classcategory_id1'] = $arrClassCatName[$list_data[$i]['classcategory_id1']];
- $list_data[$i]['classcategory_id2'] = $arrClassCatName[$list_data[$i]['classcategory_id2']];
+ if (in_array('classcategory_id1', $arrOutputCols)) {
+ $list_data[$i]['classcategory_id1'] = $arrClassCatName[$list_data[$i]['classcategory_id1']];
+ }
+ if (in_array('classcategory_id2', $arrOutputCols)) {
+ $list_data[$i]['classcategory_id2'] = $arrClassCatName[$list_data[$i]['classcategory_id2']];
+ }
- $arrCategory_id = $objQuery->getCol("dtb_product_categories",
- "category_id",
- "product_id = ?",
- array($list_data[$i]['product_id']));
+ if (in_array('category_id', $arrOutputCols)) {
+ $arrCategory_id = $objQuery->getCol("dtb_product_categories",
+ "category_id",
+ "product_id = ?",
+ array($list_data[$i]['product_id']));
- // カテゴリID 付与
- for ($j = 0; $j < count($arrCategory_id); $j++) {
- $list_data[$i]['category_id'] .= $arrCategory_id[$j];
- if ($j < count($arrCategory_id) - 1) {
- $list_data[$i]['category_id'] .= "|";
+ // カテゴリID 付与
+ for ($j = 0; $j < count($arrCategory_id); $j++) {
+ $list_data[$i]['category_id'] .= $arrCategory_id[$j];
+ if ($j < count($arrCategory_id) - 1) {
+ $list_data[$i]['category_id'] .= "|";
+ }
}
}
// 各項目をCSV出力用に変換する。
- $data .= $this->lfMakeProductsCSV($list_data[$i]);
+ $data .= $this->lfMakeProductsCSV($list_data[$i], $arrOutputCols);
}
return $data;
}
@@ -222,21 +230,21 @@
}
// 各項目をCSV出力用に変換する。(商品)
- function lfMakeProductsCSV($list) {
+ function lfMakeProductsCSV($list, $arrOutputCols) {
$line = "";
if(is_array($list)) {
- foreach($list as $key => $val) {
+ foreach($arrOutputCols as $key) {
$tmp = "";
switch($key) {
case 'point_rate':
if($val == "") {
$tmp = '0';
} else {
- $tmp = $val;
+ $tmp = $list[$key];
}
break;
default:
- $tmp = $val;
+ $tmp = $list[$key];
break;
}
Modified: eccube2/trunk/data/class/util/SC_Utils.php
===================================================================
--- eccube2/trunk/data/class/util/SC_Utils.php 2008-04-04 06:01:40 UTC (rev 44)
+++ eccube2/trunk/data/class/util/SC_Utils.php 2008-04-04 07:01:38 UTC (rev 45)
@@ -488,23 +488,25 @@
}
// 配列の値をカンマ区切りで返す。
- function sfGetCommaList($array, $space=true) {
+ function sfGetCommaList($array, $space=true, $arrPop = array()) {
if (count($array) > 0) {
$line = "";
foreach($array as $val) {
- if ($space) {
- $line .= $val . ", ";
- }else{
- $line .= $val . ",";
+ if (!in_array($val, $arrPop)) {
+ if ($space) {
+ $line .= $val . ", ";
+ } else {
+ $line .= $val . ",";
+ }
}
}
if ($space) {
$line = ereg_replace(", $", "", $line);
- }else{
+ } else {
$line = ereg_replace(",$", "", $line);
}
return $line;
- }else{
+ } else {
return false;
}
Modified: eccube2/trunk/data/mtb_constants_init.php
===================================================================
--- eccube2/trunk/data/mtb_constants_init.php 2008-04-04 06:01:40 UTC (rev 44)
+++ eccube2/trunk/data/mtb_constants_init.php 2008-04-04 07:01:38 UTC (rev 45)
@@ -73,6 +73,8 @@
define('ECCUBE_PAYMENT', "EC-CUBE");
/** PEAR::DBのデバッグモード */
define('PEAR_DB_DEBUG', 9);
+/** PEAR::DBの持続的接続オプション */
+define('PEAR_DB_PERSISTENT', false);
/** バッチを実行する最短の間隔(秒) */
define('LOAD_BATCH_PASS', 3600);
/** 締め日の指定(末日の場合は、31を指定してください。) */
Modified: eccube2/trunk/html/install/sql/insert_data.sql
===================================================================
--- eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 06:01:40 UTC (rev 44)
+++ eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 07:01:38 UTC (rev 45)
@@ -805,31 +805,32 @@
INSERT INTO mtb_constants VALUES ('LOCALE','"ja_JP.UTF-8"',40,'ロケール設定');
INSERT INTO mtb_constants VALUES ('ECCUBE_PAYMENT','"EC-CUBE"',41,'決済モジュール付与文言');
INSERT INTO mtb_constants VALUES ('PEAR_DB_DEBUG','9',42,'PEAR::DBのデバッグモード');
-INSERT INTO mtb_constants VALUES ('LOAD_BATCH_PASS','3600',43,'バッチを実行する最短の間隔(秒)');
-INSERT INTO mtb_constants VALUES ('CLOSE_DAY','31',44,'締め日の指定(末日の場合は、31を指定してください。)');
-INSERT INTO mtb_constants VALUES ('FAVORITE_ERROR','13',45,'一般サイトエラー');
-INSERT INTO mtb_constants VALUES ('LIB_DIR','DATA_PATH . "lib/"',46,'ライブラリのパス');
-INSERT INTO mtb_constants VALUES ('TTF_DIR','DATA_PATH . "fonts/"',47,'フォントのパス');
-INSERT INTO mtb_constants VALUES ('GRAPH_DIR','HTML_PATH . "upload/graph_image/"',48,'グラフ格納ディレクトリ');
-INSERT INTO mtb_constants VALUES ('GRAPH_URL','URL_DIR . "upload/graph_image/"',49,'グラフURL');
-INSERT INTO mtb_constants VALUES ('GRAPH_PIE_MAX','10',50,'円グラフ最大表示数');
-INSERT INTO mtb_constants VALUES ('GRAPH_LABEL_MAX','40',51,'グラフのラベルの文字数');
-INSERT INTO mtb_constants VALUES ('PDF_DIR','DATA_PATH . "pdf/"',52,'PDF格納ディレクトリ');
-INSERT INTO mtb_constants VALUES ('BAT_ORDER_AGE','70',53,'何歳まで集計の対象とするか');
-INSERT INTO mtb_constants VALUES ('PRODUCTS_TOTAL_MAX','15',54,'商品集計で何位まで表示するか');
-INSERT INTO mtb_constants VALUES ('DEFAULT_PRODUCT_DISP','2',55,'1:公開 2:非公開');
-INSERT INTO mtb_constants VALUES ('DELIV_FREE_AMOUNT','0',56,'送料無料購入個数（0の場合は、何個買っても無料にならない)');
-INSERT INTO mtb_constants VALUES ('INPUT_DELIV_FEE','1',57,'配送料の設定画面表示(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('OPTION_PRODUCT_DELIV_FEE','0',58,'商品ごとの送料設定(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('OPTION_DELIV_FEE','1',59,'配送業者ごとの配送料を加算する(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('OPTION_RECOMMEND','1',60,'おすすめ商品登録(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('OPTION_CLASS_REGIST','1',61,'商品規格登録(有効:1 無効:0)');
-INSERT INTO mtb_constants VALUES ('TV_IMAGE_WIDTH','170',62,'TV連動商品画像横');
-INSERT INTO mtb_constants VALUES ('TV_IMAGE_HEIGHT','95',63,'TV連動商品画像縦');
-INSERT INTO mtb_constants VALUES ('TV_PRODUCTS_MAX','10',64,'TV連動商品最大登録数');
-INSERT INTO mtb_constants VALUES ('DEFAULT_PASSWORD','"UAhgGR3L"',65,'会員登録変更(マイページ)パスワード用');
-INSERT INTO mtb_constants VALUES ('DELIV_ADDR_MAX','20',66,'別のお届け先最大登録数');
-INSERT INTO mtb_constants VALUES ('CUSTOMER_READING_MAX','30',67,'閲覧履歴保存数');
+INSERT INTO mtb_constants VALUES ('PEAR_DB_PERSISTENT','false',43,'PEAR::DBの持続的接続オプション(false:OFF、true:ON)');
+INSERT INTO mtb_constants VALUES ('LOAD_BATCH_PASS','3600',44,'バッチを実行する最短の間隔(秒)');
+INSERT INTO mtb_constants VALUES ('CLOSE_DAY','31',45,'締め日の指定(末日の場合は、31を指定してください。)');
+INSERT INTO mtb_constants VALUES ('FAVORITE_ERROR','13',46,'一般サイトエラー');
+INSERT INTO mtb_constants VALUES ('LIB_DIR','DATA_PATH . "lib/"',47,'ライブラリのパス');
+INSERT INTO mtb_constants VALUES ('TTF_DIR','DATA_PATH . "fonts/"',48,'フォントのパス');
+INSERT INTO mtb_constants VALUES ('GRAPH_DIR','HTML_PATH . "upload/graph_image/"',49,'グラフ格納ディレクトリ');
+INSERT INTO mtb_constants VALUES ('GRAPH_URL','URL_DIR . "upload/graph_image/"',50,'グラフURL');
+INSERT INTO mtb_constants VALUES ('GRAPH_PIE_MAX','10',51,'円グラフ最大表示数');
+INSERT INTO mtb_constants VALUES ('GRAPH_LABEL_MAX','40',52,'グラフのラベルの文字数');
+INSERT INTO mtb_constants VALUES ('PDF_DIR','DATA_PATH . "pdf/"',53,'PDF格納ディレクトリ');
+INSERT INTO mtb_constants VALUES ('BAT_ORDER_AGE','70',54,'何歳まで集計の対象とするか');
+INSERT INTO mtb_constants VALUES ('PRODUCTS_TOTAL_MAX','15',55,'商品集計で何位まで表示するか');
+INSERT INTO mtb_constants VALUES ('DEFAULT_PRODUCT_DISP','2',56,'1:公開 2:非公開');
+INSERT INTO mtb_constants VALUES ('DELIV_FREE_AMOUNT','0',57,'送料無料購入個数（0の場合は、何個買っても無料にならない)');
+INSERT INTO mtb_constants VALUES ('INPUT_DELIV_FEE','1',58,'配送料の設定画面表示(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('OPTION_PRODUCT_DELIV_FEE','0',59,'商品ごとの送料設定(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('OPTION_DELIV_FEE','1',60,'配送業者ごとの配送料を加算する(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('OPTION_RECOMMEND','1',61,'おすすめ商品登録(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('OPTION_CLASS_REGIST','1',62,'商品規格登録(有効:1 無効:0)');
+INSERT INTO mtb_constants VALUES ('TV_IMAGE_WIDTH','170',63,'TV連動商品画像横');
+INSERT INTO mtb_constants VALUES ('TV_IMAGE_HEIGHT','95',64,'TV連動商品画像縦');
+INSERT INTO mtb_constants VALUES ('TV_PRODUCTS_MAX','10',65,'TV連動商品最大登録数');
+INSERT INTO mtb_constants VALUES ('DEFAULT_PASSWORD','"UAhgGR3L"',66,'会員登録変更(マイページ)パスワード用');
+INSERT INTO mtb_constants VALUES ('DELIV_ADDR_MAX','20',67,'別のお届け先最大登録数');
+INSERT INTO mtb_constants VALUES ('CUSTOMER_READING_MAX','30',68,'閲覧履歴保存数');
INSERT INTO mtb_constants VALUES ('ORDER_STATUS_MAX','50',70,'管理画面ステータス一覧表示件数');
INSERT INTO mtb_constants VALUES ('REVIEW_REGIST_MAX','5',71,'フロントレビュー書き込み最大数');
INSERT INTO mtb_constants VALUES ('DEBUG_MODE','false',72,'デバッグモード(true：sfPrintRやDBのエラーメッセージを出力する、false：出力しない)');
_ [EC-CUBE] EC-CUBE更新内容4コミットしたカテゴリ情報CSVダウンロードが取り込まれました。
Date: 2008-04-04 18:01:48 +0900 (Fri, 04 Apr 2008)
New Revision: 46
Modified:
eccube2/trunk/data/Smarty/templates/default/admin/contents/subnavi.tpl
eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl
eccube2/trunk/data/class/helper/SC_Helper_CSV.php
eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
eccube2/trunk/html/install/sql/insert_data.sql
Log:
auto commit
Modified: eccube2/trunk/data/Smarty/templates/default/admin/contents/subnavi.tpl
===================================================================
--- eccube2/trunk/data/Smarty/templates/default/admin/contents/subnavi.tpl 2008-04-04 07:01:38 UTC (rev 45)
+++ eccube2/trunk/data/Smarty/templates/default/admin/contents/subnavi.tpl 2008-04-04 09:01:48 UTC (rev 46)
@@ -38,6 +38,8 @@
<!--{if $tpl_subno == 'csv'}-->
<tr><td class=<!--{if $tpl_subno_csv != 'product'}-->"subnavi"<!--{else}-->"subnavi-on"<!--{/if}-->><a href="./csv.php?tpl_subno_csv=<!--{$arrSubnavi.1}-->" onMouseOver="naviStyleChange('product_sub', '#b7b7b7')" <!--{if $tpl_subno_csv != 'product'}-->onMouseOut="naviStyleChange('product_sub', '#818287')"<!--{/if}--> id="product_sub"><span class="subnavi_text">商品管理</span></a></td></tr>
<tr><td><img src="<!--{$TPL_DIR}-->img/contents/navi_subline.gif" width="140" height="2" alt=""></td></tr>
+ <tr><td class=<!--{if $tpl_subno_csv != 'category'}-->"subnavi"<!--{else}-->"subnavi-on"<!--{/if}-->><a href="./csv.php?tpl_subno_csv=<!--{$arrSubnavi.5}-->" onMouseOver="naviStyleChange('category_sub', '#b7b7b7')" <!--{if $tpl_subno_csv != 'category'}-->onMouseOut="naviStyleChange('category_sub', '#818287')"<!--{/if}--> id="category_sub"><span class="subnavi_text">カテゴリ</span></a></td></tr>
+ <tr><td><img src="<!--{$TPL_DIR}-->img/contents/navi_subline.gif" width="140" height="2" alt=""></td></tr>
<tr><td class=<!--{if $tpl_subno_csv != 'customer'}-->"subnavi"<!--{else}-->"subnavi-on"<!--{/if}-->><a href="./csv.php?tpl_subno_csv=<!--{$arrSubnavi.2}-->" onMouseOver="naviStyleChange('customer_sub', '#b7b7b7')" <!--{if $tpl_subno_csv != 'customer'}-->onMouseOut="naviStyleChange('customer_sub', '#818287')"<!--{/if}--> id="customer_sub"><span class="subnavi_text">顧客管理</span></a></td></tr>
<tr><td><img src="<!--{$TPL_DIR}-->img/contents/navi_subline.gif" width="140" height="2" alt=""></td></tr>
<tr><td class=<!--{if $tpl_subno_csv != 'order'}-->"subnavi"<!--{else}-->"subnavi-on"<!--{/if}-->><a href="./csv.php?tpl_subno_csv=<!--{$arrSubnavi.3}-->" onMouseOver="naviStyleChange('order_sub', '#b7b7b7')" <!--{if $tpl_subno_csv != 'order'}-->onMouseOut="naviStyleChange('order_sub', '#818287')"<!--{/if}--> id="order_sub"><span class="subnavi_text">受注管理</span></a></td></tr>
@@ -47,6 +49,5 @@
<tr><td class=<!--{if $tpl_subno_csv != 'csv_sql'}-->"subnavi"<!--{else}-->"subnavi-on"<!--{/if}-->><a href="./csv_sql.php" onMouseOver="naviStyleChange('csv_sql', '#b7b7b7')" <!--{if $tpl_subno_csv != 'csv_sql'}-->onMouseOut="naviStyleChange('csv_sql', '#818287')"<!--{/if}--> id="csv_sql"><span class="subnavi_text">高度な設定</span></a></td></tr>
<tr><td><img src="<!--{$TPL_DIR}-->img/contents/navi_subline.gif" width="140" height="2" alt=""></td></tr>
<!--{/if}-->
-
<!--ナビ-->
</table>
Modified: eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl
===================================================================
--- eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl 2008-04-04 07:01:38 UTC (rev 45)
+++ eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl 2008-04-04 09:01:48 UTC (rev 46)
@@ -47,7 +47,7 @@
<tr>
<td background="<!--{$TPL_DIR}-->img/contents/main_left.jpg"><img src="<!--{$TPL_DIR}-->img/common/_.gif" width="14" height="1" alt=""></td>
<td bgcolor="#cccccc">
-
+
<!--▼登録テーブルここから-->
<table width="678" border="0" cellspacing="0" cellpadding="0" summary=" ">
<tr>
@@ -64,12 +64,13 @@
<tr>
<td colspan="3"><img src="<!--{$TPL_DIR}-->img/contents/main_bar.jpg" width="678" height="10" alt=""></td>
</tr>
- </table>
-
+ </table>
+
<table width="678" border="0" cellspacing="1" cellpadding="5" summary=" " bgcolor="#cccccc">
<tr bgcolor="#ffffff">
<!--▼画面左-->
<td width="250" valign="top" class="fs12">
+ <a href="#" onmouseover="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv_on.jpg','btn_csv');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv.jpg','btn_csv');" onclick="fnModeSubmit('csv','','');" ><img src="<!--{$TPL_DIR}-->img/contents/btn_csv.jpg" width="99" height="22" alt="CSV DOWNLOAD" border="0" name="btn_csv" id="btn_csv"></a><br />
<a href="<!--{$smarty.server.PHP_SELF|escape}-->">▼ホーム</a><br>
<!--{section name=cnt loop=$arrTree}-->
<!--{assign var=level value="`$arrTree[cnt].level`}-->
@@ -82,7 +83,7 @@
<!--{* スペース繰り返し *}-->
<!--{section name=n loop=$level}--> <!--{/section}-->
-
+
<!--{* カテゴリ名表示 *}-->
<!--{assign var=disp_name value="`$arrTree[cnt].category_id`.`$arrTree[cnt].category_name`"}-->
<!--{if $arrTree[cnt].level != $smarty.const.LEVEL_MAX}-->
@@ -97,28 +98,28 @@
<img src="<!--{$smarty.const.URL_DIR}-->misc/closef.gif" border="0">
<!--{$disp_name|sfCutString:20|escape}--></a><br>
<!--{/if}-->
-
+
<!--{if $arrTree[cnt].display == true}-->
<div id="f<!--{$arrTree[cnt].category_id}-->">
<!--{else}-->
<div id="f<!--{$arrTree[cnt].category_id}-->" style="display:none">
- <!--{/if}-->
-
+ <!--{/if}-->
+
<!--{assign var=before_level value="`$arrTree[cnt].level`}-->
- <!--{/section}-->
-
+ <!--{/section}-->
+
</td>
-
- <!--▼画面右-->
+
+ <!--▼画面右-->
<td width="428" valign="top">
-
+
<span class="red12"><!--{$arrErr.category_name}--></span>
<input type="text" name="category_name" value="<!--{$arrForm.category_name|escape}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
<input type="submit" name="button" value="登録"/><span class="red10"> （上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
- <table width="428" border="0" cellspacing="0" cellpadding="0" summary=" ">
+ <table width="428" border="0" cellspacing="0" cellpadding="0" summary=" ">
<tr><td height="15"></td></tr>
</table>
-
+
<!--{if count($arrList) > 0}-->
<table border="0" cellspacing="1" cellpadding="5" summary=" " bgcolor="#cccccc">
<tr bgcolor="#f2f1ec" align="center" class="fs12n">
@@ -159,11 +160,11 @@
</tr>
<!--{/section}-->
</table>
-
+
<!--{else}-->
<table border="0" cellspacing="0" cellpadding="0" summary=" ">
<tr>
- <td class="fs12n">この階層には、カテゴリが登録されていません。</td>
+ <td class="fs12n">この階層には、カテゴリが登録されていません。</td>
</tr>
</table>
<!--{/if}-->
@@ -189,4 +190,4 @@
</tr>
</form>
</table>
-<!--★★メインコンテンツ★★-->
+<!--★★メインコンテンツ★★-->
Modified: eccube2/trunk/data/class/helper/SC_Helper_CSV.php
===================================================================
--- eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 07:01:38 UTC (rev 45)
+++ eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 09:01:48 UTC (rev 46)
@@ -10,7 +10,7 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: SC_Helper_CSV.php 17206 2008-04-04 06:41:15Z satou $
+ * @version $Id: SC_Helper_CSV.php 17207 2008-04-04 08:56:26Z satou $
*/
class SC_Helper_CSV {
@@ -187,6 +187,27 @@
return $data;
}
+ // CSV出力データを作成する。(カテゴリ)
+ function lfGetCategoryCSV($where, $option, $arrval, $arrOutputCols) {
+ $objDb = new SC_Helper_DB_Ex();
+
+ $from = "dtb_category";
+ $cols = SC_Utils_Ex::sfGetCommaList($arrOutputCols);
+
+ $objQuery = new SC_Query();
+ $objQuery->setoption($option);
+
+ $list_data = $objQuery->select($cols, $from, $where, $arrval);
+ $max = count($list_data);
+
+ if (!isset($data)) $data = "";
+ for($i = 0; $i < $max; $i++) {
+ // 各項目をCSV出力用に変換する。
+ $data .= $this->lfMakeCSV($list_data[$i]);
+ }
+ return $data;
+ }
+
// CSV出力データを作成する。
function lfGetCSV($from, $where, $option, $arrval, $arrCsvOutputCols = "") {
@@ -333,14 +354,16 @@
1 => 'product',
2 => 'customer',
3 => 'order',
- 4 => 'campaign'
+ 4 => 'campaign',
+ 5 => 'category'
);
$this->arrSubnaviName = array(
1 => '商品管理',
2 => '顧客管理',
3 => '受注管理',
- 4 => 'キャンペーン'
+ 4 => 'キャンペーン',
+ 5 => 'カテゴリ'
);
Modified: eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2008-04-04 07:01:38 UTC (rev 45)
+++ eccube2/trunk/data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 2008-04-04 09:01:48 UTC (rev 46)
@@ -29,7 +29,7 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Admin_Products_Category.php 16741 2007-11-08 00:43:24Z adachi $
+ * @version $Id: LC_Page_Admin_Products_Category.php 17207 2008-04-04 08:56:26Z satou $
*/
class LC_Page_Admin_Products_Category extends LC_Page {
@@ -174,6 +174,29 @@
break;
case 'tree':
break;
+ case 'csv':
+ require_once(CLASS_EX_PATH . "helper_extends/SC_Helper_CSV_Ex.php");
+
+ $objCSV = new SC_Helper_CSV_Ex();
+ // オプションの指定
+ $option = "ORDER BY rank DESC";
+ // CSV出力タイトル行の作成
+ $arrOutput = SC_Utils_Ex::sfSwapArray($objCSV->sfgetCsvOutput(5, " WHERE csv_id = 5 AND status = 1"));
+
+ if (count($arrOutput) <= 0) break;
+
+ $arrOutputCols = $arrOutput['col'];
+ $arrOutputTitle = $arrOutput['disp_name'];
+
+ $head = SC_Utils_Ex::sfGetCSVList($arrOutputTitle);
+
+ $where = "del_flg = 0";
+ $data = $objCSV->lfGetCategoryCSV($where, $option, $arrval, $arrOutputCols);
+
+ // CSVを送信する。
+ SC_Utils_Ex::sfCSVDownload($head.$data, 'category');
+ exit;
+ break;
default:
$this->arrForm['parent_category_id'] = 0;
break;
Modified: eccube2/trunk/html/install/sql/insert_data.sql
===================================================================
--- eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 07:01:38 UTC (rev 45)
+++ eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 09:01:48 UTC (rev 46)
@@ -221,6 +221,11 @@
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr01','住所1',37,now(),now());
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr02','住所2',38,now(),now());
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'payment_total','お支払い合計',39,now(),now());
+insert into dtb_csv(csv_id,col,disp_name,status)values(5,'category_id','カテゴリID',2);
+insert into dtb_csv(csv_id,col,disp_name,status)values(5,'category_name','カテゴリ名',2);
+insert into dtb_csv(csv_id,col,disp_name,status)values(5,'parent_category_id','親カテゴリID',2);
+insert into dtb_csv(csv_id,col,disp_name,status)values(5,'level','階層',2);
+insert into dtb_csv(csv_id,col,disp_name,status)values(5,'rank','表示ランク',2);
INSERT INTO dtb_templates (template_code, template_name, create_date, update_date) VALUES('default','デフォルト', now(), now());
_ [EC-CUBE] EC-CUBE更新内容5こちらもコミットしたカテゴリ情報CSVダウンロードの内容
Date: 2008-04-04 19:01:35 +0900 (Fri, 04 Apr 2008)
New Revision: 47
Modified:
eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl
eccube2/trunk/html/install/sql/insert_data.sql
Log:
auto commit
Modified: eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl
===================================================================
--- eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl 2008-04-04 09:01:48 UTC (rev 46)
+++ eccube2/trunk/data/Smarty/templates/default/admin/products/category.tpl 2008-04-04 10:01:35 UTC (rev 47)
@@ -65,12 +65,21 @@
<td colspan="3"><img src="<!--{$TPL_DIR}-->img/contents/main_bar.jpg" width="678" height="10" alt=""></td>
</tr>
</table>
+
+ <table width="678" border="0" cellspacing="0" cellpadding="0" summary=" " style="background-image: url(<!--{$TPL_DIR}-->img/contents/main_bar.jpg);">
+ <tr>
+ <td width="105"><a href="#" onmouseover="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv_on.jpg','btn_csv');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv.jpg','btn_csv');" onclick="fnModeSubmit('csv','','');" ><img src="<!--{$TPL_DIR}-->img/contents/btn_csv.jpg" width="99" height="22" alt="CSV DOWNLOAD" border="0" name="btn_csv" id="btn_csv"></a></td>
+ <td width="573"><a href="../contents/csv.php?tpl_subno_csv=category"><span class="fs12n"> >> CSV出力項目設定 </span></a></td>
+ </tr>
+ <tr>
+ <td colspan="2"><img src="<!--{$TPL_DIR}-->img/contents/main_bar.jpg" width="678" height="3" alt=""></td>
+ </tr>
+ </table>
<table width="678" border="0" cellspacing="1" cellpadding="5" summary=" " bgcolor="#cccccc">
<tr bgcolor="#ffffff">
<!--▼画面左-->
<td width="250" valign="top" class="fs12">
- <a href="#" onmouseover="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv_on.jpg','btn_csv');" onmouseout="chgImg('<!--{$TPL_DIR}-->img/contents/btn_csv.jpg','btn_csv');" onclick="fnModeSubmit('csv','','');" ><img src="<!--{$TPL_DIR}-->img/contents/btn_csv.jpg" width="99" height="22" alt="CSV DOWNLOAD" border="0" name="btn_csv" id="btn_csv"></a><br />
<a href="<!--{$smarty.server.PHP_SELF|escape}-->">▼ホーム</a><br>
<!--{section name=cnt loop=$arrTree}-->
<!--{assign var=level value="`$arrTree[cnt].level`}-->
Modified: eccube2/trunk/html/install/sql/insert_data.sql
===================================================================
--- eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 09:01:48 UTC (rev 46)
+++ eccube2/trunk/html/install/sql/insert_data.sql 2008-04-04 10:01:35 UTC (rev 47)
@@ -221,9 +221,9 @@
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr01','住所1',37,now(),now());
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_addr02','住所2',38,now(),now());
insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'payment_total','お支払い合計',39,now(),now());
-insert into dtb_csv(csv_id,col,disp_name,status)values(5,'category_id','カテゴリID',2);
-insert into dtb_csv(csv_id,col,disp_name,status)values(5,'category_name','カテゴリ名',2);
-insert into dtb_csv(csv_id,col,disp_name,status)values(5,'parent_category_id','親カテゴリID',2);
+insert into dtb_csv(csv_id,col,disp_name,rank,status)values(5,'category_id','カテゴリID',1,2);
+insert into dtb_csv(csv_id,col,disp_name,rank,status)values(5,'category_name','カテゴリ名',2,2);
+insert into dtb_csv(csv_id,col,disp_name,rank,status)values(5,'parent_category_id','親カテゴリID',3,2);
insert into dtb_csv(csv_id,col,disp_name,status)values(5,'level','階層',2);
insert into dtb_csv(csv_id,col,disp_name,status)values(5,'rank','表示ランク',2);
_ [EC-CUBE] EC-CUBE更新内容6Hisotoryのtypoが修正されました。
Date: 2008-04-04 20:01:43 +0900 (Fri, 04 Apr 2008)
New Revision: 48
Modified:
eccube2/trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
eccube2/trunk/data/class/pages/admin/total/LC_Page_Admin_Total.php
eccube2/trunk/data/class/pages/mypage/LC_Page_Mypage_History.php
eccube2/trunk/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php
Log:
auto commit
Modified: eccube2/trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2008-04-04 10:01:35 UTC (rev 47)
+++ eccube2/trunk/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2008-04-04 11:01:43 UTC (rev 48)
@@ -269,8 +269,8 @@
//- 都道府県/職業の変換
for($i = 0; $i < count($this->search_data); $i ++) {
- $this->search_data[$i]["pref"] = $arrPref[ $this->search_data[$i]["pref"] ];
- $this->search_data[$i]["job"] = $arrJob[ $this->search_data[$i]["job"] ];
+ $this->search_data[$i]["pref"] = $this->arrPref[ $this->search_data[$i]["pref"] ];
+ $this->search_data[$i]["job"] = $this->arrJob[ $this->search_data[$i]["job"] ];
}
//- CSV出力
Modified: eccube2/trunk/data/class/pages/admin/total/LC_Page_Admin_Total.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/total/LC_Page_Admin_Total.php 2008-04-04 10:01:35 UTC (rev 47)
+++ eccube2/trunk/data/class/pages/admin/total/LC_Page_Admin_Total.php 2008-04-04 11:01:43 UTC (rev 48)
@@ -59,6 +59,7 @@
$masterData = new SC_DB_MasterData_Ex();
$this->arrWDAY = $masterData->getMasterData("mtb_wday");
$this->arrSex = $masterData->getMasterData("mtb_sex");
+ $this->arrJob = $masterData->getMasterData("mtb_job");
// ページタイトル
$this->arrTitle[''] = "期間別集計";
$this->arrTitle['term'] = "期間別集計";
@@ -637,7 +638,7 @@
list($where, $arrval) = $this->lfGetWhereMember('create_date', $sdate, $edate, $type);
// 会員集計の取得
- $col = "COUNT(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average, order_sex";
+ $col = "COUNT(*) AS order_count, SUM(total) AS total, trunc(AVG(total)) AS total_average, order_sex";
$from = "dtb_order";
$objQuery = new SC_Query();
$objQuery->setGroupBy("order_sex");
@@ -676,7 +677,7 @@
$where .= " and del_flg=0 and status <> " . ORDER_CANCEL;
- $sql = "SELECT T1.product_id, T1.product_code, T1.product_name as name, T1.products_count, T1.order_count, T1.price, T1.total ";
+ $sql = "SELECT T1.product_id, T1.product_code, T1.product_name, T1.products_count, T1.order_count, T1.price, T1.total ";
$sql.= "FROM ( ";
$sql.= "SELECT product_id, product_name, product_code, price, ";
$sql.= "COUNT(*) AS order_count, ";
@@ -697,17 +698,15 @@
// 円グラフの生成
if($graph) {
$image_key = "products_" . $type;
- $objPage->tpl_image = $this->lfGetGraphPie($objPage->arrResults, "name", $image_key, "(売上比率)", $sdate, $edate);
+ $objPage->tpl_image = $this->lfGetGraphPie($objPage->arrResults, "product_name", $image_key, "(売上比率)", $sdate, $edate);
}
}
/** 職業別集計 **/
function lfGetOrderJob($type, $sdate, $edate, &$objPage, $graph = true) {
- global $arrJob;
-
list($where, $arrval) = $this->lfGetWhereMember('T2.create_date', $sdate, $edate, $type);
- $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, (AVG(total)) AS total_average ";
+ $sql = "SELECT job, count(*) AS order_count, SUM(total) AS total, trunc(AVG(total)) AS total_average ";
$sql.= "FROM dtb_customer AS T1 LEFT JOIN dtb_order AS T2 USING ( customer_id ) WHERE $where AND T2.del_flg = 0 and T2.status <> " . ORDER_CANCEL;
$sql.= " GROUP BY job ORDER BY total DESC";
@@ -718,7 +717,7 @@
for($i = 0; $i < $max; $i++) {
$job_key = $objPage->arrResults[$i]['job'];
if($job_key != "") {
- $objPage->arrResults[$i]['job_name'] = $arrJob[$job_key];
+ $objPage->arrResults[$i]['job_name'] = $this->arrJob[$job_key];
} else {
$objPage->arrResults[$i]['job_name'] = "未回答";
}
Modified: eccube2/trunk/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- eccube2/trunk/data/class/pages/mypage/LC_Page_Mypage_History.php 2008-04-04 10:01:35 UTC (rev 47)
+++ eccube2/trunk/data/class/pages/mypage/LC_Page_Mypage_History.php 2008-04-04 11:01:43 UTC (rev 48)
@@ -29,9 +29,9 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Mypage_History.php 16582 2007-10-29 03:06:29Z nanasess $
+ * @version $Id: LC_Page_Mypage_History.php 17211 2008-04-04 10:04:54Z satou $
*/
-class LC_Page_Mypage_Hisotory extends LC_Page {
+class LC_Page_Mypage_History extends LC_Page {
// }}}
// {{{ functions
Modified: eccube2/trunk/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php
===================================================================
--- eccube2/trunk/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php 2008-04-04 10:01:35 UTC (rev 47)
+++ eccube2/trunk/data/class_extends/page_extends/mypage/LC_Page_Mypage_History_Ex.php 2008-04-04 11:01:43 UTC (rev 48)
@@ -31,9 +31,9 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: LC_Page_Mypage_History_Ex.php 16582 2007-10-29 03:06:29Z nanasess $
+ * @version $Id: LC_Page_Mypage_History_Ex.php 17211 2008-04-04 10:04:54Z satou $
*/
-class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_Hisotory {
+class LC_Page_Mypage_History_Ex extends LC_Page_Mypage_History {
// }}}
// {{{ functions
_ [EC-CUBE] EC-CUBE更新内容7
Date: 2008-04-04 21:01:27 +0900 (Fri, 04 Apr 2008)
New Revision: 49
Modified:
eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl
eccube2/trunk/data/class/SC_CustomerList.php
eccube2/trunk/data/class/SC_SendMail.php
eccube2/trunk/data/class/helper/SC_Helper_CSV.php
eccube2/trunk/data/class/pages/admin/order/LC_Page_Admin_Order.php
Log:
auto commit
Modified: eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl
===================================================================
--- eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl 2008-04-04 11:01:43 UTC (rev 48)
+++ eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl 2008-04-04 12:01:27 UTC (rev 49)
@@ -75,7 +75,7 @@
</tr>
<tr>
<td background="<!--{$TPL_DIR}-->img/contents/contents_title_left_bg.gif"><img src="<!--{$TPL_DIR}-->img/contents/contents_title_left.gif" width="22" height="12" alt=""></td>
- <td bgcolor="#636469" width="600" class="fs14n"><span class="white"><!--コンテンツタイトル-->メンバー登録/編集</span></td>
+ <td bgcolor="#636469" width="600" class="fs14n"><span class="white"><!--コンテンツタイトル-->配信条件</span></td>
<td background="<!--{$TPL_DIR}-->img/contents/contents_title_right_bg.gif"><img src="<!--{$TPL_DIR}-->img/common/_.gif" width="18" height="1" alt=""></td>
</tr>
<tr>
Modified: eccube2/trunk/data/class/SC_CustomerList.php
===================================================================
--- eccube2/trunk/data/class/SC_CustomerList.php 2008-04-04 11:01:43 UTC (rev 48)
+++ eccube2/trunk/data/class/SC_CustomerList.php 2008-04-04 12:01:27 UTC (rev 49)
@@ -380,7 +380,8 @@
dtb_customer.tel01,
dtb_customer.tel02,
dtb_customer.tel03,
- dtb_customer.pref,
+ dtb_customer.pref,
+ dtb_customer.create_date,
dtb_customer.mailmaga_flg";
return $column;
Modified: eccube2/trunk/data/class/SC_SendMail.php
===================================================================
--- eccube2/trunk/data/class/SC_SendMail.php 2008-04-04 11:01:43 UTC (rev 48)
+++ eccube2/trunk/data/class/SC_SendMail.php 2008-04-04 12:01:27 UTC (rev 49)
@@ -111,6 +111,9 @@
// 件名の設定
function setSubject($subject) {
$this->subject = mb_encode_mimeheader($subject);
+ $this->subject = str_replace("\x0D\x0A", "\n", $this->subject);
+ $this->subject = str_replace("\x0D", "\n", $this->subject);
+ $this->subject = str_replace("\x0A", "\n", $this->subject);
}
// 本文の設定
Modified: eccube2/trunk/data/class/helper/SC_Helper_CSV.php
===================================================================
--- eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 11:01:43 UTC (rev 48)
+++ eccube2/trunk/data/class/helper/SC_Helper_CSV.php 2008-04-04 12:01:27 UTC (rev 49)
@@ -10,7 +10,7 @@
*
* @package Page
* @author LOCKON CO.,LTD.
- * @version $Id: SC_Helper_CSV.php 17207 2008-04-04 08:56:26Z satou $
+ * @version $Id: SC_Helper_CSV.php 17219 2008-04-04 11:46:26Z satou $
*/
class SC_Helper_CSV {
@@ -237,6 +237,9 @@
case 'order_pref':
$tmp = $this->arrPref[$val];
break;
+ case 'deliv_pref':
+ $tmp = $this->arrPref[$val];
+ break;
default:
$tmp = $val;
break;
Modified: eccube2/trunk/data/class/pages/admin/order/LC_Page_Admin_Order.php
===================================================================
--- eccube2/trunk/data/class/pages/admin/order/LC_Page_Admin_Order.php 2008-04-04 11:01:43 UTC (rev 48)
+++ eccube2/trunk/data/class/pages/admin/order/LC_Page_Admin_Order.php 2008-04-04 12:01:27 UTC (rev 49)
@@ -145,7 +145,7 @@
}elseif(DB_TYPE == "mysql"){
$where .= " AND concat(order_name01,order_name02) ILIKE ?";
}
- $nonsp_val = ereg_replace("[ ]+","",$val);
+ $nonsp_val = mb_ereg_replace("[ ]+","",$val);
$arrval[] = "%$nonsp_val%";
break;
case 'search_order_kana':
@@ -154,7 +154,7 @@
}elseif(DB_TYPE == "mysql"){
$where .= " AND concat(order_kana01,order_kana02) ILIKE ?";
}
- $nonsp_val = ereg_replace("[ ]+","",$val);
+ $nonsp_val = mb_ereg_replace("[ ]+","",$val);
$arrval[] = "%$nonsp_val%";
break;
case 'search_order_id1':
_ [EC-CUBE] EC-CUBE更新内容8
Date: 2008-04-04 22:01:44 +0900 (Fri, 04 Apr 2008)
New Revision: 50
Modified:
eccube2/trunk/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
Log:
auto commit
Modified: eccube2/trunk/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- eccube2/trunk/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2008-04-04 12:01:27 UTC (rev 49)
+++ eccube2/trunk/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2008-04-04 13:01:44 UTC (rev 50)
@@ -90,7 +90,7 @@
if(count($arrErr) == 0) {
if($objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'], true)) {
- $this->sendRedirect($this->getLocation($_POST['url'], array(), false));
+ $this->sendRedirect($this->getLocation(URL_DIR, array(), false));
exit;
} else {
$arrForm['login_email'] = strtolower($arrForm['login_email']);
@@ -118,7 +118,7 @@
if ($mypage_url_search == 2){
$this->sendRedirect($this->getLocation(URL_DIR . "mypage/login.php", array(), false));
}else{
- $this->sendRedirect($this->getLocation($_POST['url'], array(), false));
+ $this->sendRedirect($this->getLocation(URL_DIR, array(), false));
}
exit;
break;
_ [EC-CUBE] EC-CUBE更新内容9
Date: 2008-04-04 23:01:22 +0900 (Fri, 04 Apr 2008)
New Revision: 51
Modified:
eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl
Log:
auto commit
Modified: eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl
===================================================================
--- eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl 2008-04-04 13:01:44 UTC (rev 50)
+++ eccube2/trunk/data/Smarty/templates/default/admin/mail/query.tpl 2008-04-04 14:01:22 UTC (rev 51)
@@ -109,7 +109,10 @@
<td bgcolor="#f0f0f0" width="110">配信形式</td>
<td bgcolor="#ffffff" width="198"><!--{$list_data.htmlmail_disp|escape|default:"（未指定）"}--></td>
<td bgcolor="#f0f0f0" width="110">購入回数</td>
- <td bgcolor="#ffffff" width="199"><!--{if $list_data.buy_times_from}--><!--{$list_data.buy_times_from|escape}-->回 〜 <!--{$list_data.buy_times_to|escape}-->回<!--{else}-->（未指定）<!--{/if}--></td>
+ <td bgcolor="#ffffff" width="199">
+ <!--{if $list_data.buy_times_from == null}-->（未指定）<!--{else}--><!--{$list_data.buy_times_from|escape}-->回<!--{/if}--> 〜
+ <!--{if $list_data.buy_times_to == null}-->（未指定）<!--{else}--><!--{$list_data.buy_times_to|escape}-->回<!--{/if}-->
+ </td>
</tr>
<tr class="fs12n">
<!--{*非会員は選択できない
@@ -121,7 +124,10 @@
<td bgcolor="#f0f0f0" width="110">購入商品コード</td>
<td bgcolor="#ffffff" width="198"><!--{$list_data.buy_product_code|escape|default:"（未指定）"}--></td>
<td bgcolor="#f0f0f0" width="110">購入金額</td>
- <td bgcolor="#ffffff" width="199"><!--{if $list_data.buy_total_from}--><!--{$list_data.buy_total_from|escape}-->円 〜 <!--{$list_data.buy_total_to|escape}-->円<!--{else}-->（未指定）<!--{/if}--></td>
+ <td bgcolor="#ffffff" width="199">
+ <!--{if $list_data.buy_total_from == null}-->（未指定）<!--{else}--><!--{$list_data.buy_total_from|escape}-->円<!--{/if}--> 〜
+ <!--{if $list_data.buy_total_to == null}-->（未指定）<!--{else}--><!--{$list_data.buy_total_to|escape}-->円<!--{/if}-->
+ </td>
</tr>
<tr class="fs12n">
<td bgcolor="#f0f0f0" width="110">メールアドレス</td>
[ツッコミを入れる]
[]
|