decidim-budgets 0.27.5 → 0.28.0.rc4

data/config/locales/zh-TW.yml

@@ -45,14 +45,13 @@ zh-TW:
         edit: 編輯
         edit_projects: 管理專案
         import: 將提案匯入專案
-        new: 新增 %{name}
         preview: 預覽
         send_voting_reminders: 發送投票提醒
         title: 操作
       admin:
         budgets:
           create:
-            invalid: 建立預算時發生問題
+            invalid: 建立預算時發生問題。
             success: 預算已成功建立
           destroy:
             invalid: 刪除此預算時出現問題
@@ -107,10 +106,10 @@ zh-TW:
             title: 新專案
           update:
             invalid: 更新此專案時出現問題
-            success: 專案更新成功
+            success: 專案更新成功。
           update_category:
             invalid: '這些專案已經擁有了 %{subject_name} 類別: %{projects}'
-            select_a_category: 請選擇一個類別
+            select_a_category: 請選擇一個類別。
             select_a_project: 請選擇一個專案
             success: '已成功將以下專案更新至 %{subject_name} 類別: %{projects}。'
           update_scope:
@@ -129,8 +128,8 @@ zh-TW:
               unselected: '這些專案已經成功從實施中取消選擇: %{projects}。'
         proposals_imports:
           create:
-            invalid: 將提案匯入專案時出現問題
-            success: "%{number} 個提案已成功匯入專案"
+            invalid: 將提案匯入專案時出現問題。
+            success: "%{number} 個提案已成功匯入專案。"
           new:
             create: 將提案匯入專案
             default_budget: 預設預算
@@ -138,7 +137,6 @@ zh-TW:
             no_components: 在此參與空間中沒有其他提案元件可以將提案匯入到專案中。
             origin_component_id: 原始元件
             select_component: 請選擇一個組件
-            title: 導入提案
         reminders:
           orders:
             description: 使用者將會收到一封電子郵件，內含連結至他們有待處理訂單的預算。
@@ -153,16 +151,11 @@ zh-TW:
           create: "%{user_name} 在 %{space_name} 空間中創建了 %{resource_name} 專案"
           delete: "%{user_name} 刪除了 %{space_name} 空間中的 %{resource_name} 專案。"
           update: "%{user_name} 更新了 %{space_name} 空間中的 %{resource_name} 專案。"
-      budget:
-        view: 查看所有預算專案
       budget_information_modal:
         back_to: 返回 %{component_name}
         close_modal: 關閉視窗
         continue: 繼續
         more_information: 更多資訊
-      budget_list_item:
-        voting_finished: 您已在此預算中投票
-        voting_started: 你已經開始在這個預算中投票了
       budgets_list:
         cancel_order:
           more_than_one: 刪除您對於 %{name} 的投票並重新開始
@@ -170,13 +163,12 @@ zh-TW:
         finished_message: 您已完成投票流程。感謝您的參與！
         highlighted_cta: 在 %{name} 上投票
         if_change_opinion: 如果您改變了主意，您可以
-        my_budgets: 我的預算
         progress: 完成投票
         show: 檢視專案
         vote: 投票
-        voted_on: 你已經對 %{links} 投票
+        voted_on: 你已經對 %{links} 投票。
       last_activity:
-        new_vote_at_html: "<span>在%{link} 有新的預算投票</span>"
+        new_vote_at: 新預算投票於
       limit_announcement:
         cant_vote: 你無法在這個預算中進行投票。<a href="%{landing_path}">嘗試在其他預算中投票</a>。
         limit_reached: 您在 %{links} 上有進行中的投票。若要對此預算進行投票，您必須<a href="%{landing_path}">刪除您目前的投票並重新開始</a>。
@@ -190,7 +182,6 @@ zh-TW:
           fields:
             category: 類別
             id: ID
-            scope: 範圍
             title: 標題
       order_summary_mailer:
         order_summary:
@@ -209,7 +200,6 @@ zh-TW:
           budget_excess:
             description: 這個專案超出了預算上限，無法被加入。如果您願意，您可以刪除您已經選擇的一個專案，以便能夠根據您的偏好再次進行投票。
             title: 已超過最高預算
