decidim-budgets 0.31.8 → 0.32.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14f59147f08856c838f48d096f69fba830f7e16271b333c844bf3149943074e4
-  data.tar.gz: 32580fdfe06bf959b07e2f15dfea7778cdc9c32863d1bb99d7a433dccabd3cf6
+  metadata.gz: 8d1e9a57f1570f7e7c744aa5491727f328cddc0eb68cab35598f7f67042e1820
+  data.tar.gz: e66a4b84c85494fcd0f56c9f7231dafca776d6e43cdd1c61fcc5e51d258f05b1
 SHA512:
-  metadata.gz: 3064538c7524d637e23291e13846fab908829bdb783660e3ebfb76bc217ba9395900f264152822f387f76e9da7e677cf2eadec0c9560bef5a28834651655f76c
-  data.tar.gz: 23499f8574368f6bca328249804c9dd41aacb0d68409d2b9729e8110a999cd3de23e6542a104b5f8712f47e9f26804d1b233e215b59f5743e94add7cfb2dcbc4
+  metadata.gz: 70d15990935083ada78aad11f412d08c9beb4207b848a726eb362bc965a3e0adb0c61e4e85db1742615293691a838c6c7e62db252f20a6b28f5ea548b3b51e1a
+  data.tar.gz: 7fa445aa14f232f290e66ff43d57f52302d81b640dc33248dad3868e5de52e2d73d2ca130d2186becacf4e82d5540d67cf61d8a152d0a5e2242d2bf73108a371

data/README.md

@@ -1,6 +1,6 @@
-# Decidim::Budgets
+# decidim-budgets
 
-The Budgets module adds budgets with projects related to them to any participatory process. It adds a CRUD engine to the admin and public views scoped inside the participatory space. Projects will link to related proposals and have a budget. The users should be able to distribute a budget between these projects.
+The Budgets module adds budgets with projects related to them to any participatory space. It adds a CRUD engine to the admin and public views scoped inside the participatory space. Projects will link to related proposals and have a budget. The users should be able to distribute a budget between these projects.
 
 ## Usage
 
