load commissioner

2017-08-23 10:24:26 +06:30
parent 74c2955ef0
commit fd1bfb7c0e
13 changed files with 738 additions and 255 deletions
--- a/app/views/origami/commissioners/show.html.erb
+++ b/app/views/origami/commissioners/show.html.erb
@@ -21,16 +21,12 @@
      <tr>
        <td style="width:20%">Employee Name</td>
        <td>
-          <% if Employee.exists? %>
-              <% employee = Employee.where('emp_id=?', @commissioner.emp_id) %>
-              <%= employee[0].name %>
-          <% end %>
-
+          <%= @commissioner.employee.name rescue '-' %>
        </td>
      </tr>
      <tr>
        <td style="width:20%">Commission Type</td>
-        <td><%= @commissioner.commission_type %></td>
+        <td><%= @commissioner.commission.product.name rescue '-' %></td>
      </tr>
      <tr>
        <td style="width:20%">Active</td>