Move base-select into base

This commit is contained in:
Darko Gjorgjijoski
2025-08-28 12:02:39 +02:00
parent 70bfe1b688
commit 697c1af065
72 changed files with 77 additions and 77 deletions

View File

@@ -10,7 +10,7 @@
<script setup>
import { computed } from 'vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
const props = defineProps({
modelValue: {

View File

@@ -19,7 +19,7 @@
>
<template #singlelabel="{ value }">
<div class="absolute left-3.5">
{{ value.name }} -
{{ value.name }} -
<template v-if="value.calculation_type === 'fixed'">
<BaseFormatMoney :amount="value.fixed_amount" :currency="currency" />
</template>
@@ -30,7 +30,7 @@
</template>
<template #option="{ option }">
{{ option.name }} -
{{ option.name }} -
<template v-if="option.calculation_type === 'fixed'">
<BaseFormatMoney :amount="option.fixed_amount" :currency="currency" />
</template>
@@ -80,7 +80,7 @@ import { useI18n } from 'vue-i18n'
import { useUserStore } from '@/scripts/admin/stores/user'
import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseFormatMoney from '@/scripts/components/base/BaseFormatMoney.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
const props = defineProps({
ability: {
@@ -165,7 +165,7 @@ const taxAmount = computed(() => {
if(localTax.calculation_type === 'fixed') {
return localTax.fixed_amount
}
if (props.discountedTotal) {
const taxPerItemEnabled = props.store[props.storeProp].tax_per_item === 'YES'
const discountPerItemEnabled = props.store[props.storeProp].discount_per_item === 'YES'

View File

@@ -99,7 +99,7 @@ import { required, helpers } from '@vuelidate/validators'
import { useVuelidate } from '@vuelidate/core'
import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseButton from '@/scripts/components/base/BaseButton.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
import BaseModal from '@/scripts/components/base/BaseModal.vue'

View File

@@ -139,7 +139,7 @@ import { useGlobalStore } from '@/scripts/admin/stores/global'
import { useRouter } from 'vue-router'
import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseButton from '@/scripts/components/base/BaseButton.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseFileUploader from '@/scripts/components/base/BaseFileUploader.vue'

View File

@@ -482,7 +482,7 @@ import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseTab from '@/scripts/components/base/BaseTab.vue'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseTabGroup from '@/scripts/components/base/BaseTabGroup.vue'

View File

@@ -205,7 +205,7 @@ import BaseInfoAlert from '@/scripts/components/base/BaseInfoAlert.vue'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
import BaseModal from '@/scripts/components/base/BaseModal.vue'

View File

@@ -141,7 +141,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseButton from '@/scripts/components/base/BaseButton.vue'
import BaseTextarea from '@/scripts/components/base/BaseTextarea.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseMoney from '@/scripts/components/base/BaseMoney.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
@@ -217,15 +217,15 @@ const v$ = useVuelidate(
const getTaxTypes = computed(() => {
return taxTypeStore.taxTypes.map((tax) => {
const amount = tax.calculation_type === 'fixed'
const amount = tax.calculation_type === 'fixed'
? new Intl.NumberFormat(undefined, {
style: 'currency',
currency: companyStore.selectedCompanyCurrency.code
}).format(tax.fixed_amount / 100)
: `${tax.percent}%`
return {
...tax,
return {
...tax,
tax_name: `${tax.name} (${amount})`
}
})

View File

@@ -119,7 +119,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseButton from '@/scripts/components/base/BaseButton.vue'
import BaseCustomInput from '@/scripts/components/base/BaseCustomInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
import BaseModal from '@/scripts/components/base/BaseModal.vue'

View File

@@ -226,7 +226,7 @@ import BaseIcon from '@/scripts/components/base/BaseIcon.vue'
import BaseButton from '@/scripts/components/base/BaseButton.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
import BaseModal from '@/scripts/components/base/BaseModal.vue'

View File

@@ -173,7 +173,7 @@ import { required, url, helpers } from '@vuelidate/validators'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
export default {
components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },

View File

@@ -152,7 +152,7 @@ import { required, helpers } from '@vuelidate/validators'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
export default {
components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },

View File

@@ -83,7 +83,7 @@ import { required, helpers } from '@vuelidate/validators'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
export default {

View File

@@ -172,7 +172,7 @@ import { required, helpers } from '@vuelidate/validators'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
export default {
components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },

View File

@@ -154,7 +154,7 @@ import { required, helpers } from '@vuelidate/validators'
import BaseSwitch from '@/scripts/components/base/BaseSwitch.vue'
import BaseInput from '@/scripts/components/base/BaseInput.vue'
import BaseInputGroup from '@/scripts/components/base/BaseInputGroup.vue'
import BaseMultiselect from '@/scripts/components/base-select/BaseMultiselect.vue'
import BaseMultiselect from '@/scripts/components/base/base-select/BaseMultiselect.vue'
import BaseInputGrid from '@/scripts/components/base/BaseInputGrid.vue'
export default {
components: { BaseInputGrid, BaseMultiselect, BaseInputGroup, BaseInput, BaseSwitch },