mirror of
https://github.com/rickbarrette/redmine_qbo.git
synced 2025-11-08 17:04:23 -05:00
Added hour totals to customer job history
This commit is contained in:
@@ -86,6 +86,10 @@ class CustomersController < ApplicationController
|
|||||||
@billing_address = address_to_s(@customer.billing_address)
|
@billing_address = address_to_s(@customer.billing_address)
|
||||||
@shipping_address = address_to_s(@customer.shipping_address)
|
@shipping_address = address_to_s(@customer.shipping_address)
|
||||||
@closed_issues = (@issues - @issues.open)
|
@closed_issues = (@issues - @issues.open)
|
||||||
|
@hours = 0
|
||||||
|
@closed_hours = 0
|
||||||
|
@issues.open.each { |i| @hours+= i.total_spent_hours }
|
||||||
|
@closed_issues.each { |i| @closed_hours+= i.total_spent_hours }
|
||||||
rescue
|
rescue
|
||||||
render_404
|
render_404
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -31,8 +31,8 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%>:</h3>
|
<h3><%=@issues.open.count%> <%=t(:label_open_issues)%> - <%=@hours.round(1)%> <%=t(:label_hours)%></h3>
|
||||||
<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
|
<%= render :partial => 'issues/list_simple', locals: {issues: @issues.open} %>
|
||||||
|
|
||||||
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%>:</h3>
|
<h3><%=@closed_issues.count%> <%=t(:label_closed_issues)%> - <%= @closed_hours.round(1)%> <%=t(:label_hours)%></h3>
|
||||||
<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
|
<%= render :partial => 'issues/list_simple', locals: {issues: @closed_issues} %>
|
||||||
|
|||||||
@@ -79,4 +79,5 @@ en:
|
|||||||
label_billed_success: "Successfully Billed "
|
label_billed_success: "Successfully Billed "
|
||||||
label_billing_error: "Cannot bill without a customer assigned"
|
label_billing_error: "Cannot bill without a customer assigned"
|
||||||
label_qbo_sync_success: "Successfully synced to Quickbooks"
|
label_qbo_sync_success: "Successfully synced to Quickbooks"
|
||||||
|
label_hours: "Hours"
|
||||||
|
|
||||||
Reference in New Issue
Block a user