decidim-budgets 0.29.2 → 0.30.0.rc1

data/lib/decidim/budgets/admin_engine.rb

@@ -13,13 +13,27 @@ module Decidim
 
       routes do
         resources :budgets do
+          collection do
+            get :manage_trash
+          end
+
+          member do
+            patch :soft_delete
+            patch :restore
+          end
+
           resources :projects do
             collection do
-              post :update_category
-              post :update_scope
+              post :update_taxonomies
               post :update_selected
               post :update_budget
               resource :proposals_import, only: [:new, :create]
+              get :manage_trash
+            end
+
+            member do
+              patch :soft_delete
+              patch :restore
             end
           end
         end

data/lib/decidim/budgets/component.rb

@@ -46,8 +46,8 @@ Decidim.register_component(:budgets) do |component|
   component.register_stat :orders_count do |components, start_at, end_at|
     budgets = Decidim::Budgets::Budget.where(component: components)
     orders = Decidim::Budgets::Order.where(budget: budgets)
-    orders = orders.where("created_at >= ?", start_at) if start_at.present?
-    orders = orders.where("created_at <= ?", end_at) if end_at.present?
+    orders = orders.where(created_at: start_at..) if start_at.present?
+    orders = orders.where(created_at: ..end_at) if end_at.present?
     orders.count
   end
 
@@ -66,7 +66,7 @@ Decidim.register_component(:budgets) do |component|
       budgets = resource_id ? Decidim::Budgets::Budget.find(resource_id) : Decidim::Budgets::Budget.where(decidim_component_id: component_instance)
       Decidim::Budgets::Project
         .where(decidim_budgets_budget_id: budgets)
-        .includes(:category, :component)
+        .includes(:taxonomies, :component)
     end
 
     exports.include_in_open_data = true
@@ -75,8 +75,7 @@ Decidim.register_component(:budgets) do |component|
   end
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: false
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
     settings.attribute :workflow, type: :enum, default: "one", choices: -> { Decidim::Budgets.workflows.keys.map(&:to_s) }
     settings.attribute :projects_per_page, type: :integer, default: 12
     settings.attribute :vote_rule_threshold_percent_enabled, type: :boolean, default: true

data/lib/decidim/budgets/engine.rb

@@ -16,6 +16,7 @@ module Decidim
           resource :order, only: [:destroy] do
             member do
               post :checkout
+              get :status
             end
             resource :line_item, only: [:create, :destroy]
           end

data/lib/decidim/budgets/project_serializer.rb

