1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00

Merge branch 'dev' for release 6.3.25

This commit is contained in:
Du Peng 2024-05-28 14:07:09 +02:00
commit ba08586b41
3 changed files with 6 additions and 2 deletions

View File

@ -2,6 +2,10 @@
## Next release
## v6.3.25 2024 May 28
- Fix a bug: member wallet amount calculation error in the excel export
## v6.3.24 2024 May 28
- Fix a bug: unable to show member children for admin

View File

@ -72,7 +72,7 @@ wb.add_worksheet(name: ExcelService.name_safe(t('export_members.members'))) do |
member.invoicing_profile&.organization&.name || '',
member.invoicing_profile&.organization&.address&.address || '',
ActionController::Base.helpers.sanitize(member.profile.note, tags: []) || '',
member.wallet&.amount ? ActionController::Base.helpers.number_to_currency(member.wallet&.amount / 100.0, locale: CURRENCY_LOCALE) : ''
ActionController::Base.helpers.number_to_currency(member.wallet&.amount, locale: CURRENCY_LOCALE) || ''
]
styles = [nil, nil, nil, nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil,
nil, nil, nil, date, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, nil]

View File

@ -1,6 +1,6 @@
{
"name": "fab-manager",
"version": "6.3.24",
"version": "6.3.25",
"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",