decidim-budgets 0.22.0 → 0.23.3

data/app/cells/decidim/budgets/limit_announcement_cell.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders information when current user can't create more budgets orders.
+    class LimitAnnouncementCell < BaseCell
+      alias budget model
+      delegate :voted?, :vote_allowed?, :discardable, :limit_reached?, to: :current_workflow
+      delegate :voting_open?, to: :controller
+
+      def show
+        cell("decidim/announcement", announcement_args) if announce?
+      end
+
+      private
+
+      def announce?
+        return unless voting_open?
+        return unless current_user
+        return if vote_allowed?(budget)
+        return if voted?(budget)
+
+        discardable.any? || !vote_allowed?(budget, false)
+      end
+
+      def announcement_args
+        {
+          callout_class: "warning",
+          announcement: announcement_message
+        }
+      end
+
+      def announcement_message
+        if discardable.any?
+          t(:limit_reached, scope: i18n_scope,
+                            links: budgets_link_list(discardable),
+                            landing_path: budgets_path)
+        else
+          t(:cant_vote, scope: i18n_scope, landing_path: budgets_path)
+        end
+      end
+
+      def should_discard_to_vote?
+        limit_reached? && discardable.any?
+      end
+
+      def i18n_scope
+        "decidim.budgets.limit_announcement"
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_list_item/project_data.erb

@@ -1,5 +1,19 @@
 <div class="budget-list__data <%= data_class %>">
-  <%= project_data_number %>
-  <%= project_data_vote_button %>
-  <%= project_data_votes %>
+  <% if voting_finished? %>
+    <div class="budget-list__data__votes">
+      <%= cell("decidim/budgets/project_votes_count", model) %>
+
+      <%= cell("decidim/budgets/project_voted_hint", model, class: "display-block margin-top-1") %>
+    </div>
+  <% else %>
+    <span class="budget-list__data__number budget-list__number show-for-medium">
+      <%= budget_to_currency(model.budget_amount) %>
+
+      <%= cell("decidim/budgets/project_votes_count", model, layout: :one_line, class: "display-inline-block") %>
+
+      <%= cell("decidim/budgets/project_voted_hint", model, class: "display-block margin-top-1") if current_order_checked_out? && resource_added? %>
+    </span>
+
+    <%= render :project_data_vote_button if !current_order_checked_out? && voting_open? %>
+  <% end %>
 </div>

data/app/cells/decidim/budgets/project_list_item/project_data_vote_button.erb

@@ -1,12 +1,12 @@
 <%= action_authorized_button_to "vote",
-      order_line_item_path(project_id: model),
+      budget_order_line_item_path(model.budget, project_id: model),
       method: vote_button_method,
       remote: true,
       class: "button tiny budget-list__action #{vote_button_class}",
       data: {
         add: !resource_added?,
         disable: true,
-        budget: model.budget,
+        budget: model.budget_amount,
         "redirect-url": resource_path
       },
       disabled: vote_button_disabled?,

data/app/cells/decidim/budgets/project_list_item/project_text.erb

@@ -1,17 +1,23 @@
-<div class="budget-list__text">
+<div class="budget-list__text card__text">
   <div>
     <%= link_to resource_path, class: "card__link" do %>
       <h5 class="card__title budget-list__title">
+        <%= cell("decidim/budgets/project_selected_status", model) %>
+
         <%= resource_title %>
       </h5>
     <% end %>
 
     <div class="show-for-medium">
-      <%= cell "decidim/tags", model, context: { extra_classes: ["tags--project"] } %>
+      <%= cell "decidim/budgets/project_tags", model, context: { extra_classes: ["tags--project"] } %>
     </div>
 
-    <span class="budget-list__data__number budget-list__number hide-for-medium">
-      <%= budget_to_currency(model.budget) %>
-    </span>
+    <div class="budget-list__data__number budget-list__number hide-for-medium">
+      <%= cell("decidim/budgets/project_votes_count",
+      model,
+      layout: :one_line) %>
+
+      <%= cell("decidim/budgets/project_voted_hint", model, class: "margin-left-1") if current_order_checked_out? && resource_added? %>
+    </div>
   </div>
 </div>

