decidim-budgets 0.27.10 → 0.28.0.rc4

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

@@ -9,24 +9,18 @@ module Decidim
       helper_method :budget, :project
 
       def create
-        enforce_permission_to :vote, :project, project: project, budget: budget, workflow: current_workflow
+        enforce_permission_to :vote, :project, project:, budget:, workflow: current_workflow
 
         respond_to do |format|
-          # Note that the user-specific lock here is important in order to
-          # prevent multiple simultaneous processes on different machines from
-          # creating multiple orders for the same user in case the button is
-          # pressed multiple times.
-          current_user.with_lock do
-            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.js { render "update_budget" }
-              end
-
-              on(:invalid) do
-                format.js { render "update_budget", status: :unprocessable_entity }
-              end
+          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.js { render "update_budget" }
+            end
+
+            on(:invalid) do
+              format.js { render "update_budget", status: :unprocessable_entity }
             end
           end
         end

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

@@ -7,11 +7,12 @@ module Decidim
       include NeedsCurrentOrder
 
       def checkout
-        enforce_permission_to :vote, :project, order: current_order, budget: budget, workflow: current_workflow
+        enforce_permission_to :vote, :project, order: current_order, budget:, workflow: current_workflow
 
         Checkout.call(current_order) do
           on(:ok) do
-            flash[:notice] = I18n.t("orders.checkout.success", scope: "decidim")
+            i18n_key = pending_to_vote_budgets.any? ? "success_html" : "success_no_left_budgets_html"
+            flash[:notice] = I18n.t(i18n_key, scope: "decidim.orders.checkout", rest_of_budgets_link: "#budgets")
             redirect_to budgets_path
           end
 
@@ -49,6 +50,10 @@ module Decidim
           budgets_path
         end
       end
+
+      def pending_to_vote_budgets
+        current_workflow.budgets - current_workflow.voted - [current_order.budget]
+      end
     end
   end
 end

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

@@ -7,8 +7,9 @@ module Decidim
       include FilterResource
       include NeedsCurrentOrder
       include Decidim::Budgets::Orderable
+      include Decidim::IconHelper
 
-      helper_method :projects, :project, :budget, :all_geocoded_projects
+      helper_method :projects, :project, :budget, :all_geocoded_projects, :tabs, :panels
 
       def index
         raise ActionController::RoutingError, "Not Found" unless budget
@@ -41,15 +42,16 @@ module Decidim
       end
 
       def search_collection
-        Project.where(budget: budget).includes([:scope, :component, :attachments, :category])
+        budget.projects.includes([:scope, :component, :attachments, :category]).with_order(filter_params[:addition_type] == "added" ? current_order : nil)
       end
 
       def default_filter_params
         {
           search_text_cont: "",
           with_any_status: default_filter_status_params,
-          with_any_scope: default_filter_scope_params,
-          with_any_category: default_filter_category_params
+          with_any_scope: nil,
+          with_any_category: nil,
+          addition_type: "all"
         }
       end
 
@@ -60,6 +62,51 @@ module Decidim
       def show_selected_budgets?
         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 ||= [
+          {
+            enabled: @project.linked_resources(:proposals, "included_proposals").present?,
+            id: "included_proposals",
+            text: t("decidim/proposals/proposal", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Budgets::Project"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @project, { type: :proposals, link_name: "included_proposals" }]
+          },
+          {
+            enabled: @project.linked_resources(:results, "included_projects").present?,
+            id: "included_results",
+            text: t("decidim/accountability/result", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("Decidim::Accountability::Result"),
+            method: :cell,
+            args: ["decidim/linked_resources_for", @project, { type: :results, link_name: "included_projects" }]
+          },
+          {
+            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]
+          }
+        ].select { |item| item[:enabled] }
+      end
     end
   end
 end

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

@@ -95,7 +95,7 @@ module Decidim
 
         private
 
-        # This method will add an error to the `attachment` field only if there's
+        # This method will add an error to the `attachment` field only if there is
         # any error in any other field. This is needed because when the form has
         # an error, the attachment is lost, so we need a way to inform the user of
         # this problem.

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

@@ -19,6 +19,10 @@ module Decidim
           ]
         )
       end
