From 3d1c852576aef01cb632bd8cb2055b5b3bcbca9a Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 29 Aug 2016 16:54:10 +0200
Subject: [PATCH] show custom prices bookings in admin/editMember

---
 app/assets/templates/admin/members/edit.html.erb | 4 ++--
 app/views/api/members/show.json.jbuilder         | 7 ++++++-
 config/locales/app.admin.en.yml                  | 2 +-
 config/locales/app.admin.fr.yml                  | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/templates/admin/members/edit.html.erb b/app/assets/templates/admin/members/edit.html.erb
index 501e803b5..099fc7745 100644
--- a/app/assets/templates/admin/members/edit.html.erb
+++ b/app/assets/templates/admin/members/edit.html.erb
@@ -160,9 +160,9 @@
                       <br/>
                       <span translate translate-values="{ NUMBER: r.nb_reserve_places}" translate-interpolation="messageformat">{{ 'NUMBER_full_price_tickets_reserved' }}</span>
                     </span>
-                    <span ng-if="r.nb_reserve_reduced_places > 0">
+                    <span ng-repeat="ticket in r.tickets">
                       <br/>
-                      <span translate translate-values="{ NUMBER: r.nb_reserve_reduced_places}" translate-interpolation="messageformat">{{ 'NUMBER_reduced_rate_tickets_reserved' }}</span>
+                      <span translate translate-values="{ NUMBER: ticket.booked, NAME: ticket.price_category.name }" translate-interpolation="messageformat">{{ 'NUMBER_NAME_tickets_reserved' }}</span>
                     </span>
                   </li>
                 </ul>
diff --git a/app/views/api/members/show.json.jbuilder b/app/views/api/members/show.json.jbuilder
index 46c9cf7f3..ece8b562b 100644
--- a/app/views/api/members/show.json.jbuilder
+++ b/app/views/api/members/show.json.jbuilder
@@ -109,7 +109,12 @@ json.events_reservations @member.reservations.where(reservable_type: 'Event').jo
   json.start_at r.slots.first.start_at
   json.end_at r.slots.first.end_at
   json.nb_reserve_places r.nb_reserve_places
-  json.nb_reserve_reduced_places r.nb_reserve_reduced_places
+  json.tickets r.tickets do |t|
+    json.booked t.booked
+    json.price_category do
+      json.name t.event_price_category.price_category.name
+    end
+  end
   json.reservable r.reservable
 end
 json.invoices @member.invoices.order('reference DESC') do |i|
diff --git a/config/locales/app.admin.en.yml b/config/locales/app.admin.en.yml
index bb6e96e2c..6f0c30b16 100644
--- a/config/locales/app.admin.en.yml
+++ b/config/locales/app.admin.en.yml
@@ -385,7 +385,7 @@ en:
         next_events: "Next events"
         no_upcoming_events: "No upcoming events"
         NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 full price ticket reserved} other{{NUMBER} full price tickets reserved}}"  # messageFormat interpolation
-        NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 reduced rate ticket reserved} other{{NUMBER} reduced rate tickets reserved}}"  # messageFormat interpolation
+        NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 {NAME} ticket reserved} other{{NUMBER} {NAME} tickets reserved}}"  # messageFormat interpolation
         passed_events: "Passed events"
         invoices: "Invoices"
         invoice_#: "Invoice #"
diff --git a/config/locales/app.admin.fr.yml b/config/locales/app.admin.fr.yml
index 7a30b2d84..fea802eb1 100644
--- a/config/locales/app.admin.fr.yml
+++ b/config/locales/app.admin.fr.yml
@@ -385,7 +385,7 @@ fr:
         next_events: "Les prochains évènements"
         no_upcoming_events: "Aucun évènement à venir"
         NUMBER_full_price_tickets_reserved: "{NUMBER, plural, =0{} one{1 place plein tarif réservée} other{{NUMBER} places plein tarif réservées}}"  # messageFormat interpolation
-        NUMBER_reduced_rate_tickets_reserved: "{NUMBER, plural, =0{} one{1 place à tarif réduit réservée} other{{NUMBER} places à tarif réduit réservées}}"  # messageFormat interpolation
+        NUMBER_NAME_tickets_reserved: "{NUMBER, plural, =0{} one{1 place {NAME} réservée} other{{NUMBER} places {NAME} réservées}}"  # messageFormat interpolation
         passed_events: "Les évènements passés"
         invoices: "Factures"
         invoice_#: "Facture n°"