Index: /branches/version-2_4/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php
===================================================================
--- /branches/version-2_4/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 17613)
+++ /branches/version-2_4/data/class/pages/admin/products/LC_Page_Admin_Products_Product.php (revision 17767)
@@ -396,5 +396,5 @@
"deliv_fee", "comment1", "comment2", "comment3",
"comment4", "comment5", "comment6", "main_list_comment",
- "sale_limit", "sale_unlimited", "deliv_date_id");
+ "sale_limit", "sale_unlimited", "deliv_date_id", "note");
$arrList = SC_Utils_Ex::arrayDefineIndexes($arrList, $checkArray);
@@ -417,4 +417,5 @@
$sqlval['sale_unlimited'] = $arrList['sale_unlimited'];
$sqlval['deliv_date_id'] = $arrList['deliv_date_id'];
+ $sqlval['note'] = $arrList['note'];
$sqlval['update_date'] = "Now()";
$sqlval['creator_id'] = $_SESSION['member_id'];
@@ -458,6 +459,6 @@
unset($arrColList[$arrColList_tmp["product_class_id"]]); //規格ID
unset($arrColList[$arrColList_tmp["product_id"]]); //商品ID
- unset($arrColList[$arrColList_tmp["create_date"]]);
-
+ unset($arrColList[$arrColList_tmp["create_date"]]);
+
$col = SC_Utils_Ex::sfGetCommaList($arrColList);
@@ -479,11 +480,11 @@
$objDb->updateProductCategories($arrList['category_id'], $product_id);
}
-
+
//商品登録の時は規格を生成する。複製の場合は規格も複製されるのでこの処理は不要。
if( $_POST["copy_product_id"] == "" ){
- // 規格登録
- SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
- }
-
+ // 規格登録
+ SC_Utils_Ex::sfInsertProductClass($objQuery, $arrList, $product_id , $arrList['product_class_id'] );
+ }
+
// おすすめ商品登録
$this->lfInsertRecommendProducts($objQuery, $arrList, $product_id);
@@ -508,4 +509,5 @@
$arrConvList['main_list_comment'] = "KVa";
$arrConvList['main_comment'] = "KVa";
+ $arrConvList['note'] = "KVa";
$arrConvList['price01'] = "n";
$arrConvList['price02'] = "n";
@@ -554,4 +556,5 @@
$objErr->doFunc(array("ポイント付与率", "point_rate", PERCENTAGE_LEN), array("EXIST_CHECK", "NUM_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
$objErr->doFunc(array("商品送料", "deliv_fee", PRICE_LEN), array("NUM_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK"));
+ $objErr->doFunc(array("備考欄(SHOP専用)", "note", LLTEXT_LEN), array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
$objErr->doFunc(array("検索ワード", "comment3", LLTEXT_LEN), array("SPTAB_CHECK", "MAX_LENGTH_CHECK"));
$objErr->doFunc(array("メーカーURL", "comment1", URL_LEN), array("SPTAB_CHECK", "URL_CHECK", "MAX_LENGTH_CHECK"));
Index: /branches/version-2_4/data/Smarty/templates/default/admin/products/product.tpl
===================================================================
--- /branches/version-2_4/data/Smarty/templates/default/admin/products/product.tpl (revision 17511)
+++ /branches/version-2_4/data/Smarty/templates/default/admin/products/product.tpl (revision 17767)
@@ -25,10 +25,10 @@
// URLの表示非表示切り替え
function lfDispSwitch(id){
- var obj = document.getElementById(id);
- if (obj.style.display == 'none') {
- obj.style.display = '';
- } else {
- obj.style.display = 'none';
- }
+ var obj = document.getElementById(id);
+ if (obj.style.display == 'none') {
+ obj.style.display = '';
+ } else {
+ obj.style.display = 'none';
+ }
}
@@ -36,15 +36,15 @@
//(移動元セレクトボックスID, 移動先セレクトボックスID)
function fnMoveSelect(select, target) {
- $('#' + select).children().each(function() {
- if (this.selected) {
- $('#' + target).append(this);
- $(this).attr({selected: false});
- }
- });
+ $('#' + select).children().each(function() {
+ if (this.selected) {
+ $('#' + target).append(this);
+ $(this).attr({selected: false});
+ }
+ });
}
// target の子要素を選択状態にする
function selectAll(target) {
- $('#' + target).children().attr({selected: true});
+ $('#' + target).children().attr({selected: true});
}
@@ -52,429 +52,437 @@
-
-
-
-
-
- |
-
-
-
-
- |
-
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+ |
+
Index: /branches/version-2_4/data/Smarty/templates/default/admin/products/confirm.tpl
===================================================================
--- /branches/version-2_4/data/Smarty/templates/default/admin/products/confirm.tpl (revision 16956)
+++ /branches/version-2_4/data/Smarty/templates/default/admin/products/confirm.tpl (revision 17767)
@@ -24,300 +24,306 @@
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
-
-
-
- |
-
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+ |
+
Index: /branches/version-2_4/html/install/sql/create_table_mysql.sql
===================================================================
--- /branches/version-2_4/html/install/sql/create_table_mysql.sql (revision 17143)
+++ /branches/version-2_4/html/install/sql/create_table_mysql.sql (revision 17767)
@@ -141,5 +141,6 @@
mypage_tpl text,
good_traded text,
- message text
+ message text,
+ regular_holiday_ids text
) TYPE=InnoDB ;
@@ -285,4 +286,5 @@
comment5 text,
comment6 text,
+ note text,
file1 text,
file2 text,
Index: /branches/version-2_4/html/install/sql/create_table_pgsql.sql
===================================================================
--- /branches/version-2_4/html/install/sql/create_table_pgsql.sql (revision 17143)
+++ /branches/version-2_4/html/install/sql/create_table_pgsql.sql (revision 17767)
@@ -141,5 +141,6 @@
mypage_tpl text,
good_traded text,
- message text
+ message text,
+ regular_holiday_ids text
);
@@ -285,4 +286,5 @@
comment5 text,
comment6 text,
+ note text,
file1 text,
file2 text,