diff --git a/app/controllers/customers_controller.rb b/app/controllers/customers_controller.rb index bac0fb9..92fd55b 100644 --- a/app/controllers/customers_controller.rb +++ b/app/controllers/customers_controller.rb @@ -92,6 +92,7 @@ class CustomersController < ApplicationController @issues = @customer.issues @billing_address = address_to_s(@customer.billing_address) @shipping_address = address_to_s(@customer.shipping_address) + @closed_issues = (@issues - @issues.open) rescue ActiveRecord::RecordNotFound render_404 end diff --git a/app/views/customers/_details.html.erb b/app/views/customers/_details.html.erb index 3e72bae..cb6152a 100644 --- a/app/views/customers/_details.html.erb +++ b/app/views/customers/_details.html.erb @@ -25,11 +25,6 @@ <%= @shipping_address %> - - <%=t(:issues)%> - <%= customer.issues.count %> - - <%=t(:label_account_balance)%> $<%= customer.balance %> diff --git a/app/views/customers/show.html.erb b/app/views/customers/show.html.erb index 209a1c8..bd5b38c 100644 --- a/app/views/customers/show.html.erb +++ b/app/views/customers/show.html.erb @@ -17,6 +17,7 @@

<%=t(:estimates)%>:

<%= render :partial => 'estimates/list', locals: {customer: @customer} %> +

<%=t(:label_invoices)%>:

<%= render :partial => 'invoices/list', locals: {customer: @customer} %> @@ -24,18 +25,19 @@
+

<%=t(:field_vehicles)%>:

<%= render :partial => 'vehicles/list' %> - <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %> + <%= button_to "New Vehicle", new_customer_vehicle_path(@customer), method: :get %>

-

<%=t(:label_open_issues)%>:

+

<%=@issues.open.count%> <%=t(:label_open_issues)%>:

<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %> -

<%=t(:label_closed_issues)%>:

- <%= render :partial => 'issues/list_simple', locals: {issues: (@issues - @issues.open)} %> +

<%=@closed_issues.count%> <%=t(:label_closed_issues)%>:

+ <%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>