mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-11 05:54:15 +01:00
[members excel export] invoicing disabled
This commit is contained in:
parent
da71ba783c
commit
d46e6cf9c9
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
## next release
|
## next release
|
||||||
|
|
||||||
|
- Export user's invoicing status in members' excel export
|
||||||
- Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations
|
- Fix a bug: number of reserved seats for an event is always of 1 in the excel export of reservations
|
||||||
- Fix a bug: conflict between similar translations around "reservations"
|
- Fix a bug: conflict between similar translations around "reservations"
|
||||||
- Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range
|
- Fix a bug: later occurrences of recurrent events does not have the initially configured theme and age range
|
||||||
|
@ -7,51 +7,68 @@ wb.add_worksheet(name: t('export_members.members')) do |sheet|
|
|||||||
|
|
||||||
## data table
|
## data table
|
||||||
# heading labels
|
# heading labels
|
||||||
columns = [t('export_members.id'), t('export_members.surname'), t('export_members.first_name'), t('export_members.email'),
|
columns = [t('export_members.id'),
|
||||||
t('export_members.newsletter'), t('export_members.gender'), t('export_members.age'), t('export_members.address'), t('export_members.phone'),
|
t('export_members.surname'),
|
||||||
t('export_members.website'), t('export_members.job'), t('export_members.interests'),
|
t('export_members.first_name'),
|
||||||
t('export_members.cad_software_mastered'), t('export_members.group'), t('export_members.subscription'),
|
t('export_members.email'),
|
||||||
t('export_members.subscription_end_date'), t('export_members.validated_trainings'), t('export_members.tags'),
|
t('export_members.newsletter'),
|
||||||
t('export_members.number_of_invoices'), t('export_members.projects'), t('export_members.facebook'),
|
t('export_members.gender'),
|
||||||
t('export_members.twitter'), t('export_members.echo_sciences'),
|
t('export_members.age'),
|
||||||
t('export_members.organization'), t('export_members.organization_address')]
|
t('export_members.address'),
|
||||||
|
t('export_members.phone'),
|
||||||
|
t('export_members.website'),
|
||||||
|
t('export_members.job'),
|
||||||
|
t('export_members.interests'),
|
||||||
|
t('export_members.cad_software_mastered'),
|
||||||
|
t('export_members.group'),
|
||||||
|
t('export_members.subscription'),
|
||||||
|
t('export_members.subscription_end_date'),
|
||||||
|
t('export_members.validated_trainings'),
|
||||||
|
t('export_members.tags'),
|
||||||
|
t('export_members.number_of_invoices'),
|
||||||
|
t('export_members.invoicing_disabled'),
|
||||||
|
t('export_members.projects'),
|
||||||
|
t('export_members.facebook'),
|
||||||
|
t('export_members.twitter'),
|
||||||
|
t('export_members.echo_sciences'),
|
||||||
|
t('export_members.organization'),
|
||||||
|
t('export_members.organization_address')]
|
||||||
sheet.add_row columns, :style => header
|
sheet.add_row columns, :style => header
|
||||||
|
|
||||||
# data rows
|
# data rows
|
||||||
@members.each do |member|
|
@members.each do |member|
|
||||||
data = [
|
data = [
|
||||||
member.id, member.profile.last_name, member.profile.first_name,
|
member.id,
|
||||||
member.email, member.is_allow_newsletter, member.profile.gender ? t('export_members.man') : t('export_members.woman'), member.profile.age,
|
member.profile.last_name,
|
||||||
member.profile.address ? member.profile.address.address : '', member.profile.phone, member.profile.website,
|
member.profile.first_name,
|
||||||
member.profile.job, member.profile.interest, member.profile.software_mastered, member.group.name,
|
member.email,
|
||||||
|
member.is_allow_newsletter,
|
||||||
|
member.profile.gender ? t('export_members.man') : t('export_members.woman'),
|
||||||
|
member.profile.age,
|
||||||
|
member.profile.address ? member.profile.address.address : '',
|
||||||
|
member.profile.phone,
|
||||||
|
member.profile.website,
|
||||||
|
member.profile.job,
|
||||||
|
member.profile.interest,
|
||||||
|
member.profile.software_mastered,
|
||||||
|
member.group.name,
|
||||||
(member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.plan.name : t('export_members.without_subscriptions'),
|
(member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.plan.name : t('export_members.without_subscriptions'),
|
||||||
(member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.expired_at.to_date : nil,
|
(member.subscription and member.subscription.expired_at > Time.now) ? member.subscription.expired_at.to_date : nil,
|
||||||
member.trainings.map(&:name).join("\n"), member.tags.map(&:name).join("\n"), member.invoices.size,
|
member.trainings.map(&:name).join("\n"),
|
||||||
member.projects.map(&:name).join("\n"), member.profile.facebook || '', member.profile.twitter || '',
|
member.tags.map(&:name).join("\n"),
|
||||||
|
member.invoices.size,
|
||||||
|
member.invoicing_disabled,
|
||||||
|
member.projects.map(&:name).join("\n"),
|
||||||
|
member.profile.facebook || '',
|
||||||
|
member.profile.twitter || '',
|
||||||
member.profile.echosciences || '',
|
member.profile.echosciences || '',
|
||||||
member.profile.organization ? member.profile.organization.name : '', member.profile.organization ? member.profile.organization.address.address : ''
|
member.profile.organization ? member.profile.organization.name : '',
|
||||||
|
member.profile.organization ? member.profile.organization.address.address : ''
|
||||||
]
|
]
|
||||||
styles = [nil, nil, nil,
|
styles = [nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]
|
||||||
nil, nil, nil, nil,
|
|
||||||
nil, nil, nil,
|
types = [:integer, :string, :string, :string, :boolean, :string, :integer, :string, :string, :string, :string, :string,
|
||||||
nil, nil, nil, nil,
|
:string, :string, :string, :date, :string, :string, :integer, :boolean, :string, :string, :string, :string, :string, :string]
|
||||||
nil,
|
|
||||||
date,
|
|
||||||
nil, nil, nil,
|
|
||||||
nil, nil, nil,
|
|
||||||
nil,
|
|
||||||
nil, nil
|
|
||||||
]
|
|
||||||
types = [:integer, :string, :string,
|
|
||||||
:string, :boolean, :string, :integer,
|
|
||||||
:string, :string, :string,
|
|
||||||
:string, :string, :string, :string,
|
|
||||||
:string,
|
|
||||||
:date,
|
|
||||||
:string, :string, :integer,
|
|
||||||
:string, :string, :string,
|
|
||||||
:string,
|
|
||||||
:string, :string]
|
|
||||||
|
|
||||||
sheet.add_row data, :style => styles, :types => types
|
sheet.add_row data, :style => styles, :types => types
|
||||||
end
|
end
|
||||||
|
@ -138,6 +138,7 @@ en:
|
|||||||
validated_trainings: "Validated trainings"
|
validated_trainings: "Validated trainings"
|
||||||
tags: "Tags"
|
tags: "Tags"
|
||||||
number_of_invoices: "Number of invoices"
|
number_of_invoices: "Number of invoices"
|
||||||
|
invoicing_disabled: "Invoicing disabled"
|
||||||
projects: "Projects"
|
projects: "Projects"
|
||||||
facebook: "Facebook"
|
facebook: "Facebook"
|
||||||
twitter: "Twitter"
|
twitter: "Twitter"
|
||||||
|
@ -138,6 +138,7 @@ fr:
|
|||||||
validated_trainings: "Formations validées"
|
validated_trainings: "Formations validées"
|
||||||
tags: "Étiquettes"
|
tags: "Étiquettes"
|
||||||
number_of_invoices: "Nombre de factures"
|
number_of_invoices: "Nombre de factures"
|
||||||
|
invoicing_disabled: "Facturation désactivée"
|
||||||
projects: "Projets"
|
projects: "Projets"
|
||||||
facebook: "Facebook"
|
facebook: "Facebook"
|
||||||
twitter: "Twitter"
|
twitter: "Twitter"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user