Merge branch 'dev' for release 6.3.24

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next release
 
+## v6.3.24 2024 May 28
+
+- Fix a bug: unable to show member children for admin
+- improvement: add wallet amount to members Excel export
+- updates translations
+
 ## v6.3.23 2024 May 20
 
 - Fix a bug: unable to update availability slot end time for training

app/controllers/api/children_controller.rb

@@ -7,7 +7,6 @@ class API::ChildrenController < API::APIController
   before_action :set_child, only: %i[show update destroy validate]
 
   def index
-    authorize Child
     user_id = current_user.id
     user_id = params[:user_id] if current_user.privileged? && params[:user_id]
     @children = Child.where(user_id: user_id).where('birthday >= ?', 18.years.ago).includes(:supporting_document_files).order(:created_at)

app/frontend/src/javascript/filters/filters.js

@@ -370,6 +370,7 @@ Application.Filters.filter('currency', [function ($locale) {
 
 Application.Filters.filter('encodeURI', [function () {
   return function (str) {
+    if (!str) return '';
     return str.replace(/[!'()*]/g, function (c) {
       return '%' + c.charCodeAt(0).toString(16);
     });

app/policies/child_policy.rb

@@ -2,10 +2,6 @@
 
 # Check the access policies for API::ChildrenController
 class ChildPolicy < ApplicationPolicy
-  def index?
-    !user.organization?
-  end
-
   def create?
     !user.organization? && user.id == record.user_id
   end

app/views/exports/users_members.xlsx.axlsx

@@ -35,7 +35,9 @@ wb.add_worksheet(name: ExcelService.name_safe(t('export_members.members'))) do |
              t('export_members.echo_sciences'),
              t('export_members.organization'),
              t('export_members.organization_address'),
-             t('export_members.note')]
+             t('export_members.note'),
+             t('export_members.wallet_amount'),
+             ]
   sheet.add_row columns, style: header
 
   # data rows
@@ -69,7 +71,8 @@ wb.add_worksheet(name: ExcelService.name_safe(t('export_members.members'))) do |
       member.profile.echosciences || '',
       member.invoicing_profile&.organization&.name || '',
       member.invoicing_profile&.organization&.address&.address || '',
-      ActionController::Base.helpers.sanitize(member.profile.note, tags: []) || ''
+      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) : ''
     ]
     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]

config/locales/de.yml

@@ -228,6 +228,7 @@ de:
     man: "Mann"
     woman: "Frau"
     without_subscriptions: "Ohne Abonnement"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservierungen"

config/locales/en.yml

@@ -228,6 +228,7 @@ en:
     man: "Man"
     woman: "Woman"
     without_subscriptions: "Without subscriptions"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservations"

config/locales/es-MX.yml

@@ -228,6 +228,7 @@ es-MX:
     man: "Hombre"
     woman: "Mujer"
     without_subscriptions: "Sin suscripciones"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservas"

config/locales/es.yml

@@ -228,6 +228,7 @@ es:
     man: "Hombre"
     woman: "Mujer"
     without_subscriptions: "Sin suscripciones"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservas"

config/locales/fr.yml

@@ -228,6 +228,7 @@ fr:
     man: "Homme"
     woman: "Femme"
     without_subscriptions: "Sans Abonnement"
+    wallet_amount: "Porte-monnaie"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Réservations"

config/locales/it.yml

@@ -228,6 +228,7 @@ it:
     man: "Uomo"
     woman: "Donna"
     without_subscriptions: "Senza abbonamenti"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Le tue prenotazioni"

config/locales/no.yml

@@ -228,6 +228,7 @@
     man: "Mann"
     woman: "Kvinne"
     without_subscriptions: "Uten abonnementer"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservasjoner"

config/locales/pt.yml

@@ -228,6 +228,7 @@ pt:
     man: "Homem"
     woman: "Mulher"
     without_subscriptions: "Sem assinaturas"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Reservas"

config/locales/sv.yml

@@ -228,6 +228,7 @@ sv:
     man: "Man"
     woman: "Kvinna"
     without_subscriptions: "Utan prenumerationer"
+    wallet_amount: "Wallet"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "Bokningar"

config/locales/zu.yml

@@ -228,6 +228,7 @@ zu:
     man: "crwdns3479:0crwdne3479:0"
     woman: "crwdns3481:0crwdne3481:0"
     without_subscriptions: "crwdns3483:0crwdne3483:0"
+    wallet_amount: "crwdns38214:0crwdne38214:0"
   #machines/trainings/events reservations list to EXCEL format
   export_reservations:
     reservations: "crwdns3485:0crwdne3485:0"

package.json

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