diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb index 3ae99b166..76565eb76 100644 --- a/app/assets/javascripts/controllers/events.coffee.erb +++ b/app/assets/javascripts/controllers/events.coffee.erb @@ -408,13 +408,14 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " ## - # Return the textual description of the conditions applyable to the given price's category + # Return the requested property of the given price's category (name or conditions) # @param category_id {number} ID of the price's category + # @param [property] {string} name of the field to get, name if undefined ## - $scope.getPriceCategoryConditions = (category_id) -> + $scope.getPriceCategory = (category_id, property = 'name') -> for cat in $scope.priceCategories if cat.id == category_id - return cat.conditions + return cat[property] diff --git a/app/assets/templates/events/show.html.erb b/app/assets/templates/events/show.html.erb index 17bc0eca0..7f5143b1d 100644 --- a/app/assets/templates/events/show.html.erb +++ b/app/assets/templates/events/show.html.erb @@ -89,7 +89,7 @@
{{ 'full_price_' | translate }} {{ event.amount | currency}}
- + {{price.category.name}} : {{price.amount | currency}} @@ -153,7 +153,9 @@
{{ 'you_booked_(DATE)' | translate:{DATE:(reservation.created_at | amDateFormat:'L LT')} }}
{{ 'full_price_' | translate }} {{reservation.nb_reserve_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_places}:"messageformat" }}
-
{{ 'reduced_rate*' | translate }} {{reservation.nb_reserve_reduced_places}} {{ 'ticket' | translate:{NUMBER:reservation.nb_reserve_reduced_places}:"messageformat" }}
+
+ {{getPriceCategory(ticket.event_price_category.price_category_id)}} : {{ticket.booked}} {{ 'ticket' | translate:{NUMBER:ticket.booked}:"messageformat" }} +
diff --git a/app/views/api/reservations/_reservation.json.jbuilder b/app/views/api/reservations/_reservation.json.jbuilder index fc724eb87..4aea0b5b8 100644 --- a/app/views/api/reservations/_reservation.json.jbuilder +++ b/app/views/api/reservations/_reservation.json.jbuilder @@ -8,7 +8,12 @@ json.slots reservation.slots do |s| json.end_at s.end_at.iso8601 end json.nb_reserve_places reservation.nb_reserve_places -json.nb_reserve_reduced_places reservation.nb_reserve_reduced_places +json.tickets reservation.tickets do |t| + json.extract! t, :booked, :created_at + json.event_price_category do + json.extract! t.event_price_category, :id, :price_category_id + end +end json.created_at reservation.created_at.iso8601 json.reservable_id reservation.reservable_id json.reservable_type reservation.reservable_type