For Pull from master

2018-03-06 11:19:19 +06:30
parent 1d15c9ed76
commit 80a0cba537
6 changed files with 33 additions and 16 deletions
--- a/app/views/transactions/orders/show.html.erb
+++ b/app/views/transactions/orders/show.html.erb
@@ -29,7 +29,7 @@

            <tbody>
                <tr>
-                  <td><%= @dining.type %>-<%= @dining.name %></td>
+                  <td><%if !@dining.nil? %> <%= @dining.type %>-<%= @dining.name %> <% else %>&nbsp; <% end %></td>
                  <td> <%= @order.waiters rescue '-' %> </td>
                  <td><%= @order.order_type %></td>
                  <td><%= @order.customer.name rescue '-' %></td>