-          close: 關閉
           description: 這個專案超出了預算上限，無法被加入。如果您願意，您可以刪除您已經選擇的一個專案，以便能夠根據您的偏好再次進行投票。
           ok: 好的
           projects_excess:
@@ -217,34 +207,15 @@ zh-TW:
             title: 超過最大專案數量
         budget_summary:
           are_you_sure: 您確定要取消您的投票嗎?
-          assigned: '已指派:'
           cancel_order: 刪除你的投票並重新開始
           checked_out:
             description: 你已經對預算表決投票了。如果你改變了主意，你可以%{cancel_link}。
             title: 預算投票完成
-          minimum_projects_rule:
-            description: 您認為我們應該撥款給哪些專案？請選擇至少 %{minimum_number} 個您想要的專案，並根據您的偏好進行投票，以定義預算。
-            instruction: "<li>請選擇至少 %{minimum_number} 個您認為應該分配預算的項目，並根據您的喜好進行投票以定義預算。</li>"
-          projects_rule:
-            description: 你認為我們應該為哪些專案分配預算？請至少選擇 %{minimum_number} 個專案，最多可選擇 %{maximum_number} 個項目，並根據你的喜好投票以定義預算。
-            instruction: "<li>請至少選擇 %{minimum_number} 個至多 %{maximum_number} 個您想要的項專案，並根據您的喜好進行投票以定義預算。</li>"
-          projects_rule_maximum_only:
-            description: 你認為我們應該為哪些專案分配預算？請選擇最多 %{maximum_number} 個專案，根據你的喜好進行投票，來定義預算。
-            instruction: "\"<li>選擇最多 %{maximum_number} 個您想為其分配預算的專案，並根據您的喜好進行投票，以定義預算。</li>"
-          rules:
-            title: 預算規則
-          title: 你決定預算
-          total_budget: 總預算
-          total_projects: 總票數
-          vote_threshold_percent_rule:
-            description: 您覺得我們應該為哪些專案分配預算？為您想要的專案分配至少 %{minimum_budget} 的預算，並按照您的喜好進行投票以定義預算。
-            instruction: "\"<li>指派至少 %{minimum_budget} 的預算給您想支持的專案，然後根據您的喜好進行投票以制定預算。</li>"
         count:
           projects_count:
             other: "%{count} 專案"
         exit_modal:
           cancel: 返回投票
-          close_modal: 關閉視窗
           exit: 退出投票
           message: 您的投票尚未被註冊，因為您尚未完成投票程序。您確定要退出投票嗎?
           title: 您尚未投票
@@ -257,20 +228,6 @@ zh-TW:
             all: 全部
             not_selected: 未選擇
             selected: 已選取
-        filters_small_view:
-          close_modal: 關閉視窗
-          filter: 篩選
-          filter_by: 篩選條件
-          unfold: 展開
-        index:
-          view_project: 檢視專案
-        order_progress:
-          vote: 投票
-        order_selected_projects:
-          remove: 移除
-          selected_projects:
-            other: 已選擇的專案
-          view: 檢視
         orders:
           highest_cost: 最高成本
           label: 專案排序方式
@@ -279,22 +236,20 @@ zh-TW:
           random: 隨機順序
           selected: 已選取
         project:
-          add: 將專案 %{resource_name} 加入您的投票
-          remove: 從您的投票中移除專案 %{resource_name}
+          add: 將專案 %{resource_name} 添加到您的投票中。
+          remove: 從您的投票中移除專案 %{resource_name}。
           selected: 已選取
-          view: 檢視
           votes:
             other: 投票
           you_voted: 你已投票支持此
         project_budget_button:
           add: 加入您的投票
-          add_descriptive: 將專案 %{resource_name} 加入您的投票
+          add_descriptive: 將專案 %{resource_name} 加入您的投票。
           added: 加入您的投票
-          added_descriptive: 將專案 %{resource_name} 加入您的投票
+          added_descriptive: 將專案 %{resource_name} 加入您的投票。
         projects_for: 專案 %{name}
         show:
           budget: 預算
-          view_all_projects: 檢視所有專案
       vote_reminder_mailer:
         vote_reminder:
           email_budgets: '您有尚未完成投票的領域:'
