wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

feat: refs #7663 fine tunning

This commit is contained in:
Jorge Penadés 2024-09-03 17:33:17 +02:00
parent edfc6ace0a
commit 50cdb053f8
5 changed files with 87 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/ui/VnConfirm.vue
View File

@ -31,6 +31,7 @@ const props = defineProps({
}); });
defineEmits(['confirm', ...useDialogPluginComponent.emits]); defineEmits(['confirm', ...useDialogPluginComponent.emits]);
defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.hide() });
const { dialogRef, onDialogOK } = useDialogPluginComponent(); const { dialogRef, onDialogOK } = useDialogPluginComponent();
@ -68,8 +69,10 @@ async function confirm() {
<QSpace /> <QSpace />
<QBtn icon="close" :disable="isLoading" flat round dense v-close-popup /> <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
</QCardSection> </QCardSection>
<QCardSection class="row items-center"> <QCardSection class="q-pb-none">
<span v-if="message !== false" v-html="message" /> <span v-if="message !== false" v-html="message" />
</QCardSection>
<QCardSection class="row items-center q-pt-none">
<slot name="customHTML"></slot> <slot name="customHTML"></slot>
</QCardSection> </QCardSection>
<QCardActions align="right"> <QCardActions align="right">

1
src/i18n/locale/en.yml
View File

@ -96,6 +96,7 @@ globals:
to: To to: To
notes: Notes notes: Notes
refresh: Refresh refresh: Refresh
weight: Weight
pageTitles: pageTitles:
logIn: Login logIn: Login
summary: Summary summary: Summary

1
src/i18n/locale/es.yml
View File

@ -98,6 +98,7 @@ globals:
to: Hasta to: Hasta
notes: Notas notes: Notas
refresh: Actualizar refresh: Actualizar
weight: Peso
pageTitles: pageTitles:
logIn: Inicio de sesión logIn: Inicio de sesión
summary: Resumen summary: Resumen

47
src/pages/Ticket/Card/TicketDescriptorMenu.vue
View File

@ -9,6 +9,8 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
import VnConfirm from 'components/ui/VnConfirm.vue'; import VnConfirm from 'components/ui/VnConfirm.vue';
import VnSmsDialog from 'components/common/VnSmsDialog.vue'; import VnSmsDialog from 'components/common/VnSmsDialog.vue';
import toDate from 'filters/toDate'; import toDate from 'filters/toDate';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
import { useArrayData } from 'src/composables/useArrayData';
const props = defineProps({ const props = defineProps({
ticket: { ticket: {
@ -21,9 +23,10 @@ const { push, currentRoute } = useRouter();
const { dialog, notify } = useQuasar(); const { dialog, notify } = useQuasar();
const { t } = useI18n(); const { t } = useI18n();
const { openReport, sendEmail } = usePrintService(); const { openReport, sendEmail } = usePrintService();
const ticketSummary = useArrayData('TicketSummary');
const ticket = ref(props.ticket); const ticket = ref(props.ticket);
const ticketId = currentRoute.value.params.id; const ticketId = currentRoute.value.params.id;
const weight = ref();
const actions = { const actions = {
clone: async () => { clone: async () => {
const opts = { message: t('Ticket cloned'), type: 'positive' }; const opts = { message: t('Ticket cloned'), type: 'positive' };
@ -46,7 +49,25 @@ const actions = {
push({ name: 'TicketSummary', params: { id: clonedTicketId } }); push({ name: 'TicketSummary', params: { id: clonedTicketId } });
} }
}, },
setWeight: async () => {}, setWeight: async () => {
try {
const invoiceIds = (
await axios.post(`Tickets/${ticketId}/setWeight`, {
weight: weight.value,
})
).data;
notify({ message: t('Weight set'), type: 'positive' });
if (invoiceIds.length)
notify({
message: t('invoiceIds', { invoiceIds: invoiceIds.join() }),
type: 'positive',
});
await ticketSummary.fetch({ updateRouter: false });
} catch (e) {
notify({ message: e.message, type: 'negative' });
}
},
remove: async () => { remove: async () => {
try { try {
await axios.post(`Tickets/${ticketId}/setDeleted`); await axios.post(`Tickets/${ticketId}/setDeleted`);
@ -261,7 +282,7 @@ function openConfirmDialog(callback) {
</QItemSection> </QItemSection>
<QItemSection>{{ t('To clone ticket') }}</QItemSection> <QItemSection>{{ t('To clone ticket') }}</QItemSection>
</QItem> </QItem>
<QItem @click="openConfirmDialog('setWeight')" v-ripple clickable> <QItem @click="$refs.weightDialog.show()" v-ripple clickable>
<QItemSection avatar> <QItemSection avatar>
<QIcon name="weight" /> <QIcon name="weight" />
</QItemSection> </QItemSection>
@ -276,9 +297,25 @@ function openConfirmDialog(callback) {
<QItemSection>{{ t('Delete ticket') }}</QItemSection> <QItemSection>{{ t('Delete ticket') }}</QItemSection>
</QItem> </QItem>
</template> </template>
<VnConfirm
ref="weightDialog"
:title="t('Set weight')"
:message="t('This ticket may be invoiced, do you want to continue?')"
:promise="actions.setWeight"
>
<template #customHTML>
<VnInputNumber
:label="t('globals.weight')"
v-model="weight"
class="full-width"
/>
</template>
</VnConfirm>
</template> </template>
<i18n> <i18n>
en:
invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
es: es:
Open Delivery Note...: Abrir albarán... Open Delivery Note...: Abrir albarán...
Send Delivery Note...: Enviar albarán... Send Delivery Note...: Enviar albarán...
@ -297,5 +334,7 @@ es:
Ticket cloned: Ticked clonado Ticket cloned: Ticked clonado
It was not able to clone the ticket: No se pudo clonar el ticket It was not able to clone the ticket: No se pudo clonar el ticket
Set weight: Establecer peso Set weight: Establecer peso
Weight set: Peso establecido
This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar? This ticket may be invoiced, do you want to continue?: Es posible que se facture este ticket, desea continuar?
invoiceIds: "Se han generado las facturas con los siguientes ids: {invoiceIds}"
</i18n> </i18n>

84
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -31,8 +31,7 @@ const $props = defineProps({
const entityId = computed(() => $props.id || route.params.id); const entityId = computed(() => $props.id || route.params.id);
const summaryRef = ref(); const summaryRef = ref();
const ticket = ref(); const ticket = computed(() => summaryRef.value?.entity);
const salesLines = ref(null);
const editableStates = ref([]); const editableStates = ref([]);
const ticketUrl = ref(); const ticketUrl = ref();
const grafanaUrl = 'https://grafana.verdnatura.es'; const grafanaUrl = 'https://grafana.verdnatura.es';
@ -40,12 +39,6 @@ const grafanaUrl = 'https://grafana.verdnatura.es';
onMounted(async () => { onMounted(async () => {
ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/'; ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
}); });
async function setData(data) {
if (data) {
ticket.value = data;
salesLines.value = data.sales;
}
}
function formattedAddress() { function formattedAddress() {
if (!ticket.value) return ''; if (!ticket.value) return '';
@ -89,7 +82,6 @@ async function changeState(value) {
<CardSummary <CardSummary
ref="summaryRef" ref="summaryRef"
:url="`Tickets/${entityId}/summary`" :url="`Tickets/${entityId}/summary`"
@on-fetch="(data) => setData(data)"
data-key="TicketSummary" data-key="TicketSummary"
> >
<template #header="{ entity }"> <template #header="{ entity }">
@ -131,7 +123,7 @@ async function changeState(value) {
</QList> </QList>
</QBtnDropdown> </QBtnDropdown>
</template> </template>
<template #body> <template #body="{ entity }">
<QCard class="vn-one"> <QCard class="vn-one">
<VnTitle <VnTitle
:url="ticketUrl + 'basic-data/step-one'" :url="ticketUrl + 'basic-data/step-one'"
@ -139,57 +131,57 @@ async function changeState(value) {
/> />
<VnLv :label="t('ticket.summary.state')"> <VnLv :label="t('ticket.summary.state')">
<template #value> <template #value>
<QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'"> <QChip :color="entity.ticketState?.state?.classColor ?? 'dark'">
{{ ticket.ticketState?.state?.name }} {{ entity.ticketState?.state?.name }}
</QChip> </QChip>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('ticket.summary.salesPerson')"> <VnLv :label="t('ticket.summary.salesPerson')">
<template #value> <template #value>
<VnUserLink <VnUserLink
:name="ticket.client?.salesPersonUser?.name" :name="entity.client?.salesPersonUser?.name"
:worker-id="ticket.client?.salesPersonFk" :worker-id="entity.client?.salesPersonFk"
/> />
</template> </template>
</VnLv> </VnLv>
<VnLv <VnLv
:label="t('ticket.summary.agency')" :label="t('ticket.summary.agency')"
:value="ticket.agencyMode?.name" :value="entity.agencyMode?.name"
/> />
<VnLv :label="t('ticket.summary.zone')" :value="ticket?.zone?.name" /> <VnLv :label="t('ticket.summary.zone')" :value="entity?.zone?.name" />
<VnLv <VnLv
:label="t('ticket.summary.warehouse')" :label="t('ticket.summary.warehouse')"
:value="ticket.warehouse?.name" :value="entity.warehouse?.name"
/> />
<VnLv <VnLv
:label="t('ticket.summary.collection')" :label="t('ticket.summary.collection')"
:value="ticket.ticketCollections[0]?.collectionFk" :value="entity.ticketCollections[0]?.collectionFk"
> >
<template #value> <template #value>
<a <a
:href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${ticket.ticketCollections[0]?.collectionFk}`" :href="`${grafanaUrl}/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-collectionFk=${entity.ticketCollections[0]?.collectionFk}`"
target="_blank" target="_blank"
class="grafana" class="grafana"
> >
{{ ticket.ticketCollections[0]?.collectionFk }} {{ entity.ticketCollections[0]?.collectionFk }}
</a> </a>
</template> </template>
</VnLv> </VnLv>
<VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" /> <VnLv :label="t('ticket.summary.route')" :value="entity.routeFk" />
<VnLv :label="t('ticket.summary.invoice')"> <VnLv :label="t('ticket.summary.invoice')">
<template #value> <template #value>
<span :class="{ link: ticket.refFk }"> <span :class="{ link: entity.refFk }">
{{ dashIfEmpty(ticket.refFk) }} {{ dashIfEmpty(entity.refFk) }}
<InvoiceOutDescriptorProxy <InvoiceOutDescriptorProxy
:id="ticket.invoiceOut.id" :id="entity.invoiceOut.id"
v-if="ticket.refFk" v-if="entity.refFk"
/> />
</span> </span>
</template> </template>
</VnLv> </VnLv>
<VnLv <VnLv
:label="t('ticket.summary.weight')" :label="t('ticket.summary.weight')"
:value="dashIfEmpty(ticket.weight)" :value="dashIfEmpty(entity.weight)"
/> />
</QCard> </QCard>
<QCard class="vn-one"> <QCard class="vn-one">
@ -199,35 +191,35 @@ async function changeState(value) {
/> />
<VnLv <VnLv
:label="t('ticket.summary.shipped')" :label="t('ticket.summary.shipped')"
:value="toDate(ticket.shipped)" :value="toDate(entity.shipped)"
/> />
<VnLv <VnLv
:label="t('ticket.summary.landed')" :label="t('ticket.summary.landed')"
:value="toDate(ticket.landed)" :value="toDate(entity.landed)"
/> />
<VnLv :label="t('globals.packages')" :value="ticket.packages" /> <VnLv :label="t('globals.packages')" :value="entity.packages" />
<VnLv :value="ticket.address.phone"> <VnLv :value="entity.address.phone">
<template #label> <template #label>
{{ t('ticket.summary.consigneePhone') }} {{ t('ticket.summary.consigneePhone') }}
<VnLinkPhone :phone-number="ticket.address.phone" /> <VnLinkPhone :phone-number="entity.address.phone" />
</template> </template>
</VnLv> </VnLv>
<VnLv :value="ticket.address.mobile"> <VnLv :value="entity.address.mobile">
<template #label> <template #label>
{{ t('ticket.summary.consigneeMobile') }} {{ t('ticket.summary.consigneeMobile') }}
<VnLinkPhone :phone-number="ticket.address.mobile" /> <VnLinkPhone :phone-number="entity.address.mobile" />
</template> </template>
</VnLv> </VnLv>
<VnLv :value="ticket.client.phone"> <VnLv :value="entity.client.phone">
<template #label> <template #label>
{{ t('ticket.summary.clientPhone') }} {{ t('ticket.summary.clientPhone') }}
<VnLinkPhone :phone-number="ticket.client.phone" /> <VnLinkPhone :phone-number="entity.client.phone" />
</template> </template>
</VnLv> </VnLv>
<VnLv :value="ticket.client.mobile"> <VnLv :value="entity.client.mobile">
<template #label> <template #label>
{{ t('ticket.summary.clientMobile') }} {{ t('ticket.summary.clientMobile') }}
<VnLinkPhone :phone-number="ticket.client.mobile" /> <VnLinkPhone :phone-number="entity.client.mobile" />
</template> </template>
</VnLv> </VnLv>
<VnLv <VnLv
@ -235,13 +227,13 @@ async function changeState(value) {
:value="formattedAddress()" :value="formattedAddress()"
/> />
</QCard> </QCard>
<QCard class="vn-one" v-if="ticket.notes.length"> <QCard class="vn-one" v-if="entity.notes.length">
<VnTitle <VnTitle
:url="ticketUrl + 'observation'" :url="ticketUrl + 'observation'"
:text="t('ticket.pageTitles.notes')" :text="t('ticket.pageTitles.notes')"
/> />
<VnLv <VnLv
v-for="note in ticket.notes" v-for="note in entity.notes"
:key="note.id" :key="note.id"
:label="note.observationType.description" :label="note.observationType.description"
:value="note.description" :value="note.description"
@ -262,15 +254,15 @@ async function changeState(value) {
<div class="bodyCard"> <div class="bodyCard">
<VnLv <VnLv
:label="t('ticket.summary.subtotal')" :label="t('ticket.summary.subtotal')"
:value="toCurrency(ticket.totalWithoutVat)" :value="toCurrency(entity.totalWithoutVat)"
/> />
<VnLv <VnLv
:label="t('ticket.summary.vat')" :label="t('ticket.summary.vat')"
:value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)" :value="toCurrency(entity.totalWithVat - entity.totalWithoutVat)"
/> />
<VnLv <VnLv
:label="t('ticket.summary.total')" :label="t('ticket.summary.total')"
:value="toCurrency(ticket.totalWithVat)" :value="toCurrency(entity.totalWithVat)"
/> />
</div> </div>
</QCard> </QCard>
@ -279,7 +271,7 @@ async function changeState(value) {
:url="ticketUrl + 'sale'" :url="ticketUrl + 'sale'"
:text="t('ticket.summary.saleLines')" :text="t('ticket.summary.saleLines')"
/> />
<QTable :rows="ticket.sales" style="text-align: center"> <QTable :rows="entity.sales" style="text-align: center">
<template #body-cell="{ value }"> <template #body-cell="{ value }">
<QTd>{{ value }}</QTd> <QTd>{{ value }}</QTd>
</template> </template>
@ -420,10 +412,10 @@ async function changeState(value) {
</QCard> </QCard>
<QCard <QCard
class="vn-max" class="vn-max"
v-if="ticket.packagings.length > 0 || ticket.services.length > 0" v-if="entity.packagings.length || entity.services.length"
> >
<VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" /> <VnTitle :url="ticketUrl + 'package'" :text="t('globals.packages')" />
<QTable :rows="ticket.packagings" flat> <QTable :rows="entity.packagings" flat>
<template #header="props"> <template #header="props">
<QTr :props="props"> <QTr :props="props">
<QTh auto-width>{{ t('ticket.summary.created') }}</QTh> <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
@ -443,7 +435,7 @@ async function changeState(value) {
:url="ticketUrl + 'service'" :url="ticketUrl + 'service'"
:text="t('ticket.summary.service')" :text="t('ticket.summary.service')"
/> />
<QTable :rows="ticket.services" flat> <QTable :rows="entity.services" flat>
<template #header="props"> <template #header="props">
<QTr :props="props"> <QTr :props="props">
<QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh> <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>