decidim-budgets 0.29.6 → 0.30.0.rc1

data/config/locales/uk.yml

@@ -3,7 +3,6 @@ uk:
   activemodel:
     attributes:
       project:
-        decidim_category_id: Категорія
         description: Опис
         proposal_ids: Супутні пропозиції
         title: Назва
@@ -19,15 +18,12 @@ uk:
       actions:
         attachment_collections: Теки
         attachments: Вкладені файли
-        destroy: Видалити
         edit: Редагувати
         import: Внести до проектів запозичені пропозиції
         preview: Попередній перегляд
         title: Дії
       admin:
         models:
-          budget:
-            name: Бюджет
           project:
             name: Проект
         projects:
@@ -55,6 +51,9 @@ uk:
         project:
           fields:
             title: Назва
+      order:
+        status:
+          title: Ваш голос успішно прийнято
       projects:
         budget_confirm:
           cancel: Скасувати
@@ -77,7 +76,6 @@ uk:
             many: "%{count} проектів"
             other: "%{count} проектів"
         filters:
-          category: Категорія
           search: Шукати
         project_budget_button:
           added: Додано
@@ -101,7 +99,5 @@ uk:
             show_votes: Показати голоси
             votes_choices:
               enabled: Голосування увімкнене
-    statistics:
-      projects_count: Проекти
   index:
     confirmed_orders_count: Кількість голосів

data/config/locales/zh-CN.yml

@@ -8,7 +8,6 @@ zh-CN:
         total_budget: 预算总额
       project:
         budget_amount: 预算金额
-        decidim_category_id: 类别
         description: 描述
         proposal_ids: 有关提议
         title: 标题
@@ -21,7 +20,6 @@ zh-CN:
       actions:
         attachment_collections: 文件夹
         attachments: 附件
-        destroy: 删除
         edit: 编辑
         edit_projects: 管理项目
         import: 导入提案到项目
@@ -88,6 +86,9 @@ zh-CN:
         project:
           fields:
             title: 标题
+      order:
+        status:
+          title: 您的投票已被接受
       order_summary_mailer:
         order_summary:
           selected_projects: '您选择的项目是：'
@@ -113,7 +114,6 @@ zh-CN:
           projects_count:
             other: "%{count} 个项目"
         filters:
-          category: 类别
           search: 搜索
           status: 状态
           status_values:
@@ -150,7 +150,6 @@ zh-CN:
             landing_page_content: 预算登陆页
             more_information_modal: 更多信息模式
             projects_per_page: 每页项目数
-            scopes_enabled: 范围已启用
             title: 标题
             total_budget: 预算总额
             vote_minimum_budget_projects_number: 要投票的项目最小数量
@@ -181,7 +180,5 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
           email_subject: '%{resource_title} 的预算现在在 %{participatory_space_title} 处于活动状态。'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> 预算现在已经在 %{participatory_space_title} 中生效。
-    statistics:
-      projects_count: 项目
   index:
     confirmed_orders_count: 所得票数

data/config/locales/zh-TW.yml

@@ -3,15 +3,12 @@ zh-TW:
   activemodel:
     attributes:
       budget:
-        decidim_scope_id: 範圍
         description: 說明
         title: 標題
         total_budget: 總預算
         weight: 排序位置
       project:
         budget_amount: 預算金額
-        decidim_category_id: 類別
-        decidim_scope_id: 範圍
         description: 說明
         proposal_ids: 相關提案
         proposals: 提案
@@ -27,10 +24,6 @@ zh-TW:
     admin:
       filters:
         projects:
-          category_id_eq:
-            label: 類別
-          scope_id_eq:
-            label: 範圍
           selected_at_null:
             label: 已選取
             values:
@@ -40,7 +33,6 @@ zh-TW:
       actions:
         attachment_collections: 資料夾
         attachments: 附件
-        destroy: 刪除
         edit: 編輯
         edit_projects: 管理專案
         import: 將提案匯入專案
@@ -52,9 +44,6 @@ zh-TW:
           create:
             invalid: 建立預算時發生問題。
             success: 預算已成功建立
-          destroy:
-            invalid: 刪除此預算時出現問題
-            success: 預算已成功刪除
           edit:
             title: 編輯預算
             update: 更新預算