@@ -16,14 +16,7 @@ module Decidim
       def serialize
         {
           id: project.id,
-          category: {
-            id: project.category.try(:id),
-            name: project.category.try(:name) || empty_translatable
-          },
-          scope: {
-            id: project.scope.try(:id),
-            name: project.scope.try(:name) || empty_translatable
-          },
+          taxonomies:,
           participatory_space: {
             id: project.participatory_space.id,
             url: Decidim::ResourceLocatorPresenter.new(project.participatory_space).url
@@ -31,13 +24,22 @@ module Decidim
           component: { id: component.id },
           title: project.title,
           description: project.description,
-          budget: { id: project.budget.id },
+          budget: { id: project.budget.id,
+                    title: project.budget.title,
+                    url: budget_url },
           budget_amount: project.budget_amount,
-          confirmed_votes: project.confirmed_orders_count,
+          confirmed_votes: (project.confirmed_orders_count if
+            project.component.current_settings.show_votes?),
           comments: project.comments_count,
           created_at: project.created_at,
           url: project.polymorphic_resource_url({}),
           address: project.address,
+          updated_at: project.updated_at,
+          selected_at: project.selected_at,
+          reference: project.reference,
+          follows_count: project.follows_count,
+          latitude: project.latitude,
+          longitude: project.longitude,
           related_proposals:,
           related_proposal_titles:,
           related_proposal_urls:
@@ -49,10 +51,6 @@ module Decidim
       attr_reader :project
       alias resource project
 
-      def component
-        project.component
-      end
-
       def related_proposals
         project.linked_resources(:proposals, "included_proposals").map(&:id)
       end
@@ -73,6 +71,10 @@ module Decidim
         Decidim::ResourceLocatorPresenter.new(project).url
       end
 
+      def budget_url
+        Decidim::EngineRouter.main_proxy(component).budget_url(project.budget)
+      end
+
       def empty_translatable(locales = Decidim.available_locales)
         locales.each_with_object({}) do |locale, result|
           result[locale.to_s] = ""

data/lib/decidim/budgets/seeds.rb

@@ -80,8 +80,6 @@ module Decidim
       def create_project!(budget:)
         params = {
           budget:,
-          scope: participatory_space.organization.scopes.sample,
-          category: participatory_space.categories.sample,
           title: Decidim::Faker::Localized.sentence(word_count: 2),
           description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(sentence_count: 3)

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.29.2"
+      "0.30.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-budgets
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,70 +18,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc1
 description: A budgets component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -115,14 +115,13 @@ files:
 - app/cells/decidim/budgets/limit_announcement_cell.rb
 - app/cells/decidim/budgets/order_activity_cell.rb
 - app/cells/decidim/budgets/project_cell.rb
+- app/cells/decidim/budgets/project_history_cell.rb
 - app/cells/decidim/budgets/project_l/extra_data.erb
 - app/cells/decidim/budgets/project_l/metadata.erb
 - app/cells/decidim/budgets/project_l_cell.rb
 - app/cells/decidim/budgets/project_metadata_cell.rb
 - app/cells/decidim/budgets/project_s_cell.rb
 - app/cells/decidim/budgets/project_selected_status_cell.rb
-- app/cells/decidim/budgets/project_tags/show.erb
-- app/cells/decidim/budgets/project_tags_cell.rb
 - app/cells/decidim/budgets/project_vote_button/show.erb
 - app/cells/decidim/budgets/project_vote_button_cell.rb
 - app/cells/decidim/budgets/project_voted_hint_cell.rb
@@ -131,12 +130,9 @@ files:
 - app/commands/decidim/budgets/admin/create_budget.rb
 - app/commands/decidim/budgets/admin/create_order_reminders.rb
 - app/commands/decidim/budgets/admin/create_project.rb
-- app/commands/decidim/budgets/admin/destroy_budget.rb
 - app/commands/decidim/budgets/admin/import_proposals_to_budgets.rb
 - app/commands/decidim/budgets/admin/update_budget.rb
 - app/commands/decidim/budgets/admin/update_project.rb
-- app/commands/decidim/budgets/admin/update_project_category.rb
-- app/commands/decidim/budgets/admin/update_project_scope.rb
 - app/commands/decidim/budgets/admin/update_project_selection.rb
 - app/commands/decidim/budgets/admin/update_projects_budget.rb
 - app/commands/decidim/budgets/cancel_order.rb
@@ -161,7 +157,6 @@ files:
 - app/forms/decidim/budgets/admin/order_reminder_form.rb
 - app/forms/decidim/budgets/admin/project_form.rb
 - app/forms/decidim/budgets/admin/project_import_proposals_form.rb
-- app/helpers/decidim/budgets/admin/application_helper.rb
 - app/helpers/decidim/budgets/admin/filterable_helper.rb
 - app/helpers/decidim/budgets/admin/project_bulk_actions_helper.rb
 - app/helpers/decidim/budgets/application_helper.rb
@@ -187,25 +182,32 @@ files:
 - app/permissions/decidim/budgets/permissions.rb
 - app/presenters/decidim/budgets/admin_log/budget_presenter.rb
 - app/presenters/decidim/budgets/admin_log/project_presenter.rb
+- app/presenters/decidim/budgets/project_presenter.rb
 - app/queries/decidim/budgets/filtered_projects.rb
 - app/queries/decidim/budgets/metrics/budget_followers_metric_measure.rb
 - app/queries/decidim/budgets/metrics/budget_participants_metric_measure.rb
 - app/serializers/decidim/budgets/download_your_data_budgets_order_serializer.rb
 - app/services/decidim/budgets/order_reminder_generator.rb
+- app/views/decidim/budgets/admin/budgets/_actions.html.erb
+- app/views/decidim/budgets/admin/budgets/_budget-tr.html.erb
+- app/views/decidim/budgets/admin/budgets/_budgets-thead.html.erb
 - app/views/decidim/budgets/admin/budgets/_form.html.erb
 - app/views/decidim/budgets/admin/budgets/edit.html.erb
 - app/views/decidim/budgets/admin/budgets/index.html.erb
+- app/views/decidim/budgets/admin/budgets/manage_trash.html.erb
 - app/views/decidim/budgets/admin/budgets/new.html.erb
+- app/views/decidim/budgets/admin/projects/_actions.html.erb
 - app/views/decidim/budgets/admin/projects/_bulk-actions.html.erb
 - app/views/decidim/budgets/admin/projects/_form.html.erb
 - app/views/decidim/budgets/admin/projects/_project-tr.html.erb
+- app/views/decidim/budgets/admin/projects/_projects-thead.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_budget-change.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_change-selected.html.erb
 - app/views/decidim/budgets/admin/projects/bulk_actions/_dropdown.html.erb
-- app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb
-- app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb
+- app/views/decidim/budgets/admin/projects/bulk_actions/_taxonomy_change.html.erb
 - app/views/decidim/budgets/admin/projects/edit.html.erb
 - app/views/decidim/budgets/admin/projects/index.html.erb
+- app/views/decidim/budgets/admin/projects/manage_trash.html.erb
 - app/views/decidim/budgets/admin/projects/new.html.erb
 - app/views/decidim/budgets/admin/projects/update_attribute.js.erb
 - app/views/decidim/budgets/admin/proposals_imports/new.html.erb
@@ -213,6 +215,7 @@ files:
 - app/views/decidim/budgets/budgets/index.js.erb
 - app/views/decidim/budgets/line_items/update_budget.js.erb
 - app/views/decidim/budgets/order_summary_mailer/order_summary.html.erb
+- app/views/decidim/budgets/orders/status.html.erb
 - app/views/decidim/budgets/projects/_addition_selector.html.erb
 - app/views/decidim/budgets/projects/_budget_confirm.html.erb
 - app/views/decidim/budgets/projects/_budget_excess.html.erb
@@ -336,6 +339,8 @@ files:
 - db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb
 - db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb
 - db/migrate/20220428072638_add_geolocalization_fields_to_projects.rb
+- db/migrate/20240828103724_add_deleted_at_to_decidim_budgets_budgets.rb
+- db/migrate/20240916135141_add_deleted_at_to_decidim_budgets_projects.rb
 - decidim-budgets.gemspec
 - lib/decidim/api/budget_type.rb
 - lib/decidim/api/budgets_type.rb
@@ -372,14 +377,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Decidim budgets module

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

@@ -1,5 +0,0 @@
-<%= content_tag :ul, class: tags_classes do %>
-  <%= content_tag :li, icon("price-tag-3-line", class: "inline-block") %>
-  <%= 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

@@ -1,18 +0,0 @@
-# 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: { with_any_category: [model.category.id.to_s] })
-      end
-
-      def scope_path
-        resource_locator([model.budget, model]).index(filter: { with_any_scope: [model.scope.id] })
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-# 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 < Decidim::Commands::DestroyResource
-        private
-
-        def invalid? = resource.projects.present?
-
-        def extra_params = { visibility: "all" }
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-# 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

@@ -1,54 +0,0 @@
-# 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:
-          )
-        end
-      end
-    end
-  end
-end

data/app/helpers/decidim/budgets/admin/application_helper.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Budgets
-    module Admin
-      # Custom helpers, scoped to the budgets admin engine.
-      #
-      module ApplicationHelper
-        include Decidim::Admin::ResourceScopeHelper
-      end
-    end
-  end
-end

data/app/views/decidim/budgets/admin/projects/bulk_actions/_recategorize.html.erb

@@ -1,15 +0,0 @@
-<div id="js-recategorize-projects-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_category_budget_projects_path, method: :post, remote: true, id: "js-form-recategorize-projects", class: "form form-defaults flex items-center gap-x-2") do %>
-    <div class="hide">
-      <% projects.each do |project| %>
-        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
-      <% end %>
-    </div>
-
-    <%= bulk_categories_select current_component.categories %>
-
-    <%= submit_tag(t("decidim.budgets.admin.projects.index.update"), id: "js-submit-edit-category", class: "button button__sm button__secondary small button--simple float-left") %>
-
-    <button id="js-cancel-edit-category" class="button button__sm button__secondary js-cancel-bulk-action" type="button"><%= t("decidim.budgets.admin.projects.index.cancel") %></button>
-  <% end %>
-</div>

data/app/views/decidim/budgets/admin/projects/bulk_actions/_scope-change.html.erb

@@ -1,22 +0,0 @@
-<div id="js-scope-change-projects-actions" class="hide js-bulk-action-form">
-  <%= form_tag(update_scope_budget_projects_path, method: :post, remote: true, id: "js-form-scope-change-projects", class: "form form-defaults flex items-center gap-x-2") do %>
-
-    <div class="hide">
-      <% projects.each do |project| %>
-        <%= check_box_tag "project_ids[]", project.id, false, class: "js-check-all-resources js-resource-id-#{project.id}" %>
-      <% end %>
-    </div>
-
-    <%= scopes_select_tag(:scope_id) %>
-
-    <%= submit_tag(
-          t("decidim.budgets.admin.projects.index.update_scope_button"),
-          id: "js-submit-scope-change-projects",
-          class: "button button__sm button__secondary small button--simple float-left"
-        ) %>
-
-    <button id="js-cancel-scope-change-projects" class="button button__sm button__secondary js-cancel-bulk-action" type="button">
-      <%= t("decidim.budgets.admin.projects.index.cancel") %>
-    </button>
-  <% end %>
-</div>