Merge branch 'dev' for release 5.8.1

sleede · Mar 3, 2023 · aa4d676 · aa4d676
2 parents 4228b44 + 3bbca47
commit aa4d676
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog Fab-manager
 
+## v5.8.1 2023 March 03
+
+- Fix a bug: unable to reserve an event
+
 ## v5.8.0 2023 March 03
 
 - OpenAPI events endpoint returns category, theme and age_range

diff --git a/app/models/reservation.rb b/app/models/reservation.rb
@@ -121,7 +121,7 @@ def slots_not_locked
   end
 
   def extend_subscription
-    Subscriptions::ExtensionAfterReservation.new(self).extend_subscription_if_eligible
+    ::Subscriptions::ExtensionAfterReservation.new(self).extend_subscription_if_eligible
   end
 
   def notify_member_create_reservation

diff --git a/app/services/subscriptions/expire_service.rb b/app/services/subscriptions/expire_service.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Services around subscriptions
+module Subscriptions; end
+
 # Expire the given subscription
 class Subscriptions::ExpireService
   class << self

diff --git a/app/services/subscriptions/extension_after_reservation.rb b/app/services/subscriptions/extension_after_reservation.rb
@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# Services around subscriptions
+module Subscriptions; end
+
 # Extend the user's current subscription after his first training reservation if
 # he subscribed to a rolling plan
 class Subscriptions::ExtensionAfterReservation

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "5.8.0",
+  "version": "5.8.1",
   "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",