From cfe2cbdda1ed9a78391b29b31782480d3db81718 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Tue, 1 Aug 2023 10:47:56 +0200 Subject: [PATCH 1/4] (bug) 403 error when manager edit an event --- CHANGELOG.md | 1 + app/policies/setting_policy.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ee58ecb79..b8a38ea72 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - 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 - [TODO DEPLOY] `rails fablab:setup:build_places_cache` ## v6.0.11 2023 July 21 diff --git a/app/policies/setting_policy.rb b/app/policies/setting_policy.rb index 1a74868be..85d207861 100644 --- a/app/policies/setting_policy.rb +++ b/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] end From 7187e53835fa1d9f85adbbcea1bfe825d06ef58c Mon Sep 17 00:00:00 2001 From: Du Peng Date: Fri, 11 Aug 2023 11:26:09 +0200 Subject: [PATCH 2/4] (bug) unable to show projects next page button --- CHANGELOG.md | 1 + app/services/project_service.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8a38ea72..95dd7cd9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - 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 diff --git a/app/services/project_service.rb b/app/services/project_service.rb index 0e6abf32b..be85c3cd2 100644 --- a/app/services/project_service.rb +++ b/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 From 52631532020497b7d053b0956834400582dc6176 Mon Sep 17 00:00:00 2001 From: Du Peng Date: Mon, 14 Aug 2023 16:10:03 +0200 Subject: [PATCH 3/4] Version 6.0.12 --- CHANGELOG.md | 2 ++ package.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95dd7cd9b..5e4a61e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +## 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 diff --git a/package.json b/package.json index b74e94ca6..9ce268fd3 100644 --- a/package.json +++ b/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", From 14f404dfb6f29d24b810e02252dd16ccb19ff84d Mon Sep 17 00:00:00 2001 From: Du Peng Date: Mon, 21 Aug 2023 18:24:56 +0200 Subject: [PATCH 4/4] (bug) unable to cancel a payment schedule --- CHANGELOG.md | 2 ++ app/controllers/api/subscriptions_controller.rb | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e4a61e7b..717afbd00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: unable to cancel a payment schedule + ## v6.0.12 2023 August 14 - Fix a bug: event reserved places compute error diff --git a/app/controllers/api/subscriptions_controller.rb b/app/controllers/api/subscriptions_controller.rb index 07e4a0310..5e7eb1b8f 100644 --- a/app/controllers/api/subscriptions_controller.rb +++ b/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