mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-18 12:54:27 +01:00
Merge branch 'dev' for release 5.1.5
This commit is contained in:
commit
9a52c97730
10
CHANGELOG.md
10
CHANGELOG.md
@ -1,5 +1,10 @@
|
|||||||
# Changelog Fab-manager
|
# Changelog Fab-manager
|
||||||
|
|
||||||
|
## v5.1.5 2021 August 2
|
||||||
|
|
||||||
|
- Fix a bug: unable to show statistics
|
||||||
|
- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2021,6]`
|
||||||
|
|
||||||
## v5.1.4 2021 July 9
|
## v5.1.4 2021 July 9
|
||||||
|
|
||||||
- Fix a bug: stripe 3D Secure payment
|
- Fix a bug: stripe 3D Secure payment
|
||||||
@ -34,6 +39,11 @@
|
|||||||
- [TODO DEPLOY] `rails db:seed`
|
- [TODO DEPLOY] `rails db:seed`
|
||||||
- [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet`
|
- [TODO DEPLOY] `rails fablab:maintenance:rebuild_stylesheet`
|
||||||
|
|
||||||
|
## v5.0.10 2021 August 2
|
||||||
|
|
||||||
|
- Fix a bug: unable to show statistics
|
||||||
|
- [TODO DEPLOY] `rails fablab:maintenance:regenerate_statistics[2021,6]`
|
||||||
|
|
||||||
## v5.0.9 2021 July 9
|
## v5.0.9 2021 July 9
|
||||||
|
|
||||||
- Fix a bug: stripe 3D Secure payment
|
- Fix a bug: stripe 3D Secure payment
|
||||||
|
@ -108,5 +108,23 @@ namespace :fablab do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
desc 'regenerate statistics'
|
||||||
|
task :regenerate_statistics, %i[year month] => :environment do |_task, args|
|
||||||
|
return unless Setting.get('statistics_module')
|
||||||
|
|
||||||
|
yesterday = 1.day.ago
|
||||||
|
year = args.year || yesterday.year
|
||||||
|
month = args.month || yesterday.month
|
||||||
|
start_date = Time.zone.local(year.to_i, month.to_i, 1)
|
||||||
|
end_date = yesterday.end_of_day
|
||||||
|
puts "-> Start regenerate statistics between #{I18n.l start_date, format: :long} and " \
|
||||||
|
"#{I18n.l end_date, format: :long}"
|
||||||
|
StatisticService.new.generate_statistic(
|
||||||
|
start_date: start_date,
|
||||||
|
end_date: end_date
|
||||||
|
)
|
||||||
|
puts '-> Done'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "fab-manager",
|
"name": "fab-manager",
|
||||||
"version": "5.1.4",
|
"version": "5.1.5",
|
||||||
"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.",
|
"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": [
|
"keywords": [
|
||||||
"fablab",
|
"fablab",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user