Changeset 21695 for branches/version-2_12-dev/data

Timestamp:

2012/03/30 03:53:21 (12 years ago)

Author:

Seasoft

Message:

#1613 (typo修正・ソース整形・ソースコメントの改善)

Location:

branches/version-2_12-dev/data

Files:

• Smarty/templates/admin/basis/index.tpl (modified) (1 diff)
• Smarty/templates/admin/products/upload_csv_category_complete.tpl (modified) (1 diff)
• Smarty/templates/admin/products/upload_csv_complete.tpl (modified) (1 diff)
• class/helper/SC_Helper_Customer.php (modified) (1 diff)

branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl

@@ -307 +307 @@
 
     <h2>地図設定</h2>
-    <table id="basis-index-func">
+    <table>
         <tr>
             <th>緯度/経度情報</th>

branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category_complete.tpl

@@ -51 +51 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="./upload_csv_category.php"><span class="btn-prev">戻る</span></a></li>
+            <li><a class="btn-action" href="?"><span class="btn-prev">戻る</span></a></li>
         </ul>
     </div>

branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_complete.tpl

@@ -51 +51 @@
     <div class="btn-area">
         <ul>
-            <li><a class="btn-action" href="./upload_csv.php"><span class="btn-prev">戻る</span></a></li>
+            <li><a class="btn-action" href="?"><span class="btn-prev">戻る</span></a></li>
         </ul>
     </div>

branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php

@@ -596 +596 @@
         $objErr->doFunc(array('登録・更新日(終了日)', 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_DATE'));
         $objErr->doFunc(array('登録・更新日(開始日)','登録・更新日(終了日)', 'search_start_year', 'search_start_month', 'search_start_day', 'search_end_year', 'search_end_month', 'search_end_day'), array('CHECK_SET_TERM'));
-        $objErr->doFunc(array('最終購入日(開始日)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day',), array('CHECK_DATE'));
-        $objErr->doFunc(array('最終購入(終了日)', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_DATE'));
-        //購入金額(from) ＞ 購入金額(to) の場合はエラーとする
-        $objErr->doFunc(array('最終購入日(開始日)','登録・更新日(終了日)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_SET_TERM'));
+        $objErr->doFunc(array('最終購入日(開始)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day',), array('CHECK_DATE'));
+        $objErr->doFunc(array('最終購入日(終了)', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_DATE'));
+        // 開始 > 終了 の場合はエラーとする
+        $objErr->doFunc(array('最終購入日(開始)','最終購入日(終了)', 'search_buy_start_year', 'search_buy_start_month', 'search_buy_start_day', 'search_buy_end_year', 'search_buy_end_month', 'search_buy_end_day'), array('CHECK_SET_TERM'));
 
         if (SC_Utils_Ex::sfIsInt($array['search_buy_total_from'])