diff --git a/src/filters/index.js b/src/filters/index.js index 5f9d9e746..c08f897c4 100644 --- a/src/filters/index.js +++ b/src/filters/index.js @@ -3,7 +3,6 @@ import toDate from './toDate'; import toCurrency from './toCurrency'; import toPercentage from './toPercentage'; import dashIfEmpty from './dashIfEmpty'; -import zeroFill from './zeroFill'; export { toLowerCase, @@ -11,5 +10,4 @@ export { toCurrency, toPercentage, dashIfEmpty, - zeroFill }; diff --git a/src/filters/zeroFill.js b/src/filters/zeroFill.js deleted file mode 100644 index 00d47d366..000000000 --- a/src/filters/zeroFill.js +++ /dev/null @@ -1,4 +0,0 @@ -export default function (value, pad) { - const valueStr = String(value); - return valueStr.padStart(pad, '0'); -} diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index b172d0c89..f2cdb4c7a 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -3,7 +3,7 @@ import { onMounted, ref, computed, onUpdated } from 'vue'; import { useRoute, useRouter } from 'vue-router'; import { useI18n } from 'vue-i18n'; import axios from 'axios'; -import { dashIfEmpty, toDate, toCurrency, zeroFill } from 'src/filters'; +import { dashIfEmpty, toDate, toCurrency } from 'src/filters'; import SkeletonSummary from 'components/ui/SkeletonSummary.vue'; import FetchData from 'components/FetchData.vue'; import FetchedTags from 'components/ui/FetchedTags.vue'; @@ -33,7 +33,6 @@ async function fetch() { const { data } = await axios.get(`Tickets/${entityId.value}/summary`); if (data) { ticket.value = data; - console.log(ticket.value); salesLines.value = data.sales; } } @@ -92,7 +91,8 @@ async function changeState(value) { @@ -248,199 +248,221 @@ async function changeState(value) {
- - {{ t('ticket.summary.saleLines') }} - {{ t('ticket.summary.goTo') }} - - - - + +
- - {{ t('ticket.summary.packages') }} - {{ t('ticket.summary.goTo') }} - - - - - + + + {{ t('ticket.summary.packages') }} + + + + + + +
- - {{ t('ticket.summary.services') }} - {{ t('ticket.summary.goTo') }} - - - - - + + + {{ t('ticket.summary.services') }} + + + + + + +
- - {{ t('ticket.summary.request') }} - {{ t('ticket.summary.goTo') }} - - - - - + + + {{ t('ticket.summary.request') }} + + + + + + +
@@ -455,9 +477,21 @@ async function changeState(value) { .q-card { width: 100%; + height: 100%; + max-width: 1200px; } .summary { + .q-list { + .q-item__label--header { + display: flex; + justify-content: space-between; + + a { + color: $primary; + } + } + } .fetched-tags { display: flex; flex-wrap: wrap; @@ -494,26 +528,6 @@ async function changeState(value) { } } - .text-h6 { - margin-bottom: $spacing-md; - text-transform: uppercase; - line-height: 1; - padding: 7px 0; - padding-bottom: 5px; - border-bottom: 2px solid $primary; - overflow: hidden; - position: relative; - } - - .text-h6:after { - font-family: 'Material Icons'; - content: 'open_in_new'; - position: absolute; - right: 5px; - text-transform: none; - color: $primary; - } - .header { font-size: 18px; display: flex; @@ -532,4 +546,8 @@ async function changeState(value) { } } } + +.q-dialog .summary { + max-width: 1200px; +} diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue index 330c17bbf..f875e5314 100644 --- a/src/pages/Ticket/TicketList.vue +++ b/src/pages/Ticket/TicketList.vue @@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n'; import { useRouter } from 'vue-router'; import Paginate from 'components/Paginate.vue'; import { toDate, toCurrency } from 'src/filters/index'; -// import TicketSummary from './Card/TicketSummary.vue'; +import TicketSummary from './Card/TicketSummary.vue'; const router = useRouter(); const { t } = useI18n(); @@ -55,7 +55,7 @@ const preview = ref({ function showPreview(id) { preview.value.shown = true; preview.value.data = { - customerId: id, + ticketId: id, }; } @@ -108,42 +108,19 @@ function showPreview(id) { - - {{ t('components.smartCard.openCard') }} {{ t('components.smartCard.openSummary') }} - - + + +