diff --git a/src/plugins/pricelist/components/CalculationTable.vue b/src/plugins/pricelist/components/CalculationTable.vue index ec221fc..20cd3e7 100644 --- a/src/plugins/pricelist/components/CalculationTable.vue +++ b/src/plugins/pricelist/components/CalculationTable.vue @@ -4,7 +4,6 @@ title="Preistabelle" :columns="columns" :rows="drinks" - :visible-columns="visibleColumn" dense :filter="search" :filter-method="filter" @@ -19,19 +18,6 @@ - - Neues Getränk @@ -52,7 +35,7 @@
import { defineComponent, onBeforeMount, ComputedRef, computed, ref } from 'vue'; -import { useMainStore } from 'src/stores'; import { Drink, usePricelistStore, DrinkPriceVolume } from 'src/plugins/pricelist/store'; import MinPriceSetting from 'src/plugins/pricelist/components/MinPriceSetting.vue'; import SearchInput from './SearchInput.vue'; @@ -197,23 +179,12 @@ export default defineComponent({ }, }, setup(props) { - const mainStore = useMainStore(); const store = usePricelistStore(); onBeforeMount(() => { void store.getDrinks(); - try { - user.value = mainStore.currentUser.userid; - } catch { - user.value = undefined; - } - - if (user.value) { - store.getPriceCalcColumn(user.value); - } }); - const user = ref(); const columns = [ { @@ -369,12 +340,6 @@ export default defineComponent({ field: 'public', }, ]; - const visibleColumn = computed({ - get: () => store.pricecalc_columns, - set: (val) => { - store.updatePriceCalcColumn(user.value, val); - }, - }); const search_keys = computed(() => columns.filter( @@ -515,7 +480,6 @@ export default defineComponent({ columns, column_calc, column_prices, - visibleColumn, drinkTypes, updateDrink, deleteDrink, diff --git a/src/plugins/pricelist/components/CalculationTable/BuildManual.vue b/src/plugins/pricelist/components/CalculationTable/BuildManual.vue index 40d4ee7..61eaa0f 100644 --- a/src/plugins/pricelist/components/CalculationTable/BuildManual.vue +++ b/src/plugins/pricelist/components/CalculationTable/BuildManual.vue @@ -32,6 +32,7 @@ export default defineComponent({ props: { steps: { type: Array as PropType>, + default: undefined }, editable: { type: Boolean, diff --git a/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumes.vue b/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumes.vue index 83cf1dc..776d3ca 100644 --- a/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumes.vue +++ b/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumes.vue @@ -101,7 +101,7 @@
>, required: true, }, - cost_per_volume: { + costPerVolume: { type: undefined, + default: undefined }, editable: { type: Boolean, diff --git a/src/plugins/pricelist/components/DrinkModify.vue b/src/plugins/pricelist/components/DrinkModify.vue index 9162fde..661bf41 100644 --- a/src/plugins/pricelist/components/DrinkModify.vue +++ b/src/plugins/pricelist/components/DrinkModify.vue @@ -125,7 +125,7 @@ , drinks: [] as Array, extraIngredients: [] as Array, - pricecalc_columns: [] as Array, min_prices: [] as Array, tags: [] as Array, }), @@ -199,24 +197,6 @@ export const usePricelistStore = defineStore({ }) .catch((err) => console.warn(err)); }, - getPriceCalcColumn(userid: string) { - api - .get(`pricelist/users/${userid}/pricecalc_columns`) - .then(({ data }: AxiosResponse>) => { - if (data.length > 0) { - this.pricecalc_columns = data; - } - }) - .catch((err) => console.log(err)); - }, - updatePriceCalcColumn(userid: string, data: Array) { - api - .put(`pricelist/users/${userid}/pricecalc_columns`, data) - .then(() => { - this.pricecalc_columns = data; - }) - .catch((err) => console.log(err)); - }, async get_min_prices() { const { data } = await api.get>('pricelist/settings/min_prices'); this.min_prices = data;