+
+      def component_name
+        (defined?(current_component) && translated_attribute(current_component&.name).presence) || t("decidim.components.budgets.name")
+      end
     end
   end
 end

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

@@ -44,44 +44,61 @@ module Decidim
         current_order&.can_checkout?
       end
 
-      def current_rule_explanation
-        return unless current_order
+      # Returns false if the current order does not have a rule for minimum budget
+      # Returns false if the current order has not reached the minimum budget
+      # Otherwhise returns true
+      def current_order_minimum_reached?
+        return false if current_order.minimum_budget.zero?
 
-        if current_order.projects_rule?
-          if current_order.minimum_projects.positive? && current_order.minimum_projects < current_order.maximum_projects
-            t(
-              ".projects_rule.instruction",
-              minimum_number: current_order.minimum_projects,
-              maximum_number: current_order.maximum_projects
-            )
-          else
-            t(".projects_rule_maximum_only.instruction", maximum_number: current_order.maximum_projects)
-          end
-        elsif current_order.minimum_projects_rule?
-          t(".minimum_projects_rule.instruction", minimum_number: current_order.minimum_projects)
+        current_order.total > current_order.minimum_budget
+      end
+
+      def current_rule_call_for_action_text
+        return "" unless current_order
+
+        if current_order_minimum_reached?
+          t("minimum_reached", scope: "decidim.budgets.projects.order_progress.dynamic_help")
+        elsif current_order.projects.empty?
+          t("start_adding_projects", scope: "decidim.budgets.projects.order_progress.dynamic_help")
         else
-          t(".vote_threshold_percent_rule.instruction", minimum_budget: budget_to_currency(current_order.minimum_budget))
+          t("keep_adding_projects", scope: "decidim.budgets.projects.order_progress.dynamic_help")
         end
       end
 
       def current_rule_description
         return unless current_order
 
