Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

This commit is contained in:
Yan
2017-12-12 17:50:33 +06:30
8 changed files with 269 additions and 154 deletions

View File

@@ -157,16 +157,17 @@
<% end %>
<% end %>
<% end %>
<tr>
<td><%= t("views.right_panel.detail.card_sale") %> : </td>
<td align="right">
<% total_card = 0.0 %>
<% @sale_data.each do |data| %>
<% total_card = data["card"] %>
<% break end %>
<%= total_card.to_f %>
</td>
</tr>
<% total_card = @sale_data.select { |hash| hash["card"]!=nil }.first %>
<% if !total_card.nil? %>
<tr>
<td><%= t("views.right_panel.detail.card_sale") %> : </td>
<td align="right">
<%= total_card["card"].to_f %>
</td>
</tr>
<% end %>
<% end %>
</table>
</div>