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

statistics generation for event with custom prices

Browse Source
This commit is contained in:
Sylvain 2016-08-29 16:44:07 +02:00
parent d86cccf98c
commit d47a5aea5f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/statistic_service.rb
View File

@ -209,7 +209,7 @@ class StatisticService
event_date: slot.start_at.to_date, event_date: slot.start_at.to_date,
event_theme: (r.reservable.event_themes.first ? r.reservable.event_themes.first.name : ''), event_theme: (r.reservable.event_themes.first ? r.reservable.event_themes.first.name : ''),
age_range: (r.reservable.age_range_id ? r.reservable.age_range.name : ''), age_range: (r.reservable.age_range_id ? r.reservable.age_range.name : ''),
nb_places: r.nb_reserve_places + r.nb_reserve_reduced_places, nb_places: r.nb_reserve_places + (r.tickets.map(&:booked).map(&:to_i).reduce(:+) || 0),
nb_hours: difference_in_hours(slot.start_at, slot.end_at), nb_hours: difference_in_hours(slot.start_at, slot.end_at),
ca: calcul_ca(r.invoice) ca: calcul_ca(r.invoice)
}.merge(user_info(u))) if r.reservable }.merge(user_info(u))) if r.reservable

2
config/locales/en.yml
View File

@ -70,7 +70,7 @@ en:
cancellation_of_invoice_REF: "Cancellation of invoice %{REF}" cancellation_of_invoice_REF: "Cancellation of invoice %{REF}"
reservation_of_USER_on_DATE_at_TIME: "Reservation of %{USER} on %{DATE} at %{TIME}" reservation_of_USER_on_DATE_at_TIME: "Reservation of %{USER} on %{DATE} at %{TIME}"
cancellation: "Cancellation" cancellation: "Cancellation"
object: "Object:"COUNT object: "Object:"
order_summary: "Order summary:" order_summary: "Order summary:"
details: "Details" details: "Details"
amount: "Amount" amount: "Amount"