Merge branch 'master'

This commit is contained in:
Mohit Panjwani
2019-12-11 20:16:23 +05:30
3 changed files with 4 additions and 3 deletions

View File

@ -9,10 +9,11 @@ export default {
bootstrap ({ commit, dispatch, state }) {
return new Promise((resolve, reject) => {
window.axios.get('/api/bootstrap').then((response) => {
commit('company/' + companyTypes.BOOTSTRAP_COMPANIES, response.data.companies)
commit('company/' + companyTypes.SET_SELECTED_COMPANY, response.data.company)
commit('currency/' + currencyTypes.BOOTSTRAP_CURRENCIES, response.data)
commit('currency/' + currencyTypes.SET_DEFAULT_CURRENCY, response.data)
commit('user/' + userTypes.BOOTSTRAP_CURRENT_USER, response.data.user)
commit('company/' + companyTypes.BOOTSTRAP_COMPANIES, response.data.companies)
commit('taxType/' + taxTypeTypes.BOOTSTRAP_TAX_TYPES, response.data.taxTypes)
commit('preferences/' + preferencesTypes.SET_MOMENT_DATE_FORMAT, response.data.moment_date_format)
commit('preferences/' + preferencesTypes.SET_LANGUAGE_FORMAT, response.data.default_language)

View File

@ -1,7 +1,5 @@
import * as types from './mutation-types'
import Ls from '@/services/ls'
export const setSelectedCompany = ({ commit, dispatch, state }, data) => {
Ls.set('selectedCompany', data.id)
commit(types.SET_SELECTED_COMPANY, data)
}

View File

@ -1,4 +1,5 @@
import * as types from './mutation-types'
import Ls from '@/services/ls'
export default {
[types.BOOTSTRAP_COMPANIES] (state, companies) {
@ -6,6 +7,7 @@ export default {
state.selectedCompany = companies[0]
},
[types.SET_SELECTED_COMPANY] (state, company) {
Ls.set('selectedCompany', company.id)
state.selectedCompany = company
}
}