-        if current_order.projects_rule?
-          if current_order.minimum_projects.positive? && current_order.minimum_projects < current_order.maximum_projects
-            t(
-              ".projects_rule.description",
-              minimum_number: current_order.minimum_projects,
-              maximum_number: current_order.maximum_projects
-            )
-          else
-            t(".projects_rule_maximum_only.description", maximum_number: current_order.maximum_projects)
-          end
-        elsif current_order.minimum_projects_rule?
-          t(".minimum_projects_rule.description", minimum_number: current_order.minimum_projects)
-        else
-          t(".vote_threshold_percent_rule.description", minimum_budget: budget_to_currency(current_order.minimum_budget))
-        end
+        rule_text = if current_order_minimum_reached?
+                      ""
+                    elsif current_order.projects_rule?
+                      if current_order.minimum_projects.positive? && current_order.minimum_projects < current_order.maximum_projects
+                        t(
+                          "projects_rule.description",
+                          scope: "decidim.budgets.projects.order_progress",
+                          minimum_number: current_order.minimum_projects,
+                          maximum_number: current_order.maximum_projects
+                        )
+                      else
+                        t(
+                          "projects_rule_maximum_only.description",
+                          scope: "decidim.budgets.projects.order_progress",
+                          maximum_number: current_order.maximum_projects
+                        )
+                      end
+                    elsif current_order.minimum_projects_rule?
+                      t(
+                        "minimum_projects_rule.description",
+                        scope: "decidim.budgets.projects.order_progress",
+                        minimum_number: current_order.minimum_projects
+                      )
+                    else
+                      t(
+                        "vote_threshold_percent_rule.description",
+                        scope: "decidim.budgets.projects.order_progress",
+                        minimum_budget: budget_to_currency(current_order.minimum_budget)
+                      )
+                    end
+        %(<strong>#{current_rule_call_for_action_text}</strong>. #{rule_text}).html_safe
       end
 
       # Serialize a collection of geocoded projects to be used by the dynamic map component
@@ -98,9 +115,8 @@ module Decidim
           .slice(:latitude, :longitude, :address)
           .merge(
             title: decidim_html_escape(translated_attribute(project.title)),
-            description: html_truncate(decidim_sanitize_editor(translated_attribute(project.description)), length: 100),
-            icon: icon("project", width: 40, height: 70, remove_icon_class: true),
-            link: ::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path
+            link: ::Decidim::ResourceLocatorPresenter.new([project.budget, project]).path,
+            items: cell("decidim/budgets/project_metadata", project).send(:project_items_for_map).to_json
           )
       end
 
@@ -109,6 +125,46 @@ module Decidim
 
         project.latitude.present? && project.longitude.present?
       end
+
+      def filter_addition_type_values(added_count:)
+        return [] if voting_finished?
+
+        [
+          ["all", { text: t("all", scope: "decidim.budgets.projects.project_filter"), count: nil }],
+          ["added", { text: t("added", scope: "decidim.budgets.projects.project_filter"), count: added_count }]
+        ]
+      end
+
+      def filter_sections
+        @filter_sections ||= begin
+          items = []
+          items.append(method: :with_any_status, collection: filter_status_values, label_scope: "decidim.budgets.projects.filters", id: "status") if voting_finished?
+          if current_component.has_subscopes?
+            items.append(method: :with_any_scope, collection: resource_filter_scope_values(budget.scope), label_scope: "decidim.budgets.projects.filters", id: "scope")
+          end
+          if current_participatory_space.categories.any?
+            items.append(method: :with_any_category, collection: filter_categories_values, label_scope: "decidim.budgets.projects.filters", id: "category")
+          end
+        end
+
+        items.reject { |item| item[:collection].blank? }
+      end
+
+      def budgets_select_tag(name, options: {})
+        select_tag(
+          name,
+          options_for_select(reference_budgets_for_select),
+          options.merge(include_blank: I18n.t("decidim.budgets.prompt"))
+        )
+      end
+
+      def reference_budgets_for_select
+        references = Budget.joins(:component)
+                           .where(component: { participatory_space: current_participatory_space }).order(weight: :asc)
+        references.map do |budget|
+          ["#{"&nbsp;" * 4} #{translated_attribute(budget.title)}".html_safe, budget.id]
+        end
+      end
     end
   end
 end

data/app/jobs/decidim/budgets/send_vote_reminder_job.rb

@@ -8,7 +8,7 @@ module Decidim
       def perform(reminder)
         return if reminder.records.active.blank?
 
-        ::Decidim::ReminderDelivery.create(reminder: reminder)
+        ::Decidim::ReminderDelivery.create(reminder:)
         ::Decidim::Budgets::VoteReminderMailer.vote_reminder(reminder).deliver_now
       end
     end

data/app/mailers/decidim/budgets/order_summary_mailer.rb

@@ -28,7 +28,7 @@ module Decidim
             budget_name: translated_attribute(@budget.title),
             space_name: translated_attribute(@space.title)
           )
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
     end

data/app/mailers/decidim/budgets/vote_reminder_mailer.rb

@@ -25,7 +25,7 @@ module Decidim
             count: @orders.count
           )
 
-          mail(to: @user.email, subject: subject)
+          mail(to: @user.email, subject:)
         end
       end
 

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

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::ScopableResource
       include Decidim::HasComponent
       include Decidim::Searchable
+      include Decidim::Randomable
       include Traceable
       include Loggable
 

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

@@ -28,9 +28,17 @@ module Decidim
       has_many :orders, through: :line_items, foreign_key: "decidim_project_id", class_name: "Decidim::Budgets::Order"
 
       delegate :organization, :participatory_space, :can_participate_in_space?, to: :component
+      delegate :visible?, to: :budget
 
       alias can_participate? can_participate_in_space?
 
