From d47a5aea5f71836bfdb81a1f9131577d6be728ee Mon Sep 17 00:00:00 2001 From: Sylvain Date: Mon, 29 Aug 2016 16:44:07 +0200 Subject: [PATCH] statistics generation for event with custom prices --- app/services/statistic_service.rb | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/statistic_service.rb b/app/services/statistic_service.rb index e5d0f3f8c..0d7fce73f 100644 --- a/app/services/statistic_service.rb +++ b/app/services/statistic_service.rb @@ -209,7 +209,7 @@ class StatisticService event_date: slot.start_at.to_date, 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 : ''), - 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), ca: calcul_ca(r.invoice) }.merge(user_info(u))) if r.reservable diff --git a/config/locales/en.yml b/config/locales/en.yml index 4b78ed2bc..10dfe2410 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -70,7 +70,7 @@ en: cancellation_of_invoice_REF: "Cancellation of invoice %{REF}" reservation_of_USER_on_DATE_at_TIME: "Reservation of %{USER} on %{DATE} at %{TIME}" cancellation: "Cancellation" - object: "Object:"COUNT + object: "Object:" order_summary: "Order summary:" details: "Details" amount: "Amount"