From e1a3309783259a250d5cc545126b0fadaeb25ff3 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Thu, 23 Nov 2023 15:17:41 +0100 Subject: [PATCH] (fix) user was not able to reserve at the same time of an event with pre-registration invalidated --- app/frontend/src/javascript/directives/cart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/frontend/src/javascript/directives/cart.js b/app/frontend/src/javascript/directives/cart.js index 2c2725a6d..5e89d5bc5 100644 --- a/app/frontend/src/javascript/directives/cart.js +++ b/app/frontend/src/javascript/directives/cart.js @@ -468,7 +468,7 @@ Application.Directives.directive('cart', ['$rootScope', '$uibModal', 'dialogs', const validateSameTimeReservations = function (slot, callback) { let sameTimeReservations = $scope.settings.overlapping_categories.split(',').map(function (k) { return _.filter($scope.user[k], function (sr) { - return !sr.canceled_at && ( + return !sr.canceled_at && !(sr.reservable_type === 'Event' && (sr.is_valid === false)) && ( slot.start.isSame(sr.start_at) || (slot.end.isAfter(sr.start_at) && slot.end.isBefore(sr.end_at)) || (slot.start.isAfter(sr.start_at) && slot.start.isBefore(sr.end_at)) ||