decidim-budgets 0.26.2 → 0.27.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17e890e9021bc82b0f86715d9078790fd8c493b7979e3be2b19f0acb27a587b
-  data.tar.gz: 5f1b1c43e21cc12288ce5f39ad58ace8e1a801c82699a84ba32f140f6c612263
+  metadata.gz: c9298facc7d7638d2e7c3e94cf26ed4aaae0a8fe19688240f1bfff4d75d00f6f
+  data.tar.gz: 6660a551c8bacb4561639ef50ae672e41a1ae7dc0451f1095d9e508f3dae564a
 SHA512:
-  metadata.gz: cc1202205337bf77b4b63050f1ac26fca46835c9f769a8c19dadb0e28d4db8cdd0000e361d61e02aa505632009c796e8c0173b97ee4562c654a8a0306bd8824f
-  data.tar.gz: 0d33cff35072e2a4ca7df5fdd3e64249ab3c49402e1de27b3a6942625933b98bbdaf7f70c49ffca091231da4ec86b98863c1e3814e9e5e7470deb0d98f87b929
+  metadata.gz: c08076c938815c28eaf4ec8a601433812b57ccad5c46a3b0c63728786ec3baff8257a7838dba678af556f110da40b64d4f30d1d860c56e484a9df698fc69caff
+  data.tar.gz: d7ce76fbc30f45949b0c7b9b86cf552d197ceb61927a48f5aeb541fdb53bf15ee34bc71b6c31e7e51aa43de2fde7276dc816c523a97ff62fda44a79a0e610e7b

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    # A cell to display when actions happen on an order.
+    class OrderActivityCell < ActivityCell
+      def title
+        I18n.t(
+          "decidim.budgets.last_activity.new_vote_at_html",
+          link: participatory_space_link
+        )
+      end
+
+      def resource_link_path
+        resource_locator(budget).path
+      end
+
+      def resource_link_text
+        decidim_html_escape(translated_attribute(budget.title))
+      end
+
+      private
+
+      def budget
+        @budget ||= resource.budget
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to add new line items to orders
-    class AddLineItem < Rectify::Command
+    class AddLineItem < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user or nil if it is not created yet.
@@ -23,11 +23,13 @@ module Decidim
       # Returns nothing.
       def call
         transaction do
-          return broadcast(:invalid) if voting_not_enabled? || order.checked_out? || exceeds_budget?
+          raise ActiveRecord::RecordInvalid if voting_not_enabled? || order.checked_out? || exceeds_budget?
 
           add_line_item
           broadcast(:ok, order)
         end
+      rescue ActiveRecord::RecordInvalid
+        broadcast(:invalid)
       end
 
       private

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates an Budget
       # from the admin panel.
-      class CreateBudget < Rectify::Command
+      class CreateBudget < Decidim::Command
         def initialize(form)
           @form = form
         end

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

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      # This command is executed when admin sends vote reminders.
+      class CreateOrderReminders < Decidim::Command
+        def initialize(form)
+          @form = form
+        end
+
+        def call
+          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid) unless voting_enabled?
+          return broadcast(:invalid) if voting_ends_soon?
+
+          generator.generate_for(current_component, &alternative_refresh_state)
+
+          broadcast(:ok, generator.reminder_jobs_queued)
+        end
+
+        private
+
+        attr_reader :form
+
+        def alternative_refresh_state
+          proc do |reminder|
+            reminder.records.each do |record|
+              next if %w(active pending).exclude? record.state
+
+              record.state = begin
+                if record.remindable.created_at > minimum_time_between_reminders ||
+                   (reminder.deliveries.present? && reminder.deliveries.last.created_at > minimum_time_between_reminders)
+                  "pending"
+                else
+                  "active"
+                end
+              end
+              record.save if record.changed?
+            end
+          end
+        end
+
+        def minimum_time_between_reminders
+          form.minimum_interval_between_reminders.ago
+        end
+
+        def generator
+          @generator ||= Decidim::Budgets::OrderReminderGenerator.new
+        end
+
+        def current_component
+          form.current_component
+        end
+
+        def voting_enabled?
+          form.voting_enabled?
+        end
+
+        def voting_ends_soon?
+          form.voting_ends_soon?
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Project from the admin
       # panel.
-      class CreateProject < Rectify::Command
+      class CreateProject < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -44,7 +44,10 @@ module Decidim
             category: form.category,
             title: form.title,
             description: form.description,