@@ -316,7 +271,7 @@ zh-TW:
             comments_max_length: 評論字數最大長度(若要使用預設值請輸入0)
             form:
               errors:
-                budget_voting_rule_only_one: 僅能啟用一個投票規則
+                budget_voting_rule_only_one: 僅能啟用一個投票規則。
                 budget_voting_rule_required: 必須啟用一種投票規則
             geocoding_enabled: 地理編碼已啟用
             landing_page_content: 預算網頁首頁
@@ -362,10 +317,9 @@ zh-TW:
     orders:
       checkout:
         error: 處理您的投票時出現問題。
-        success: 您的投票已成功接受
       destroy:
         error: 取消您的投票時出現問題
-        success: 您的投票已成功取消
+        success: 您的投票已成功取消。
     resource_links:
       included_proposals:
         project_proposal: 此專案中包括的提案

data/lib/decidim/budgets/admin_engine.rb

@@ -18,6 +18,7 @@ module Decidim
               post :update_category
               post :update_scope
               post :update_selected
+              post :update_budget
               resource :proposals_import, only: [:new, :create]
             end
           end
@@ -26,8 +27,8 @@ module Decidim
         resources :projects, exclude: [:index, :new, :create, :edit, :update, :destroy] do
           get :proposals_picker, on: :collection
 
-          resources :attachment_collections
-          resources :attachments
+          resources :attachment_collections, except: [:show]
+          resources :attachments, except: [:show]
         end
 
         root to: "budgets#index"

data/lib/decidim/budgets/component.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:budgets) do |component|
   component.engine = Decidim::Budgets::Engine
   component.admin_engine = Decidim::Budgets::AdminEngine
   component.icon = "media/images/decidim_budgets.svg"
+  component.icon_key = "coin-line"
   component.stylesheet = "decidim/budgets/budgets"
   component.permissions_class_name = "Decidim::Budgets::Permissions"
   component.component_form_class_name = "Decidim::Budgets::Admin::ComponentForm"
@@ -19,7 +18,7 @@ Decidim.register_component(:budgets) do |component|
   component.actions = %w(vote comment)
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Budgets::Budget.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Budgets::Budget.where(component: instance).any?
   end
 
   component.register_resource(:budget) do |resource|
@@ -110,93 +109,8 @@ Decidim.register_component(:budgets) do |component|
   end
 
   component.seeds do |participatory_space|
-    landing_page_content = Decidim::Faker::Localized.localized do
-      "<h2>#{::Faker::Lorem.sentence}</h2>" \
-        "<p>#{::Faker::Lorem.paragraph}</p>" \
-        "<p>#{::Faker::Lorem.paragraph}</p>"
-    end
+    require "decidim/budgets/seeds"
 
-    component = Decidim::Component.create!(
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name,
-      manifest_name: :budgets,
-      published_at: Time.current,
-      participatory_space: participatory_space,
-      settings: {
-        landing_page_content: landing_page_content,
-        more_information_modal: Decidim::Faker::Localized.paragraph(sentence_count: 4),
-        workflow: Decidim::Budgets.workflows.keys.sample
-      }
-    )
-
-    rand(1...3).times do
-      Decidim::Budgets::Budget.create!(
-        component: component,
-        title: Decidim::Faker::Localized.sentence(word_count: 2),
-        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-          Decidim::Faker::Localized.paragraph(sentence_count: 3)
-        end,
-        total_budget: Faker::Number.number(digits: 8)
-      )
-    end
-
-    Decidim::Budgets::Budget.where(component: component).each do |budget|
-      rand(2...4).times do
-        project = Decidim::Budgets::Project.create!(
-          budget: 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)
-          end,
-          budget_amount: Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
-        )
-
-        attachment_collection = Decidim::AttachmentCollection.create!(
-          name: Decidim::Faker::Localized.word,
-          description: Decidim::Faker::Localized.sentence(word_count: 5),
-          collection_for: project
-        )
-
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5),
-          attachment_collection: attachment_collection,
-          attached_to: project,
-          content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_and_upload!(
-            io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-            filename: "Exampledocument.pdf",
-            content_type: "application/pdf",
-            metadata: nil
-          )
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5),
-          attached_to: project,
-          content_type: "image/jpeg",
-          file: ActiveStorage::Blob.create_and_upload!(
-            io: File.open(File.join(__dir__, "seeds", "city.jpeg")),
-            filename: "city.jpeg",
-            content_type: "image/jpeg",
-            metadata: nil
-          )
-        )
-        Decidim::Attachment.create!(
-          title: Decidim::Faker::Localized.sentence(word_count: 2),
-          description: Decidim::Faker::Localized.sentence(word_count: 5),
-          attached_to: project,
-          content_type: "application/pdf",
-          file: ActiveStorage::Blob.create_and_upload!(
-            io: File.open(File.join(__dir__, "seeds", "Exampledocument.pdf")),
-            filename: "Exampledocument.pdf",
-            content_type: "application/pdf",
-            metadata: nil
-          )
-        )
-        Decidim::Comments::Seed.comments_for(project)
-      end
-    end
+    Decidim::Budgets::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/budgets/engine.rb

