rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-06 01:08:21 +01:00
Code Issues Releases Activity

(bug) broken notifications

Browse Source
This commit is contained in:
Sylvain 2023-04-05 11:31:38 +02:00
parent 60793815ce
commit f33a0d7657
6 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -6,7 +6,7 @@
- Fix a bug: unable to subscribe with a payment schedule using PayZen - 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: unable to list supporting documents types for a deleted group
- Fix a bug: notification is broken when updating payzen currency - 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 - Fix a bug: unable to bulk update settings
## v6.0.1 2023 April 03 ## v6.0.1 2023 April 03

2
app/views/api/notifications/_notify_admin_training_auto_cancelled.json.jbuilder
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
json.title notification.notification_type json.title notification.notification_type
json.description "#{t('.auto_cancelled_training', { json.description "#{t('.auto_cancelled_training', **{
TRAINING: notification.attached_object.trainings.first.name, TRAINING: notification.attached_object.trainings.first.name,
DATE: I18n.l(notification.attached_object.start_at.to_date) DATE: I18n.l(notification.attached_object.start_at.to_date)
})} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : t('.manual_refund')}" })} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : t('.manual_refund')}"

2
app/views/api/notifications/_notify_member_training_authorization_expired.json.jbuilder
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
json.title notification.notification_type 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(', ') })

2
app/views/api/notifications/_notify_member_training_auto_cancelled.json.jbuilder
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
json.title notification.notification_type json.title notification.notification_type
json.description "#{t('.auto_cancelled_training', { json.description "#{t('.auto_cancelled_training', **{
TRAINING: notification.attached_object.reservation.reservable.name, TRAINING: notification.attached_object.reservation.reservable.name,
DATE: I18n.l(notification.attached_object.slot.start_at.to_date) DATE: I18n.l(notification.attached_object.slot.start_at.to_date)
})} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : ''}" })} #{notification.meta_data['auto_refund'] ? t('.auto_refund') : ''}"

2
app/views/api/notifications/_notify_member_training_invalidated.json.jbuilder
View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
json.title notification.notification_type 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(', ') })

1
config/application.rb
View File

@ -30,7 +30,6 @@ class FabManager::Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version. # Initialize configuration defaults for originally generated Rails version.
config.load_defaults 7.0 config.load_defaults 7.0
config.active_support.cache_format_version = 6.1 config.active_support.cache_format_version = 6.1
config.action_dispatch.cookies_serializer = :hybrid
config.active_record.verify_foreign_keys_for_fixtures = false config.active_record.verify_foreign_keys_for_fixtures = false
# prevent this new behavior with rails >= 5.0 # 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 # see https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#active-record-belongs-to-required-by-default-option