@@ -16,17 +16,7 @@ This plugin provides:
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem "decidim-budgets"
-```
-
-And then execute:
-
-```bash
-bundle
-```
+This is on the default Decidim installation so you should not change anything to use this component.
 
 ## Budget Workflows
 

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

@@ -47,18 +47,12 @@ module Decidim
       # If not (i.e. voting is disabled or finished), then link to the resource itself
       def link_to_resource_or_vote(css_class)
         if voting_open?
-          if current_user
-            action_authorized_link_to :vote,
-                                      budget_projects_path(budget, start_voting: true),
-                                      resource: budget,
-                                      class: css_class,
-                                      data: { "redirect-url": budget_projects_path(budget) } do
-              yield
-            end
-          else
-            link_to budget_projects_path(budget, start_voting: true), class: css_class do
-              yield
-            end
+          action_authorized_link_to "vote",
+                                    budget_projects_path(budget, start_voting: true),
+                                    resource: budget,
+                                    data: { "redirect-url": budget_projects_path(budget) },
+                                    class: css_class do
+            yield
           end
         else
           link_to resource_path, class: css_class do

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

@@ -6,24 +6,25 @@ module Decidim
       # This command is executed when the user creates a Project from the admin
       # panel.
       class CreateProject < Decidim::Commands::CreateResource
-        include ::Decidim::MultipleAttachmentsMethods
+        include ::Decidim::GalleryMethods
+
         fetch_form_attributes :budget, :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         private
 
-        attr_reader :attachments
+        attr_reader :gallery
 
         def run_after_hooks
           @attached_to = resource
           link_proposals
-          create_attachments if process_attachments?
+          create_gallery if process_gallery?
         end
 
         def run_before_hooks
-          return unless process_attachments?
+          return unless process_gallery?
 
-          build_attachments
-          raise Decidim::Commands::HookError if attachments_invalid?
+          build_gallery
+          raise Decidim::Commands::HookError if gallery_invalid?
         end
 
         def extra_params

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

@@ -6,7 +6,8 @@ module Decidim
       # This command is executed when the user changes a Project from the admin
       # panel.
       class UpdateProject < Decidim::Commands::UpdateResource
-        include ::Decidim::MultipleAttachmentsMethods
+        include ::Decidim::GalleryMethods
+
         fetch_form_attributes :taxonomizations, :title, :description, :budget_amount, :address, :latitude, :longitude
 
         def initialize(form, project)
@@ -18,15 +19,15 @@ module Decidim
 
         def run_after_hooks
           link_proposals
-          create_attachments if process_attachments?
-          attachment_cleanup!(include_all_attachments: true)
+          create_gallery if process_gallery?
+          photo_cleanup!
         end
 
         def run_before_hooks
-          return unless process_attachments?
+          return unless process_gallery?
 
-          build_attachments
-          raise Decidim::Commands::HookError if attachments_invalid?
+          build_gallery
+          raise Decidim::Commands::HookError if gallery_invalid?
         end
 
         def attributes

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

@@ -31,7 +31,7 @@ module Decidim
         return unless order && order.valid?
 
         @order.with_lock do
-          SendOrderSummaryJob.perform_later(@order)
+          send_order_summary_job(@order)
 
           Decidim.traceability.update!(
             @order,
@@ -43,6 +43,12 @@ module Decidim
           false
         end
       end
+
+      def send_order_summary_job(order)
+        return if order&.user&.email.blank?
+
+        OrderSummaryMailer.order_summary(order).deliver_later
+      end
     end
   end
 end

data/app/controllers/concerns/decidim/budgets/admin/filterable.rb

@@ -23,10 +23,6 @@ module Decidim
             collection.includes(:taxonomies).joins(:taxonomies)
           end
 
-          def search_field_predicate
-            :id_string_or_title_cont
-          end
-
           def filters
             [
               :taxonomies_part_of_contains,

data/app/controllers/concerns/decidim/budgets/needs_current_order.rb

@@ -18,6 +18,14 @@ module Decidim
           @current_order ||= Order.includes(:projects).find_or_initialize_by(user: current_user, budget:)
         end
 
+        def current_order=(order)
+          @current_order = order
+        end
+
+        def persisted_current_order
+          current_order if current_order&.persisted?
+        end
+
         def can_have_order?
           current_user.present? &&
             voting_open? &&
@@ -29,16 +37,6 @@ module Decidim
         def voted_for?(project)
           current_order && current_order.projects.include?(project)
         end
-
-        private
-
-        def current_order=(order)
-          @current_order = order
-        end
-
-        def persisted_current_order
-          current_order if current_order&.persisted?
-        end
       end
     end
   end

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

@@ -8,8 +8,6 @@ module Decidim
       class AttachmentCollectionsController < Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachmentCollections
 
-        protected
-
         def after_destroy_path
           project_attachment_collections_path(project, project.component, current_participatory_space)
         end

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

@@ -9,8 +9,6 @@ module Decidim
       class AttachmentsController < Admin::ApplicationController
         include Decidim::Admin::Concerns::HasAttachments
 
-        protected
-
         def after_destroy_path
           budget_projects_path(project.budget)
         end

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

@@ -6,6 +6,7 @@ module Decidim
       # This controller allows the create or update a budget.
       class BudgetsController < Admin::ApplicationController
         include Decidim::Admin::HasTrashableResources
+
         helper_method :budgets, :budget, :finished_orders, :pending_orders,
                       :users_with_pending_orders, :users_with_finished_orders
 
@@ -26,7 +27,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("budgets.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
@@ -48,7 +49,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("budgets.update.invalid", scope: "decidim.budgets.admin")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end
@@ -76,7 +77,7 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget: budgets) # rubocop:disable Decidim/OrganizationScopedFinder -- budgets are scoped to current_component above
+          @orders ||= Order.where(budget: budgets)
         end
 
         def pending_orders

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

@@ -9,11 +9,16 @@ module Decidim
         include Decidim::Admin::HasTrashableResources
         include Decidim::Admin::ComponentTaxonomiesHelper
         include Decidim::Budgets::Admin::Filterable
+
         helper Decidim::Budgets::Admin::ProjectBulkActionsHelper
         helper Decidim::Budgets::ProjectsHelper
 
         helper_method :projects, :finished_orders, :pending_orders, :present, :project_ids
 
+        def collection
+          @collection ||= budget.projects.page(params[:page]).per(15)
+        end
+
         def new
           enforce_permission_to :create, :project
           @form = form(ProjectForm).from_params(
@@ -35,7 +40,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("projects.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
@@ -58,7 +63,7 @@ module Decidim
 
             on(:invalid) do
               flash.now[:alert] = I18n.t("projects.update.invalid", scope: "decidim.budgets.admin")
-              render action: "edit", status: :unprocessable_entity
+              render action: "edit", status: :unprocessable_content
             end
           end
         end
@@ -66,7 +71,7 @@ module Decidim
         def update_taxonomies
           enforce_permission_to :update, :project_taxonomy
 
-          UpdateResourcesTaxonomies.call(params[:taxonomies], budget.projects.where(id: project_ids), current_organization) do
+          UpdateResourcesTaxonomies.call(params[:taxonomies], Decidim::Budgets::Project.where(id: project_ids), current_organization) do
             on(:invalid_taxonomies) do
               flash[:error] = I18n.t(
                 "projects.update_taxonomies.select_a_taxonomy",
@@ -158,10 +163,6 @@ module Decidim
 
         private
 
-        def collection
-          @collection ||= budget.projects.page(params[:page]).per(15)
-        end
-
         def trashable_deleted_resource_type
           :project
         end
@@ -179,7 +180,7 @@ module Decidim
         end
 
         def orders
-          @orders ||= Order.where(budget:) # rubocop:disable Decidim/OrganizationScopedFinder -- budget is scoped to current_component in ApplicationController
+          @orders ||= Order.where(budget:)
         end
 
         def project_ids
@@ -189,7 +190,7 @@ module Decidim
         def reference_budget
           return unless params[:reference_id]
 
-          Budget.where(component: current_component).find(params.require(:reference_id))
+          Budget.find(params[:reference_id])
         end
 
         def pending_orders
@@ -203,7 +204,7 @@ module Decidim
         def sample_project
           return if project_ids.empty?
 
-          budget.projects.find(project_ids.first)
+          Decidim::Budgets::Project.find(project_ids.first)
         end
 
         def project

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

@@ -24,7 +24,7 @@ module Decidim
 
             on(:invalid) do
               flash[:alert] = I18n.t("proposals_imports.create.invalid", scope: "decidim.budgets.admin")
-              render action: "new", status: :unprocessable_entity
+              render action: "new", status: :unprocessable_content
             end
           end
         end
@@ -34,7 +34,7 @@ module Decidim
           component = current_participatory_space.components.find_by(id: params[:origin_id])
 
           if component
-            states = Decidim::Proposals::ProposalState # rubocop:disable Decidim/OrganizationScopedFinder -- component is scoped above via current_participatory_space
+            states = Decidim::Proposals::ProposalState
                      .where(component:)
                      .map { |s| { token: s.token, title: translated_attribute(s.title) } }
             states << { token: "not_answered", title: I18n.t("decidim.proposals.answers.not_answered") }

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

@@ -8,7 +8,7 @@ module Decidim
     # Note that it inherits from `Decidim::Components::BaseController`, which
     # override its layout and provide all kinds of useful methods.
     class ApplicationController < Decidim::Components::BaseController
-      helper_method :current_workflow, :voting_finished?, :voting_open?, :show_votes_count?, :resource_added?
+      helper_method :current_workflow, :voting_finished?, :voting_open?, :show_votes_count?
 
       def current_workflow
         @current_workflow ||= Decidim::Budgets.workflows[workflow_name].new(current_component, current_user)

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

@@ -9,13 +9,9 @@ module Decidim
       include Decidim::Budgets::Orderable
       include Decidim::TranslatableAttributes
 
-      def index
-        enforce_permission_to :read, :budget
-      end
+      def index; end
 
       def show
-        enforce_permission_to(:read, :budget, budget:)
-
         raise ActionController::RoutingError, "Not Found" unless budget
 
         redirect_to budget_projects_path(budget)

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

@@ -22,12 +22,12 @@ module Decidim
             AddLineItem.call(persisted_current_order, project, current_user) do
               on(:ok) do |order|
                 self.current_order = order
-                format.html { redirect_back(fallback_location: budget_path(budget)) }
+                format.html { redirect_back_or_to(budget_path(budget)) }
                 format.js { render "update_budget" }
               end
 
               on(:invalid) do
-                format.js { render "update_budget", status: :unprocessable_entity }
+                format.js { render "update_budget", status: :unprocessable_content }
               end
             end
           end
@@ -35,17 +35,15 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :vote, :project, project:, budget:, workflow: current_workflow
-
         respond_to do |format|
           RemoveLineItem.call(current_order, project) do
             on(:ok) do |_order|
-              format.html { redirect_back(fallback_location: budget_path(budget)) }
+              format.html { redirect_back_or_to(budget_path(budget)) }
               format.js { render "update_budget" }
             end
 
             on(:invalid) do
-              format.js { render "update_budget", status: :unprocessable_entity }
+              format.js { render "update_budget", status: :unprocessable_content }
             end
           end
         end

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

@@ -26,8 +26,6 @@ module Decidim
       end
 
       def destroy
-        enforce_permission_to :destroy, :order, order: current_order
-
         CancelOrder.call(current_order) do
           on(:ok) do
             flash[:notice] = I18n.t("orders.destroy.success", scope: "decidim")
@@ -42,8 +40,6 @@ module Decidim
       end
 
       def status
-        enforce_permission_to :read, :order, order: current_order
-
         redirect_to redirect_path unless current_order.persisted?
       end
 

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

@@ -6,24 +6,21 @@ module Decidim
     class ProjectsController < Decidim::Budgets::ApplicationController
       include FilterResource
       include NeedsCurrentOrder
+      include Decidim::AttachmentsHelper
       include Decidim::Budgets::Orderable
       include Decidim::IconHelper
 
-      helper_method :projects, :project, :budget, :all_geocoded_projects, :tabs, :panels, :resource_added?
+      helper_method :projects, :project, :budget, :all_geocoded_projects, :resource_added?, :tab_panel_items
 
       before_action :set_focus_mode_if_voting_open
 
       def index
-        enforce_permission_to :read, :project
-
         raise ActionController::RoutingError, "Not Found" unless budget
       end
 
       def show
         raise ActionController::RoutingError, "Not Found" unless budget
         raise ActionController::RoutingError, "Not Found" unless project
-
-        enforce_permission_to :read, :project, project:
       end
 
       private
@@ -68,16 +65,8 @@ module Decidim
         voting_finished? && budget.projects.selected.any?
       end
 
-      def tabs
-        @tabs ||= items.map { |item| item.slice(:id, :text, :icon) }
-      end
-
-      def panels
-        @panels ||= items.map { |item| item.slice(:id, :method, :args) }
-      end
-
-      def items
-        @items ||= [
+      def tab_panel_items
+        @tab_panel_items ||= [
           {
             enabled: ProjectHistoryCell.new(@project).render?,
             id: "included_history",
@@ -86,24 +75,31 @@ module Decidim
             method: :cell,
             args: ["decidim/budgets/project_history", @project]
           },
-          {
-            enabled: @project.photos.present?,
-            id: "images",
-            text: t("decidim.application.photos.photos"),
-            icon: resource_type_icon_key("images"),
-            method: :cell,
-            args: ["decidim/images_panel", @project]
-          },
-          {
-            enabled: @project.documents.present?,
-            id: "documents",
-            text: t("decidim.application.documents.documents"),
-            icon: resource_type_icon_key("documents"),
-            method: :cell,
-            args: ["decidim/documents_panel", @project]
-          }
+          *attachments_tab_panel_items(@project)
         ].select { |item| item[:enabled] }
       end
+
+      def add_breadcrumb_item
+        return {} if project.blank?
+
+        {
+          label: translated_attribute(project.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).budget_project_url(budget, project),
+          active: false,
+          resource: project
+        }
+      end
+
+      def add_parent_breadcrumb_item
+        return {} if budget.blank?
+
+        {
+          label: translated_attribute(budget.title),
+          url: Decidim::EngineRouter.main_proxy(current_component).budget_projects_url(budget),
+          active: false,
+          resource: budget
+        }
+      end
     end
   end
 end

data/app/forms/decidim/budgets/admin/project_form.rb

@@ -22,7 +22,7 @@ module Decidim
         attribute :attachment, AttachmentForm
         attribute :selected, Boolean
 
-        attachments_attribute :attachments
+        attachments_attribute :photos
 
         validates :title, translatable_presence: true
         validates :description, translatable_presence: true
@@ -36,8 +36,6 @@ module Decidim
         def map_model(model)
           self.proposal_ids = model.linked_resources(:proposals, "included_proposals").pluck(:id)
           self.selected = model.selected?
-          self.attachments = model.attachments.ids
-          self.add_attachments = model.attachments.map { |att| { id: att.id, title: att.title } }
         end
 
         def participatory_space_manifest
@@ -76,7 +74,7 @@ module Decidim
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.
         def notify_missing_attachment_if_errored
-          errors.add(:add_attachments, :needs_to_be_reattached) if errors.any? && add_attachments.present?
+          errors.add(:add_photos, :needs_to_be_reattached) if errors.any? && add_photos.present?
         end
       end
     end

data/app/forms/decidim/budgets/admin/project_import_proposals_form.rb

@@ -14,7 +14,6 @@ module Decidim
 
         validates :origin_component_id, :origin_component, :current_component, presence: true
         validates :default_budget, presence: true, numericality: { greater_than: 0 }
-        validate :valid_states
 
         def states
           super.compact_blank
@@ -37,18 +36,6 @@ module Decidim
         def budget
           @budget ||= context[:budget]
         end
-
-        private
-
-        def valid_states
-          return unless origin_component
-          return if states.empty?
-
-          valid_tokens = Decidim::Proposals::ProposalState.where(component: origin_component).pluck(:token) + ["not_answered"]
-          return if states.all? { |state| valid_tokens.include?(state) }
-
-          errors.add(:states, :invalid)
-        end
       end
     end
   end

data/app/helpers/decidim/budgets/projects_helper.rb

@@ -117,9 +117,16 @@ module Decidim
       def filter_sections
         @filter_sections ||= begin
           items = []
-          items.append(method: :with_any_status, collection: filter_status_values, label: t("decidim.budgets.projects.filters.status"), id: "status") if voting_finished?
+          if voting_finished?
+            items.append(method: :with_any_status,
+                         name: "[with_any_status]",
+                         collection: filter_status_values,
+                         label: t("decidim.budgets.projects.filters.status"),
+                         id: "status")
+          end
           current_component.available_taxonomy_filters.each do |taxonomy_filter|
-            items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+            items.append(method: :with_any_taxonomies,
+                         name: "[with_any_taxonomies][#{taxonomy_filter.root_taxonomy_id}]",
                          collection: filter_taxonomy_values_for(taxonomy_filter),
                          label: decidim_sanitize_translated(taxonomy_filter.name),
                          id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")

data/app/models/decidim/budgets/project.rb

@@ -134,14 +134,14 @@ module Decidim
       end
 
       ransacker :confirmed_orders_count do
-        query = <<-SQL.squish
-        (
-            SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
-            FROM decidim_budgets_line_items
-            LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
-            WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
-            AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
-        )
+        query = <<~SQL.squish
+          (
+              SELECT COUNT(decidim_budgets_line_items.decidim_order_id)
+              FROM decidim_budgets_line_items
+              LEFT JOIN decidim_budgets_orders ON decidim_budgets_orders.id = decidim_budgets_line_items.decidim_order_id
+              WHERE decidim_budgets_orders.checked_out_at IS NOT NULL
+              AND decidim_budgets_projects.id = decidim_budgets_line_items.decidim_project_id
+          )
         SQL
         Arel.sql(query)
       end

data/app/packs/stylesheets/budgets.scss

@@ -1,6 +1,6 @@
 .budget {
   &-list__map {
-    @apply lg:-ml-16 -mt-6 lg:-mt-8 mb-0 lg:mb-4 aspect-square lg:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 lg:[&+*]:mt-12;
+    @apply lg:-ml-16 -mt-6 lg:-mt-12 mb-6 aspect-square lg:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 lg:[&+*]:mt-12;
   }
 
   &-summary {