diff --git a/app/views/settings/commissioners/index.html.erb b/app/views/settings/commissioners/index.html.erb index caf87297..2c3487e0 100755 --- a/app/views/settings/commissioners/index.html.erb +++ b/app/views/settings/commissioners/index.html.erb @@ -18,7 +18,7 @@ <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.employee") %> <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.commission_type") %> + <%= t("views.right_panel.detail.commission") %> <%= t("views.right_panel.detail.joined_date") %> <%= t("views.right_panel.detail.resigned_date") %> <%= t("views.right_panel.detail.active") %> @@ -33,7 +33,7 @@ <%= commissioner.employee.name rescue '-' %> - <%= commissioner.commission.menu_item.name rescue '-' %> + <%= commissioner.commission.name rescue '-' %> <%= commissioner.joined_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') rescue '-' %> <%= commissioner.is_active %> diff --git a/app/views/settings/commissioners/show.html.erb b/app/views/settings/commissioners/show.html.erb index 8f51b20c..49c7f2de 100755 --- a/app/views/settings/commissioners/show.html.erb +++ b/app/views/settings/commissioners/show.html.erb @@ -38,8 +38,8 @@ <%= @commissioner.employee.name rescue '-' %> - <%= t("views.right_panel.detail.commission_type") %> - <%= @commissioner.commission.menu_item.name rescue '-' %> + <%= t("views.right_panel.detail.commission") %> + <%= @commissioner.commission.name rescue '-' %> <%= t("views.right_panel.detail.joined_date") %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 1bb7afab..7dc50bbb 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -291,6 +291,7 @@ en: net_price: "Net price" percentage: "Percentage" product: "Product" + commission: "Commission" commission_type: "Commission Type" amount: "Amount" active: "Active"