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

[Seasoft]

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

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

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
U   branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
U   branches/version-2_12-dev/data/class/SC_CartSession.php

変更: branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	2012-03-13 19:19:54 UTC (rev 21643)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/disp.tpl	2012-03-13 19:21:51 UTC (rev 21644)
@@ -149,7 +149,7 @@
             <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
         </tr>
         <tr>
-            <th colspan="5" class="column right">値引</th>
+            <th colspan="5" class="column right">値引き</th>
             <td class="right"><!--{$arrForm.discount.value|h}-->円</td>
         </tr>
         <tr>

変更: branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	2012-03-13 19:19:54 UTC (rev 21643)
+++ branches/version-2_12-dev/data/Smarty/templates/admin/order/edit.tpl	2012-03-13 19:21:51 UTC (rev 21644)
@@ -306,7 +306,7 @@
             <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td>
         </tr>
         <tr>
-            <th colspan="5" class="column right">値引</th>
+            <th colspan="5" class="column right">値引き</th>
             <td class="right">
                 <!--{assign var=key value="discount"}-->
                 <span class="attention"><!--{$arrErr[$key]}--></span>

変更: branches/version-2_12-dev/data/class/SC_CartSession.php
===================================================================
--- branches/version-2_12-dev/data/class/SC_CartSession.php	2012-03-13 19:19:54 UTC (rev 21643)
+++ branches/version-2_12-dev/data/class/SC_CartSession.php	2012-03-13 19:21:51 UTC (rev 21644)
@@ -616,7 +616,7 @@
      * @param integer|array $deliv_pref 配送先都道府県ID.
                                         複数に配送する場合は都道府県IDの配列
      * @param integer $charge 手数料
-     * @param integer $discount 値引
+     * @param integer $discount 値引き
      * @param integer $deliv_id 配送業者ID
      * @return array カートの計算結果の配列
      */