[Svn-src-all:2796] [version-2_12-dev 21695] #1613 (typo修正・ソース整形・ソースコメントの改善)

[Seasoft]

Subversion committed to /home/svn/open 21695
http://svn.ec-cube.net/open_trac/changeset/21695
┌────────────────────────────┐
│更新者　:  Seasoft                                      │
│更新日時:  2012-03-30 03:53:21 +0900 (金, 30  3月 2012)│
└────────────────────────────┘

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

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category_complete.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_complete.tpl
U   branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php

変更: branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	2012-03-29 13:01:54 UTC (rev 21694)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/basis/index.tpl	2012-03-29 18:53:21 UTC (rev 21695)
@@ -306,7 +306,7 @@
     </table>
 
     <h2>地図設定</h2>
-    <table id="basis-index-func">
+    <table>
         <tr>
             <th>緯度/経度情報</th>
             <td>

変更: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category_complete.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category_complete.tpl	2012-03-29 13:01:54 UTC (rev 21694)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_category_complete.tpl	2012-03-29 18:53:21 UTC (rev 21695)
@@ -50,7 +50,7 @@
     <!--{/if}-->
     <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>
 </div>

変更: branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_complete.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_complete.tpl	2012-03-29 13:01:54 UTC (rev 21694)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/products/upload_csv_complete.tpl	2012-03-29 18:53:21 UTC (rev 21695)
@@ -50,7 +50,7 @@
     <!--{/if}-->
     <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>
 </div>

変更: branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php	2012-03-29 13:01:54 UTC (rev 21694)
+++ branches/version-2_12-dev/data/class/helper/SC_Helper_Customer.php	2012-03-29 18:53:21 UTC (rev 21695)
@@ -595,10 +595,10 @@
         $objErr->doFunc(array('登録・更新日(開始日)', 'search_start_year', 'search_start_month', 'search_start_day',), array('CHECK_DATE'));
         $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'])
             && SC_Utils_Ex::sfIsInt($array['search_buy_total_to'])