merge conflict

lang/breadcrumbs/fr-FR.js

@@ -2,6 +2,7 @@ export default (context, locale) => {
   return ({
     item: 'Détails',
     organization_breadcrumbs: 'Fiche de la structure',
+    subscription_breadcrumbs: 'Mon abonnement',
     address_breadcrumbs: 'Adresse postale'
   })
 }

store/profile/access.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash'
 import { $roleUtils } from '~/services/rights/roleUtils'
-import { AbilitiesType, accessState, baseAccessState, baseOrganizationState, Historical } from '~/types/interfaces'
+import {AbilitiesType, accessState, baseAccessState, baseOrganizationState, Historical} from '~/types/interfaces'
 import { GENDER } from '~/types/enums'
 import { MyProfile } from '~/models/Access/MyProfile'
 import { repositoryHelper } from '~/services/store/repository'
@@ -133,7 +133,7 @@ export const mutations = {
 
 export const actions = {
   setProfile (context: any, profile: any) {
-    const rolesArray: Array<string> = Object.values(profile.roles)
+    const roles_to_array: Array<string> = Object.values(profile.roles)
 
     context.commit('setName', profile.name)
     context.commit('setGivenName', profile.givenName)
@@ -170,8 +170,8 @@ export const actions = {
 
     context.dispatch('createNewMyProfileVUexOrmInstance', profile)
   },
-  setMultiAccesses (context: any, accesses: any) {
-    _.each(accesses, (organization) => {
+  setMultiAccesses (context: any, organizations: any) {
+    _.each(organizations, (organization:baseOrganizationState) => {
       const o: baseOrganizationState = {
         id: organization.id,
         name: organization.name
@@ -180,7 +180,7 @@ export const actions = {
     })
   },
   setFamilyAccesses (context: any, accesses: any) {
-    _.each(accesses, (access) => {
+    _.each(accesses, (access: baseAccessState) => {
       const a:baseAccessState = {
         id: access.id,
         name: access.name,

use/layout/Menus/accountMenu.ts

@@ -78,7 +78,7 @@ class AccountMenu extends BaseMenu implements Menu {
     }
 
     if (this.$ability.can('display', 'subscription_page')) {
-      children.push(this.constructMenu('my_subscription', undefined, `/subscription`, true))
+      children.push(this.constructMenu('my_subscription', undefined, `/subscription`))
     }
 
     if (this.$ability.can('display', 'my_bills_page')) {