release v2.0.0 #4
|
@ -84,9 +84,12 @@
|
||||||
</div>
|
</div>
|
||||||
<q-separator v-if="index < volume.prices.length - 1" />
|
<q-separator v-if="index < volume.prices.length - 1" />
|
||||||
</div>
|
</div>
|
||||||
<div v-if='!public && !nodetails && isUnderMinPrice' class='fit warning bg-red text-center text-white text-body1'>
|
<div
|
||||||
Einer der Preise ist unterhalb des niedrigsten minimal Preises.
|
v-if="!public && !nodetails && isUnderMinPrice"
|
||||||
</div>
|
class="fit warning bg-red text-center text-white text-body1"
|
||||||
|
>
|
||||||
|
Einer der Preise ist unterhalb des niedrigsten minimal Preises.
|
||||||
|
</div>
|
||||||
<div v-if="editable" class="full-width row justify-end text-right">
|
<div v-if="editable" class="full-width row justify-end text-right">
|
||||||
<q-btn round icon="mdi-plus" size="sm" color="primary">
|
<q-btn round icon="mdi-plus" size="sm" color="primary">
|
||||||
<q-tooltip> Preis hinzufügen </q-tooltip>
|
<q-tooltip> Preis hinzufügen </q-tooltip>
|
||||||
|
@ -134,7 +137,7 @@ export default defineComponent({
|
||||||
required: true,
|
required: true,
|
||||||
},
|
},
|
||||||
cost_per_volume: {
|
cost_per_volume: {
|
||||||
type: undefined
|
type: undefined,
|
||||||
},
|
},
|
||||||
editable: {
|
editable: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
|
@ -274,21 +277,21 @@ export default defineComponent({
|
||||||
|
|
||||||
const isUnderMinPrice = computed(() => {
|
const isUnderMinPrice = computed(() => {
|
||||||
if (volumes.value) {
|
if (volumes.value) {
|
||||||
const this_volume = volumes.value.find(a => a.id === volume.value)
|
const this_volume = volumes.value.find((a) => a.id === volume.value);
|
||||||
if (this_volume) {
|
if (this_volume) {
|
||||||
if (this_volume.min_prices.length > 0) {
|
if (this_volume.min_prices.length > 0) {
|
||||||
const min_price = this_volume.min_prices.sort((a, b) => {
|
const min_price = this_volume.min_prices.sort((a, b) => {
|
||||||
if (a.price > b.price) return 1
|
if (a.price > b.price) return 1;
|
||||||
if (a.price < b.price) return -1
|
if (a.price < b.price) return -1;
|
||||||
return 0
|
return 0;
|
||||||
})[0]
|
})[0];
|
||||||
console.log('min_price', min_price)
|
console.log('min_price', min_price);
|
||||||
return this_volume.prices.some(a => a.price < min_price.price)
|
return this_volume.prices.some((a) => a.price < min_price.price);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false
|
return false;
|
||||||
})
|
});
|
||||||
|
|
||||||
return {
|
return {
|
||||||
volumes,
|
volumes,
|
||||||
|
@ -303,7 +306,7 @@ export default defineComponent({
|
||||||
deleteVolume,
|
deleteVolume,
|
||||||
deleteIngredient,
|
deleteIngredient,
|
||||||
change,
|
change,
|
||||||
isUnderMinPrice
|
isUnderMinPrice,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -125,7 +125,7 @@
|
||||||
<q-card-section :key="key">
|
<q-card-section :key="key">
|
||||||
<drink-price-volumes
|
<drink-price-volumes
|
||||||
v-model="edit_volumes"
|
v-model="edit_volumes"
|
||||||
:cost_per_volume='cost_per_volume'
|
:cost_per_volume="cost_per_volume"
|
||||||
editable
|
editable
|
||||||
@update="updateVolume"
|
@update="updateVolume"
|
||||||
@delete-volume="deleteVolume"
|
@delete-volume="deleteVolume"
|
||||||
|
@ -315,7 +315,9 @@ export default defineComponent({
|
||||||
set: (val: number) => ((<Drink>edit_drink.value).cost_per_volume = val),
|
set: (val: number) => ((<Drink>edit_drink.value).cost_per_volume = val),
|
||||||
});
|
});
|
||||||
|
|
||||||
const hasIngredients = computed(() => edit_volumes.value?.some(a => a.ingredients.length > 0))
|
const hasIngredients = computed(() =>
|
||||||
|
edit_volumes.value?.some((a) => a.ingredients.length > 0)
|
||||||
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
edit_drink,
|
edit_drink,
|
||||||
|
|
Loading…
Reference in New Issue