diff --git a/app/frontend/templates/admin/members/edit.html b/app/frontend/templates/admin/members/edit.html index 7f1448b47..8dbbffcdb 100644 --- a/app/frontend/templates/admin/members/edit.html +++ b/app/frontend/templates/admin/members/edit.html @@ -213,10 +213,20 @@
{{ 'app.admin.members_edit.NUMBER_full_price_tickets_reserved' }} + +
+ {{bu.name}} + {{bu.name}} +

{{ 'app.admin.members_edit.NUMBER_NAME_tickets_reserved' }} + +
+ {{bu.name}} + {{bu.name}} +
diff --git a/app/views/api/members/show.json.jbuilder b/app/views/api/members/show.json.jbuilder index c718821a8..051b19718 100644 --- a/app/views/api/members/show.json.jbuilder +++ b/app/views/api/members/show.json.jbuilder @@ -77,13 +77,22 @@ json.events_reservations @member.reservations.where(reservable_type: 'Event').jo json.nb_reserve_places sr.reservation.nb_reserve_places json.tickets sr.reservation.tickets do |t| json.booked t.booked + json.event_price_category_id t.event_price_category_id json.price_category do json.name t.event_price_category.price_category.name end end json.reservable sr.reservation.reservable json.reservable_type 'Event' + json.event_type sr.reservation.reservable.event_type json.canceled_at sr.canceled_at + json.booking_users_attributes sr.reservation.booking_users.order(booked_type: :desc) do |bu| + json.id bu.id + json.name bu.name + json.event_price_category_id bu.event_price_category_id + json.booked_id bu.booked_id + json.booked_type bu.booked_type + end end json.invoices @member.invoices.order('reference DESC') do |i| json.id i.id