@@ -20,8 +20,18 @@ module Decidim
             resource :line_item, only: [:create, :destroy]
           end
         end
+        scope "/budgets" do
+          root to: "budgets#index"
+        end
+        get "/", to: redirect("budgets", status: 301)
+      end
 
-        root to: "budgets#index"
+      initializer "decidim_budgets.register_icons" do
+        Decidim.icons.register(name: "Decidim::Budgets::Budget", icon: "coin-line", description: "Budget", category: "activity", engine: :budgets)
+        Decidim.icons.register(name: "Decidim::Budgets::Project", icon: "coin-line", description: "Project (Budgets)", category: "activity", engine: :budgets)
+        Decidim.icons.register(name: "Decidim::Budgets::Order", icon: "check-double-fill", description: "Budget voting", category: "activity", engine: :budgets)
+
+        Decidim.icons.register(name: "git-pull-request-line", icon: "git-pull-request-line", category: "system", description: "", engine: :budgets)
       end
 
       initializer "decidim_budgets.add_cells_view_paths" do
@@ -44,18 +54,28 @@ module Decidim
       end
 
       initializer "decidim_budgets.register_reminders" do
-        Decidim.reminders_registry.register(:orders) do |reminder_registry|
-          reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
-          reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
-          reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+        config.after_initialize do
+          Decidim.reminders_registry.register(:orders) do |reminder_registry|
+            reminder_registry.generator_class_name = "Decidim::Budgets::OrderReminderGenerator"
+            reminder_registry.form_class_name = "Decidim::Budgets::Admin::OrderReminderForm"
+            reminder_registry.command_class_name = "Decidim::Budgets::Admin::CreateOrderReminders"
+
+            reminder_registry.settings do |settings|
+              settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+            end
 
-          reminder_registry.settings do |settings|
-            settings.attribute :reminder_times, type: :array, default: [2.hours, 1.week, 2.weeks]
+            reminder_registry.messages do |msg|
+              msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count:) }
+              msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+            end
           end
+        end
+      end
 
-          reminder_registry.messages do |msg|
-            msg.set(:title) { |count: 0| I18n.t("decidim.budgets.admin.reminders.orders.title", count: count) }
-            msg.set(:description) { I18n.t("decidim.budgets.admin.reminders.orders.description") }
+      initializer "decidim_budgets.authorization_transfer" do
+        config.to_prepare do
+          Decidim::AuthorizationTransfer.register(:budgets) do |transfer|
+            transfer.move_records(Decidim::Budgets::Order, :decidim_user_id)
           end
         end
       end

data/lib/decidim/budgets/project_serializer.rb

@@ -37,9 +37,9 @@ module Decidim
           comments: project.comments_count,
           created_at: project.created_at,
           url: project.polymorphic_resource_url({}),
-          related_proposals: related_proposals,
-          related_proposal_titles: related_proposal_titles,
-          related_proposal_urls: related_proposal_urls
+          related_proposals:,
+          related_proposal_titles:,
+          related_proposal_urls:
         }
       end
 

