diff --git a/CHANGELOG.md b/CHANGELOG.md index 90560e7f6..e28ec19f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Fix a bug: unable to subscribe with a payment schedule using PayZen - Fix a bug: unable to list supporting documents types for a deleted group - Fix a bug: notification is broken when updating payzen currency -- Fix a bug: broken admin notifications if an order has been paid +- Fix a bug: broken notifications - Fix a bug: unable to bulk update settings ## v6.0.1 2023 April 03 diff --git a/app/views/api/notifications/_notify_admin_training_auto_cancelled.json.jbuilder b/app/views/api/notifications/_notify_admin_training_auto_cancelled.json.jbuilder index 3f8522e27..2ec008e46 100644 --- a/app/views/api/notifications/_notify_admin_training_auto_cancelled.json.jbuilder +++ b/app/views/api/notifications/_notify_admin_training_auto_cancelled.json.jbuilder @@ -1,7 +1,7 @@ # frozen_string_literal: true json.title notification.notification_type -json.description "#{t('.auto_cancelled_training', { +json.description "#{t('.auto_cancelled_training', **{ TRAINING: notification.attached_object.trainings.first.name, DATE: I18n.l(notification.attached_object.start_at.to_date) })} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : t('.manual_refund')}" diff --git a/app/views/api/notifications/_notify_member_training_authorization_expired.json.jbuilder b/app/views/api/notifications/_notify_member_training_authorization_expired.json.jbuilder index 5cd6d3b89..4bd017979 100644 --- a/app/views/api/notifications/_notify_member_training_authorization_expired.json.jbuilder +++ b/app/views/api/notifications/_notify_member_training_authorization_expired.json.jbuilder @@ -1,4 +1,4 @@ # frozen_string_literal: true json.title notification.notification_type -json.description t('.training_authorization_revoked', { MACHINES: notification.attached_object.machines.map(&:name).join(', ') }) +json.description t('.training_authorization_revoked', **{ MACHINES: notification.attached_object.machines.map(&:name).join(', ') }) diff --git a/app/views/api/notifications/_notify_member_training_auto_cancelled.json.jbuilder b/app/views/api/notifications/_notify_member_training_auto_cancelled.json.jbuilder index 219454622..c598f5c50 100644 --- a/app/views/api/notifications/_notify_member_training_auto_cancelled.json.jbuilder +++ b/app/views/api/notifications/_notify_member_training_auto_cancelled.json.jbuilder @@ -1,7 +1,7 @@ # frozen_string_literal: true json.title notification.notification_type -json.description "#{t('.auto_cancelled_training', { +json.description "#{t('.auto_cancelled_training', **{ TRAINING: notification.attached_object.reservation.reservable.name, DATE: I18n.l(notification.attached_object.slot.start_at.to_date) })} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : ''}" diff --git a/app/views/api/notifications/_notify_member_training_invalidated.json.jbuilder b/app/views/api/notifications/_notify_member_training_invalidated.json.jbuilder index 438cc548e..17ca7525f 100644 --- a/app/views/api/notifications/_notify_member_training_invalidated.json.jbuilder +++ b/app/views/api/notifications/_notify_member_training_invalidated.json.jbuilder @@ -1,4 +1,4 @@ # frozen_string_literal: true json.title notification.notification_type -json.description t('.invalidated', { MACHINES: notification.attached_object.machines.map(&:name).join(', ') }) +json.description t('.invalidated', **{ MACHINES: notification.attached_object.machines.map(&:name).join(', ') }) diff --git a/config/application.rb b/config/application.rb index 44874c4d5..1f85d8a6a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -30,7 +30,6 @@ class FabManager::Application < Rails::Application # Initialize configuration defaults for originally generated Rails version. config.load_defaults 7.0 config.active_support.cache_format_version = 6.1 - config.action_dispatch.cookies_serializer = :hybrid config.active_record.verify_foreign_keys_for_fixtures = false # prevent this new behavior with rails >= 5.0 # see https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#active-record-belongs-to-required-by-default-option