リリース後のバグ修正 #24 #25

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/elecoma/trunk@12 06daa6dd-5c14-464e-8a85-0d68c524be32

diff --git a/app/views/admin/orders/_form.html.erb b/app/views/admin/orders/_form.html.erb
index ecd6bf4..7b42c63 100644 (file)
--- a/app/views/admin/orders/_form.html.erb
+++ b/app/views/admin/orders/_form.html.erb
@@ -135,14 +135,6 @@
    <td><%=h number_with_delimiter(@order_delivery.payment_total) %>円</td>
   </tr>
   <tr>
-   <th colspan="6">お支払方法</th>
-  </tr>
-  <tr>
-   <td colspan="6">
-     <%=h @order_delivery.payment_name %>
-   </td>
-  </tr>
-  <tr>
    <th colspan="5">使用ポイント</th>
    <td><%=h number_with_delimiter(@order_delivery.use_point) %>ポイント</td>
   </tr>
@@ -151,6 +143,14 @@
    <td><%=h number_with_delimiter(@order_delivery.add_point) %>ポイント</td>
   </tr>
   <tr>
+   <th colspan="6">お支払方法</th>
+  </tr>
+  <tr>
+   <td colspan="6">
+     <%=h @order_delivery.payment_name %>
+   </td>
+  </tr>
+  <tr>
    <th colspan="6">時間指定</th>
   </tr>
   <tr>

diff --git a/app/views/admin/orders/_show.html.erb b/app/views/admin/orders/_show.html.erb
index 7decb4c..b1406e9 100644 (file)
--- a/app/views/admin/orders/_show.html.erb
+++ b/app/views/admin/orders/_show.html.erb
@@ -125,9 +125,6 @@
   <th colspan="5">お支払い合計</th>
   <td><%=h number_with_delimiter(@order_delivery.payment_total) %>円</td>
  </tr>
- <tr>
-  <th colspan="6">お支払方法（お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</th>
- </tr>
   <tr>
    <th colspan="5">使用ポイント</th>
    <td><%=h number_with_delimiter(@order_delivery.use_point) %>ポイント</td>
@@ -137,6 +134,9 @@
    <td><%=h number_with_delimiter(@order_delivery.add_point) %>ポイント</td>
   </tr>
  <tr>
+  <th colspan="6">お支払方法（お支払方法の変更に伴う手数料の変更は手動にてお願いします。)</th>
+ </tr>
+ <tr>
   <td colspan="6"><%=h @order_delivery.payment_name  %></td>
  </tr>
  <tr>