decidim-budgets 0.21.0 → 0.23.2

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

@@ -6,6 +6,9 @@ module Decidim
       # This command is executed when the user changes a Project from the admin
       # panel.
       class UpdateProject < Rectify::Command
+        include ::Decidim::AttachmentMethods
+        include ::Decidim::GalleryMethods
+
         # Initializes an UpdateProject Command.
         #
         # form - The form from which to get the data.
@@ -13,6 +16,7 @@ module Decidim
         def initialize(form, project)
           @form = form
           @project = project
+          @attached_to = project
         end
 
         # Updates the project if valid.
@@ -21,9 +25,16 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
+          if process_gallery?
+            build_gallery
+            return broadcast(:invalid) if gallery_invalid?
+          end
+
           transaction do
             update_project
             link_proposals
+            create_gallery if process_gallery?
+            photo_cleanup!
           end
 
           broadcast(:ok)
@@ -31,7 +42,7 @@ module Decidim
 
         private
 
-        attr_reader :project, :form
+        attr_reader :project, :form, :gallery
 
         def update_project
           Decidim.traceability.update!(
@@ -41,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
 
@@ -52,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,17 +18,20 @@ 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
+        return unless order && order.valid?
 
         @order.with_lock do
+          SendOrderSummaryJob.perform_later(@order)
           @order.checked_out_at = Time.current
           @order.save
         end

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,18 +9,34 @@ 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_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)
           @current_order = order
         end
+
+        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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Budgets
+    # Common logic to sorting resources
+    module Orderable
+      extend ActiveSupport::Concern
+
+      included do
+        include Decidim::Orderable
+
+        private
+
+        # Available orders based on enabled settings
+        def available_orders
+          @available_orders ||= begin
+            available_orders = []
+            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
+          end
+        end
+
+        def default_order
+          available_orders.first
+        end
+
+        def votes_are_visible?
+          current_settings.show_votes?
+        end
+
+        def reorder(projects)
+          case order
+          when "highest_cost"
+            projects.order(budget_amount: :desc)
+          when "lowest_cost"
+            projects.order(budget_amount: :asc)
+          when "most_voted"
+            if votes_are_visible?
+              ids = projects.sort_by(&:confirmed_orders_count).map(&:id).reverse
+              projects.ordered_ids(ids)
+            else
+              projects
+            end
+          when "random"
+            projects.order_randomly(random_seed)
+          else
+            projects
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,23 +5,27 @@ module Decidim
     module Admin
       # This controller allows an admin to manage projects from a Participatory Process
       class ProjectsController < Admin::ApplicationController
-        helper_method :projects, :finished_orders, :pending_orders
+        include Decidim::ApplicationHelper
+        include Decidim::Proposals::Admin::Picker
+
+        helper_method :projects, :finished_orders, :pending_orders, :present
 
         def new
           enforce_permission_to :create, :project
-
-          @form = form(ProjectForm).instance
+          @form = form(ProjectForm).from_params(
+            attachment: form(AttachmentForm).instance
+          )
         end
 
         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
@@ -33,19 +37,18 @@ module Decidim
 
         def edit
           enforce_permission_to :update, :project, project: project
-
           @form = form(ProjectForm).from_model(project)
+          @form.attachment = form(AttachmentForm).instance
         end
 
         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
@@ -61,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
@@ -69,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

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

@@ -4,6 +4,8 @@ module Decidim
   module Budgets
     module Admin
       class ProposalsImportsController < Admin::ApplicationController
+        helper_method :budget
+
         def new
           enforce_permission_to :import_proposals, :projects
 
@@ -13,11 +15,11 @@ module Decidim
         def create
           enforce_permission_to :import_proposals, :projects
 
-          @form = form(Admin::ProjectImportProposalsForm).from_params(params)
+          @form = form(Admin::ProjectImportProposalsForm).from_params(params, budget: budget)
           Admin::ImportProposalsToBudgets.call(@form) do
             on(:ok) do |projects|
               flash[:notice] = I18n.t("proposals_imports.create.success", scope: "decidim.budgets.admin", number: projects.length)
-              redirect_to EngineRouter.admin_proxy(current_component).root_path
+              redirect_to budget_projects_path(budget)
             end
 
             on(:invalid) do
@@ -26,6 +28,12 @@ module Decidim
             end
           end
         end
+
+        private
+
+        def budget
+          @budget ||= Budget.where(component: current_component).find_by(id: params[:budget_id])
+        end
       end
     end
   end