OSDN Git Service
(root)
/
elecoma
/
elecoma.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
92c934f
)
支払いデータを消された時の対応
author
Taro Matsuzawa
<tmatsuzawa@kbmj.com>
Tue, 26 Oct 2010 10:19:56 +0000
(19:19 +0900)
committer
Taro Matsuzawa
<tmatsuzawa@kbmj.com>
Tue, 26 Oct 2010 10:19:56 +0000
(19:19 +0900)
app/views/accounts/history_list.html.erb
patch
|
blob
|
history
diff --git
a/app/views/accounts/history_list.html.erb
b/app/views/accounts/history_list.html.erb
index
1a1c1e3
..
3dedd47
100644
(file)
--- a/
app/views/accounts/history_list.html.erb
+++ b/
app/views/accounts/history_list.html.erb
@@
-28,7
+28,11
@@
<tr>
\r
<td><%= date_time(order.received_at) %></td>
\r
<td><%= order.code %></td>
\r
- <td><%= order_delivery.payment.name %></td>
\r
+ <td>
\r
+ <% if order_delivery.payment %>
\r
+ <%= order_delivery.payment.name %>
\r
+ <% end %>
\r
+ </td>
\r
<td><%= number_with_delimiter(order.total) %>円</td>
\r
<td><%= link_to '詳細を見る', :action => 'history_show', :id => order.id %></td>
\r
</tr>
\r