From 813bcfc119b025433cc0528caf0709302060272f Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 7 Dec 2017 12:41:10 +0630 Subject: [PATCH 1/2] update sale item index --- app/views/reports/saleitem/index.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb index faad445d..28c3be5c 100644 --- a/app/views/reports/saleitem/index.html.erb +++ b/app/views/reports/saleitem/index.html.erb @@ -190,19 +190,19 @@ <% @sale_taxes.each do |tax| %> - + <% end %>   Net Amount - <%= grand_total.to_f + total_tax.to_f%> + <%= grand_total.to_f - @discount_data.to_f%> - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_credit_payment_index_path} %> -
- - - - -
- <%= t("views.btn.exp_to_excel") %> -
- -
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb index 82ed099a..44a9cc57 100755 --- a/app/views/reports/dailysale/index.xls.erb +++ b/app/views/reports/dailysale/index.xls.erb @@ -1,22 +1,7 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.daily_sale_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
- <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => false, :report_path =>reports_dailysale_index_path} %> -
-
- <%= t("views.btn.exp_to_excel") %> -
- +
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb index 8bdd64fb..c8521b0d 100755 --- a/app/views/reports/receipt_no/index.xls.erb +++ b/app/views/reports/receipt_no/index.xls.erb @@ -1,34 +1,10 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.receipt_no_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+
- - - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %> -
- - - - -
- <%= t("views.btn.exp_to_excel") %> -
- - -
- diff --git a/app/views/reports/saleitem/index.xls.erb b/app/views/reports/saleitem/index.xls.erb index 6b4e358a..f97edbb8 100755 --- a/app/views/reports/saleitem/index.xls.erb +++ b/app/views/reports/saleitem/index.xls.erb @@ -1,12 +1,5 @@
- -
- -
- <%= t("views.btn.exp_to_excel") %> -
-
diff --git a/app/views/reports/shiftsale/index.xls.erb b/app/views/reports/shiftsale/index.xls.erb index 7a7b1836..2730b901 100755 --- a/app/views/reports/shiftsale/index.xls.erb +++ b/app/views/reports/shiftsale/index.xls.erb @@ -1,29 +1,6 @@ -
-
    -
  1. <%= t("views.right_panel.button.home") %>
    2. -
  2. <%= t("views.right_panel.detail.shift_sale_report") %>
    3. - - <%= link_to 'Back', dashboard_path %> - -
-
+
- - - <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %> -
- - - - -
- <%= t("views.btn.exp_to_excel") %> -
- - -
- <%= render :partial=>'shift_sale_report_filter', - :locals=>{ :period_type => true, :shift_name => true, :report_path =>reports_void_sale_index_path} %> -
- - - - -
- <%= t("views.btn.exp_to_excel") %> -
- - -
<% if @sale_data.count > 0 %>
<%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>