decidim-budgets 0.26.10 → 0.27.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0a1fb2dce4b41d7bc04ee39f452c7294fdc00346e4a232389cb86a9a88406e
-  data.tar.gz: b115656e85dec113373f601fe3bc851037190420da5d8a16518487ae2565366c
+  metadata.gz: 3fa531ee417f1965e642ac669891a7ab1705d2a39bbad0fbd20b862d2366887a
+  data.tar.gz: 014fee8507d07e68e6dcce958912efac0d6c4264ba08a380a4cc6bf77b95171f
 SHA512:
-  metadata.gz: 9b1ec32da26ae5ae2c7fbf9ff40c2e262257fd91eef493368f46c44f2ebb8acc1bc65fef6adc347a5bb550889c0490b1e90101c5c4b2980f3d764e8794b435e8
-  data.tar.gz: ca6852114e2e925cbf7b1a5012e9e836be8c60be144a40f5217fe1e6b414d2eccee70056363fd4651579b875027532fb95df1fda34f32b2c311f029869baf8a5
+  metadata.gz: 347007356a92385202d42ba9380cab18a1b04122a18477df5b640d54d84daf8b440a0e5c6300b3161d5d69b87b1ba5dc4dd04903be5eb0d7f68eb638df34fe5f
+  data.tar.gz: 5174a84a9e0a1c73efb3fd0b94c4a7ed4fc9a176891905e4497adbccc4181af2d924740df96e704666f13f594879f70a8ffa162e39dc4ad0f31e403ee88ca88e

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="columns medium-7 mediumlarge-8">
     <div class="section">
-      <%= decidim_sanitize_editor_admin(landing_page_content) %>
+      <%= decidim_sanitize_editor(landing_page_content) %>
     </div>
   </div>
 </div>

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!(
@@ -81,10 +84,7 @@ module Decidim
         end
 
         def proposal_already_copied?(original_proposal)
-          # Note: we are including also projects from unpublished components
-          # because otherwise duplicates could be created until the component is
-          # published.
-          original_proposal.linked_resources(:projects, "included_proposals", component_published: false).any? do |project|
+          original_proposal.linked_resources(:projects, "included_proposals").any? do |project|
             project.budget == form.budget
           end
         end

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/application_controller.rb

@@ -22,6 +22,8 @@ module Decidim
         end
 
         def project
+          return unless projects
+
           @project ||= projects.find(params[:id])
         end
       end

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

@@ -17,9 +17,7 @@ module Decidim
         end
 
         def project
-          @project ||= Decidim::Budgets::Project
-                       .joins("INNER JOIN decidim_budgets_budgets budget ON budget.id = decidim_budgets_projects.decidim_budgets_budget_id")
-                       .where(budget: { component: current_component }).find(params[:project_id])
+          @project ||= Decidim::Budgets::Project.find(params[:project_id])
         end
       end
     end

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

@@ -17,14 +17,8 @@ module Decidim
           project
         end
 
-        def projects
-          @projects ||= Decidim::Budgets::Project
-                        .joins("INNER JOIN decidim_budgets_budgets budget ON budget.id = decidim_budgets_projects.decidim_budgets_budget_id")
-                        .where(budget: { component: current_component })
-        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

@@ -79,7 +79,7 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget: budgets)
+          @orders ||= Order.where(decidim_budgets_budget_id: budgets)
         end
 
         def pending_orders