data/lib/decidim/budgets/seeds.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+require "decidim/seeds"
+
+module Decidim
+  module Budgets
+    class Seeds < Decidim::Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        landing_page_content = Decidim::Faker::Localized.localized do
+          "<h2>#{::Faker::Lorem.sentence}</h2>" \
+            "<p>#{::Faker::Lorem.paragraph}</p>" \
+            "<p>#{::Faker::Lorem.paragraph}</p>"
+        end
+
+        component = Decidim::Component.create!(
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name,
+          manifest_name: :budgets,
+          published_at: Time.current,
+          participatory_space:,
+          settings: {
+            landing_page_content:,
+            more_information_modal: Decidim::Faker::Localized.paragraph(sentence_count: 4),
+            workflow: Decidim::Budgets.workflows.keys.sample
+          }
+        )
+
+        rand(1...3).times do
+          Decidim::Budgets::Budget.create!(
+            component:,
+            title: Decidim::Faker::Localized.sentence(word_count: 2),
+            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+              Decidim::Faker::Localized.paragraph(sentence_count: 3)
+            end,
+            total_budget: ::Faker::Number.number(digits: 8)
+          )
+        end
+
+        Decidim::Budgets::Budget.where(component:).each do |budget|
+          rand(2...4).times do
+            project = Decidim::Budgets::Project.create!(
+              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)
+              end,
+              budget_amount: ::Faker::Number.between(from: Integer(budget.total_budget * 0.7), to: budget.total_budget)
+            )
+
+            attachment_collection = create_attachment_collection(collection_for: project)
+            create_attachment(attached_to: project, filename: "Exampledocument.pdf", attachment_collection:)
+            create_attachment(attached_to: project, filename: "city.jpeg")
+            create_attachment(attached_to: project, filename: "Exampledocument.pdf")
+
+            Decidim::Comments::Seed.comments_for(project)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/decidim/budgets/test/factories.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/faker/localized"
 require "decidim/dev"
 
@@ -10,7 +11,7 @@ FactoryBot.define do
   factory :budgets_component, parent: :component do
     name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :budgets).i18n_name }
     manifest_name { :budgets }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
 
     trait :with_geocoding_enabled do
       settings do
@@ -30,10 +31,10 @@ FactoryBot.define do
 
       settings do
         {
-          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
-          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_threshold_percent_enabled:,
+          vote_rule_minimum_budget_projects_enabled:,
           vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
-          vote_threshold_percent: vote_threshold_percent
+          vote_threshold_percent:
         }
       end
     end
@@ -48,10 +49,10 @@ FactoryBot.define do
 
       settings do
         {
-          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
-          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_threshold_percent_enabled:,
+          vote_rule_minimum_budget_projects_enabled:,
           vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
-          vote_minimum_budget_projects_number: vote_minimum_budget_projects_number
+          vote_minimum_budget_projects_number:
         }
       end
     end
@@ -67,8 +68,8 @@ FactoryBot.define do
 
       settings do
         {
-          vote_rule_threshold_percent_enabled: vote_rule_threshold_percent_enabled,
-          vote_rule_minimum_budget_projects_enabled: vote_rule_minimum_budget_projects_enabled,
+          vote_rule_threshold_percent_enabled:,
+          vote_rule_minimum_budget_projects_enabled:,
           vote_rule_selected_projects_enabled: vote_rule_projects_enabled,
           vote_selected_projects_minimum: vote_minimum_budget_projects_number,
           vote_selected_projects_maximum: vote_maximum_budget_projects_number
@@ -120,7 +121,7 @@ FactoryBot.define do
       end
 
       after(:create) do |budget, evaluator|
-        create_list(:project, evaluator.projects_number, budget: budget)
+        create_list(:project, evaluator.projects_number, budget:)
       end
     end
   end

data/lib/decidim/budgets/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-budgets version.
   module Budgets
     def self.version
-      "0.27.5"
+      "0.28.0.rc4"
     end
   end
 end

data/lib/decidim/budgets/workflows/base.rb

@@ -123,7 +123,7 @@ module Decidim
 
         def orders
           @orders ||= Decidim::Budgets::Order.includes(:projects).where(decidim_user_id: user, decidim_budgets_budget_id: budgets).map do |order|
-            [order.decidim_budgets_budget_id, { order: order, status: order.checked_out? ? :voted : :progress }] if order.projects.any?
+            [order.decidim_budgets_budget_id, { order:, status: order.checked_out? ? :voted : :progress }] if order.projects.any?
           end.compact.to_h
         end
       end