diff --git a/app/controllers/deliverables_controller.rb b/app/controllers/deliverables_controller.rb index 9e56b73..e1b64ce 100644 --- a/app/controllers/deliverables_controller.rb +++ b/app/controllers/deliverables_controller.rb @@ -8,6 +8,7 @@ class DeliverablesController < InheritedResources::Base helper :contracts helper :contract_formatter + include ContractsHelper def index redirect_to contract_url(@project, @contract) @@ -37,8 +38,16 @@ class DeliverablesController < InheritedResources::Base end def finances + @deliverable = @contract.deliverables.find(params[:id]) + period = extract_period(params[:period]) + if period + @period = validate_period(@deliverable, period) + else + @period = nil + end + respond_to do |format| - format.js { render :partial => 'deliverables/finances', :locals => {:contract => @contract, :deliverable => @contract.deliverables.find(params[:id])} } + format.js { render :partial => 'deliverables/finances', :locals => {:contract => @contract, :deliverable => @deliverable, :period => @period } } format.html { } end diff --git a/app/views/deliverables/_finances.html.erb b/app/views/deliverables/_finances.html.erb index 1ea935d..da9c08d 100644 --- a/app/views/deliverables/_finances.html.erb +++ b/app/views/deliverables/_finances.html.erb @@ -7,6 +7,16 @@

<%= h(deliverable.title) %>

+<% if deliverable.retainer? %> +
+
+ +
+
+<% end %> + <% has_categories = deliverable.project.issue_categories.count > 0 %>
diff --git a/app/views/deliverables/finances.html.erb b/app/views/deliverables/finances.html.erb index 8109183..86229bc 100644 --- a/app/views/deliverables/finances.html.erb +++ b/app/views/deliverables/finances.html.erb @@ -1 +1 @@ -<%= render :partial => 'finances', :locals => {:contract => @contract, :deliverable => @contract.deliverables.find(params[:id])} %> +<%= render :partial => 'finances', :locals => {:contract => @contract, :deliverable => @deliverable, :period => @period } %>