+      scope :with_order, lambda { |order|
+        if order.present?
+          joins(:orders).where(decidim_budgets_orders: { id: order.id })
+        else
+          all
+        end
+      }
       scope :selected, -> { where.not(selected_at: nil) }
       scope :not_selected, -> { where(selected_at: nil) }
 
@@ -38,13 +46,15 @@ module Decidim
 
       scope_search_multi :with_any_status, [:selected, :not_selected]
 
-      searchable_fields(
-        scope_id: :decidim_scope_id,
-        participatory_space: { component: :participatory_space },
-        A: :title,
-        D: :description,
-        datetime: :created_at
-      )
+      searchable_fields({
+                          scope_id: :decidim_scope_id,
+                          participatory_space: { component: :participatory_space },
+                          A: :title,
+                          D: :description,
+                          datetime: :created_at
+                        },
+                        index_on_create: ->(project) { project.visible? },
+                        index_on_update: ->(project) { project.visible? })
 
       def self.ordered_ids(ids)
         # Make sure each ID in the matching text has a "," character as their

data/app/packs/entrypoints/decidim_budgets.js

@@ -4,3 +4,5 @@ import "src/decidim/budgets/exit_handler"
 
 // Images
 require.context("../images", true)
+
+import "stylesheets/budgets.scss"

data/app/packs/src/decidim/budgets/exit_handler.js

