git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update commission

Browse Source
This commit is contained in:
Yan
2017-11-07 10:52:57 +06:30
parent 4fa0705f1c
commit 17afb039cb
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/settings/commissioners/index.html.erb
View File

@@ -18,7 +18,7 @@
<tr> <tr>
<th><%= t("views.right_panel.detail.name") %></th> <th><%= t("views.right_panel.detail.name") %></th>
<th><%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %></th> <th><%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %></th>
<th><%= t("views.right_panel.detail.commission_type") %></th> <th><%= t("views.right_panel.detail.commission") %></th>
<th><%= t("views.right_panel.detail.joined_date") %></th> <th><%= t("views.right_panel.detail.joined_date") %></th>
<th><%= t("views.right_panel.detail.resigned_date") %></th> <th><%= t("views.right_panel.detail.resigned_date") %></th>
<th><%= t("views.right_panel.detail.active") %></th> <th><%= t("views.right_panel.detail.active") %></th>
@@ -33,7 +33,7 @@
<td> <td>
<%= commissioner.employee.name rescue '-' %> <%= commissioner.employee.name rescue '-' %>
</td> </td>
<td><%= commissioner.commission.menu_item.name rescue '-' %></td> <td><%= commissioner.commission.name rescue '-' %></td>
<td><%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td> <td><%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
<td><%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td> <td><%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %></td>
<td><%= commissioner.is_active %></td> <td><%= commissioner.is_active %></td>

4
app/views/settings/commissioners/show.html.erb
View File

@@ -38,8 +38,8 @@
<td><%= @commissioner.employee.name rescue '-' %></td> <td><%= @commissioner.employee.name rescue '-' %></td>
</tr> </tr>
<tr> <tr>
<td style="width:20%"><%= t("views.right_panel.detail.commission_type") %></td> <td style="width:20%"><%= t("views.right_panel.detail.commission") %></td>
<td><%= @commissioner.commission.menu_item.name rescue '-' %></td> <td><%= @commissioner.commission.name rescue '-' %></td>
</tr> </tr>
<tr> <tr>
<td style="width:20%"><%= t("views.right_panel.detail.joined_date") %></td> <td style="width:20%"><%= t("views.right_panel.detail.joined_date") %></td>

1
config/locales/en.yml
View File

@@ -291,6 +291,7 @@ en:
net_price: "Net price" net_price: "Net price"
percentage: "Percentage" percentage: "Percentage"
product: "Product" product: "Product"
commission: "Commission"
commission_type: "Commission Type" commission_type: "Commission Type"
amount: "Amount" amount: "Amount"
active: "Active" active: "Active"