From cb3397fd1a4166e06bcb57ea038fd296e4ac1009 Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Mon, 11 Nov 2019 22:30:15 +0000 Subject: [PATCH] Convert reports index and sales_total views from erb to haml --- app/views/spree/admin/reports/index.html.erb | 21 ----------- app/views/spree/admin/reports/index.html.haml | 13 +++++++ .../spree/admin/reports/sales_total.html.erb | 37 ------------------- .../spree/admin/reports/sales_total.html.haml | 26 +++++++++++++ 4 files changed, 39 insertions(+), 58 deletions(-) delete mode 100644 app/views/spree/admin/reports/index.html.erb create mode 100644 app/views/spree/admin/reports/index.html.haml delete mode 100644 app/views/spree/admin/reports/sales_total.html.erb create mode 100644 app/views/spree/admin/reports/sales_total.html.haml diff --git a/app/views/spree/admin/reports/index.html.erb b/app/views/spree/admin/reports/index.html.erb deleted file mode 100644 index cb514a5291..0000000000 --- a/app/views/spree/admin/reports/index.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -<% content_for :page_title do %> - <%= t(:listing_reports) %> -<% end %> - - - - - - - - - - <% @reports.each do |key, value| %> - - - - - <% end %> - -
<%= t(:name) %><%= t(:description) %>
<%= link_to value[:name], value[:url] %><%= value[:description] %>
- diff --git a/app/views/spree/admin/reports/index.html.haml b/app/views/spree/admin/reports/index.html.haml new file mode 100644 index 0000000000..cc5205c885 --- /dev/null +++ b/app/views/spree/admin/reports/index.html.haml @@ -0,0 +1,13 @@ +- content_for :page_title do + = t(:listing_reports) + +%table.index + %thead + %tr + %th= t(:name) + %th= t(:description) + %tbody + - @reports.each do |key, value| + %tr + %td= link_to value[:name], value[:url] + %td= value[:description] diff --git a/app/views/spree/admin/reports/sales_total.html.erb b/app/views/spree/admin/reports/sales_total.html.erb deleted file mode 100644 index 3369fc4eb4..0000000000 --- a/app/views/spree/admin/reports/sales_total.html.erb +++ /dev/null @@ -1,37 +0,0 @@ -<% content_for :page_title do %> - <%= Spree.t(:sales_totals) %> -<% end %> - -<% content_for :page_actions do %> -
  • <%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %>
  • -<% end %> - - -<% content_for :table_filter_title do %> - <%= Spree.t(:date_range) %> -<% end %> - -<% content_for :table_filter do %> - <%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %> -<% end %> - - - - - - - - - - - - <% @totals.each do |key, row| %> - - - - - - - <% end %> - -
    <%= Spree.t(:currency) %><%= Spree.t(:item_total) %><%= Spree.t(:adjustment_total) %><%= Spree.t(:sales_total) %>
    <%= key %><%= row[:item_total].format %><%= row[:adjustment_total].format %><%= row[:sales_total].format %>
    diff --git a/app/views/spree/admin/reports/sales_total.html.haml b/app/views/spree/admin/reports/sales_total.html.haml new file mode 100644 index 0000000000..ccfd2d7926 --- /dev/null +++ b/app/views/spree/admin/reports/sales_total.html.haml @@ -0,0 +1,26 @@ +- content_for :page_title do + = Spree.t(:sales_totals) + +- content_for :page_actions do + %li= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, class: 'button' + +- content_for :table_filter_title do + = Spree.t(:date_range) + +- content_for :table_filter do + = render partial: 'spree/admin/shared/report_criteria', locals: {} + +%table.admin-report + %thead + %tr + %th= Spree.t(:currency) + %th= Spree.t(:item_total) + %th= Spree.t(:adjustment_total) + %th= Spree.t(:sales_total) + %tbody + - @totals.each do |key, row| + %tr.align-center + %td= key + %td= row[:item_total].format + %td= row[:adjustment_total].format + %td= row[:sales_total].format