decidim-budgets 0.22.0 → 0.23.0

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This command is executed when the user destroys a Budget
+      # from the admin panel.
+      class DestroyBudget < Rectify::Command
+        def initialize(budget, current_user)
+          @budget = budget
+          @current_user = current_user
+        end
+
+        # Destroys the budget if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if budget.projects.present?
+
+          destroy_budget!
+
+          broadcast(:ok, budget)
+        end
+
+        private
+
+        attr_reader :budget, :current_user
+
+        def destroy_budget!
+          Decidim.traceability.perform_action!(
+            :delete,
+            budget,
+            current_user,
+            visibility: "all"
+          ) do
+            budget.destroy!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Decidim
   module Budgets
     module Admin
       # A command with all the business logic when an admin imports proposals from
-      # one component to budget component.
+      # one component to projects of a budget.
       class ImportProposalsToBudgets < Rectify::Command
         # Public: Initializes the command.
         #
@@ -32,45 +32,46 @@ module Decidim
         def create_projects_from_accepted_proposals
           transaction do
             proposals.map do |original_proposal|
-              next if proposal_already_copied?(original_proposal, target_component)
+              next if proposal_already_copied?(original_proposal)
 
-              project = Decidim::Budgets::Project.new
-              project.title = project_localized(original_proposal.title)
-              project.description = project_localized(original_proposal.body)
-              project.budget = form.default_budget
-              project.category = original_proposal.category
-              project.scope = original_proposal.scope
-              project.component = target_component
-              project.save!
+              new_project = create_project_from_proposal!(original_proposal)
 
-              project.link_resources([original_proposal], "included_proposals")
+              new_project.link_resources([original_proposal], "included_proposals")
             end.compact
           end
         end
 
+        def create_project_from_proposal!(original_proposal)
+          params = {
+            budget: form.budget,
+            title: original_proposal.title,
+            description: original_proposal.body,
+            budget_amount: form.default_budget,
+            category: original_proposal.category,
+            scope: original_proposal.scope
+          }
+
+          @project = Decidim.traceability.create!(
+            Project,
+            form.current_user,
+            params,
+            visibility: "all"
+          )
+        end
+
         def proposals
           Decidim::Proposals::Proposal.where(component: origin_component).where(state: "accepted")
         end
 
         def origin_component
-          @form.origin_component
+          form.origin_component
         end
 
-        def target_component
-          @form.current_component
-        end
-
-        def proposal_already_copied?(original_proposal, target_component)
-          original_proposal.linked_resources(:projects, "included_proposals").any? do |proposal|
-            proposal.component == target_component
+        def proposal_already_copied?(original_proposal)
+          original_proposal.linked_resources(:projects, "included_proposals").any? do |project|
+            project.budget == form.budget
           end
         end
-
-        def project_localized(text)
-          Decidim.available_locales.inject({}) do |result, locale|
-            result.update(locale => text)
-          end.with_indifferent_access
-        end
       end
     end
   end

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

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

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

@@ -52,7 +52,8 @@ module Decidim
             category: form.category,
             title: form.title,
             description: form.description,
-            budget: form.budget
+            budget_amount: form.budget_amount,
+            selected_at: selected_at
           )
         end
 
@@ -63,6 +64,12 @@ module Decidim
         def link_proposals
           project.link_resources(proposals, "included_proposals")
         end
+
+        def selected_at
+          return unless form.selected
+
+          Time.current
+        end
       end
     end
   end

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

@@ -7,10 +7,8 @@ module Decidim
       # Public: Initializes the command.
       #
       # order - The current order for the user.
-      # component - The current component.
-      def initialize(order, component)
+      def initialize(order)
         @order = order
-        @component = component
       end
 
       # Executes the command. Broadcasts these events:
@@ -20,15 +18,17 @@ module Decidim
       #
       # Returns nothing.
       def call
-        return broadcast(:invalid, @order) unless checkout!
+        return broadcast(:invalid, order) unless checkout!
 
-        broadcast(:ok, @order)
+        broadcast(:ok, order)
       end
 
       private
 
+      attr_reader :order
+
       def checkout!
-        return unless @order && @order.valid?
+        return unless order && order.valid?
 
         @order.with_lock do
           SendOrderSummaryJob.perform_later(@order)

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

@@ -28,9 +28,10 @@ module Decidim
 
       private
 
+      attr_reader :project
+
       def remove_line_item
-        @order.projects.destroy(@project)
-        @order.save!
+        @order.projects.destroy(project)
       end
     end
   end

data/app/controllers/concerns/decidim/budgets/needs_current_order.rb

@@ -9,13 +9,13 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        helper_method :current_order
+        helper_method :current_order, :can_have_order?, :voted_for?
 
         # The current order created by the user.
         #
         # Returns an Order.
         def current_order
-          @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, component: current_component)
+          @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, budget: budget)
         end
 
         def current_order=(order)
@@ -25,6 +25,18 @@ module Decidim
         def persisted_current_order
           current_order if current_order&.persisted?
         end
+
+        def can_have_order?
+          current_user.present? &&
+            voting_open? &&
+            current_participatory_space.can_participate?(current_user) &&
+            allowed_to?(:create, :order, budget: budget, workflow: current_workflow)
+        end
+
+        # Return true if the user has voted the project
+        def voted_for?(project)
+          current_order && current_order.projects.include?(project)
+        end
       end
     end
   end

data/app/controllers/concerns/decidim/budgets/orderable.rb

@@ -17,7 +17,7 @@ module Decidim
         def available_orders
           @available_orders ||= begin
             available_orders = []
