mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-21 15:54:22 +01:00
Prevent event reservation in the past
This commit is contained in:
parent
6aa3c0caeb
commit
0c11f61010
@ -12,6 +12,7 @@
|
|||||||
- Improved notification email to the member when a rolling subscription is taken
|
- Improved notification email to the member when a rolling subscription is taken
|
||||||
- Notify all admins on the creation of a refund invoice
|
- Notify all admins on the creation of a refund invoice
|
||||||
- Calendar management: improved legend display and visual behavior
|
- Calendar management: improved legend display and visual behavior
|
||||||
|
- Prevent event reservation in the past [Taiga#127]
|
||||||
- Handle Ctrl^C in upgrade scripts
|
- Handle Ctrl^C in upgrade scripts
|
||||||
- Updated moment-timezone
|
- Updated moment-timezone
|
||||||
- Added freeCAD files as default allowed extensions
|
- Added freeCAD files as default allowed extensions
|
||||||
|
@ -133,6 +133,9 @@ Application.Controllers.controller('ShowEventController', ['$scope', '$state', '
|
|||||||
// reservations for the currently shown event
|
// reservations for the currently shown event
|
||||||
$scope.reservations = [];
|
$scope.reservations = [];
|
||||||
|
|
||||||
|
// current date & time
|
||||||
|
$scope.now = moment();
|
||||||
|
|
||||||
// user to deal with
|
// user to deal with
|
||||||
$scope.ctrl =
|
$scope.ctrl =
|
||||||
{ member: {} };
|
{ member: {} };
|
||||||
|
@ -171,7 +171,12 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<button class="btn btn-warning-full rounded btn-block text-sm" ng-click="reserveEvent()" ng-show="event.nb_free_places > 0 && !reserve.toReserve">{{ 'book' | translate }}</button>
|
<div ng-show="now.isSameOrAfter(event.end_date)" class="alert alert-info">
|
||||||
|
<span translate>{{ 'event_is_over' }}</span>
|
||||||
|
<span ng-show="reservations.length > 0" translate>{{ 'thanks_for_coming' }}</span>
|
||||||
|
<a ui-sref="app.public.events_list" translate>{{ 'view_event_list' }}</a>
|
||||||
|
</div>
|
||||||
|
<button class="btn btn-warning-full rounded btn-block text-sm" ng-click="reserveEvent()" ng-show="event.nb_free_places > 0 && !reserve.toReserve && now.isBefore(event.end_date)">{{ 'book' | translate }}</button>
|
||||||
|
|
||||||
<coupon show="reserve.totalSeats > 0 && ctrl.member" coupon="coupon.applied" total="reserve.totalNoCoupon" user-id="{{ctrl.member.id}}"></coupon>
|
<coupon show="reserve.totalSeats > 0 && ctrl.member" coupon="coupon.applied" total="reserve.totalNoCoupon" user-id="{{ctrl.member.id}}"></coupon>
|
||||||
</div>
|
</div>
|
||||||
|
@ -295,6 +295,9 @@ en:
|
|||||||
cancel_the_reservation: "Cancel the reservation"
|
cancel_the_reservation: "Cancel the reservation"
|
||||||
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets."
|
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets."
|
||||||
cancellation_failed: "Cancellation failed."
|
cancellation_failed: "Cancellation failed."
|
||||||
|
event_is_over: "The event is over"
|
||||||
|
thanks_for_coming: "Thanks for coming!"
|
||||||
|
view_event_list: "View events to come"
|
||||||
|
|
||||||
calendar:
|
calendar:
|
||||||
# public calendar
|
# public calendar
|
||||||
|
@ -295,6 +295,9 @@ es:
|
|||||||
cancel_the_reservation: "Cancel the reservation" #translation_missing
|
cancel_the_reservation: "Cancel the reservation" #translation_missing
|
||||||
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing
|
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing
|
||||||
cancellation_failed: "Cancellation failed." #translation_missing
|
cancellation_failed: "Cancellation failed." #translation_missing
|
||||||
|
event_is_over: "The event is over" #translation_missing
|
||||||
|
thanks_for_coming: "Thanks for coming!" #translation_missing
|
||||||
|
view_event_list: "View events to come" #translation_missing
|
||||||
|
|
||||||
calendar:
|
calendar:
|
||||||
# public calendar
|
# public calendar
|
||||||
|
@ -295,6 +295,9 @@ fr:
|
|||||||
cancel_the_reservation: "Annuler la réservation"
|
cancel_the_reservation: "Annuler la réservation"
|
||||||
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Êtes vous sur de vouloir annuler cette réservation? Ceci s'applique à TOUTES les places réservées."
|
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Êtes vous sur de vouloir annuler cette réservation? Ceci s'applique à TOUTES les places réservées."
|
||||||
cancellation_failed: "L'annulation a échoué."
|
cancellation_failed: "L'annulation a échoué."
|
||||||
|
event_is_over: "L'évènement est terminé."
|
||||||
|
thanks_for_coming: "Merci d'avoir participé !"
|
||||||
|
view_event_list: "Voir les évènements à venir"
|
||||||
|
|
||||||
calendar:
|
calendar:
|
||||||
# calendrier publique
|
# calendrier publique
|
||||||
|
@ -295,6 +295,9 @@ pt:
|
|||||||
cancel_the_reservation: "Cancel the reservation" #translation_missing
|
cancel_the_reservation: "Cancel the reservation" #translation_missing
|
||||||
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing
|
do_you_really_want_to_cancel_this_reservation_this_apply_to_all_booked_tickets: "Do you really want to cancel this reservation? This apply to ALL booked tickets." #translation_missing
|
||||||
cancellation_failed: "Cancellation failed." #translation_missin
|
cancellation_failed: "Cancellation failed." #translation_missin
|
||||||
|
event_is_over: "The event is over" #translation_missing
|
||||||
|
thanks_for_coming: "Thanks for coming!" #translation_missing
|
||||||
|
view_event_list: "View events to come" #translation_missing
|
||||||
|
|
||||||
calendar:
|
calendar:
|
||||||
# public calendar
|
# public calendar
|
||||||
|
Loading…
x
Reference in New Issue
Block a user