data/app/cells/decidim/budgets/project_list_item/show.erb

@@ -1,5 +1,5 @@
 <div id="project-<%= model.id %>-item" class="budget-list__item">
-  <%= project_image %>
-  <%= project_text %>
-  <%= project_data %>
+  <%= render :project_image %>
+  <%= render :project_text %>
+  <%= render :project_data %>
 </div>

data/app/cells/decidim/budgets/project_list_item_cell.rb

@@ -11,36 +11,13 @@ module Decidim
       include Decidim::Budgets::ProjectsHelper
       include Decidim::Budgets::Engine.routes.url_helpers
 
-      delegate :current_user, :current_settings, :current_order, :current_component, :current_participatory_space, to: :parent_controller
-
-      def project_image
-        render
-      end
-
-      def project_text
-        render
-      end
-
-      def project_data
-        render
-      end
-
-      def project_data_number
-        render
-      end
-
-      def project_data_votes
-        render
-      end
-
-      def project_data_vote_button
-        render
-      end
+      delegate :current_user, :current_settings, :current_order, :current_component,
+               :current_participatory_space, :can_have_order?, :voting_open?, :voting_finished?, to: :parent_controller
 
       private
 
       def resource_path
-        resource_locator(model).path
+        resource_locator([model.budget, model]).path(filter_link_params)
       end
 
       def resource_title
@@ -52,11 +29,14 @@ module Decidim
       end
 
       def data_class
-        return "budget-list__data--added" if resource_added?
+        [].tap do |list|
+          list << "budget-list__data--added" if can_have_order? && resource_added?
+          list << "show-for-medium" if voting_finished? || (current_order_checked_out? && !resource_added?)
+        end.join(" ")
       end
 
       def vote_button_disabled?
-        !current_settings.votes_enabled? || current_order_checked_out? || !current_participatory_space.can_participate?(current_user)
+        current_user && !can_have_order?
       end
 
       def vote_button_class

data/app/cells/decidim/budgets/project_m/data.erb

@@ -5,7 +5,7 @@
     </li>
     <li class="card-data__item">
       <div class="text-left">
-        <strong class="heading4"><%= budget_to_currency model.budget %></strong>
+        <strong class="heading4"><%= budget_to_currency model.budget_amount %></strong>
       </div>
     </li>
   </ul>

data/app/cells/decidim/budgets/project_m_cell.rb

@@ -13,6 +13,10 @@ module Decidim
       def resource_icon
         icon "projects", class: "icon--big"
       end
+
+      def resource_path
+        resource_locator([model.budget, model]).path
+      end
     end
   end
 end

data/app/cells/decidim/budgets/project_selected_status_cell.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders the selected status if the project has been selected
+    class ProjectSelectedStatusCell < Decidim::ViewModel
+      delegate :voting_finished?, to: :controller
+
+      def show
+        if voting_finished? && model.selected?
+          content_tag :span, class: css_class do
+            t("decidim.budgets.projects.project.selected")
+          end
+        end
+      end
+
+      private
+
+      def css_class
+        if options[:as_label] == true
+          "success label project-status"
+        else
+          "success card__text--status"
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_tags/show.erb

@@ -0,0 +1,5 @@
+<%= content_tag :ul, class: tags_classes do %>
+  <%= content_tag :li, link_to_category if category? %>
+
+  <%= content_tag :li, link_to_scope if scope? %>
+<% end %>

data/app/cells/decidim/budgets/project_tags_cell.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell overrides *_path methods from Decidim::TagsCell for project tags
+    class ProjectTagsCell < Decidim::TagsCell
+      private
+
+      def category_path
+        resource_locator([model.budget, model]).index(filter: { category_id: [model.category.id.to_s] })
+      end
+
+      def scope_path
+        resource_locator([model.budget, model]).index(filter: { scope_id: [model.scope.id] })
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_voted_hint_cell.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders a checkmark with a text.
+    class ProjectVotedHintCell < BaseCell
+      include Decidim::IconHelper
+
+      delegate :voted_for?, :current_order, to: :controller
+
+      def show
+        return unless voted_for?(model)
+
+        content_tag :span, safe_join(hint), class: css_class
+      end
+
+      private
+
+      def hint
+        contents = []
+        contents << icon("check", role: "img")
+        contents << " "
+        contents << t("decidim.budgets.projects.project.you_voted")
+      end
+
+      def css_class
+        css = ["text-sm", "text-success"]
+        css << options[:class] if options[:class]
+        css.join(" ")
+      end
+    end
+  end
+end

