diff --git a/quasar.config.js b/quasar.config.js index d04c43cf8..828633cf6 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -86,7 +86,6 @@ module.exports = configure(function (ctx) { type: 'http', }, port: 8080, - open: true, // opens browser window automatically proxy: { '/api': { target: 'http://0.0.0.0:3000', diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index d352d7f78..e5c5676f7 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -17,7 +17,7 @@ function onToggleDrawer() { diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue index f1e05bcb4..e78602aae 100644 --- a/src/pages/Customer/Card/CustomerCard.vue +++ b/src/pages/Customer/Card/CustomerCard.vue @@ -1,152 +1,16 @@ - - diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue new file mode 100644 index 000000000..62804d43a --- /dev/null +++ b/src/pages/Customer/Card/CustomerDescriptor.vue @@ -0,0 +1,111 @@ + + + diff --git a/src/pages/Customer/Card/CustomerDescriptorPopover.vue b/src/pages/Customer/Card/CustomerDescriptorPopover.vue new file mode 100644 index 000000000..78d1c5801 --- /dev/null +++ b/src/pages/Customer/Card/CustomerDescriptorPopover.vue @@ -0,0 +1,15 @@ + + diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue index dd06bd52d..7151b291e 100644 --- a/src/pages/Customer/Card/CustomerSummary.vue +++ b/src/pages/Customer/Card/CustomerSummary.vue @@ -12,13 +12,13 @@ const route = useRoute(); const { t } = useI18n(); const $props = defineProps({ - customerId: { + id: { type: Number, default: 0, }, }); -const entityId = computed(() => $props.customerId || route.params.id); +const entityId = computed(() => $props.id || route.params.id); const customer = ref(null); function fetch() { diff --git a/src/pages/Customer/Card/CustomerSummaryDialog.vue b/src/pages/Customer/Card/CustomerSummaryDialog.vue new file mode 100644 index 000000000..84ecaf084 --- /dev/null +++ b/src/pages/Customer/Card/CustomerSummaryDialog.vue @@ -0,0 +1,21 @@ + + + diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue index 1cba2f7b0..342eda587 100644 --- a/src/pages/Customer/CustomerList.vue +++ b/src/pages/Customer/CustomerList.vue @@ -1,26 +1,25 @@ @@ -73,7 +72,7 @@ function showPreview(id) { {{ t('components.smartCard.openCard') }} - + {{ t('components.smartCard.openSummary') }} - - - -
- - - {{ ticket.nickname }} - {{ ticket.nickname }} - - - - {{ t('ticket.card.ticketId') }} - #{{ ticket.id }} - - - {{ t('ticket.card.state') }} - - {{ ticket.ticketState.state.name }} - - - - - - {{ t('ticket.card.customerId') }} - {{ ticket.clientFk }} - - - {{ t('ticket.card.salesPerson') }} - {{ ticket.client.salesPersonUser.name }} - - - - - {{ t('ticket.card.agency') }} - {{ ticket.agencyMode.name }} - - - {{ t('ticket.card.shipped') }} - {{ toDate(ticket.shipped) }} - - - - - {{ t('ticket.card.warehouse') }} - {{ ticket.warehouse.name }} - - - - - - - {{ t('ticket.card.customerCard') }} - - -
- -
-
- - - - -
- - - - - - - - -
- + + - diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue new file mode 100644 index 000000000..ce875d1cd --- /dev/null +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -0,0 +1,109 @@ + + + diff --git a/src/pages/Ticket/Card/TicketDescriptorPopover.vue b/src/pages/Ticket/Card/TicketDescriptorPopover.vue new file mode 100644 index 000000000..891ffb3a8 --- /dev/null +++ b/src/pages/Ticket/Card/TicketDescriptorPopover.vue @@ -0,0 +1,15 @@ + +