From 98a76a1ae53b6061a2197d9787df175480d4a1a8 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 5 May 2017 17:14:54 +0200 Subject: [PATCH] show price on index/show if feasible && selected --- app/models/budget/investment.rb | 6 ++++++ app/views/budgets/investments/_investment.html.erb | 7 +++++++ app/views/budgets/investments/_investment_show.html.erb | 9 +++++++++ config/locales/budgets.en.yml | 1 + config/locales/budgets.es.yml | 1 + 5 files changed, 24 insertions(+) diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index 7f0150293..0d730945b 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -217,6 +217,12 @@ class Budget budget.balloting? end + def should_show_price? + feasible? && + selected? && + (budget.reviewing_ballots? || budget.finished?) + end + def should_show_price_info? feasible? && price_explanation.present? && diff --git a/app/views/budgets/investments/_investment.html.erb b/app/views/budgets/investments/_investment.html.erb index c9391cbe5..3155853cd 100644 --- a/app/views/budgets/investments/_investment.html.erb +++ b/app/views/budgets/investments/_investment.html.erb @@ -73,6 +73,13 @@ ballot: ballot } %> + <% elsif investment.should_show_price? %> +
+

+ <%= investment.formatted_price %> +

+
<% end %> <% end %> diff --git a/app/views/budgets/investments/_investment_show.html.erb b/app/views/budgets/investments/_investment_show.html.erb index e0822145b..f9a371585 100644 --- a/app/views/budgets/investments/_investment_show.html.erb +++ b/app/views/budgets/investments/_investment_show.html.erb @@ -98,6 +98,15 @@
<% end %> + <% if investment.should_show_price? %> + +

<%= t("budgets.investments.show.price") %>

+
+

+ <%= investment.formatted_price %> +

+
+ <% end %>

<%= t("budgets.investments.show.share") %>

diff --git a/config/locales/budgets.en.yml b/config/locales/budgets.en.yml index 7b3251ad4..2774dcfbd 100644 --- a/config/locales/budgets.en.yml +++ b/config/locales/budgets.en.yml @@ -84,6 +84,7 @@ en: title: Investment project supports: Supports votes: Votes + price: Price wrong_price_format: Only integer numbers investment: title: Investment project diff --git a/config/locales/budgets.es.yml b/config/locales/budgets.es.yml index 44b748698..84d10228a 100644 --- a/config/locales/budgets.es.yml +++ b/config/locales/budgets.es.yml @@ -84,6 +84,7 @@ es: title: Propuesta de inversión supports: Apoyos votes: Votos + price: Coste wrong_price_format: Solo puede incluir caracteres numéricos investment: title: Propuesta de inversión