data/app/cells/decidim/budgets/project_votes_count_cell.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # This cell renders the vote count.
+    # Two possible layouts: One or two lines
+    class ProjectVotesCountCell < Decidim::ViewModel
+      include Decidim::IconHelper
+      delegate :show_votes_count?, to: :controller
+
+      def show
+        return unless show_votes_count?
+
+        content_tag :span, content, class: css_class
+      end
+
+      private
+
+      def content
+        if options[:layout] == :one_line
+          safe_join([model.confirmed_orders_count, " ", label(t("decidim.budgets.projects.project.votes",
+                                                                count: model.confirmed_orders_count))])
+        else
+          safe_join([number, label(t("decidim.budgets.projects.project.votes",
+                                     count: model.confirmed_orders_count))])
+        end
+      end
+
+      def number
+        content_tag :div, model.confirmed_orders_count, class: "text-large"
+      end
+
+      def label(i18n_string)
+        content_tag :span, i18n_string, class: "text-uppercase text-small"
+      end
+
+      def css_class
+        css = ["project-votes"]
+        css << options[:class] if options[:class]
+        css.join(" ")
+      end
+    end
+  end
+end

data/app/commands/decidim/budgets/add_line_item.rb

@@ -23,7 +23,7 @@ module Decidim
       # Returns nothing.
       def call
         transaction do
-          return broadcast(:invalid) if votes_disabled? || order.checked_out?
+          return broadcast(:invalid) if voting_not_enabled? || order.checked_out?
 
           add_line_item
           broadcast(:ok, order)
@@ -32,23 +32,20 @@ module Decidim
 
       private
 
+      attr_reader :current_user, :project
+
       def order
-        @order ||= Order.create!(user: @current_user, component: @project.component)
+        @order ||= Order.create!(user: current_user, budget: project.budget)
       end
 
       def add_line_item
         order.with_lock do
-          order.projects << @project
-          order.save!
+          order.projects << project
         end
       end
 
-      def component
-        @project.component
-      end
-
-      def votes_disabled?
-        !component.current_settings.votes_enabled?
+      def voting_not_enabled?
+        project.component.current_settings.votes != "enabled"
       end
     end
   end

data/app/commands/decidim/budgets/admin/create_budget.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This command is executed when the user creates an Budget
+      # from the admin panel.
+      class CreateBudget < Rectify::Command
+        def initialize(form)
+          @form = form
+        end
+
+        # Creates the budget if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          create_budget!
+
+          broadcast(:ok, budget)
+        end
+
+        private
+
+        attr_reader :form, :budget
+
+        def create_budget!
+          attributes = {
+            component: form.current_component,
+            scope: form.scope,
+            title: form.title,
+            weight: form.weight,
+            description: form.description,
+            total_budget: form.total_budget
+          }
+
+          @budget = Decidim.traceability.create!(
+            Budget,
+            form.current_user,
+            attributes,
+            visibility: "all"
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/budgets/admin/create_project.rb

@@ -25,7 +25,7 @@ module Decidim
           end
 
           transaction do
-            create_project
+            create_project!
             link_proposals
             create_gallery if process_gallery?
           end
@@ -37,16 +37,21 @@ module Decidim
 
         attr_reader :form, :project, :gallery
 
-        def create_project
-          @project = Decidim.traceability.create!(
-            Project,
-            form.current_user,
+        def create_project!
+          attributes = {
+            budget: form.budget,
             scope: form.scope,
             category: form.category,
-            component: form.current_component,
             title: form.title,
             description: form.description,
-            budget: form.budget
+            budget_amount: form.budget_amount
+          }
+
+          @project = Decidim.traceability.create!(
+            Project,
+            form.current_user,
+            attributes,
+            visibility: "all"
           )
           @attached_to = @project
         end