From a6d4f393fca485c7fe65f86adfaaf242e8fac9ac Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 27 Jun 2018 11:22:25 +0630
Subject: [PATCH] change commission report xls format

---
 app/views/reports/commission/index.xls.erb | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

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 @@
           <th colspan="7"> From Date : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - To Date : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %></th>
         </tr>
         <tr>
-          <th>Commissioner Name</th>
-          <th>Product Name</th>
-          <th>Qty</th>
-          <th>Commission Price</th>
-          <th>Commission Amount</th>
-          <th>Date</th>
+          <th><%= t :sale %></th>
+          <th><%= t :sale %> <%= t("views.right_panel.detail.item") %></th>
+          <th><%= t :commissioner %> <%= t("views.right_panel.detail.name") %></th>
+          <th><%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.name") %></th>
+          <th><%= t("views.right_panel.detail.qty") %></th>
+          <th><%= t("views.right_panel.detail.commission_price") %></th>
+          <th><%= t("views.right_panel.detail.commission_amount") %></th>
+          <th><%= t("views.right_panel.detail.date") %></th>
         </tr>
         </thead>
         <tbody>
@@ -29,12 +31,10 @@
 
         <% @transaction.each do |result| %>
             <tr>
-              <td>
-                <%= result.commissioner.name rescue '-' %>
-              </td>
-              <td>
-                <%= result.commission.menu_item.name rescue '-' %>
-              </td>
+              <td><%= result.sale_id rescue '-' %></td>
+              <td><%= result.sale_item_id rescue '-' %></td>
+              <td><%= result.commissioner.name rescue '-' %></td>
+              <td><%= result.porduct_name rescue '-' %></td>
               <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
               <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>