Merge branch 'dev' into staging

CHANGELOG.md

@@ -1,10 +1,16 @@
 # Changelog Fab-manager
 
+- Fix a bug: unable to cancel a payment schedule
 - adds reservation context feature (for machine, training, space)
-- Fix a bug: event reserved places compute error
-- Fix a bug: event canceled places error
 - [TODO DEPLOY] `rails fablab:es:build_stats`
 - [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2014,1]`
+
+## v6.0.12 2023 August 14
+
+- Fix a bug: event reserved places compute error
+- Fix a bug: event canceled places error
+- Fix a bug: 403 error when manager edit an event
+- Fix a bug: unable to show projects next page button
 - [TODO DEPLOY] `rails fablab:setup:build_places_cache`
 
 ## v6.0.11 2023 July 21

app/controllers/api/subscriptions_controller.rb

@@ -15,6 +15,12 @@ class API::SubscriptionsController < API::APIController
 
   def cancel
     authorize @subscription
+    payment_schedule = @subscription.original_payment_schedule
+    if payment_schedule
+      PaymentScheduleService.cancel(payment_schedule)
+      render :show, status: :ok, location: @subscription and return
+    end
+
     if @subscription.expire
       render :show, status: :ok, location: @subscription
     else

app/policies/setting_policy.rb

@@ -46,7 +46,7 @@ class SettingPolicy < ApplicationPolicy
        external_id machines_banner_active machines_banner_text machines_banner_cta_active machines_banner_cta_label
        machines_banner_cta_url trainings_banner_active trainings_banner_text trainings_banner_cta_active trainings_banner_cta_label
        trainings_banner_cta_url events_banner_active events_banner_text events_banner_cta_active events_banner_cta_label
-       events_banner_cta_url projects_list_member_filter_presence projects_list_date_filters_presence
+       events_banner_cta_url projects_list_member_filter_presence projects_list_date_filters_presence advanced_accounting
        project_categories_filter_placeholder project_categories_wording family_account child_validation_required reservation_context_feature]
   end
 

app/services/project_service.rb

@@ -47,6 +47,6 @@ class ProjectService
     records = records.includes(:users, :project_image)
     records = records.page(params[:page]) if paginate
 
-    { total: records.count, projects: records }
+    { total: records.total_count, projects: records }
   end
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",