1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-26 20:54:21 +01:00

Merge branch 'dev' for release 5.4.24

This commit is contained in:
Du Peng 2022-10-14 17:26:45 +02:00
commit 7215b021e5
3 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,9 @@
# Changelog Fab-manager
## v5.4.24 2022 October 14
- Fix a bug: unable debit hours of prepaid pack after a reservation of machine
## v5.4.23 2022 October 12
- Fix a bug: unable to build docker image

View File

@ -160,6 +160,7 @@ class ShoppingCart
# The total booked minutes are subtracted from the user's prepaid minutes
def update_packs(objects)
objects.filter { |o| o.is_a? Reservation }.each do |reservation|
reservation.reload
PrepaidPackService.update_user_minutes(@customer, reservation)
end
end

View File

@ -1,6 +1,6 @@
{
"name": "fab-manager",
"version": "5.4.23",
"version": "5.4.24",
"description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
"keywords": [
"fablab",