-            budget_amount: form.budget_amount
+            budget_amount: form.budget_amount,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
           }
 
           @project = Decidim.traceability.create!(

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Budget
       # from the admin panel.
-      class DestroyBudget < Rectify::Command
+      class DestroyBudget < Decidim::Command
         def initialize(budget, current_user)
           @budget = budget
           @current_user = current_user

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user deletes a Project from the admin
       # panel.
-      class DestroyProject < Rectify::Command
+      class DestroyProject < Decidim::Command
         # Initializes an UpdateProject Command.
         #
         # project - The current instance of the project to be destroyed.

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when an admin imports proposals from
       # one component to projects of a budget.
-      class ImportProposalsToBudgets < Rectify::Command
+      class ImportProposalsToBudgets < Decidim::Command
         # Public: Initializes the command.
         #
         # form - A form object with the params.
@@ -48,7 +48,10 @@ module Decidim
             description: original_proposal.body,
             budget_amount: budget_for(original_proposal),
             category: original_proposal.category,
-            scope: original_proposal.scope
+            scope: original_proposal.scope,
+            address: original_proposal.address,
+            latitude: original_proposal.latitude,
+            longitude: original_proposal.longitude
           }
 
           @project = Decidim.traceability.create!(

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user updates a Budget
       # from the admin panel.
-      class UpdateBudget < Rectify::Command
+      class UpdateBudget < Decidim::Command
         def initialize(form, budget)
           @form = form
           @budget = budget

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

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Project from the admin
       # panel.
-      class UpdateProject < Rectify::Command
+      class UpdateProject < Decidim::Command
         include ::Decidim::AttachmentMethods
         include ::Decidim::GalleryMethods
 
@@ -53,7 +53,10 @@ module Decidim
             title: form.title,
             description: form.description,
             budget_amount: form.budget_amount,
-            selected_at: selected_at
+            selected_at: selected_at,
+            address: form.address,
+            latitude: form.latitude,
+            longitude: form.longitude
           )
         end
 

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectCategory < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # category_id - the category id to update
+        # project_ids - the project ids to update.
+        def initialize(category_id, project_ids)
+          @category = Decidim::Category.find_by id: category_id
+          @project_ids = project_ids
+          @response = { category_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_category) if @category.blank?
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          @response[:category_name] = @category.translated_name
+          Project.where(id: @project_ids).find_each do |project|
+            if @category == project.category
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_category project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+
+          broadcast(:update_projects_category, @response)
+        end
+
+        private
+
+        def update_project_category(project)
+          project.update!(
+            category: @category
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectScope < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # scope_id - the scope id to update
+        # project_ids - the project ids to update.
+        def initialize(scope_id, project_ids)
+          @scope = ::Decidim::Scope.find_by id: scope_id
+          @project_ids = project_ids
+          @response = { scope_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_scope) if @scope.blank?
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          update_projects_scope
+
+          broadcast(:update_projects_scope, @response)
+        end
+
+        private
+
+        attr_reader :scope, :project_ids
+
+        def update_projects_scope
+          @response[:scope_name] = translated_attribute(scope.name, scope.organization)
+          ::Decidim::Budgets::Project.where(id: project_ids).find_each do |project|
+            if scope == project.scope
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_scope project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+        end
+
+        def update_project_scope(project)
+          project.update!(
+            scope: scope
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Budgets
+    module Admin
+      class UpdateProjectSelection < Decidim::Command
+        include TranslatableAttributes
+
+        # Public: Initializes the command.
+        #
+        # selection - Defines if projects are selected (for implementation)
+        # project_ids - the project ids to update.
+        def initialize(selection, project_ids)
+          @selection = selection
+          @project_ids = project_ids
+          @response = { selection_name: "", successful: [], errored: [] }
+        end
+
+        def call
+          return broadcast(:invalid_selection) if @selection.blank? || [true, false, "true", "false"].exclude?(@selection)
+          return broadcast(:invalid_project_ids) if @project_ids.blank?
+
+          @selection = ActiveModel::Type::Boolean.new.cast(@selection)
+
+          update_projects_selection
+
+          broadcast(:update_projects_selection, @response)
+        end
+
+        private
+
+        attr_reader :selection, :project_ids
+
+        def update_projects_selection
+          ::Decidim::Budgets::Project.where(id: project_ids).find_each do |project|
+            if (selection == false && !project.selected?) || (selection && project.selected?)
+              @response[:errored] << translated_attribute(project.title)
+            else
+              transaction do
+                update_project_selection project
+              end
+              @response[:successful] << translated_attribute(project.title)
+            end
+          end
+        end
+
+        def update_project_selection(project)
+          selected_at = selection ? Time.current : nil
+          project.update!(
+            selected_at: selected_at
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to cancel an order.
-    class CancelOrder < Rectify::Command
+    class CancelOrder < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user.

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

@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to checkout.
-    class Checkout < Rectify::Command
+    class Checkout < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user.
@@ -32,8 +32,15 @@ module Decidim
 
         @order.with_lock do
           SendOrderSummaryJob.perform_later(@order)
-          @order.checked_out_at = Time.current
-          @order.save
+
+          Decidim.traceability.update!(
+            @order,
+            @order.user,
+            { checked_out_at: Time.current },
+            visibility: "private-only"
+          )
+        rescue ActiveRecord::RecordInvalid
+          false
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Decidim
   module Budgets
     # A command with all the business to add remove line items from orders
-    class RemoveLineItem < Rectify::Command
+    class RemoveLineItem < Decidim::Command
       # Public: Initializes the command.
       #
       # order - The current order for the user

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

@@ -8,8 +8,9 @@ module Decidim
         include Decidim::ApplicationHelper
         include Decidim::Proposals::Admin::Picker if Decidim::Budgets.enable_proposal_linking
         include Decidim::Budgets::Admin::Filterable
+        helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
 
-        helper_method :projects, :finished_orders, :pending_orders, :present
+        helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
         def collection
           @collection ||= budget.projects.page(params[:page]).per(15)
@@ -74,6 +75,93 @@ module Decidim
           end
         end
 
+        def update_category
+          enforce_permission_to :update, :project_category
+
+          ::Decidim::Budgets::Admin::UpdateProjectCategory.call(params[:category][:id], project_ids) do
+            on(:invalid_category) do
+              flash.now[:error] = I18n.t(
+                "projects.update_category.select_a_category",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = I18n.t(
+                "projects.update_category.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_category) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :category)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :category)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-recategorize-projects", attribute_selector: "#category_id" } }
+          end
+        end
+
+        def update_scope
+          enforce_permission_to :update, :project_scope
+
+          ::Decidim::Budgets::Admin::UpdateProjectScope.call(params[:scope_id], project_ids) do
+            on(:invalid_scope) do
+              flash.now[:error] = t(
+                "projects.update_scope.select_a_scope",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_scope.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_scope) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :scope)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :scope)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-scope-change-projects", attribute_selector: "#scope_id" } }
+          end
+        end
+
+        def update_selected
+          enforce_permission_to :update, :project_selected
+
+          ::Decidim::Budgets::Admin::UpdateProjectSelection.call(params.dig(:selected, "value"), project_ids) do
+            on(:invalid_selection) do
+              flash.now[:error] = t(
+                "projects.update_selected.select_a_selection",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:invalid_project_ids) do
+              flash.now[:alert] = t(
+                "projects.update_selected.select_a_project",
+                scope: "decidim.budgets.admin"
+              )
+            end
+
+            on(:update_projects_selection) do
+              flash.now[:notice] = update_projects_bulk_response_successful(@response, :selected)
+              flash.now[:alert] = update_projects_bulk_response_errored(@response, :selected)
+            end
+          end
+
+          respond_to do |format|
+            format.js { render :update_attribute, locals: { form_selector: "#js-form-change-selected-projects", attribute_selector: "#selected_value" } }
+          end
+        end
+
         private
 
         def projects
@@ -84,6 +172,10 @@ module Decidim
           @orders ||= Order.where(budget: budget)
         end
 
+        def project_ids
+          @project_ids ||= params[:project_ids]
+        end
+
         def pending_orders
           orders.pending
         end
@@ -95,6 +187,62 @@ module Decidim
         def project
           @project ||= projects.find(params[:id])
         end
+
+        def update_projects_bulk_response_successful(response, subject)
+          return if response[:successful].blank?
+
+          case subject
+          when :category
+            t(
+              "projects.update_category.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :scope
+            t(
+              "projects.update_scope.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :selected
+            t(
+              "projects.update_selected.success",
+              subject_name: response[:subject_name],
+              projects: response[:successful].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          end
+        end
+
+        def update_projects_bulk_response_errored(response, subject)
+          return if response[:errored].blank?
+
+          case subject
+          when :category
+            t(
+              "projects.update_category.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :scope
+            t(
+              "projects.update_scope.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          when :selected
+            t(
+              "projects.update_selected.invalid",
+              subject_name: response[:subject_name],
+              projects: response[:errored].to_sentence,
+              scope: "decidim.budgets.admin"
+            )
+          end
+        end
       end
     end
   end

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

@@ -8,7 +8,7 @@ module Decidim
       include NeedsCurrentOrder
       include Decidim::Budgets::Orderable
 
-      helper_method :projects, :project, :budget
+      helper_method :projects, :project, :budget, :all_geocoded_projects
 
       def index
         raise ActionController::RoutingError, "Not Found" unless budget
@@ -28,34 +28,34 @@ module Decidim
       def projects
         return @projects if @projects
 
-        @projects = search.results.page(params[:page]).per(current_component.settings.projects_per_page)
+        @projects = search.result.page(params[:page]).per(current_component.settings.projects_per_page)
         @projects = reorder(@projects)
       end
 
+      def all_geocoded_projects
+        @all_geocoded_projects ||= projects.geocoded
+      end
+
       def project
         @project ||= Project.find_by(id: params[:id])
       end
 
-      def search_klass
-        ProjectSearch
+      def search_collection
+        Project.where(budget: budget).includes([:scope, :component, :attachments, :category])
       end
 
       def default_filter_params
         {
-          search_text: "",
-          status: default_filter_status_params,
-          scope_id: default_filter_scope_params,
-          category_id: default_filter_category_params
+          search_text_cont: "",
+          with_any_status: default_filter_status_params,
+          with_any_scope: default_filter_scope_params,
+          with_any_category: default_filter_category_params
         }
       end
 
       def default_filter_status_params
         voting_finished? ? %w(selected) : %w(all)
       end
-
-      def context_params
-        { budget: budget, component: current_component, organization: current_organization }
-      end
     end
   end
 end