@@ -81,16 +70,12 @@ zh-TW:
           create:
             invalid: 這個專案創建時出了問題
             success: 專案建立成功
-          destroy:
-            success: 專案刪除成功
           edit:
             title: 編輯專案
             update: 更新
           index:
             actions: 操作
             cancel: 撤銷
-            change_category: 變更類別
-            change_scope: 變更範圍
             change_selected: 更改所選狀態
             deselect_implementation: 從實施中取消選擇
             finished_orders: 已完成投票
@@ -99,32 +84,15 @@ zh-TW:
             selected: 已選取
             title: 專案
             update: 更新
-            update_scope_button: 更新範圍
           new:
             create: 建立
             title: 新專案
           update:
             invalid: 更新此專案時出現問題
             success: 專案更新成功。
-          update_category:
-            invalid: '這些專案已經擁有了 %{subject_name} 類別: %{projects}'
-            select_a_category: 請選擇一個類別。
-            select_a_project: 請選擇一個專案
-            success: '已成功將以下專案更新至 %{subject_name} 類別: %{projects}。'
-          update_scope:
-            invalid: '這些專案已經有了 %{subject_name} 的範圍: %{projects}。'
-            select_a_project: 請選擇一個專案
-            select_a_scope: 請選擇一個範圍。
-            success: '已成功將以下專案更新至 %{subject_name} 範圍: %{projects}。'
           update_selected:
-            invalid:
-              selected: '這些專案已被選擇以實施：％{projects}。'
-              unselected: '這些專案已從實施中取消選擇: ％{projects}。'
             select_a_project: 請選擇一個專案
             select_a_selection: 請選擇實施狀態。
-            success:
-              selected: '這些專案已成功選擇實施：%{projects}。'
-              unselected: '這些專案已經成功從實施中取消選擇: %{projects}。'
         proposals_imports:
           create:
             invalid: 將提案匯入專案時出現問題。
@@ -178,15 +146,16 @@ zh-TW:
             total_budget: 總預算
         project:
           fields:
-            category: 類別
             id: ID
             title: 標題
+      order:
+        status:
+          title: 您的投票已成功接受
       order_summary_mailer:
         order_summary:
           selected_projects: '你選擇的專案如下：'
           subject: 您已經在 %{space_name} 參與空間投票
           voted_on_space: 您已對「%{space_name}」參與空間的「%{budget_name}」預算進行投票。
-          voted_on_space_with_scope: 您已在%{scope_type} 的%{scope_name} 中，對%{space_name} 參與空間的%{budget_name} 預算進行了投票。
       projects:
         budget_confirm:
           are_you_sure: 如果您改變了主意，稍後可以更改您的選票。
@@ -218,8 +187,6 @@ zh-TW:
           message: 您的投票尚未被註冊，因為您尚未完成投票程序。您確定要退出投票嗎?
           title: 您尚未投票
         filters:
-          category: 類別
-          scope: 範圍
           search: 搜尋
           status: 狀態
           status_values:
@@ -271,13 +238,10 @@ zh-TW:
               errors:
                 budget_voting_rule_only_one: 僅能啟用一個投票規則。
                 budget_voting_rule_required: 必須啟用一種投票規則
-            geocoding_enabled: 地理編碼已啟用
             landing_page_content: 預算網頁首頁
             more_information_modal: 更多資訊彈出式視窗
             projects_per_page: 每頁顯示專案
             resources_permissions_enabled: 可為每個專案設定動作權限
-            scope_id: 範圍
-            scopes_enabled: 啟用範圍
             title: 標題
             total_budget: 總預算
             vote_minimum_budget_projects_number: 最少需要投票的專案數量

data/db/migrate/20200827154129_add_commentable_counter_cache_to_projects.rb

@@ -4,6 +4,6 @@ class AddCommentableCounterCacheToProjects < ActiveRecord::Migration[5.2]
   def change
     add_column :decidim_budgets_projects, :comments_count, :integer, null: false, default: 0, index: true
     Decidim::Budgets::Project.reset_column_information
-    Decidim::Budgets::Project.find_each(&:update_comments_count)
+    Decidim::Budgets::Project.unscoped.find_each(&:update_comments_count)
   end
 end