@@ -9,7 +9,7 @@ const isSafeUrl = (exitUrl) => {
   }
 
   const safeUrls = [
-    $(".budget-summary").attr("data-safe-url").split("?")[0],
+    $(".budget-summary").attr("data-safe-url").replace(location.origin, ""),
     `${location.pathname}#`,
     `${location.href}#`,
     "#"
@@ -18,7 +18,7 @@ const isSafeUrl = (exitUrl) => {
   let safe = false;
   safeUrls.forEach((url) => {
     if (exitUrl.startsWith(url)) {
-      safe =  true
+      safe = true
     }
   });
 
@@ -36,10 +36,12 @@ const allowExitFrom = ($el) => {
     return true;
   } else if ($el.attr("id") === "exit-notification-link") {
     return true;
-  } else if ($el.parents(".voting-wrapper").length > 0) {
+  } else if ($el.parents("main").length > 0) {
     return true;
   } else if (isSafeUrl($el.attr("href"))) {
     return true
+  } else if (document.querySelector(".panel-container") && document.querySelector(".panel-container").contains($el[0])) {
+    return true
   }
 
   return false;
@@ -50,6 +52,7 @@ $(() => {
   const $exitLink = $("#exit-notification-link");
   const defaultExitUrl = $exitLink.attr("href");
   const defaultExitLinkText = $exitLink.text();
+  const signOutPath = window.Decidim.config.get("sign_out_path");
   let exitLinkText = defaultExitLinkText;
 
   if ($exitNotification.length < 1) {
@@ -65,8 +68,8 @@ $(() => {
     }
 
     $exitLink.attr("href", url);
-    $exitLink.text(exitLinkText);
-    $exitNotification.foundation("open");
+    $exitLink.html(exitLinkText);
+    window.Decidim.currentDialogs["exit-notification"].open();
   };
 
   $(document).on("click", "a", (event) => {
@@ -78,11 +81,11 @@ $(() => {
       openExitNotification($link.attr("href"), $link.data("method"));
     }
   });
-  // Custom handling for the header sign out so that it won't trigger the
+  // Custom handling for the header sign out so that it will not trigger the
   // logout form submit and so that it changes the exit link text. This does
   // not trigger the document link click listener because it has the
   // data-method attribute to trigger a form submit event.
-  $(".header a.sign-out-link").on("click", (event) => {
+  $(`[href='${signOutPath}']`).on("click", (event) => {
     event.preventDefault();
     event.stopPropagation();
 
@@ -93,7 +96,7 @@ $(() => {
   // Custom handling for the exit link which needs to change the exit link
   // text to the default text as this is not handled by the document click
   // listener.
-  $("a[data-open='exit-notification']").on("click", () => {
+  $("a[data-dialog-open='exit-notification']").on("click", () => {
     exitLinkText = defaultExitLinkText;
     openExitNotification(defaultExitUrl);
   });

data/app/packs/src/decidim/budgets/progressFixed.js

@@ -1,18 +1,32 @@
 $(() => {
   const checkProgressPosition = () => {
-    let progressFix = document.querySelector("[data-progressbox-fixed]"),
-        progressRef = document.querySelector("[data-progress-reference]"),
-        progressVisibleClass = "is-progressbox-visible";
 
-    if (!progressRef) {
-      return;
-    }
+    const progressRef = document.querySelectorAll("[data-progress-reference]");
+    if (progressRef.length) {
+      const progressFix = document.querySelectorAll("[data-progressbox-fixed]");
+
+      let selectedProgressRef = "";
+      let selectedProgressFix = "";
+      const progressVisibleClass = "is-progressbox-visible";
+
+      if (window.matchMedia("(min-width: 768px)").matches) {
+        selectedProgressRef = progressRef[1];
+        selectedProgressFix = progressFix[1];
+      } else {
+        selectedProgressRef = progressRef[0];
+        selectedProgressFix = progressFix[0];
+      }
+
+      if (!progressRef) {
+        return;
+      }
 
-    let progressPosition = progressRef.getBoundingClientRect().bottom;
-    if (progressPosition > 0) {
-      progressFix.classList.remove(progressVisibleClass);
-    } else {
-      progressFix.classList.add(progressVisibleClass);
+      let progressPosition = selectedProgressRef.getBoundingClientRect().bottom;
+      if (progressPosition > 0) {
+        selectedProgressFix.classList.remove(progressVisibleClass);
+      } else {
+        selectedProgressFix.classList.add(progressVisibleClass);
+      }
     }
   }
 

data/app/packs/src/decidim/budgets/projects.js

@@ -1,13 +1,13 @@
 $(() => {
-  const $projects = $("#projects, #project");
-  const $budgetSummaryTotal = $(".budget-summary__total");
-  const $budgetExceedModal = $("#budget-excess");
+  const $projects = $("#projects, #project-item");
+  const $budgetSummaryTotal = $(".budget-summary__progressbar-marks_right");
+  const selectBudgetSummaryTotal = $budgetSummaryTotal.data("totalAllocation");
   const $budgetSummary = $(".budget-summary__progressbox");
   const $voteButton = $(".budget-vote-button");
-  const totalAllocation = parseInt($budgetSummaryTotal.attr("data-total-allocation"), 10);
+  const totalAllocation = parseInt(selectBudgetSummaryTotal, 10);
+  const additionSelectorButtons = document.querySelectorAll(".budget__list--header .button__pill")
 
   const cancelEvent = (event) => {
-    $(event.currentTarget).removeClass("loading-spinner");
     event.stopPropagation();
     event.preventDefault();
   };
@@ -21,15 +21,20 @@ $(() => {
     const $currentTarget = $(event.currentTarget);
     const projectAllocation = parseInt($currentTarget.attr("data-allocation"), 10);
 
-    if (!$currentTarget.attr("data-open")) {
-      $currentTarget.addClass("loading-spinner");
-    }
-
     if ($currentTarget.attr("disabled")) {
       cancelEvent(event);
     } else if (($currentTarget.attr("data-add") === "true") && ((currentAllocation + projectAllocation) > totalAllocation)) {
-      $budgetExceedModal.foundation("toggle");
+      window.Decidim.currentDialogs["budget-excess"].toggle()
       cancelEvent(event);
     }
   });
+
+  additionSelectorButtons.forEach(function(button) {
+    button.addEventListener("click", function(event) {
+      additionSelectorButtons.forEach(function(element) {
+        element.classList.remove("button__pill--active")
+      })
+      event.currentTarget.classList.add("button__pill--active")
+    })
+  });
 });