diff --git a/src/flaschengeist.d.ts b/src/flaschengeist.d.ts index 1e08ed4..216d696 100644 --- a/src/flaschengeist.d.ts +++ b/src/flaschengeist.d.ts @@ -91,7 +91,7 @@ declare namespace FG { type?: DrinkType; volumes: Array; uuid: string; - receipt?: string; + receipt?: Array; } interface DrinkIngredient { id: number; diff --git a/src/plugins/pricelist/components/CalculationTable.vue b/src/plugins/pricelist/components/CalculationTable.vue index 8b11644..fdb261a 100644 --- a/src/plugins/pricelist/components/CalculationTable.vue +++ b/src/plugins/pricelist/components/CalculationTable.vue @@ -154,7 +154,7 @@ v-model="scope.value" :options="drinkTypes" option-label="name" - option-value='id' + option-value="id" filled dense autofocus @@ -296,8 +296,12 @@ /> - {{drinks_props.row.receipt}} - + @@ -326,6 +330,7 @@ import { useMainStore } from 'src/store'; import { Drink, usePricelistStore } from 'src/plugins/pricelist/store'; import MinPriceSetting from 'src/plugins/pricelist/components/MinPriceSetting.vue'; import NewDrink from 'src/plugins/pricelist/components/CalculationTable/NewDrink.vue'; +import BuildManual from 'src/plugins/pricelist/components/CalculationTable/BuildManual.vue'; import { Notify } from 'quasar'; function sort(a: string | number, b: string | number) { @@ -336,15 +341,15 @@ function sort(a: string | number, b: string | number) { export default defineComponent({ name: 'CalculationTable', - components: { MinPriceSetting, DrinkPriceVolumesTable, NewDrink }, + components: { BuildManual, MinPriceSetting, DrinkPriceVolumesTable, NewDrink }, setup() { const mainStore = useMainStore(); const store = usePricelistStore(); onBeforeMount(() => { - void store.getDrinkTypes() - void store.getExtraIngredients() - void store.get_min_prices() + void store.getDrinkTypes(); + void store.getExtraIngredients(); + void store.get_min_prices(); store.getPriceCalcColumn(user); }); @@ -506,6 +511,18 @@ export default defineComponent({ void store.delete_drink_picture(drink); } + function addStep(event: string, drink: Drink) { + console.log(event, drink.receipt); + drink.receipt?.push(event); + updateDrink(drink); + } + + function deleteStep(event: number, drink: Drink) { + console.log(event, drink.receipt); + drink.receipt?.splice(event, 1); + updateDrink(drink); + } + return { drinks: computed(() => store.drinks), pagination, @@ -520,6 +537,8 @@ export default defineComponent({ drinkPic, savePicture, deletePicture, + addStep, + deleteStep, console, }; }, diff --git a/src/plugins/pricelist/components/CalculationTable/BuildManual.vue b/src/plugins/pricelist/components/CalculationTable/BuildManual.vue new file mode 100644 index 0000000..c51de63 --- /dev/null +++ b/src/plugins/pricelist/components/CalculationTable/BuildManual.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumeTable/NewVolume.vue b/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumeTable/NewVolume.vue index 863a734..9669361 100644 --- a/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumeTable/NewVolume.vue +++ b/src/plugins/pricelist/components/CalculationTable/DrinkPriceVolumeTable/NewVolume.vue @@ -1,10 +1,5 @@ @@ -40,8 +43,10 @@