rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-20 14:54:15 +01:00
Code Issues Releases Activity

(fix) user was not able to reserve at the same time of an event with pre-registration invalidated

Browse Source
This commit is contained in:
Nicolas Florentin 2023-11-23 15:17:41 +01:00
parent 10acf9d3ee
commit e1a3309783
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/frontend/src/javascript/directives/cart.js
View File

@ -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)) ||