diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue
index d6cc19bd1..438a63db6 100644
--- a/src/pages/Ticket/Card/TicketPicture.vue
+++ b/src/pages/Ticket/Card/TicketPicture.vue
@@ -5,11 +5,13 @@ import { useI18n } from 'vue-i18n';
import FetchData from 'components/FetchData.vue';
import CatalogItem from 'components/ui/CatalogItem.vue';
-
-import { toCurrency } from 'filters/index';
+import VnCurrency from 'src/components/ui/VnCurrency.vue';
+import { useArrayData } from 'composables/useArrayData';
const { t } = useI18n();
const route = useRoute();
+const arrayData = useArrayData('ticketData');
+const { store } = arrayData;
const salesFilter = {
include: {
@@ -37,7 +39,12 @@ const sales = ref([]);
{{ sale.quantity }}
{{ t('by') }}
- {{ toCurrency(sale?.price) }}
+
+
+
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 38adebd11..588b9ef76 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -58,7 +58,7 @@ const canProceed = ref();
watch(
() => route.params.id,
- () => tableRef.value.reload()
+ () => tableRef.value.reload(),
);
const columns = computed(() => [
@@ -201,7 +201,7 @@ const changeQuantity = async (sale) => {
await updateQuantity(sale);
} catch (e) {
const { quantity } = tableRef.value.CrudModelRef.originalData.find(
- (s) => s.id === sale.id
+ (s) => s.id === sale.id,
);
sale.quantity = quantity;
throw e;
@@ -506,7 +506,7 @@ async function isSalePrepared(item) {
componentProps: {
title: t('Item prepared'),
message: t(
- 'This item is already prepared. Do you want to continue?'
+ 'This item is already prepared. Do you want to continue?',
),
data: item,
},
@@ -528,7 +528,7 @@ watch(
if (newItemFk) {
updateItem(newRow.value);
}
- }
+ },
);
@@ -598,7 +598,7 @@ watch(
openConfirmationModal(
t('Continue anyway?'),
t('You are going to delete lines of the ticket'),
- removeSales
+ removeSales,
)
"
>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2c6e34864..9e758ed53 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -21,6 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
import VnSelect from 'src/components/common/VnSelect.vue';
import VnToSummary from 'src/components/ui/VnToSummary.vue';
import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
+import VnCurrency from 'src/components/ui/VnCurrency.vue';
const route = useRoute();
const { notify } = useNotify();
@@ -277,19 +278,38 @@ function toTicketUrl(section) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -447,16 +467,28 @@ function toTicketUrl(section) {
:item="props.row.item"
>
- {{ props.row.price }} €
+
+
+
{{ props.row.discount }} %
- {{
- toCurrency(
- props.row.quantity *
+
+
{{ dashIfEmpty(props.row.item.itemPackingTypeFk) }}
@@ -501,7 +533,12 @@ function toTicketUrl(section) {
{{ props.row.quantity }}
{{ props.row.description }}
- {{ toCurrency(props.row.price) }}
+
+
+
{{ props.row.taxClass.description }}
{{
toCurrency(props.row.quantity * props.row.price)
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 5ea0e619c..85f16fc6a 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,11 +1,11 @@
@@ -543,14 +547,18 @@ function setReference(data) {
-
- {{ row.totalWithVat }}
-
+
+