diff --git a/app/assets/javascripts/controllers/events.coffee.erb b/app/assets/javascripts/controllers/events.coffee.erb index 399cb8983..e64229556 100644 --- a/app/assets/javascripts/controllers/events.coffee.erb +++ b/app/assets/javascripts/controllers/events.coffee.erb @@ -358,11 +358,14 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", " $uibModalInstance.dismiss('cancel') ] .result['finally'](null).then (reservation)-> + # remove the reservation from the user's reservations list for this event (occurrence) $scope.reservations.splice(index, 1) - $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.nb_reserve_places + reservation.nb_reserve_reduced_places + # add the number of places transfered (to the new date) to the total of free places for this event + $scope.event.nb_free_places = $scope.event.nb_free_places + reservation.total_booked_seats + # remove the number of places transfered from the total of free places of the receiving occurrance angular.forEach $scope.event.recurrence_events, (e)-> - if e.id is parseInt(reservation.reservable_id, 10) - e.nb_free_places = e.nb_free_places - reservation.nb_reserve_places - reservation.nb_reserve_reduced_places + if e.id is parseInt(reservation.reservable.id, 10) + e.nb_free_places = e.nb_free_places - reservation.total_booked_seats diff --git a/app/assets/javascripts/router.coffee.erb b/app/assets/javascripts/router.coffee.erb index 770c5fa9b..921fb4fab 100644 --- a/app/assets/javascripts/router.coffee.erb +++ b/app/assets/javascripts/router.coffee.erb @@ -512,9 +512,6 @@ angular.module('application.router', ['ui.router']). eventPromise: ['Event', '$stateParams', (Event, $stateParams)-> Event.get(id: $stateParams.id).$promise ] - reducedAmountAlert: ['Setting', (Setting)-> - Setting.get(name: 'event_reduced_amount_alert').$promise - ] priceCategoriesPromise: ['PriceCategory', (PriceCategory) -> PriceCategory.query().$promise ] diff --git a/app/views/api/reservations/show.json.jbuilder b/app/views/api/reservations/show.json.jbuilder index 1f36016a5..cf62a5a88 100644 --- a/app/views/api/reservations/show.json.jbuilder +++ b/app/views/api/reservations/show.json.jbuilder @@ -34,4 +34,5 @@ json.tickets @reservation.tickets do |t| end end end +json.total_booked_seats @reservation.total_booked_seats json.created_at @reservation.created_at.iso8601