diff --git a/src/pages/Ecomerce/BasketView.vue b/src/pages/Ecomerce/BasketView.vue index cf6656ea..aebd4c7e 100644 --- a/src/pages/Ecomerce/BasketView.vue +++ b/src/pages/Ecomerce/BasketView.vue @@ -1,14 +1,106 @@ + diff --git a/src/pages/Ecomerce/TicketDetails.vue b/src/pages/Ecomerce/TicketDetails.vue index 776d9b9b..6b66800c 100644 --- a/src/pages/Ecomerce/TicketDetails.vue +++ b/src/pages/Ecomerce/TicketDetails.vue @@ -11,6 +11,10 @@ defineProps({ rows: { type: Array, default: () => [] + }, + showTax: { + type: Boolean, + default: true } }); @@ -33,15 +37,15 @@ const lineSubtotal = line =>
{{ t('shippingInformation') }}
-
+
{{ t('preparation') }} {{ formatDateTitle(ticket.shipped) }}
-
+
{{ t('delivery') }} {{ formatDateTitle(ticket.landed) }}
-
+
{{ t(ticket.method != 'PICKUP' ? 'agency' : 'warehouse') }} {{ ticket.agency }}
@@ -53,9 +57,10 @@ const lineSubtotal = line =>
{{ ticket.nickname }}
{{ ticket.street }}
- {{ ticket.postalCode }} {{ ticket.city }} ({{ - ticket.province - }}) + + {{ ticket.postalCode }}, {{ ticket.city }} + + ({{ ticket.province }})
{{ t('total') }} {{ currency(ticket.taxBase) }} - + {{ t('totalTax') }} {{ currency(ticket.total) }} - - + + /> - + {{ row.concept }} + + {{ row.item }} + {{ row.value5 }} {{ row.value6 }} {{ row.value7 }} - {{ row.quantity }} x {{ currency(row.price) }} + {{ row.quantity }} x + {{ currency(row.price) }} + {{ currency(lineDiscountSubtotal(row)) }} - {{ currency(lineDiscountSubtotal(row)) }} - + - {{ currency(row.discount) }} = + {{ currency(lineSubtotal(row)) }} - {{ currency(lineSubtotal(row)) }}