data/db/migrate/20210310120613_add_followable_counter_cache_to_budgets.rb

@@ -7,7 +7,7 @@ class AddFollowableCounterCacheToBudgets < ActiveRecord::Migration[5.2]
     reversible do |dir|
       dir.up do
         Decidim::Budgets::Project.reset_column_information
-        Decidim::Budgets::Project.find_each do |record|
+        Decidim::Budgets::Project.unscoped.find_each do |record|
           record.class.reset_counters(record.id, :follows)
         end
       end

data/db/migrate/20240828103724_add_deleted_at_to_decidim_budgets_budgets.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimBudgetsBudgets < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_budgets_budgets, :deleted_at, :datetime
+    add_index :decidim_budgets_budgets, :deleted_at
+  end
+end

data/db/migrate/20240916135141_add_deleted_at_to_decidim_budgets_projects.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimBudgetsProjects < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_budgets_projects, :deleted_at, :datetime
+    add_index :decidim_budgets_projects, :deleted_at
+  end
+end

data/decidim-budgets.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-budgets"
   s.summary = "Decidim budgets module"

data/lib/decidim/api/budget_type.rb

@@ -3,19 +3,16 @@
 module Decidim
   module Budgets
     class BudgetType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::TimestampsInterface
       implements Decidim::Core::TraceableInterface
 
       description "A budget"
 
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this budget", null: false
       field :id, GraphQL::Types::ID, "The internal ID of this budget", null: false
+      field :projects, [Decidim::Budgets::ProjectType, { null: true }], "The projects for this budget", null: false
       field :title, Decidim::Core::TranslatedFieldType, "The title for this budget", null: false
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this budget", null: false
       field :total_budget, GraphQL::Types::Int, "The total budget", null: false, camelize: false
-      field :created_at, Decidim::Core::DateTimeType, "When this budget was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "When this budget was updated", null: true
-
-      field :projects, [Decidim::Budgets::ProjectType, { null: true }], "The projects for this budget", null: false
 
       def self.authorized?(object, context)
         super && object.visible?

data/lib/decidim/api/budgets_type.rb

@@ -6,16 +6,15 @@ module Decidim
       graphql_name "Budgets"
       description "A budget component of a participatory space."
 
-      field :budgets, Decidim::Budgets::BudgetType.connection_type, null: true, connection: true
+      field :budget, Decidim::Budgets::BudgetType, "A single Budget object", null: true do
+        argument :id, GraphQL::Types::ID, "The id of the Budget requested", required: true
+      end
+      field :budgets, Decidim::Budgets::BudgetType.connection_type, "A collection of Budgets", null: true, connection: true
 
       def budgets
         Budget.where(component: object).includes(:component)
       end
 
-      field :budget, Decidim::Budgets::BudgetType, null: true do
-        argument :id, GraphQL::Types::ID, required: true
-      end
-
       def budget(**args)
         Budget.where(component: object).find_by(id: args[:id])
       end

data/lib/decidim/api/project_type.rb

@@ -3,21 +3,19 @@
 module Decidim
   module Budgets
     class ProjectType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::ScopableInterface
+      implements Decidim::Core::TimestampsInterface
+      implements Decidim::Core::TaxonomizableInterface
       implements Decidim::Core::AttachableInterface
       implements Decidim::Comments::CommentableInterface
-      implements Decidim::Core::CategorizableInterface
 
       description "A project"
 
-      field :id, GraphQL::Types::ID, "The internal ID for this project", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this project", null: true
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this project", null: true
       field :budget_amount, GraphQL::Types::Int, "The budget amount for this project", null: true, camelize: false
-      field :selected, GraphQL::Types::Boolean, "Whether this proposal is selected or not", method: :selected?, null: true
-      field :created_at, Decidim::Core::DateTimeType, "When this project was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "When this project was updated", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this project", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this project", null: false
       field :reference, GraphQL::Types::String, "The reference for this project", null: true
+      field :selected, GraphQL::Types::Boolean, "Whether this proposal is selected or not", method: :selected?, null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this project", null: true
 
       def self.authorized?(object, context)
         context[:project] = object

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.6"
+      "0.30.0.rc1"
     end
   end
 end