diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2d5be27..15226c781 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog Fab-manager +- Fix a bug: unable to export reservations + ## v4.5.3 2020 July 21 - Documentation of the easy upgrade procedure diff --git a/app/views/exports/users_reservations.xlsx.axlsx b/app/views/exports/users_reservations.xlsx.axlsx index 2c0f8cadd..d2127da4f 100644 --- a/app/views/exports/users_reservations.xlsx.axlsx +++ b/app/views/exports/users_reservations.xlsx.axlsx @@ -15,14 +15,14 @@ wb.add_worksheet(name: t('export_reservations.reservations')) do |sheet| # data rows @reservations.each do |resrv| data = [ - resrv.user.id, - resrv.user.profile.full_name, - resrv.user.email, + resrv.user&.id, + resrv.user&.profile&.full_name || t('export_reservations.deleted_user'), + resrv.user&.email, resrv.created_at.to_date, resrv.reservable_type, (resrv.reservable.nil? ? '' : resrv.reservable.name), (resrv.reservable_type == 'Event') ? resrv.total_booked_seats: resrv.slots.count, - (resrv.invoice.paid_with_stripe?) ? t('export_reservations.local_payment') : t('export_reservations.online_payment') + (resrv.invoice&.paid_with_stripe?) ? t('export_reservations.online_payment') : t('export_reservations.local_payment') ] styles = [nil, nil, nil, date, nil, nil, nil, nil] types = [:integer, :string, :string, :date, :string, :string, :integer, :string] diff --git a/config/locales/en.yml b/config/locales/en.yml index e77f9301f..7073772f7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -188,6 +188,7 @@ en: payment_method: "Payment method" local_payment: "Payment at the reception" online_payment: "Online payment" + deleted_user: "Deleted user" #subscriptions list export to EXCEL format export_subscriptions: subscriptions: "Subscriptions" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 1e6128a0f..e1fc17e14 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -188,6 +188,7 @@ fr: payment_method: "Méthode de paiement" local_payment: "Paiement à l'accueil" online_payment: "Paiement en ligne" + deleted_user: "Utilisateur supprimé" #subscriptions list export to EXCEL format export_subscriptions: subscriptions: "Abonnements"