diff --git a/app/views/reports/commission/index.xls.erb b/app/views/reports/commission/index.xls.erb index 6ec88072..5877edf8 100755 --- a/app/views/reports/commission/index.xls.erb +++ b/app/views/reports/commission/index.xls.erb @@ -14,12 +14,14 @@ From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - Commissioner Name - Product Name - Qty - Commission Price - Commission Amount - Date + <%= t :sale %> + <%= t :sale %> <%= t("views.right_panel.detail.item") %> + <%= t :commissioner %> <%= t("views.right_panel.detail.name") %> + <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name") %> + <%= t("views.right_panel.detail.qty") %> + <%= t("views.right_panel.detail.commission_price") %> + <%= t("views.right_panel.detail.commission_amount") %> + <%= t("views.right_panel.detail.date") %> @@ -29,12 +31,10 @@ <% @transaction.each do |result| %> - - <%= result.commissioner.name rescue '-' %> - - - <%= result.commission.menu_item.name rescue '-' %> - + <%= result.sale_id rescue '-' %> + <%= result.sale_item_id rescue '-' %> + <%= result.commissioner.name rescue '-' %> + <%= result.porduct_name rescue '-' %> <%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %> <%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %> <%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %>