diff --git a/app/assets/javascripts/router.js.erb b/app/assets/javascripts/router.js.erb
index 3720e069d..6936c6138 100644
--- a/app/assets/javascripts/router.js.erb
+++ b/app/assets/javascripts/router.js.erb
@@ -30,33 +30,30 @@ angular.module('application.router', ['ui.router'])
           'main': {}
         },
         resolve: {
-          logoFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'logo-file' }).$promise
-          ],
-          logoBlackFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'logo-black-file' }).$promise
-          ],
-          commonTranslations: [ 'Translations', Translations => Translations.query(['app.public.common', 'app.shared.buttons', 'app.shared.elements']).$promise
-          ]
+          logoFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'logo-file' }).$promise }],
+          logoBlackFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'logo-black-file' }).$promise }],
+          commonTranslations: [ 'Translations', function (Translations) { return Translations.query(['app.public.common', 'app.shared.buttons', 'app.shared.elements']).$promise }]
         },
         onEnter: ['$rootScope', 'logoFile', 'logoBlackFile', function ($rootScope, logoFile, logoBlackFile) {
           // Application logo
           $rootScope.logo = logoFile.custom_asset
           return $rootScope.logoBlack = logoBlackFile.custom_asset
-        }
-        ]
+        }]
+      })
+      .state('app.public', {
+        abstract: true
       })
-      .state('app.public',
-        { abstract: true })
       .state('app.logged', {
         abstract: true,
         data: {
           authorizedRoles: ['member', 'admin']
         },
         resolve: {
-          currentUser: ['Auth', Auth => Auth.currentUser()
-          ]
+          currentUser: ['Auth', function (Auth) { return Auth.currentUser() }]
         },
-        onEnter: ['$state', '$timeout', 'currentUser', '$rootScope', ($state, $timeout, currentUser, $rootScope) => $rootScope.currentUser = currentUser
-        ]
+        onEnter: ['$state', '$timeout', 'currentUser', '$rootScope', function ($state, $timeout, currentUser, $rootScope) {
+          $rootScope.currentUser = currentUser
+        }]
       })
       .state('app.admin', {
         abstract: true,
@@ -64,11 +61,11 @@ angular.module('application.router', ['ui.router'])
           authorizedRoles: ['admin']
         },
         resolve: {
-          currentUser: ['Auth', Auth => Auth.currentUser()
-          ]
+          currentUser: ['Auth', function (Auth) { return Auth.currentUser() }]
         },
-        onEnter: ['$state', '$timeout', 'currentUser', '$rootScope', ($state, $timeout, currentUser, $rootScope) => $rootScope.currentUser = currentUser
-        ]
+        onEnter: ['$state', '$timeout', 'currentUser', '$rootScope', function ($state, $timeout, currentUser, $rootScope) {
+          $rootScope.currentUser = currentUser
+        }]
       })
 
       // main pages
@@ -81,8 +78,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.public.about').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.public.about').$promise }]
         }
       })
       .state('app.public.home', {
@@ -94,18 +90,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          lastMembersPromise: ['Member', Member => Member.lastSubscribed({ limit: 4 }).$promise
-          ],
-          lastProjectsPromise: ['Project', Project => Project.lastPublished().$promise
-          ],
-          upcomingEventsPromise: ['Event', Event => Event.upcoming({ limit: 3 }).$promise
-          ],
-          homeBlogpostPromise: ['Setting', Setting => Setting.get({ name: 'home_blogpost' }).$promise
-          ],
-          twitterNamePromise: ['Setting', Setting => Setting.get({ name: 'twitter_name' }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.public.home').$promise
-          ]
+          lastMembersPromise: ['Member', function (Member) { return Member.lastSubscribed({ limit: 4 }).$promise }],
+          lastProjectsPromise: ['Project', function (Project) { return Project.lastPublished().$promise }],
+          upcomingEventsPromise: ['Event', function (Event) { return Event.upcoming({ limit: 3 }).$promise }],
+          homeBlogpostPromise: ['Setting', function (Setting) { return Setting.get({ name: 'home_blogpost' }).$promise }],
+          twitterNamePromise: ['Setting', function (Setting) { return Setting.get({ name: 'twitter_name' }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.public.home').$promise }]
         }
       })
 
@@ -119,18 +109,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          settingsPromise: ['Setting', Setting => Setting.query({ names: "['fablab_name', 'name_genre']" }).$promise
-          ],
-          activeProviderPromise: ['AuthProvider', AuthProvider => AuthProvider.active().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          cguFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'cgu-file' }).$promise
-          ],
-          memberPromise: ['Member', 'currentUser', (Member, currentUser) => Member.get({ id: currentUser.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.profileCompletion', 'app.shared.user']).$promise
-          ]
+          settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['fablab_name', 'name_genre']" }).$promise }],
+          activeProviderPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.active().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          cguFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'cgu-file' }).$promise }],
+          memberPromise: ['Member', 'currentUser', function (Member, currentUser) { return Member.get({ id: currentUser.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.profileCompletion', 'app.shared.user']).$promise }]
         }
       })
 
@@ -139,8 +123,7 @@ angular.module('application.router', ['ui.router'])
         abstract: true,
         url: '/dashboard',
         resolve: {
-          memberPromise: ['Member', 'currentUser', (Member, currentUser) => Member.get({ id: currentUser.id }).$promise
-          ]
+          memberPromise: ['Member', 'currentUser', function (Member, currentUser) { return Member.get({ id: currentUser.id }).$promise }]
         }
       })
       .state('app.logged.dashboard.profile', {
@@ -152,8 +135,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.dashboard.profile', 'app.shared.public_profile']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.dashboard.profile', 'app.shared.public_profile']).$promise }]
         }
       })
       .state('app.logged.dashboard.settings', {
@@ -165,12 +147,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          groups: ['Group', Group => Group.query().$promise
-          ],
-          activeProviderPromise: ['AuthProvider', AuthProvider => AuthProvider.active().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.dashboard.settings', 'app.shared.user']).$promise
-          ]
+          groups: ['Group', function (Group) { return Group.query().$promise }],
+          activeProviderPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.active().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.dashboard.settings', 'app.shared.user']).$promise }]
         }
       })
       .state('app.logged.dashboard.projects', {
@@ -182,8 +161,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.logged.dashboard.projects').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.dashboard.projects').$promise }]
         }
       })
       .state('app.logged.dashboard.trainings', {
@@ -195,8 +173,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.logged.dashboard.trainings').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.dashboard.trainings').$promise }]
         }
       })
       .state('app.logged.dashboard.events', {
@@ -208,8 +185,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.logged.dashboard.events').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.dashboard.events').$promise }]
         }
       })
       .state('app.logged.dashboard.invoices', {
@@ -221,8 +197,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.logged.dashboard.invoices').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.dashboard.invoices').$promise }]
         }
       })
       .state('app.logged.dashboard.wallet', {
@@ -234,12 +209,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          walletPromise: ['Wallet', 'currentUser', (Wallet, currentUser) => Wallet.getWalletByUser({ user_id: currentUser.id }).$promise
-          ],
-          transactionsPromise: ['Wallet', 'walletPromise', (Wallet, walletPromise) => Wallet.transactions({ id: walletPromise.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.shared.wallet']).$promise
-          ]
+          walletPromise: ['Wallet', 'currentUser', function (Wallet, currentUser) { return Wallet.getWalletByUser({ user_id: currentUser.id }).$promise }],
+          transactionsPromise: ['Wallet', 'walletPromise', function (Wallet, walletPromise) { return Wallet.transactions({ id: walletPromise.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.shared.wallet']).$promise }]
         }
       })
 
@@ -253,10 +225,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          memberPromise: ['$stateParams', 'Member', ($stateParams, Member) => Member.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.members_show', 'app.shared.public_profile']).$promise
-          ]
+          memberPromise: ['$stateParams', 'Member', function ($stateParams, Member) { return Member.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.members_show', 'app.shared.public_profile']).$promise }]
         }
       })
       .state('app.logged.members', {
@@ -268,10 +238,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          membersPromise: ['Member', Member => Member.query({ requested_attributes: '[profile]', page: 1, size: 10 }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.logged.members').$promise
-          ]
+          membersPromise: ['Member', function (Member) { return Member.query({ requested_attributes: '[profile]', page: 1, size: 10 }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.members').$promise }]
         }
       })
 
@@ -285,14 +253,10 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          themesPromise: ['Theme', Theme => Theme.query().$promise
-          ],
-          componentsPromise: ['Component', Component => Component.query().$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.public.projects_list').$promise
-          ]
+          themesPromise: ['Theme', function (Theme) { return Theme.query().$promise }],
+          componentsPromise: ['Component', function (Component) { return Component.query().$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.public.projects_list').$promise }]
         }
       })
       .state('app.logged.projects_new', {
@@ -304,10 +268,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          allowedExtensions: ['Project', Project => Project.allowedExtensions().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.projects_new', 'app.shared.project']).$promise
-          ]
+          allowedExtensions: ['Project', function (Project) { return Project.allowedExtensions().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.projects_new', 'app.shared.project']).$promise }]
         }
       })
       .state('app.public.projects_show', {
@@ -319,10 +281,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          projectPromise: ['$stateParams', 'Project', ($stateParams, Project) => Project.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.public.projects_show').$promise
-          ]
+          projectPromise: ['$stateParams', 'Project', function ($stateParams, Project) { return Project.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.public.projects_show').$promise }]
         }
       })
       .state('app.logged.projects_edit', {
@@ -334,12 +294,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          projectPromise: ['$stateParams', 'Project', ($stateParams, Project) => Project.get({ id: $stateParams.id }).$promise
-          ],
-          allowedExtensions: ['Project', Project => Project.allowedExtensions().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.logged.projects_edit', 'app.shared.project']).$promise
-          ]
+          projectPromise: ['$stateParams', 'Project', function ($stateParams, Project) { return Project.get({ id: $stateParams.id }).$promise }],
+          allowedExtensions: ['Project', function (Project) { return Project.allowedExtensions().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.logged.projects_edit', 'app.shared.project']).$promise }]
         }
       })
 
@@ -353,10 +310,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.machines_list', 'app.shared.training_reservation_modal', 'app.shared.request_training_modal']).$promise
-          ]
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.machines_list', 'app.shared.training_reservation_modal', 'app.shared.request_training_modal']).$promise }]
         }
       })
       .state('app.admin.machines_new', {
@@ -368,8 +323,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.machines_new', 'app.shared.machine']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.machines_new', 'app.shared.machine']).$promise }]
         }
       })
       .state('app.public.machines_show', {
@@ -381,10 +335,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          machinePromise: ['Machine', '$stateParams', (Machine, $stateParams) => Machine.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.machines_show', 'app.shared.training_reservation_modal', 'app.shared.request_training_modal']).$promise
-          ]
+          machinePromise: ['Machine', '$stateParams', function (Machine, $stateParams) { return Machine.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.machines_show', 'app.shared.training_reservation_modal', 'app.shared.request_training_modal']).$promise }]
         }
       })
       .state('app.logged.machines_reserve', {
@@ -396,29 +348,26 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          plansPromise: ['Plan', Plan => Plan.query().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          machinePromise: ['Machine', '$stateParams', (Machine, $stateParams) => Machine.get({ id: $stateParams.id }).$promise
-          ],
-          settingsPromise: ['Setting', Setting =>
-            Setting.query({ names: `['machine_explications_alert', \
-'booking_window_start', \
-'booking_window_end', \
-'booking_move_enable', \
-'booking_move_delay', \
-'booking_cancel_enable', \
-'booking_cancel_delay', \
-'subscription_explications_alert']` }).$promise
-
-          ],
-          translations: [ 'Translations', Translations =>
-            Translations.query(['app.logged.machines_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
+          plansPromise: ['Plan', function (Plan) { return Plan.query().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          machinePromise: ['Machine', '$stateParams', function (Machine, $stateParams) { return Machine.get({ id: $stateParams.id }).$promise }],
+          settingsPromise: ['Setting', function (Setting) {
+            return Setting.query({
+              names: `['machine_explications_alert', \
+                       'booking_window_start', \
+                       'booking_window_end', \
+                       'booking_move_enable', \
+                       'booking_move_delay', \
+                       'booking_cancel_enable', \
+                       'booking_cancel_delay', \
+                       'subscription_explications_alert']`
+            }).$promise
+          }],
+          translations: [ 'Translations', function (Translations) {
+            return Translations.query(['app.logged.machines_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
               'app.shared.stripe', 'app.shared.valid_reservation_modal', 'app.shared.confirm_modify_slot_modal',
               'app.shared.wallet', 'app.shared.coupon_input', 'app.shared.cart']).$promise
-
-          ]
+          }]
         }
       })
       .state('app.admin.machines_edit', {
@@ -430,10 +379,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          machinePromise: ['Machine', '$stateParams', (Machine, $stateParams) => Machine.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.machines_edit', 'app.shared.machine']).$promise
-          ]
+          machinePromise: ['Machine', '$stateParams', function (Machine, $stateParams) { return Machine.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.machines_edit', 'app.shared.machine']).$promise }]
         }
       })
 
@@ -448,10 +395,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          spacesPromise: ['Space', Space => Space.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.spaces_list']).$promise
-          ]
+          spacesPromise: ['Space', function (Space) { return Space.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.spaces_list']).$promise }]
         }
       })
       .state('app.admin.space_new', {
@@ -464,8 +409,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.space_new', 'app.shared.space']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.space_new', 'app.shared.space']).$promise }]
         }
       })
       .state('app.public.space_show', {
@@ -478,10 +422,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          spacePromise: ['Space', '$stateParams', (Space, $stateParams) => Space.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.space_show']).$promise
-          ]
+          spacePromise: ['Space', '$stateParams', function (Space, $stateParams) { return Space.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.space_show']).$promise }]
         }
       })
       .state('app.admin.space_edit', {
@@ -494,10 +436,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          spacePromise: ['Space', '$stateParams', (Space, $stateParams) => Space.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.space_edit', 'app.shared.space']).$promise
-          ]
+          spacePromise: ['Space', '$stateParams', function (Space, $stateParams) { return Space.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.space_edit', 'app.shared.space']).$promise }]
         }
       })
       .state('app.logged.space_reserve', {
@@ -510,31 +450,26 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          spacePromise: ['Space', '$stateParams', (Space, $stateParams) => Space.get({ id: $stateParams.id }).$promise
-          ],
-          availabilitySpacesPromise: ['Availability', '$stateParams', (Availability, $stateParams) => Availability.spaces({ spaceId: $stateParams.id }).$promise
-          ],
-          plansPromise: ['Plan', Plan => Plan.query().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          settingsPromise: ['Setting', Setting =>
-            Setting.query({ names: `['booking_window_start', \
-'booking_window_end', \
-'booking_move_enable', \
-'booking_move_delay', \
-'booking_cancel_enable', \
-'booking_cancel_delay', \
-'subscription_explications_alert', \
-'space_explications_alert']` }).$promise
-
-          ],
-          translations: [ 'Translations', Translations =>
-            Translations.query(['app.logged.space_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
+          spacePromise: ['Space', '$stateParams', function (Space, $stateParams) { return Space.get({ id: $stateParams.id }).$promise }],
+          availabilitySpacesPromise: ['Availability', '$stateParams', function (Availability, $stateParams) { return Availability.spaces({ spaceId: $stateParams.id }).$promise }],
+          plansPromise: ['Plan', function (Plan) { return Plan.query().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          settingsPromise: ['Setting', function (Setting) {
+            return Setting.query({
+              names: `['booking_window_start', \
+                       'booking_window_end', \
+                       'booking_move_enable', \
+                       'booking_move_delay', \
+                       'booking_cancel_enable', \
+                       'booking_cancel_delay', \
+                       'subscription_explications_alert', \
+                       'space_explications_alert']` }).$promise
+          }],
+          translations: [ 'Translations', function (Translations) {
+            return Translations.query(['app.logged.space_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
               'app.shared.stripe', 'app.shared.valid_reservation_modal', 'app.shared.confirm_modify_slot_modal',
               'app.shared.wallet', 'app.shared.coupon_input', 'app.shared.cart']).$promise
-
-          ]
+          }]
         }
       })
 
@@ -548,10 +483,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          trainingsPromise: ['Training', Training => Training.query({ public_page: true }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.trainings_list']).$promise
-          ]
+          trainingsPromise: ['Training', function (Training) { return Training.query({ public_page: true }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.trainings_list']).$promise }]
         }
       })
       .state('app.public.training_show', {
@@ -563,10 +496,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          trainingPromise: ['Training', '$stateParams', (Training, $stateParams) => Training.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.training_show']).$promise
-          ]
+          trainingPromise: ['Training', '$stateParams', function (Training, $stateParams) { return Training.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.training_show']).$promise }]
         }
       })
       .state('app.logged.trainings_reserve', {
@@ -578,36 +509,30 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          explicationAlertPromise: ['Setting', Setting => Setting.get({ name: 'training_explications_alert' }).$promise
-          ],
-          plansPromise: ['Plan', Plan => Plan.query().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          availabilityTrainingsPromise: ['Availability', '$stateParams', (Availability, $stateParams) => Availability.trainings({ trainingId: $stateParams.id }).$promise
-          ],
+          explicationAlertPromise: ['Setting', function (Setting) { return Setting.get({ name: 'training_explications_alert' }).$promise }],
+          plansPromise: ['Plan', function (Plan) { return Plan.query().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          availabilityTrainingsPromise: ['Availability', '$stateParams', function (Availability, $stateParams) { return Availability.trainings({ trainingId: $stateParams.id }).$promise }],
           trainingPromise: ['Training', '$stateParams', function (Training, $stateParams) {
             if ($stateParams.id !== 'all') { return Training.get({ id: $stateParams.id }).$promise }
-          }
-          ],
-          settingsPromise: ['Setting', Setting =>
-            Setting.query({ names: `['booking_window_start', \
-'booking_window_end', \
-'booking_move_enable', \
-'booking_move_delay', \
-'booking_cancel_enable', \
-'booking_cancel_delay', \
-'subscription_explications_alert', \
-'training_explications_alert', \
-'training_information_message']` }).$promise
-
-          ],
-          translations: [ 'Translations', Translations =>
-            Translations.query(['app.logged.trainings_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
+          }],
+          settingsPromise: ['Setting', function (Setting) {
+            return Setting.query({ 
+              names: `['booking_window_start', \
+                       'booking_window_end', \
+                       'booking_move_enable', \
+                       'booking_move_delay', \
+                       'booking_cancel_enable', \
+                       'booking_cancel_delay', \
+                       'subscription_explications_alert', \
+                       'training_explications_alert', \
+                       'training_information_message']` }).$promise
+          }],
+          translations: [ 'Translations', function (Translations) {
+            return Translations.query(['app.logged.trainings_reserve', 'app.shared.plan_subscribe', 'app.shared.member_select',
               'app.shared.stripe', 'app.shared.valid_reservation_modal', 'app.shared.confirm_modify_slot_modal',
               'app.shared.wallet', 'app.shared.coupon_input', 'app.shared.cart']).$promise
-
-          ]
+          }]
         }
       })
       // notifications
@@ -620,8 +545,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.logged.notifications').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.logged.notifications').$promise }]
         }
       })
 
@@ -636,17 +560,13 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          subscriptionExplicationsPromise: ['Setting', Setting => Setting.get({ name: 'subscription_explications_alert' }).$promise
-          ],
-          plansPromise: ['Plan', Plan => Plan.query().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          translations: [ 'Translations', Translations =>
-            Translations.query(['app.public.plans', 'app.shared.member_select', 'app.shared.stripe', 'app.shared.wallet',
+          subscriptionExplicationsPromise: ['Setting', function (Setting) { return Setting.get({ name: 'subscription_explications_alert' }).$promise }],
+          plansPromise: ['Plan', function (Plan) { return Plan.query().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          translations: [ 'Translations', function (Translations) {
+            return Translations.query(['app.public.plans', 'app.shared.member_select', 'app.shared.stripe', 'app.shared.wallet',
               'app.shared.coupon_input']).$promise
-
-          ]
+          }]
         }
       })
 
@@ -660,14 +580,10 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          categoriesPromise: ['Category', Category => Category.query().$promise
-          ],
-          themesPromise: ['EventTheme', EventTheme => EventTheme.query().$promise
-          ],
-          ageRangesPromise: ['AgeRange', AgeRange => AgeRange.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.public.events_list').$promise
-          ]
+          categoriesPromise: ['Category', function (Category) { return Category.query().$promise }],
+          themesPromise: ['EventTheme', function (EventTheme) { return EventTheme.query().$promise }],
+          ageRangesPromise: ['AgeRange', function (AgeRange) { return AgeRange.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.public.events_list').$promise }]
         }
       })
       .state('app.public.events_show', {
@@ -679,17 +595,13 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          eventPromise: ['Event', '$stateParams', (Event, $stateParams) => Event.get({ id: $stateParams.id }).$promise
-          ],
-          priceCategoriesPromise: ['PriceCategory', PriceCategory => PriceCategory.query().$promise
-          ],
-          settingsPromise: ['Setting', Setting => Setting.query({ names: "['booking_move_enable', 'booking_move_delay', 'event_explications_alert']" }).$promise
-          ],
-          translations: [ 'Translations', Translations =>
-            Translations.query(['app.public.events_show', 'app.shared.member_select', 'app.shared.stripe',
+          eventPromise: ['Event', '$stateParams', function (Event, $stateParams) { return Event.get({ id: $stateParams.id }).$promise }],
+          priceCategoriesPromise: ['PriceCategory', function (PriceCategory) { return PriceCategory.query().$promise }],
+          settingsPromise: ['Setting', function (Setting) { return Setting.query({ names: "['booking_move_enable', 'booking_move_delay', 'event_explications_alert']" }).$promise }],
+          translations: [ 'Translations', function (Translations) {
+            return Translations.query(['app.public.events_show', 'app.shared.member_select', 'app.shared.stripe',
               'app.shared.valid_reservation_modal', 'app.shared.wallet', 'app.shared.coupon_input']).$promise
-
-          ]
+          }]
         }
       })
 
@@ -703,18 +615,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          bookingWindowStart: ['Setting', Setting => Setting.get({ name: 'booking_window_start' }).$promise
-          ],
-          bookingWindowEnd: ['Setting', Setting => Setting.get({ name: 'booking_window_end' }).$promise
-          ],
-          trainingsPromise: ['Training', Training => Training.query().$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          spacesPromise: ['Space', Space => Space.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.public.calendar']).$promise
-          ]
+          bookingWindowStart: ['Setting', function (Setting) { return Setting.get({ name: 'booking_window_start' }).$promise }],
+          bookingWindowEnd: ['Setting', function (Setting) { return Setting.get({ name: 'booking_window_end' }).$promise }],
+          trainingsPromise: ['Training', function (Training) { return Training.query().$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          spacesPromise: ['Space', function (Space) { return Space.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.public.calendar']).$promise }]
         }
       })
 
@@ -729,14 +635,10 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          bookingWindowStart: ['Setting', Setting => Setting.get({ name: 'booking_window_start' }).$promise
-          ],
-          bookingWindowEnd: ['Setting', Setting => Setting.get({ name: 'booking_window_end' }).$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.calendar').$promise
-          ]
+          bookingWindowStart: ['Setting', function (Setting) { return Setting.get({ name: 'booking_window_start' }).$promise }],
+          bookingWindowEnd: ['Setting', function (Setting) { return Setting.get({ name: 'booking_window_end' }).$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.calendar').$promise }]
         }
       })
 
@@ -750,14 +652,10 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          componentsPromise: ['Component', Component => Component.query().$promise
-          ],
-          licencesPromise: ['Licence', Licence => Licence.query().$promise
-          ],
-          themesPromise: ['Theme', Theme => Theme.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.project_elements').$promise
-          ]
+          componentsPromise: ['Component', function (Component) { return Component.query().$promise }],
+          licencesPromise: ['Licence', function (Licence) { return Licence.query().$promise }],
+          themesPromise: ['Theme', function (Theme) { return Theme.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.project_elements').$promise }]
         }
       })
 
@@ -771,12 +669,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          trainingsPromise: ['Training', Training => Training.query().$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.trainings', 'app.shared.trainings']).$promise
-          ]
+          trainingsPromise: ['Training', function (Training) { return Training.query().$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.trainings', 'app.shared.trainings']).$promise }]
         }
       })
       .state('app.admin.trainings_new', {
@@ -788,10 +683,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.trainings_new', 'app.shared.trainings']).$promise
-          ]
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.trainings_new', 'app.shared.trainings']).$promise }]
         }
       })
       .state('app.admin.trainings_edit', {
@@ -803,12 +696,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          trainingPromise: ['Training', '$stateParams', (Training, $stateParams) => Training.get({ id: $stateParams.id }).$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.shared.trainings').$promise
-          ]
+          trainingPromise: ['Training', '$stateParams', function (Training, $stateParams) { return Training.get({ id: $stateParams.id }).$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.shared.trainings').$promise }]
         }
       })
       // events
@@ -821,18 +711,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          eventsPromise: ['Event', Event => Event.query({ page: 1 }).$promise
-          ],
-          categoriesPromise: ['Category', Category => Category.query().$promise
-          ],
-          themesPromise: ['EventTheme', EventTheme => EventTheme.query().$promise
-          ],
-          ageRangesPromise: ['AgeRange', AgeRange => AgeRange.query().$promise
-          ],
-          priceCategoriesPromise: ['PriceCategory', PriceCategory => PriceCategory.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.events').$promise
-          ]
+          eventsPromise: ['Event', function (Event) { return Event.query({ page: 1 }).$promise }],
+          categoriesPromise: ['Category', function (Category) { return Category.query().$promise }],
+          themesPromise: ['EventTheme', function (EventTheme) { return EventTheme.query().$promise }],
+          ageRangesPromise: ['AgeRange', function (AgeRange) { return AgeRange.query().$promise }],
+          priceCategoriesPromise: ['PriceCategory', function (PriceCategory) { return PriceCategory.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.events').$promise }]
         }
       })
       .state('app.admin.events_new', {
@@ -844,16 +728,11 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          categoriesPromise: ['Category', Category => Category.query().$promise
-          ],
-          themesPromise: ['EventTheme', EventTheme => EventTheme.query().$promise
-          ],
-          ageRangesPromise: ['AgeRange', AgeRange => AgeRange.query().$promise
-          ],
-          priceCategoriesPromise: ['PriceCategory', PriceCategory => PriceCategory.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.events_new', 'app.shared.event']).$promise
-          ]
+          categoriesPromise: ['Category', function (Category) { return Category.query().$promise }],
+          themesPromise: ['EventTheme', function (EventTheme) { return EventTheme.query().$promise }],
+          ageRangesPromise: ['AgeRange', function (AgeRange) { return AgeRange.query().$promise }],
+          priceCategoriesPromise: ['PriceCategory', function (PriceCategory) { return PriceCategory.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.events_new', 'app.shared.event']).$promise }]
         }
       })
       .state('app.admin.events_edit', {
@@ -865,18 +744,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          eventPromise: ['Event', '$stateParams', (Event, $stateParams) => Event.get({ id: $stateParams.id }).$promise
-          ],
-          categoriesPromise: ['Category', Category => Category.query().$promise
-          ],
-          themesPromise: ['EventTheme', EventTheme => EventTheme.query().$promise
-          ],
-          ageRangesPromise: ['AgeRange', AgeRange => AgeRange.query().$promise
-          ],
-          priceCategoriesPromise: ['PriceCategory', PriceCategory => PriceCategory.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.events_edit', 'app.shared.event']).$promise
-          ]
+          eventPromise: ['Event', '$stateParams', function (Event, $stateParams) { return Event.get({ id: $stateParams.id }).$promise }],
+          categoriesPromise: ['Category', function (Category) { return Category.query().$promise }],
+          themesPromise: ['EventTheme', function (EventTheme) { return EventTheme.query().$promise }],
+          ageRangesPromise: ['AgeRange', function (AgeRange) { return AgeRange.query().$promise }],
+          priceCategoriesPromise: ['PriceCategory', function (PriceCategory) { return PriceCategory.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.events_edit', 'app.shared.event']).$promise }]
         }
       })
       .state('app.admin.event_reservations', {
@@ -888,12 +761,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          eventPromise: ['Event', '$stateParams', (Event, $stateParams) => Event.get({ id: $stateParams.id }).$promise
-          ],
-          reservationsPromise: ['Reservation', '$stateParams', (Reservation, $stateParams) => Reservation.query({ reservable_id: $stateParams.id, reservable_type: 'Event' }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.event_reservations').$promise
-          ]
+          eventPromise: ['Event', '$stateParams', function (Event, $stateParams) { return Event.get({ id: $stateParams.id }).$promise }],
+          reservationsPromise: ['Reservation', '$stateParams', function (Reservation, $stateParams) { return Reservation.query({ reservable_id: $stateParams.id, reservable_type: 'Event' }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.event_reservations').$promise }]
         }
       })
 
@@ -907,32 +777,19 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          plans: ['Plan', Plan => Plan.query().$promise
-          ],
-          groups: ['Group', Group => Group.query().$promise
-          ],
-          machinesPricesPromise: ['Price', Price => Price.query({ priceable_type: 'Machine', plan_id: 'null' }).$promise
-          ],
-          trainingsPricingsPromise: ['TrainingsPricing', TrainingsPricing => TrainingsPricing.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.pricing', 'app.shared.member_select', 'app.shared.coupon']).$promise
-          ],
-          trainingsPromise: ['Training', Training => Training.query().$promise
-          ],
-          machineCreditsPromise: ['Credit', Credit => Credit.query({ creditable_type: 'Machine' }).$promise
-          ],
-          machinesPromise: ['Machine', Machine => Machine.query().$promise
-          ],
-          trainingCreditsPromise: ['Credit', Credit => Credit.query({ creditable_type: 'Training' }).$promise
-          ],
-          couponsPromise: ['Coupon', Coupon => Coupon.query().$promise
-          ],
-          spacesPromise: ['Space', Space => Space.query().$promise
-          ],
-          spacesPricesPromise: ['Price', Price => Price.query({ priceable_type: 'Space', plan_id: 'null' }).$promise
-          ],
-          spacesCreditsPromise: ['Credit', Credit => Credit.query({ creditable_type: 'Space' }).$promise
-          ]
+          plans: ['Plan', function (Plan) { return Plan.query().$promise }],
+          groups: ['Group', function (Group) { return Group.query().$promise }],
+          machinesPricesPromise: ['Price', function (Price) { return Price.query({ priceable_type: 'Machine', plan_id: 'null' }).$promise }],
+          trainingsPricingsPromise: ['TrainingsPricing', function (TrainingsPricing) { return TrainingsPricing.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.pricing', 'app.shared.member_select', 'app.shared.coupon']).$promise }],
+          trainingsPromise: ['Training', function (Training) { return Training.query().$promise }],
+          machineCreditsPromise: ['Credit', function (Credit) { return Credit.query({ creditable_type: 'Machine' }).$promise }],
+          machinesPromise: ['Machine', function (Machine) { return Machine.query().$promise }],
+          trainingCreditsPromise: ['Credit', function (Credit) { return Credit.query({ creditable_type: 'Training' }).$promise }],
+          couponsPromise: ['Coupon', function (Coupon) { return Coupon.query().$promise }],
+          spacesPromise: ['Space', function (Space) { return Space.query().$promise }],
+          spacesPricesPromise: ['Price', function (Price) { return Price.query({ priceable_type: 'Space', plan_id: 'null' }).$promise }],
+          spacesCreditsPromise: ['Credit', function (Credit) { return Credit.query({ creditable_type: 'Space' }).$promise }]
         }
       })
 
@@ -940,12 +797,9 @@ angular.module('application.router', ['ui.router'])
       .state('app.admin.plans', {
         abstract: true,
         resolve: {
-          prices: ['Pricing', Pricing => Pricing.query().$promise
-          ],
-          groups: ['Group', Group => Group.query().$promise
-          ],
-          partners: ['User', User => User.query({ role: 'partner' }).$promise
-          ]
+          prices: ['Pricing', function (Pricing) { return Pricing.query().$promise }],
+          groups: ['Group', function (Group) { return Group.query().$promise }],
+          partners: ['User', function (User) { return User.query({ role: 'partner' }).$promise }]
         }
       })
       .state('app.admin.plans.new', {
@@ -957,8 +811,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.plans.new', 'app.shared.plan']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.plans.new', 'app.shared.plan']).$promise }]
         }
       })
       .state('app.admin.plans.edit', {
@@ -970,16 +823,11 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          spaces: ['Space', Space => Space.query().$promise
-          ],
-          machines: ['Machine', Machine => Machine.query().$promise
-          ],
-          plans: ['Plan', Plan => Plan.query().$promise
-          ],
-          planPromise: ['Plan', '$stateParams', (Plan, $stateParams) => Plan.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.plans.edit', 'app.shared.plan']).$promise
-          ]
+          spaces: ['Space', function (Space) { return Space.query().$promise }],
+          machines: ['Machine', function (Machine) { return Machine.query().$promise }],
+          plans: ['Plan', function (Plan) { return Plan.query().$promise }],
+          planPromise: ['Plan', '$stateParams', function (Plan, $stateParams) { return Plan.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.plans.edit', 'app.shared.plan']).$promise }]
         }
       })
 
@@ -993,8 +841,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.coupons_new', 'app.shared.coupon']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.coupons_new', 'app.shared.coupon']).$promise }]
         }
       })
       .state('app.admin.coupons_edit', {
@@ -1006,10 +853,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          couponPromise: ['Coupon', '$stateParams', (Coupon, $stateParams) => Coupon.get({ id: $stateParams.id }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.coupons_edit', 'app.shared.coupon']).$promise
-          ]
+          couponPromise: ['Coupon', '$stateParams', function (Coupon, $stateParams) { return Coupon.get({ id: $stateParams.id }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.coupons_edit', 'app.shared.coupon']).$promise }]
         }
       })
 
@@ -1023,28 +868,24 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          settings: ['Setting', Setting =>
-            Setting.query({ names: `[ \
-'invoice_legals', \
-'invoice_text', \
-'invoice_VAT-rate', \
-'invoice_VAT-active', \
-'invoice_order-nb', \
-'invoice_code-value', \
-'invoice_code-active', \
-'invoice_reference', \
-'invoice_logo' \
-]` }).$promise
-
-          ],
-          invoices: [ 'Invoice', Invoice =>
-            Invoice.list({
+          settings: ['Setting', function (Setting) {
+            return Setting.query({
+              names: `['invoice_legals', \
+                       'invoice_text', \
+                       'invoice_VAT-rate', \
+                       'invoice_VAT-active', \
+                       'invoice_order-nb', \
+                       'invoice_code-value', \
+                       'invoice_code-active', \
+                       'invoice_reference', \
+                       'invoice_logo']` }).$promise
+          }],
+          invoices: [ 'Invoice', function (Invoice) {
+            return Invoice.list({
               query: { number: '', customer: '', date: null, order_by: '-reference', page: 1, size: 20 }
             }).$promise
-
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.invoices').$promise
-          ]
+          }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.invoices').$promise }]
         }
       })
 
@@ -1070,18 +911,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          membersPromise: ['Member', Member => Member.list({ query: { search: '', order_by: 'id', page: 1, size: 20 } }).$promise
-          ],
-          adminsPromise: ['Admin', Admin => Admin.query().$promise
-          ],
-          groupsPromise: ['Group', Group => Group.query().$promise
-          ],
-          tagsPromise: ['Tag', Tag => Tag.query().$promise
-          ],
-          authProvidersPromise: ['AuthProvider', AuthProvider => AuthProvider.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.members').$promise
-          ]
+          membersPromise: ['Member', function (Member) { return Member.list({ query: { search: '', order_by: 'id', page: 1, size: 20 } }).$promise }],
+          adminsPromise: ['Admin', function (Admin) { return Admin.query().$promise }],
+          groupsPromise: ['Group', function (Group) { return Group.query().$promise }],
+          tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise }],
+          authProvidersPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.members').$promise }]
         }
       })
       .state('app.admin.members_new', {
@@ -1093,8 +928,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.members_new', 'app.shared.user', 'app.shared.user_admin']).$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.members_new', 'app.shared.user', 'app.shared.user_admin']).$promise }]
         }
       })
       .state('app.admin.members_edit', {
@@ -1106,18 +940,12 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          memberPromise: ['Member', '$stateParams', (Member, $stateParams) => Member.get({ id: $stateParams.id }).$promise
-          ],
-          activeProviderPromise: ['AuthProvider', AuthProvider => AuthProvider.active().$promise
-          ],
-          walletPromise: ['Wallet', '$stateParams', (Wallet, $stateParams) => Wallet.getWalletByUser({ user_id: $stateParams.id }).$promise
-          ],
-          transactionsPromise: ['Wallet', 'walletPromise', (Wallet, walletPromise) => Wallet.transactions({ id: walletPromise.id }).$promise
-          ],
-          tagsPromise: ['Tag', Tag => Tag.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.members_edit', 'app.shared.user', 'app.shared.user_admin', 'app.shared.wallet']).$promise
-          ]
+          memberPromise: ['Member', '$stateParams', function (Member, $stateParams) { return Member.get({ id: $stateParams.id }).$promise }],
+          activeProviderPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.active().$promise }],
+          walletPromise: ['Wallet', '$stateParams', function (Wallet, $stateParams) { return Wallet.getWalletByUser({ user_id: $stateParams.id }).$promise }],
+          transactionsPromise: ['Wallet', 'walletPromise', function (Wallet, walletPromise) { return Wallet.transactions({ id: walletPromise.id }).$promise }],
+          tagsPromise: ['Tag', function (Tag) { return Tag.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.members_edit', 'app.shared.user', 'app.shared.user_admin', 'app.shared.wallet']).$promise }]
         }
       })
       .state('app.admin.admins_new', {
@@ -1129,8 +957,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.admin.admins_new').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.admins_new').$promise }]
         }
       })
 
@@ -1144,12 +971,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          mappingFieldsPromise: ['AuthProvider', AuthProvider => AuthProvider.mapping_fields().$promise
-          ],
-          authProvidersPromise: ['AuthProvider', AuthProvider => AuthProvider.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.authentication_new', 'app.shared.authentication', 'app.shared.oauth2']).$promise
-          ]
+          mappingFieldsPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.mapping_fields().$promise }],
+          authProvidersPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.authentication_new', 'app.shared.authentication', 'app.shared.oauth2']).$promise }]
         }
       })
       .state('app.admin.authentication_edit', {
@@ -1161,12 +985,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          providerPromise: ['AuthProvider', '$stateParams', (AuthProvider, $stateParams) => AuthProvider.get({ id: $stateParams.id }).$promise
-          ],
-          mappingFieldsPromise: ['AuthProvider', AuthProvider => AuthProvider.mapping_fields().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query(['app.admin.authentication_edit', 'app.shared.authentication', 'app.shared.oauth2']).$promise
-          ]
+          providerPromise: ['AuthProvider', '$stateParams', function (AuthProvider, $stateParams) { return AuthProvider.get({ id: $stateParams.id }).$promise }],
+          mappingFieldsPromise: ['AuthProvider', function (AuthProvider) { return AuthProvider.mapping_fields().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query(['app.admin.authentication_edit', 'app.shared.authentication', 'app.shared.oauth2']).$promise }]
         }
       })
 
@@ -1180,12 +1001,9 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          membersPromise: ['Member', Member => Member.mapping().$promise
-          ],
-          statisticsPromise: ['Statistics', Statistics => Statistics.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.statistics').$promise
-          ]
+          membersPromise: ['Member', function (Member) { return Member.mapping().$promise }],
+          statisticsPromise: ['Statistics', function (Statistics) { return Statistics.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.statistics').$promise }]
         }
       })
       .state('app.admin.stats_graphs', {
@@ -1197,8 +1015,7 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          translations: [ 'Translations', Translations => Translations.query('app.admin.stats_graphs').$promise
-          ]
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.stats_graphs').$promise }]
         }
       })
 
@@ -1212,48 +1029,41 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          settingsPromise: ['Setting', Setting =>
-            Setting.query({ names: `[ \
-'twitter_name', \
-'about_title', \
-'about_body', \
-'about_contacts', \
-'home_blogpost', \
-'machine_explications_alert', \
-'training_explications_alert', \
-'training_information_message', \
-'subscription_explications_alert', \
-'event_explications_alert', \
-'space_explications_alert', \
-'booking_window_start', \
-'booking_window_end', \
-'booking_move_enable', \
-'booking_move_delay', \
-'booking_cancel_enable', \
-'booking_cancel_delay', \
-'main_color', \
-'secondary_color', \
-'fablab_name', \
-'name_genre', \
-'reminder_enable', \
-'reminder_delay', \
-'visibility_yearly', \
-'visibility_others', \
-'display_name_enable', \
-'machines_sort_by' \
-]` }).$promise
-
-          ],
-          cguFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'cgu-file' }).$promise
-          ],
-          cgvFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'cgv-file' }).$promise
-          ],
-          faviconFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'favicon-file' }).$promise
-          ],
-          profileImageFile: ['CustomAsset', CustomAsset => CustomAsset.get({ name: 'profile-image-file' }).$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.settings').$promise
-          ]
+          settingsPromise: ['Setting', function (Setting) {
+            return Setting.query({
+              names: `['twitter_name', \
+                       'about_title', \
+                       'about_body', \
+                       'about_contacts', \
+                       'home_blogpost', \
+                       'machine_explications_alert', \
+                       'training_explications_alert', \
+                       'training_information_message', \
+                       'subscription_explications_alert', \
+                       'event_explications_alert', \
+                       'space_explications_alert', \
+                       'booking_window_start', \
+                       'booking_window_end', \
+                       'booking_move_enable', \
+                       'booking_move_delay', \
+                       'booking_cancel_enable', \
+                       'booking_cancel_delay', \
+                       'main_color', \
+                       'secondary_color', \
+                       'fablab_name', \
+                       'name_genre', \
+                       'reminder_enable', \
+                       'reminder_delay', \
+                       'visibility_yearly', \
+                       'visibility_others', \
+                       'display_name_enable', \
+                       'machines_sort_by']` }).$promise
+          }],
+          cguFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'cgu-file' }).$promise }],
+          cgvFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'cgv-file' }).$promise }],
+          faviconFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'favicon-file' }).$promise }],
+          profileImageFile: ['CustomAsset', function (CustomAsset) { return CustomAsset.get({ name: 'profile-image-file' }).$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.settings').$promise }]
         }
       })
 
@@ -1267,10 +1077,8 @@ angular.module('application.router', ['ui.router'])
           }
         },
         resolve: {
-          clientsPromise: ['OpenAPIClient', OpenAPIClient => OpenAPIClient.query().$promise
-          ],
-          translations: [ 'Translations', Translations => Translations.query('app.admin.open_api_clients').$promise
-          ]
+          clientsPromise: ['OpenAPIClient', function (OpenAPIClient) { return OpenAPIClient.query().$promise }],
+          translations: [ 'Translations', function (Translations) { return Translations.query('app.admin.open_api_clients').$promise }]
         }
       })
   }