Skip to content

Commit

Permalink
index htead
Browse files Browse the repository at this point in the history
  • Loading branch information
qinmingyuan committed Jan 4, 2025
1 parent 42a72fc commit 508ac9d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/views/trade/admin/orders/_base/_index_tbody.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<td>
<p><%# link_to model.user_name, { action: 'user', user_id: model.user_id } if model.user_id %></p>
<p>
<% if model&.member %>
<span><%= model.member.name %></span>
<span class="text-grey"><%= model.member_organ.name %></span>
<% if model.agent %>
<span><%= model.agent.name %></span>
<span class="text-grey">下单</span>
<% end %>
</p>
</td>
Expand Down
5 changes: 4 additions & 1 deletion app/views/trade/admin/orders/_base/_index_thead.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@
<p><%= Trade::Order.human_attribute_name(:received_amount) %></p>
<p class="text-success"><%= Trade::Order.human_attribute_name(:paid_at) %></p>
</th>
<th><%= Trade::Order.human_attribute_name(:user_id) %></th>
<th>
<p><%= Trade::Order.human_attribute_name(:user_id) %></p>
<p><%= Trade::Order.human_attribute_name(:agent_id) %></p>
</th>
<th><%= Trade::Order.human_attribute_name(:extra) %></th>
1 change: 1 addition & 0 deletions config/locales/zh.attributes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ zh:
refunded_amount: 已退款
currency: 币种
user_id: 购买者
agent_id: 下单者
extra: 附加信息
state: 状态
created_at: 下单时间
Expand Down
1 change: 1 addition & 0 deletions config/locales/zh.controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ zh:
edit:
title: 修改数量
agent:
title: 销售订单
carts:
index:
title: 最近下单
Expand Down

0 comments on commit 508ac9d

Please sign in to comment.