-            available_orders << "random" if voting_is_open? || !votes_are_visible?
+            available_orders << "random" if voting_open? || !votes_are_visible?
             available_orders << "most_voted" if votes_are_visible?
             available_orders += %w(highest_cost lowest_cost)
             available_orders
@@ -28,10 +28,6 @@ module Decidim
           available_orders.first
         end
 
-        def voting_is_open?
-          current_settings.votes_enabled?
-        end
-
         def votes_are_visible?
           current_settings.show_votes?
         end
@@ -39,9 +35,9 @@ module Decidim
         def reorder(projects)
           case order
           when "highest_cost"
-            projects.order(budget: :desc)
+            projects.order(budget_amount: :desc)
           when "lowest_cost"
-            projects.order(budget: :asc)
+            projects.order(budget_amount: :asc)
           when "most_voted"
             if votes_are_visible?
               ids = projects.sort_by(&:confirmed_orders_count).map(&:id).reverse

data/app/controllers/decidim/budgets/admin/application_controller.rb

@@ -9,13 +9,21 @@ module Decidim
       # Note that it inherits from `Decidim::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::Components::BaseController
-        helper_method :projects, :project
+        helper_method :budget, :projects, :project
+
+        def budget
+          @budget ||= Budget.where(component: current_component).includes(:projects).find_by(id: params[:budget_id])
+        end
 
         def projects
-          @projects ||= Project.where(component: current_component)
+          return unless budget
+
+          @projects ||= budget.projects
         end
 
         def project
+          return unless projects
+
           @project ||= projects.find(params[:id])
         end
       end

data/app/controllers/decidim/budgets/admin/attachment_collections_controller.rb

@@ -17,7 +17,7 @@ module Decidim
         end
 
         def project
-          @project ||= projects.find(params[:project_id])
+          @project ||= Decidim::Budgets::Project.find(params[:project_id])
         end
       end
     end

data/app/controllers/decidim/budgets/admin/attachments_controller.rb

@@ -10,7 +10,7 @@ module Decidim
         include Decidim::Admin::Concerns::HasAttachments
 
         def after_destroy_path
-          projects_path
+          budget_projects_path(project.budget)
         end
 
         def attached_to
@@ -18,7 +18,7 @@ module Decidim
         end
 
         def project
-          @project ||= projects.find(params[:project_id])
+          @project ||= Decidim::Budgets::Project.find(params[:project_id])
         end
       end
     end

data/app/controllers/decidim/budgets/admin/budgets_controller.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This controller allows the create or update a budget.
+      class BudgetsController < Admin::ApplicationController
+        helper_method :budgets, :budget
+
+        def new
+          enforce_permission_to :create, :budget
+          @form = form(BudgetForm).instance
+        end
+
+        def create
+          enforce_permission_to :create, :budget
+          @form = form(BudgetForm).from_params(params, current_component: current_component)
+
+          CreateBudget.call(@form) do
+            on(:ok) do
+              flash[:notice] = I18n.t("budgets.create.success", scope: "decidim.budgets.admin")
+              redirect_to budgets_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
+              render action: "new"
+            end
+          end
+        end
+
+        def edit
+          enforce_permission_to :update, :budget, budget: budget
+          @form = form(BudgetForm).from_model(budget)
+        end
+
+        def update
+          enforce_permission_to :update, :budget, budget: budget
+          @form = form(BudgetForm).from_params(params, current_component: current_component)
+
+          UpdateBudget.call(@form, budget) do
+            on(:ok) do
+              flash[:notice] = I18n.t("budgets.update.success", scope: "decidim.budgets.admin")
+              redirect_to budgets_path
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
+              render action: "edit"
+            end
+          end
+        end
+
+        def destroy
+          enforce_permission_to :delete, :budget, budget: budget
+
+          DestroyBudget.call(budget, current_user) do
+            on(:ok) do
+              flash[:notice] = I18n.t("budgets.destroy.success", scope: "decidim.budgets.admin")
+            end
+
+            on(:invalid) do
+              flash.now[:alert] = I18n.t("budgets.destroy.invalid", scope: "decidim.budgets.admin")
+            end
+          end
+
+          redirect_to budgets_path
+        end
+
+        private
+
+        def budgets
+          @budgets ||= Budget.where(component: current_component).order(weight: :asc)
+        end
+
+        def budget
+          @budget ||= budgets.find_by(id: params[:id])
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/budgets/admin/projects_controller.rb

@@ -20,12 +20,12 @@ module Decidim
         def create
           enforce_permission_to :create, :project
 
-          @form = form(ProjectForm).from_params(params)
+          @form = form(ProjectForm).from_params(params, budget: budget)
 
           CreateProject.call(@form) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.create.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -43,12 +43,12 @@ module Decidim
 
         def update
           enforce_permission_to :update, :project, project: project
-          @form = form(ProjectForm).from_params(params)
+          @form = form(ProjectForm).from_params(params, budget: budget)
 
           UpdateProject.call(@form, project) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.update.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -64,7 +64,7 @@ module Decidim
           DestroyProject.call(project, current_user) do
             on(:ok) do
               flash[:notice] = I18n.t("projects.destroy.success", scope: "decidim.budgets.admin")
-              redirect_to projects_path
+              redirect_to budget_projects_path(budget)
             end
           end
         end
@@ -72,11 +72,11 @@ module Decidim
         private
 
         def projects
-          @projects ||= Project.where(component: current_component).page(params[:page]).per(15)
+          @projects ||= budget.projects.page(params[:page]).per(15)
         end
 
         def orders
-          @orders ||= Order.where(component: current_component)
+          @orders ||= Order.where(budget: budget)
         end
 
         def pending_orders