mirror of
https://github.com/crater-invoice/crater.git
synced 2025-10-28 12:11:08 -04:00
Merge branch 'master' of https://github.com/bytefury/crater
This commit is contained in:
@ -61,6 +61,7 @@
|
|||||||
<base-select
|
<base-select
|
||||||
v-model="currency"
|
v-model="currency"
|
||||||
:options="currencies"
|
:options="currencies"
|
||||||
|
:custom-label="currencyNameWithCode"
|
||||||
:allow-empty="false"
|
:allow-empty="false"
|
||||||
:searchable="true"
|
:searchable="true"
|
||||||
:show-labels="false"
|
:show-labels="false"
|
||||||
@ -435,6 +436,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
currencyNameWithCode ({name, code}) {
|
||||||
|
return `${code} - ${name}`
|
||||||
|
},
|
||||||
...mapActions('customer', [
|
...mapActions('customer', [
|
||||||
'addCustomer',
|
'addCustomer',
|
||||||
'fetchCustomer',
|
'fetchCustomer',
|
||||||
|
|||||||
@ -14,6 +14,7 @@
|
|||||||
<base-select
|
<base-select
|
||||||
v-model="formData.currency"
|
v-model="formData.currency"
|
||||||
:options="currencies"
|
:options="currencies"
|
||||||
|
:custom-label="currencyNameWithCode"
|
||||||
:class="{'error': $v.formData.currency.$error }"
|
:class="{'error': $v.formData.currency.$error }"
|
||||||
:searchable="true"
|
:searchable="true"
|
||||||
:show-labels="false"
|
:show-labels="false"
|
||||||
@ -179,6 +180,9 @@ export default {
|
|||||||
this.getDiscountSettings()
|
this.getDiscountSettings()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
currencyNameWithCode ({name, code}) {
|
||||||
|
return `${code} - ${name}`
|
||||||
|
},
|
||||||
...mapActions('currency', [
|
...mapActions('currency', [
|
||||||
'setDefaultCurrency'
|
'setDefaultCurrency'
|
||||||
]),
|
]),
|
||||||
|
|||||||
@ -11,6 +11,7 @@
|
|||||||
v-model="settingData.currency"
|
v-model="settingData.currency"
|
||||||
:class="{'error': $v.settingData.currency.$error }"
|
:class="{'error': $v.settingData.currency.$error }"
|
||||||
:options="currencies"
|
:options="currencies"
|
||||||
|
:custom-label="currencyNameWithCode"
|
||||||
:searchable="true"
|
:searchable="true"
|
||||||
:show-labels="false"
|
:show-labels="false"
|
||||||
:placeholder="$t('settings.currencies.select_currency')"
|
:placeholder="$t('settings.currencies.select_currency')"
|
||||||
@ -150,6 +151,9 @@ export default {
|
|||||||
this.getOnboardingData()
|
this.getOnboardingData()
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
currencyNameWithCode ({name, code}) {
|
||||||
|
return `${code} - ${name}`
|
||||||
|
},
|
||||||
...mapActions('auth', [
|
...mapActions('auth', [
|
||||||
'loginOnBoardingUser'
|
'loginOnBoardingUser'
|
||||||
]),
|
]),
|
||||||
|
|||||||
Reference in New Issue
Block a user